Unverified Commit 6f50ebf2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ixp4xx-dts-v5.18' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 7743b59f 8d3ca344

arch/arm/boot/dts/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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) += \

arch/arm/boot/dts/intel-ixp42x-gateway-7001.dts

+1 −2
Original line number Diff line number Diff line 
// 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 @@ chosen { 
	aliases {

		/* second UART is the primary console */

		serial0 = &uart1;

		serial1 = &uart0;

	};



	soc {

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

+14 −15
Original line number Diff line number Diff line
@@ -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 @@ flash@0,0 { 
				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 @@ ethernet@c8009000 { 
			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>;

				};

			};

		};

arch/arm/boot/dts/intel-ixp42x.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ / { 
	soc {

		bus@c4000000 {

			compatible = "intel,ixp42x-expansion-bus-controller", "syscon";

			reg = <0xc4000000 0x28>;

			reg = <0xc4000000 0x30>;

		};



		pci@c0000000 {