Commit 3a7c41e5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-dt-4.20-1' of git://git.infradead.org/linux-mvebu into next/dt 

mvebu dt for 4.20 (part 1)

- updates the armada-xp-98dx3236 SoC and related boards to use the new
  style dts bindings for nand

- add db-88f6820-amc board: plugin card for some of Marvell's switch
  development kits

- fix SPI and I2C bus warnings coming with the new checks in dtc

- add new compatible string "marvell,prestera" to the armada-xp-98dx*

- fix sdhci supply property name on the clearfog (the '-supply' suffix
  was missing)

* tag 'mvebu-dt-4.20-1' of git://git.infradead.org/linux-mvebu

:
  ARM: dts: clearfog: fix sdhci supply property name
  ARM: dts: mvebu: add "marvell,prestera" to PP nodes
  ARM: dts: marvell: Fix SPI and I2C bus warnings
  ARM: dts: mvebu: Add device tree for db-88f6820-amc board
  ARM: dts: mvebu: db-xc3-24g4: use new style nand binding
  ARM: dts: mvebu: db-dxbc2: use new style nand binding
  ARM: dts: mvebu: 98dx3236: Rename nand controller node

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents ca2fbd9a e807f029

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -1157,6 +1157,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \ 
dtb-$(CONFIG_MACH_ARMADA_375) += \

	armada-375-db.dtb

dtb-$(CONFIG_MACH_ARMADA_38X) += \

	armada-385-db-88f6820-amc.dtb \

	armada-385-db-ap.dtb \

	armada-385-linksys-caiman.dtb \

	armada-385-linksys-cobra.dtb \

arch/arm/boot/dts/armada-385-db-88f6820-amc.dts

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

/*

 * Device Tree file for Marvell Armada 385 AMC board

 * (DB-88F6820-AMC)

 *

 * Copyright (C) 2017 Allied Telesis Labs

 */



/dts-v1/;

#include "armada-385.dtsi"



#include <dt-bindings/gpio/gpio.h>



/ {

	model = "Marvell Armada 385 AMC";

	compatible = "marvell,a385-db-amc", "marvell,armada385", "marvell,armada380";



	chosen {

		stdout-path = "serial0:115200n8";

	};



	aliases {

		ethernet0 = &eth0;

		ethernet1 = &eth1;

		spi1 = &spi1;

	};



	memory {

		device_type = "memory";

		reg = <0x00000000 0x80000000>; /* 2GB */

	};



	soc {

		ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000

			  MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000>;

	};

};



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;

	status = "okay";

};



&uart0 {

	/*

	 * Exported on the micro USB connector CON3

	 * through an FTDI

	 */



	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins>;

	status = "okay";

};





&eth0 {

	pinctrl-names = "default";

	/*

	 * The Reference Clock 0 is used to provide a

	 * clock to the PHY

	 */

	pinctrl-0 = <&ge0_rgmii_pins>, <&ref_clk0_pins>;

	status = "okay";

	phy = <&phy0>;

	phy-mode = "rgmii-id";

};



&eth2 {

	status = "okay";

	phy = <&phy1>;

	phy-mode = "sgmii";

};



&usb0 {

	status = "okay";

};







&mdio {

	pinctrl-names = "default";

	pinctrl-0 = <&mdio_pins>;



	phy0: ethernet-phy@1 {

		reg = <1>;

	};



	phy1: ethernet-phy@0 {

		reg = <0>;

	};

};



&nand_controller {

	status = "okay";



	nand@0 {

		reg = <0>;

		label = "pxa3xx_nand-0";

		nand-rb = <0>;

		nand-on-flash-bbt;

		nand-ecc-strength = <4>;

		nand-ecc-step-size = <512>;



		partitions {

			compatible = "fixed-partitions";

			#address-cells = <1>;

			#size-cells = <1>;

			partition@0 {

				reg = <0x00000000 0x40000000>;

				label = "user";

			};

		};

	};

};



&pciec {

	status = "okay";

};



&pcie1 {

	/* Port 0, Lane 0 */

	status = "okay";

};



&spi1 {

	pinctrl-names = "default";

	pinctrl-0 = <&spi1_pins>;

	status = "okay";



	spi-flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "jedec,spi-nor";

		reg = <0>; /* Chip select 0 */

		spi-max-frequency = <50000000>;

		m25p,fast-read;



		partitions {

			compatible = "fixed-partitions";

			#address-cells = <1>;

			#size-cells = <1>;

			partition@0 {

				reg = <0x00000000 0x00100000>;

				label = "u-boot";

			};

			partition@100000 {

				reg = <0x00100000 0x00040000>;

				label = "u-boot-env";

			};

		};

	};

};



&refclk {

	clock-frequency = <20000000>;

};

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

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
					     &clearfog_sdhci_cd_pins>;

				pinctrl-names = "default";

				status = "okay";

				vmmc = <&reg_3p3v>;

				vmmc-supply = <&reg_3p3v>;

				wp-inverted;

			};

arch/arm/boot/dts/armada-xp-98dx3236.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ 
				};

			};



			nand: nand@d0000 {

			nand_controller: nand-controller@d0000 {

				clocks = <&dfx_coredivclk 0>;

			};
@@ -243,7 +243,7 @@ 
			ranges = <0 MBUS_ID(0x03, 0x00) 0 0x100000>;



			pp0: packet-processor@0 {

				compatible = "marvell,prestera-98dx3236";

				compatible = "marvell,prestera-98dx3236", "marvell,prestera";

				reg = <0 0x4000000>;

				interrupts = <33>, <34>, <35>;

				dfx = <&dfx>;

arch/arm/boot/dts/armada-xp-98dx3336.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -35,5 +35,5 @@ 
};



&pp0 {

	compatible = "marvell,prestera-98dx3336";

	compatible = "marvell,prestera-98dx3336", "marvell,prestera";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE