Commit 5aef4d1e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

mvebu dt64 for 5.19 (part 1)

Update sdhci node names to match schema on all mvebu dt64 dtsi files

Armada 3720:
  uDPU board:
   - correct temperature sensors
   - update partition table

  espressobin-ultra board:
   - enable front USB3 port
   - add PHY and switch reset pins
   - fix SPI-NOR config

* tag 'mvebu-dt64-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu

:
  arm64: dts: marvell: Update sdhci node names to match schema
  arm64: dts: marvell: espressobin-ultra: enable front USB3 port
  arm64: dts: marvell: espressobin-ultra: add PHY and switch reset pins
  arm64: dts: marvell: espressobin-ultra: fix SPI-NOR config
  arm64: dts: uDPU: correct temperature sensors
  arm64: dts: uDPU: update partition table

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 9dd7a5a8 239466bd

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

+4 −5
Original line number Diff line number Diff line
@@ -71,10 +71,6 @@ 


&spi0 {

	flash@0 {

		spi-max-frequency = <108000000>;

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

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



		partitions {

			compatible = "fixed-partitions";

			#address-cells = <1>;
@@ -112,18 +108,21 @@ 


&usb3 {

	usb-phy = <&usb3_phy>;

	status = "disabled";

};



&mdio {

	extphy: ethernet-phy@1 {

		reg = <1>;



		reset-gpios = <&gpionb 2 GPIO_ACTIVE_LOW>;

	};

};



&switch0 {

	reg = <3>;



	reset-gpios = <&gpiosb 23 GPIO_ACTIVE_LOW>;



	ports {

		switch0port1: port@1 {

			reg = <1>;

arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts

+12 −7
Original line number Diff line number Diff line
@@ -108,10 +108,15 @@ 
			compatible = "fixed-partitions";

			#address-cells = <1>;

			#size-cells = <1>;

			/* only bootloader is located on the SPI */



			partition@0 {

				label = "uboot";

				reg = <0 0x400000>;

				label = "firmware";

				reg = <0x0 0x180000>;

			};



			partition@180000 {

				label = "u-boot-env";

				reg = <0x180000 0x10000>;

			};

		};

	};
@@ -148,15 +153,15 @@ 
	scl-gpios = <&gpionb 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

	sda-gpios = <&gpionb 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;



	lm75@48 {

	nct375@48 {

		status = "okay";

		compatible = "lm75";

		compatible = "ti,tmp75c";

		reg = <0x48>;

	};



	lm75@49 {

	nct375@49 {

		status = "okay";

		compatible = "lm75";

		compatible = "ti,tmp75c";

		reg = <0x49>;

	};

};

arch/arm64/boot/dts/marvell/armada-37xx.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ 
				#mbox-cells = <1>;

			};



			sdhci1: sdhci@d0000 {

			sdhci1: mmc@d0000 {

				compatible = "marvell,armada-3700-sdhci",

					     "marvell,sdhci-xenon";

				reg = <0xd0000 0x300>,
@@ -455,7 +455,7 @@ 
				status = "disabled";

			};



			sdhci0: sdhci@d8000 {

			sdhci0: mmc@d8000 {

				compatible = "marvell,armada-3700-sdhci",

					     "marvell,sdhci-xenon";

				reg = <0xd8000 0x300>,

arch/arm64/boot/dts/marvell/armada-ap80x.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ 
				interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;

			};



			ap_sdhci0: sdhci@6e0000 {

			ap_sdhci0: mmc@6e0000 {

				compatible = "marvell,armada-ap806-sdhci";

				reg = <0x6e0000 0x300>;

				interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/marvell/armada-cp11x.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ 
			status = "okay";

		};



		CP11X_LABEL(sdhci0): sdhci@780000 {

		CP11X_LABEL(sdhci0): mmc@780000 {

			compatible = "marvell,armada-cp110-sdhci";

			reg = <0x780000 0x300>;

			interrupts = <27 IRQ_TYPE_LEVEL_HIGH>;