Skip to content

Commit 9053d2d

Browse files
torvaldstorvalds
committed
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann: "Only a handful of device tree fixes, all simple enough: NVIDIA Tegra: - Fix a regression for booting on chromebooks TI OMAP: - Two fixes PHY mode on am335x reference boards Marvell mvebu: - A regression fix for Armada XP NAND flash controllers - An incorrect reset signal on the clearfog board" * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: ARM: tegra: Restore DT ABI on Tegra124 Chromebooks ARM: dts: am335x-evm: Fix PHY mode for ethernet ARM: dts: am335x-evmsk: Fix PHY mode for ethernet arm64: dts: clearfog-gt-8k: fix SGMII PHY reset signal ARM: dts: armada-xp: fix Armada XP boards NAND description
2 parents 2cc63b3 + 2f8b1ce commit 9053d2d

File tree

7 files changed

+96
-73
lines changed

7 files changed

+96
-73
lines changed

‎arch/arm/boot/dts/am335x-evm.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@
729729

730730
&cpsw_emac0 {
731731
phy-handle = <&ethphy0>;
732-
phy-mode = "rgmii-txid";
732+
phy-mode = "rgmii-id";
733733
};
734734

735735
&tscadc {

‎arch/arm/boot/dts/am335x-evmsk.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -651,13 +651,13 @@
651651

652652
&cpsw_emac0 {
653653
phy-handle = <&ethphy0>;
654-
phy-mode = "rgmii-txid";
654+
phy-mode = "rgmii-id";
655655
dual_emac_res_vlan = <1>;
656656
};
657657

658658
&cpsw_emac1 {
659659
phy-handle = <&ethphy1>;
660-
phy-mode = "rgmii-txid";
660+
phy-mode = "rgmii-id";
661661
dual_emac_res_vlan = <2>;
662662
};
663663

‎arch/arm/boot/dts/armada-xp-db.dts

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -144,30 +144,32 @@
144144
status = "okay";
145145
};
146146

