Commit a2f9886a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-dt64-5.11-1' of... 

Merge tag 'mvebu-dt64-5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into arm/dt

mvebu dt64 for 5.11 (part 1)

 - Add support for IEI Puzzle-M801 board (Armada 8040 based)
 - Add support ESPRESSObin-Ultra (Armada 3720 based)
 - Clean-up and improve espressobin device tree
 - Switch to per-port SATA interrupts on CP110 based SoC
 - Use compliant node name for USB3  on CP110 based SoC
 - Add heartbeat LED on mcbin singleshot
 - Disable SMMU by default for Armada 7040 and 8040 to continued
   supporting custom bot firmware
 - Turris mox:
   - add 3W power capability to SFP cage
   - update ethernet-phy handle name

* tag 'mvebu-dt64-5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
  arm64: dts: armada-3720-turris-mox: add 3W power capability to SFP cage
  arm64: dts: marvell: keep SMMU disabled by default for Armada 7040 and 8040
  arm64: dts: mcbin-singleshot: add heartbeat LED
  arm64: dts: marvell: cp11x: Harmonize xHCI DT nodes name
  arm64: dts: marvell: espressobin: Update link to V7 schematic
  arm64: dts: armada-3720-turris-mox: update ethernet-phy handle name
  arm64: dts: marvell: armada-cp110: Switch to per-port SATA interrupts
  arm64: dts: marvell: add DT for ESPRESSObin-Ultra
  arm64: dts: marvell: espressobin: Add support for LED2
  arm64: dts: marvell: Add a device tree for the IEI Puzzle-M801 board
  arm64: dts: marvell: espressobin: De-duplicate eMMC definitions
  arm64: dts: marvell: espressobin: Get rid of duplicate serial aliases
  arm64: dts: marvell: espressobin: Simplify v7 ethernet port labeling

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 9bc08aa6 a2081c09

arch/arm64/boot/dts/marvell/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-db.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin-emmc.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin-ultra.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin-v7.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin-v7-emmc.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-turris-mox.dtb
@@ -12,6 +13,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-clearfog-gt-8k.dtb 
dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-db.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin-singleshot.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-puzzle-m801.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-8080-db.dtb

dtb-$(CONFIG_ARCH_MVEBU) += cn9130-db.dtb

dtb-$(CONFIG_ARCH_MVEBU) += cn9131-db.dtb

arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts

+0 −18
Original line number Diff line number Diff line
@@ -21,24 +21,6 @@ 
		     "marvell,armada3720", "marvell,armada3710";

};



/* U11 */

&sdhci0 {

	non-removable;

	bus-width = <8>;

	mmc-ddr-1_8v;

	mmc-hs400-1_8v;

	marvell,xenon-emmc;

	marvell,xenon-tun-count = <9>;

	marvell,pad-type = "fixed-1-8v";



	pinctrl-names = "default";

	pinctrl-0 = <&mmc_pins>;

	status = "okay";



	#address-cells = <1>;

	#size-cells = <0>;

	mmccard: mmccard@0 {

		compatible = "mmc-card";

		reg = <0>;

	};

};

arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts

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

/*

 * Device Tree file for ESPRESSObin-Ultra board.

 * Copyright (C) 2019 Globalscale technologies, Inc.

 *

 * Jason Hung <jhung@globalscaletechnologies.com>

 */



/dts-v1/;



#include "armada-3720-espressobin.dtsi"



/ {

	model = "Globalscale Marvell ESPRESSOBin Ultra Board";

	compatible = "globalscale,espressobin-ultra", "marvell,armada3720",

		     "marvell,armada3710";



	aliases {

		/* ethernet1 is WAN port */

		ethernet1 = &switch0port5;

		ethernet2 = &switch0port1;

		ethernet3 = &switch0port2;

		ethernet4 = &switch0port3;

		ethernet5 = &switch0port4;

	};



	reg_usb3_vbus: usb3-vbus {

		compatible = "regulator-fixed";

		regulator-name = "usb3-vbus";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		enable-active-high;

		gpio = <&gpionb 19 GPIO_ACTIVE_HIGH>;

	};



	usb3_phy: usb3-phy {

		compatible = "usb-nop-xceiv";

		vcc-supply = <&reg_usb3_vbus>;

	};



	gpio-leds {

		pinctrl-names = "default";

		compatible = "gpio-leds";

		/* No assigned functions to the LEDs by default */

		led1 {

			label = "ebin-ultra:blue:led1";

			gpios = <&gpionb 11 GPIO_ACTIVE_LOW>;

		};

		led2 {

			label = "ebin-ultra:green:led2";

			gpios = <&gpionb 12 GPIO_ACTIVE_LOW>;

		};

		led3 {

			label = "ebin-ultra:red:led3";

			gpios = <&gpionb 13 GPIO_ACTIVE_LOW>;

		};

		led4 {

			label = "ebin-ultra:yellow:led4";

			gpios = <&gpionb 14 GPIO_ACTIVE_LOW>;

		};

	};

};



