tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'ixp4xx-dts-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into arm/dt
IXP4xx patches for the v5.18 kernel cycle:
- Fix up the WG302 to support the v1 version (also tested)
- Fix up the syscon size
- Drop the alias for UART1 in GW7001
* tag 'ixp4xx-dts-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
ARM: dts: Drop serial 1 alias on GW7001
ARM: dts: ixp42x: Expand syscon register range
ARM: dts: ixp4xx: Fix up the Netgear WG302 device tree
Link: https://lore.kernel.org/r/CACRpkdaMk+XECwhXJYeiF8SMU6cQsj_dk8gGMoPE3zAURAPqTw@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+17
-19
+1
-1
arch/arm/boot/dts/Makefile
+1
-1
arch/arm/boot/dts/Makefile
···
271
271
intel-ixp42x-dlink-dsm-g600.dtb \
272
272
intel-ixp42x-gateworks-gw2348.dtb \
273
273
intel-ixp43x-gateworks-gw2358.dtb \
274
-
intel-ixp42x-netgear-wg302v2.dtb \
274
+
intel-ixp42x-netgear-wg302v1.dtb \
275
275
intel-ixp42x-arcom-vulcan.dtb \
276
276
intel-ixp42x-gateway-7001.dtb
277
277
dtb-$(CONFIG_ARCH_KEYSTONE) += \
+1
-2
arch/arm/boot/dts/intel-ixp42x-gateway-7001.dts
+1
-2
arch/arm/boot/dts/intel-ixp42x-gateway-7001.dts
···
1
1
// SPDX-License-Identifier: ISC
2
2
/*
3
-
* Device Tree file for Gateway 7001 AP
3
+
* Device Tree file for Gateway 7001 AP based on IXP422
4
4
* Derived from boardfiles written by Imre Kaloz
5
5
*/
6
6
···
29
29
aliases {
30
30
/* second UART is the primary console */
31
31
serial0 = &uart1;
32
-
serial1 = &uart0;
33
32
};
34
33
35
34
soc {
+14
-15
arch/arm/boot/dts/intel-ixp42x-netgear-wg302v2.dts
arch/arm/boot/dts/intel-ixp42x-netgear-wg302v1.dts
+14
-15
arch/arm/boot/dts/intel-ixp42x-netgear-wg302v2.dts
arch/arm/boot/dts/intel-ixp42x-netgear-wg302v1.dts
···
10
10
#include <dt-bindings/input/input.h>
11
11
12
12
/ {
13
-
model = "Netgear WG302 v2";
14
-
compatible = "netgear,wg302v2", "intel,ixp42x";
13
+
model = "Netgear WG302 v1";
14
+
compatible = "netgear,wg302v1", "intel,ixp42x";
15
15
#address-cells = <1>;
16
16
#size-cells = <1>;
17
17
18
18
memory@0 {
19
-
/* 16 MB SDRAM according to OpenWrt database */
19
+
/* 32 MB SDRAM according to boot arguments */
20
20
device_type = "memory";
21
-
reg = <0x00000000 0x01000000>;
21
+
reg = <0x00000000 0x02000000>;
22
22
};
23
23
24
24
chosen {
25
-
bootargs = "console=ttyS0,115200n8 root=/dev/sda1 rw rootwait";
26
-
stdout-path = "uart1:115200n8";
25
+
/* The RedBoot comes up in 9600 baud so let's keep this */
26
+
bootargs = "console=ttyS0,9600n8";
27
+
stdout-path = "uart1:9600n8";
27
28
};
28
29
29
30
aliases {
30
31
/* These are switched around */
31
32
serial0 = &uart1;
32
-
serial1 = &uart0;
33
33
};
34
34
35
35
soc {
···
38
38
compatible = "intel,ixp4xx-flash", "cfi-flash";
39
39
bank-width = <2>;
40
40
/*
41
-
* 32 MB of Flash in 128 0x20000 sized blocks
42
-
* mapped in at CS0 and CS1
41
+
* 8 MB of Flash in 64 0x20000 sized blocks
42
+
* mapped in at CS0.
43
43
*/
44
-
reg = <0 0x00000000 0x2000000>;
44
+
reg = <0 0x00000000 0x800000>;
45
45
46
46
/* Configure expansion bus to allow writes */
47
47
intel,ixp4xx-eb-write-enable = <1>;
48
48
49
49
partitions {
50
50
compatible = "redboot-fis";
51
-
/* CHECKME: guess this is Redboot FIS */
52
-
fis-index-block = <0xff>;
51
+
fis-index-block = <0x3f>;
53
52
};
54
53
};
55
54
};
···
81
82
queue-rx = <&qmgr 3>;
82
83
queue-txready = <&qmgr 20>;
83
84
phy-mode = "rgmii";
84
-
phy-handle = <&phy8>;
85
+
phy-handle = <&phy30>;
85
86
86
87
mdio {
87
88
#address-cells = <1>;
88
89
#size-cells = <0>;
89
90
90
-
phy8: ethernet-phy@8 {
91
-
reg = <8>;
91
+
phy30: ethernet-phy@30 {
92
+
reg = <30>;
92
93
};
93
94
};
94
95
};