iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IXP4xx patches for the v5.18 kernel cycle:

Browse Source 
- Fix up the WG302 to support the v1 version (also tested)
 - Fix up the syscon size
 - Drop the alias for UART1 in GW7001
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEElDRnuGcz/wPCXQWMQRCzN7AZXXMFAmIIHtgACgkQQRCzN7AZ
 XXMZoRAAtILhm1zZP0IAYpeXNEg6Mj51YVKuQamyo6zZG7MrEqy/9wjSnHGY5+P0
 DBBkYBPjJmMoF3Jn3IK68tNVoJadE8dg2eklKharU1nYcOLAbNkrxZSmFv79dasO
 rEDwR3FihNW1uu/USGfHL5ckWVpU3ld6iGtejyehXkMJI6AwHRDA+UGLP6fbi0nI
 +/lgGqVRtHmlYiR5HKE3plQYSDVKFuTs8VxRZS3NS1cHR3ERuA3gXPA7t4ls0e2j
 PBKkgJJov7SqnHqWGdhZwoIyZpxyn/t6Rt/nM+Mvk2jTImMvkGREOp8X/vkrXAGo
 B7f9mgw//36H0PN+2Hdbw56JYq7VU7lgAUp1wk+DQgwp5+xrTP4jwTVHL3nwjHlJ
 TVs3CVOTHjQedeQoSPNT5OiwLUiG88x6uXepZVOEGRfObM0AXvwayreAO6iAKShR
 IS+xhioJx5JRDxA3Wqfsy8OE+WiDWzgFI7zvdSluxEiiIlK67QS+oGpU77C8SkeU
 XtY5fjSYd5x7RVTUtsMpfWHqRDUeF4q9NuIXFfTZJunJhxLYJF57NswkoG3j0ijJ
 zM+yhoqY55Wc5yj2Tor+nMGSAC9h1CxgAswFXN50cktReZ2fULC88L3zFGPZs+8u
 KAWVswMwdLS6fTYHYHv+JHAR7PONQkZjjlvpEm524IgwMVXlDrE=
 =ydjH
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmIY6RsACgkQmmx57+YA
 GNm1FBAAi6TykQDRm1L++QYIFsXmkKHBgZ39g6OBG4I6mi/2bXq8CpjR75WDj4vU
 sx1J/x6iDce5ReSDiQuCoyXq6hqKPKV168gVgb6pHVDcH5gJyUshGOsJx1dHnMF3
 f3a/tV8YkzWbyq8cN2EaTCzGMPfaDrpiJamV2czezoKAMivOoQ4hFg/Gzx3eNt7B
 kdQMTwNUfNusXcwFXsDDhOcDagWq82iZjKLIFbIe7xkuBhLkKQ5o+qF+2Zymjhni
 0twjazrZmgSYLFvMiz+MmKARXGAtLc4DF+WJ2UV8yXlHdSrQF6MgxxiIJEJCeySM
 ZdReMW7cqaAtIgTsDOIcURPB4rMZOlvJ7ar50L+KN4nPH6xIeGRiyqzLOqdYBrj+
 FskPO+YfPTYygZzFvjYV1TBbKCdqUtvNN4MymC8vsW5TkixXVnKxkn834UQSgRVN
 u9YN/fREh4m8B+QM2DnQWPAIHQvfYn/XuPDLaZx9brnFoh4Kg2tUNNl8SqNiAcLv
 pFjgaAO3xnorMsEpbZMjJM3lIL0lSWkRgMfcJEBP6aeNpTKK0qfqwYH5Vw55Gkl/
 hCsPx74QCdUxGVn2587OOG5OUJ/jdcmRmWFjRjP+fQ1qH2EbcS7NOogjB2X+X8yf
 nIaPlPjgwr/sAqwISc7wa8ztaDGl8OWI+smTO8SX5dHjYVBCh6Y=
 =Vc2E
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Arnd Bergmann 2022-02-25 15:35:07 +01:00
commit 6f50ebf280
4 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/Makefile
View File

@ -271,7 +271,7 @@ dtb-$(CONFIG_ARCH_IXP4XX) += \
intel-ixp42x-dlink-dsm-g600.dtb \
intel-ixp42x-gateworks-gw2348.dtb \
intel-ixp43x-gateworks-gw2358.dtb \
intel-ixp42x-netgear-wg302v2.dtb \
intel-ixp42x-netgear-wg302v1.dtb \
intel-ixp42x-arcom-vulcan.dtb \
intel-ixp42x-gateway-7001.dtb
dtb-$(CONFIG_ARCH_KEYSTONE) += \

3
arch/arm/boot/dts/intel-ixp42x-gateway-7001.dts
View File

@ -1,6 +1,6 @@
// SPDX-License-Identifier: ISC
/*
* Device Tree file for Gateway 7001 AP
* Device Tree file for Gateway 7001 AP based on IXP422
* Derived from boardfiles written by Imre Kaloz
*/
@ -29,7 +29,6 @@
aliases {
/* second UART is the primary console */
serial0 = &uart1;
serial1 = &uart0;
};
soc {

29
arch/arm/boot/dts/intel-ixp42x-netgear-wg302v2.dts → arch/arm/boot/dts/intel-ixp42x-netgear-wg302v1.dts
View File

@ -10,26 +10,26 @@
#include <dt-bindings/input/input.h>
/ {
model = "Netgear WG302 v2";
compatible = "netgear,wg302v2", "intel,ixp42x";
model = "Netgear WG302 v1";
compatible = "netgear,wg302v1", "intel,ixp42x";
#address-cells = <1>;
#size-cells = <1>;
memory@0 {
/* 16 MB SDRAM according to OpenWrt database */
/* 32 MB SDRAM according to boot arguments */
device_type = "memory";
reg = <0x00000000 0x01000000>;
reg = <0x00000000 0x02000000>;
};
chosen {
bootargs = "console=ttyS0,115200n8 root=/dev/sda1 rw rootwait";
stdout-path = "uart1:115200n8";
/* The RedBoot comes up in 9600 baud so let's keep this */
bootargs = "console=ttyS0,9600n8";
stdout-path = "uart1:9600n8";
};
aliases {
/* These are switched around */
serial0 = &uart1;
serial1 = &uart0;
};
soc {
@ -38,18 +38,17 @@
compatible = "intel,ixp4xx-flash", "cfi-flash";
bank-width = <2>;
/*
* 32 MB of Flash in 128 0x20000 sized blocks
* mapped in at CS0 and CS1
* 8 MB of Flash in 64 0x20000 sized blocks
* mapped in at CS0.
*/
reg = <0 0x00000000 0x2000000>;
reg = <0 0x00000000 0x800000>;
/* Configure expansion bus to allow writes */
intel,ixp4xx-eb-write-enable = <1>;
partitions {
compatible = "redboot-fis";
/* CHECKME: guess this is Redboot FIS */
fis-index-block = <0xff>;
fis-index-block = <0x3f>;
};
};
};
@ -82,14 +81,14 @@
queue-rx = <&qmgr 3>;
queue-txready = <&qmgr 20>;
phy-mode = "rgmii";
phy-handle = <&phy8>;
phy-handle = <&phy30>;
mdio {
#address-cells = <1>;
#size-cells = <0>;
phy8: ethernet-phy@8 {
reg = <8>;
phy30: ethernet-phy@30 {
reg = <30>;
};
};
};

2
arch/arm/boot/dts/intel-ixp42x.dtsi
View File

@ -9,7 +9,7 @@
soc {
bus@c4000000 {
compatible = "intel,ixp42x-expansion-bus-controller", "syscon";
reg = <0xc4000000 0x28>;
reg = <0xc4000000 0x30>;
};
pci@c0000000 {