147-
nand@d0000 {
147+
nand-controller@d0000 {
148148
status = "okay";
149-
label = "pxa3xx_nand-0";
150-
num-cs = <1>;
151-
marvell,nand-keep-config;
152-
nand-on-flash-bbt;
153-
154-
partitions {
155-
compatible = "fixed-partitions";
156-
#address-cells = <1>;
157-
#size-cells = <1>;
158-
159-
partition@0 {
160-
label = "U-Boot";
161-
reg = <0 0x800000>;
162-
};
163-
partition@800000 {
164-
label = "Linux";
165-
reg = <0x800000 0x800000>;
166-
};
167-
partition@1000000 {
168-
label = "Filesystem";
169-
reg = <0x1000000 0x3f000000>;
170149

150+
nand@0 {
151+
reg = <0>;
152+
label = "pxa3xx_nand-0";
153+
nand-rb = <0>;
154+
nand-on-flash-bbt;
155+
156+
partitions {
157+
compatible = "fixed-partitions";
158+
#address-cells = <1>;
159+
#size-cells = <1>;
160+
161+
partition@0 {
162+
label = "U-Boot";
163+
reg = <0 0x800000>;
164+
};
165+
partition@800000 {
166+
label = "Linux";
167+
reg = <0x800000 0x800000>;
168+
};
169+
partition@1000000 {
170+
label = "Filesystem";
171+
reg = <0x1000000 0x3f000000>;
172+
};
171173
};
172174
};
173175
};

‎arch/arm/boot/dts/armada-xp-gp.dts

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,15 @@
160160
status = "okay";
161161
};
162162

163-
nand@d0000 {
163+
nand-controller@d0000 {
164164
status = "okay";
165-
label = "pxa3xx_nand-0";
166-
num-cs = <1>;
167-
marvell,nand-keep-config;
168-
nand-on-flash-bbt;
165+
166+
nand@0 {
167+
reg = <0>;
168+
label = "pxa3xx_nand-0";
169+
nand-rb = <0>;
170+
nand-on-flash-bbt;
171+
};
169172
};
170173
};
171174

‎arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts

Lines changed: 44 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -81,49 +81,52 @@
8181

8282
};
8383

84-
nand@d0000 {
84+
nand-controller@d0000 {
8585
status = "okay";
86-
label = "pxa3xx_nand-0";
87-
num-cs = <1>;
88-
marvell,nand-keep-config;
89-
nand-on-flash-bbt;
90-
91-
partitions {
92-
compatible = "fixed-partitions";
93-
#address-cells = <1>;
94-
#size-cells = <1>;
95-
96-
partition@0 {
97-
label = "u-boot";
98-
reg = <0x00000000 0x000e0000>;
99-
read-only;
100-
};
101-
102-
partition@e0000 {
103-
label = "u-boot-env";
104-
reg = <0x000e0000 0x00020000>;
105-
read-only;
106-
};
107-
108-
partition@100000 {
109-
label = "u-boot-env2";
110-
reg = <0x00100000 0x00020000>;
111-
read-only;
112-
};
113-
114-
partition@120000 {
115-
label = "zImage";
116-
reg = <0x00120000 0x00400000>;
117-
};
118-
119-
partition@520000 {
120-
label = "initrd";
121-
reg = <0x00520000 0x00400000>;
122-
};
12386

124-
partition@e00000 {
125-
label = "boot";
126-
reg = <0x00e00000 0x3f200000>;
87+
nand@0 {
88+
reg = <0>;
89+
label = "pxa3xx_nand-0";
90+
nand-rb = <0>;
91+
nand-on-flash-bbt;
92+
93+
partitions {
94+
compatible = "fixed-partitions";
95+
#address-cells = <1>;
96+
#size-cells = <1>;
97+
98+
partition@0 {
99+
label = "u-boot";
100+
reg = <0x00000000 0x000e0000>;
101+
read-only;
102+
};
103+
104+
partition@e0000 {
105+
label = "u-boot-env";
106+
reg = <0x000e0000 0x00020000>;
107+
read-only;
108+
};
109+
110+
partition@100000 {
111+
label = "u-boot-env2";
112+
reg = <0x00100000 0x00020000>;
113+
read-only;
114+
};
115+
116+
partition@120000 {
117+
label = "zImage";
118+
reg = <0x00120000 0x00400000>;
119+
};
120+
121+
partition@520000 {
122+
label = "initrd";
123+
reg = <0x00520000 0x00400000>;
124+
};
125+
126+
partition@e00000 {
127+
label = "boot";
128+
reg = <0x00e00000 0x3f200000>;
129+
};
127130
};
128131
};
129132
};

‎arch/arm/boot/dts/tegra124-nyan.dtsi

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,25 @@
1313
stdout-path = "serial0:115200n8";
1414
};
1515

16-
memory@80000000 {
16+
/*
17+
* Note that recent version of the device tree compiler (starting with
18+
* version 1.4.2) warn about this node containing a reg property, but
19+
* missing a unit-address. However, the bootloader on these Chromebook
20+
* devices relies on the full name of this node to be exactly /memory.
21+
* Adding the unit-address causes the bootloader to create a /memory
22+
* node and write the memory bank configuration to that node, which in
23+
* turn leads the kernel to believe that the device has 2 GiB of
24+
* memory instead of the amount detected by the bootloader.
25+
*
26+
* The name of this node is effectively ABI and must not be changed.
27+
*/
28+
memory {
29+
device_type = "memory";
1730
reg = <0x0 0x80000000 0x0 0x80000000>;
1831
};
1932

33+
/delete-node/ memory@80000000;
34+
2035
host1x@50000000 {
2136
hdmi@54280000 {
2237
status = "okay";

‎arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@
351351
reg = <0>;
352352
pinctrl-names = "default";
353353
pinctrl-0 = <&cp0_copper_eth_phy_reset>;
354-
reset-gpios = <&cp1_gpio1 11 GPIO_ACTIVE_LOW>;
354+
reset-gpios = <&cp0_gpio2 11 GPIO_ACTIVE_LOW>;
355355
reset-assert-us = <10000>;
356356
};
357357

0 commit comments

Comments
 (0)