&sdhci0 {

	status = "okay";

};



&sdhci1 {

	status = "disabled";

};



&spi0 {

	flash@0 {

		spi-max-frequency = <108000000>;

		spi-rx-bus-width = <4>;

		spi-tx-bus-width = <4>;



		partitions {

			compatible = "fixed-partitions";

			#address-cells = <1>;

			#size-cells = <1>;



			partition@0 {

				label = "firmware";

				reg = <0x0 0x3e0000>;

			};

			partition@3e0000 {

				label = "hw-info";

				reg = <0x3e0000 0x10000>;

				read-only;

			};

			partition@3f0000 {

				label = "u-boot-env";

				reg = <0x3f0000 0x10000>;

			};

		};

	};

};



&i2c0 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins>;



	clock-frequency = <100000>;



	rtc@51 {

		compatible = "nxp,pcf8563";

		reg = <0x51>;

	};

};



&usb3 {

	usb-phy = <&usb3_phy>;

	status = "disabled";

};



&mdio {

	extphy: ethernet-phy@1 {

		reg = <1>;

	};

};



&switch0 {

	reg = <3>;



	ports {

		switch0port1: port@1 {

			reg = <1>;

			label = "lan0";

			phy-handle = <&switch0phy0>;

		};



		switch0port2: port@2 {

			reg = <2>;

			label = "lan1";

			phy-handle = <&switch0phy1>;

		};



		switch0port3: port@3 {

			reg = <3>;

			label = "lan2";

			phy-handle = <&switch0phy2>;

		};



		switch0port4: port@4 {

			reg = <4>;

			label = "lan3";

			phy-handle = <&switch0phy3>;

		};



		switch0port5: port@5 {

			reg = <5>;

			label = "wan";

			phy-handle = <&extphy>;

			phy-mode = "sgmii";

		};

	};



	mdio {

		switch0phy3: switch0phy3@14 {

			reg = <0x14>;

		};

	};

};

arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts

+9 −31
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 *

 */

/*

 * Schematic available at http://wiki.espressobin.net/tiki-download_file.php?fileId=200

 * Schematic available at http://espressobin.net/wp-content/uploads/2020/05/ESPRESSObin_V7-0_Schematic.pdf

 */



/dts-v1/;
@@ -28,40 +28,18 @@ 
	};

};



&switch0 {

	ports {

		switch0port1: port@1 {

			reg = <1>;

&switch0port1 {

	label = "lan1";

			phy-handle = <&switch0phy0>;

};



		switch0port3: port@3 {

			reg = <3>;

&switch0port3 {

	label = "wan";

			phy-handle = <&switch0phy2>;

		};

	};

};



/* U11 */

&sdhci0 {

	non-removable;

	bus-width = <8>;

	mmc-ddr-1_8v;

	mmc-hs400-1_8v;

	marvell,xenon-emmc;

	marvell,xenon-tun-count = <9>;

	marvell,pad-type = "fixed-1-8v";



	pinctrl-names = "default";

	pinctrl-0 = <&mmc_pins>;

	status = "okay";



	#address-cells = <1>;

	#size-cells = <0>;

	mmccard: mmccard@0 {

		compatible = "mmc-card";

		reg = <0>;

};



&led2 {

	status = "okay";

};

arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts

+10 −14
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 *

 */

/*

 * Schematic available at http://wiki.espressobin.net/tiki-download_file.php?fileId=200

 * Schematic available at http://espressobin.net/wp-content/uploads/2020/05/ESPRESSObin_V7-0_Schematic.pdf

 */



/dts-v1/;
@@ -27,18 +27,14 @@ 
	};

};



&switch0 {

	ports {

		switch0port1: port@1 {

			reg = <1>;

&switch0port1 {

	label = "lan1";

			phy-handle = <&switch0phy0>;

};



		switch0port3: port@3 {

			reg = <3>;

&switch0port3 {

	label = "wan";

			phy-handle = <&switch0phy2>;

		};

};



&led2 {

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE