Unverified Commit e86147a2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-dt-6.5-1' of... 

Merge tag 'mvebu-dt-6.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into soc/dt

mvebu dt for 6.5 (part 1)

Add Endian 4i Edge 200 board (kirkwood based)
Add missing phy-modes on Armada 388 clearfog board
Replace deprecated spi-gpio properties on Armada XP
Align MTD partition nodes to dtschema for all mvebu boards

* tag 'mvebu-dt-6.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
  ARM: dts: mvebu: align MTD partition nodes to dtschema
  ARM: dts: armada-xp: Replace deprecated spi-gpio properties
  ARM: dts: armada388-clearfog: add missing phy-modes
  ARM: dts: kirkwood: Add Endian 4i Edge 200 board

Link: https://lore.kernel.org/r/87a5wzh8b1.fsf@BL-laptop


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5bfea833 dc393f1f

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -304,6 +304,7 @@ dtb-$(CONFIG_ARCH_KEYSTONE) += \ 
	keystone-k2g-evm.dtb \

	keystone-k2g-ice.dtb

dtb-$(CONFIG_MACH_KIRKWOOD) += \

	kirkwood-4i-edge-200.dtb \

	kirkwood-b3.dtb \

	kirkwood-blackarmor-nas220.dtb \

	kirkwood-c200-v1.dtb \

arch/arm/boot/dts/armada-385-atl-x530.dts

+7 −7
Original line number Diff line number Diff line
@@ -179,19 +179,19 @@ 
			compatible = "fixed-partitions";

			#address-cells = <1>;

			#size-cells = <1>;

			partition@u-boot {

			partition@0 {

				reg = <0x00000000 0x00100000>;

				label = "u-boot";

			};

			partition@u-boot-env {

			partition@100000 {

				reg = <0x00100000 0x00040000>;

				label = "u-boot-env";

			};

			partition@unused {

			partition@140000 {

				reg = <0x00140000 0x00e80000>;

				label = "unused";

			};

			partition@idprom {

			partition@fc0000 {

				reg = <0x00fc0000 0x00040000>;

				label = "idprom";

			};
@@ -216,16 +216,16 @@ 
			compatible = "fixed-partitions";

			#address-cells = <1>;

			#size-cells = <1>;

			partition@user {

			partition@0 {

				reg = <0x00000000 0x0f000000>;

				label = "user";

			};

			partition@errlog {

			partition@f000000 {

				/* Maximum mtdoops size is 8MB, so set to that. */

				reg = <0x0f000000 0x00800000>;

				label = "errlog";

			};

			partition@nand-bbt {

			partition@f800000 {

				reg = <0x0f800000 0x00800000>;

				label = "nand-bbt";

			};

arch/arm/boot/dts/armada-388-clearfog.dts

+6 −1
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ 


&eth1 {

	/* ethernet@30000 */

	phy-mode = "1000base-x";



	fixed-link {

		speed = <1000>;

		full-duplex;
@@ -129,8 +131,9 @@ 


			port@5 {

				reg = <5>;

				label = "cpu";

				ethernet = <&eth1>;

				phy-mode = "1000base-x";



				fixed-link {

					speed = <1000>;

					full-duplex;
@@ -141,6 +144,8 @@ 
				/* 88E1512 external phy */

				reg = <6>;

				label = "lan6";

				phy-mode = "rgmii-id";



				fixed-link {

					speed = <1000>;

					full-duplex;

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

+2 −2
Original line number Diff line number Diff line
@@ -167,8 +167,8 @@ 
	spi-3 {

		compatible = "spi-gpio";

		status = "okay";

		gpio-sck = <&gpio0 25 GPIO_ACTIVE_LOW>;

		gpio-mosi = <&gpio1 15 GPIO_ACTIVE_LOW>; /*gpio 47*/

		sck-gpios  = <&gpio0 25 GPIO_ACTIVE_LOW>;

		mosi-gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; /*gpio 47*/

		cs-gpios = <&gpio0 27 GPIO_ACTIVE_LOW>;

		num-chipselects = <1>;

		#address-cells = <1>;

arch/arm/boot/dts/kirkwood-4i-edge-200.dts

0 → 100644
+205 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * Endian 4i Edge 200 Board Description

 * Note: Endian UTM Mini is hardware clone of Endian Edge 200

 * Copyright 2021-2022 Pawel Dembicki <paweldembicki@gmail.com>

 */



/dts-v1/;



#include "kirkwood.dtsi"

#include "kirkwood-6281.dtsi"

#include <dt-bindings/leds/common.h>



/ {

	model = "Endian 4i Edge 200";

	compatible = "endian,4i-edge-200", "marvell,kirkwood-88f6281", "marvell,kirkwood";



	memory {

		device_type = "memory";

		reg = <0x00000000 0x20000000>;

	};



	chosen {

		bootargs = "console=ttyS0,115200n8";

		stdout-path = &uart0;

	};



	leds {

		compatible = "gpio-leds";

		pinctrl-0 = <&pmx_led>;

		pinctrl-names = "default";



		led-1 {

			function = LED_FUNCTION_SD;

			color = <LED_COLOR_ID_AMBER>;

			gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "mmc0";

		};



		led-2 {

			function = LED_FUNCTION_STATUS;

			color = <LED_COLOR_ID_AMBER>;

			gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;

		};



		led-3 {

			function = LED_FUNCTION_STATUS;

			color = <LED_COLOR_ID_GREEN>;

			gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;

		};

	};

};



&eth0 {

	status = "okay";

};



&eth0port {

	speed = <1000>;

	duplex = <1>;

};



&eth1 {

	status = "okay";

};



&eth1port {

	phy-handle = <&ethphyb>;

};



&mdio {

	status = "okay";



	ethphyb: ethernet-phy@b {

		reg = <0x0b>;



		marvell,reg-init =

			/* link-activity, bi-color mode 4 */

			<3 0x10 0xfff0 0xf>; /* Reg 3,16 <- 0xzzzf */

	};



	switch0: switch@11 {

		compatible = "marvell,mv88e6085";

		reg = <0x11>;



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

				label = "port1";

			};



			port@1 {

				reg = <1>;

				label = "port2";

			};



			port@2 {

				reg = <2>;

				label = "port3";

			};



			port@3 {

				reg = <3>;

				label = "port4";

			};



			port@5 {

				reg = <5>;

				phy-mode = "rgmii-id";

				ethernet = <&eth0port>;



				fixed-link {

					speed = <1000>;

					full-duplex;

				};

			};

		};

	};

};



&nand {

	status = "okay";

	pinctrl-0 = <&pmx_nand>;

	pinctrl-names = "default";



	partition@0 {

		label = "u-boot";

		reg = <0x00000000 0x000a0000>;

		read-only;

	};



	partition@a0000 {

		label = "u-boot-env";

		reg = <0x000a0000 0x00060000>;

		read-only;

	};



	partition@100000 {

		label = "kernel";

		reg = <0x00100000 0x00400000>;

	};



	partition@500000 {

		label = "ubi";

		reg = <0x00500000 0x1fb00000>;

	};

};



&pciec {

	status = "okay";

};



&pcie0 {

	status = "okay";

};



&pinctrl {

	pinctrl-0 = <&pmx_sysrst>;

	pinctrl-names = "default";



	pmx_sysrst: pmx-sysrst {

		marvell,pins = "mpp6";

		marvell,function = "sysrst";

	};



	pmx_sdio_cd: pmx-sdio-cd {

		marvell,pins = "mpp28";

		marvell,function = "gpio";

	};



	pmx_led: pmx-led {

		marvell,pins = "mpp34", "mpp35", "mpp49";

		marvell,function = "gpio";

	};

};



&rtc {

	status = "okay";

};



&sata_phy0 {

	status = "disabled";

};



&sata_phy1 {

	status = "disabled";

};



&sdio {

	pinctrl-0 = <&pmx_sdio_cd>;

	pinctrl-names = "default";

	status = "okay";

	cd-gpios = <&gpio0 28 9>;

};



&uart0 {

	status = "okay";

};



&usb0 {

	status = "okay";

};