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

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

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

mvebu dt64 for 6.20 (part 1)

Add support for Armada 7020 Express Type 7 CPU module board by Marvell, including:
 - COM Express CPU module and carrier board (Marvell DB-98CX85x0)
  - DDR4 memory, 1Gbit OOB Ethernet, 10G KR Ethernet, NAND/SPI flash, PCIe, SATA, USB, and UART interfaces
Add SoC-specific compatibles for SafeXcel crypto engine on Armada 37xx and CP11x
Fix regulator type from "regulator-gpio" to "regulator-fixed" where no GPIO control is present
Add missing GPIO properties for "nxp,pca9536" on cn9131-cf-solidwan
Fix and clean up pinctrl-names properties and typos
Add missing "#phy-cells" to "usb-nop-xceiv" nodes
MAINTAINERS: Add Falcon DB to the list of maintained Marvell Armada dts files

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

:
  MAINTAINERS: Add Falcon DB
  arm64: dts: a7k: add COM Express boards
  arm64: dts: marvell: Add SoC specific compatibles to SafeXcel crypto
  arm64: dts: marvell: change regulator-gpio to regulator-fixed
  arm64: dts: marvell: cn9131-cf-solidwan: Add missing GPIO properties on "nxp,pca9536"
  arm64: dts: marvell: Fix stray and typo "pinctrl-names" properties
  arm64: dts: marvell: Add missing "#phy-cells" to "usb-nop-xceiv"

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 17102e75 fcaf733c

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -2943,6 +2943,7 @@ S: Maintained 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git

F:	Documentation/devicetree/bindings/arm/marvell/

F:	arch/arm/boot/dts/marvell/armada*

F:	arch/arm/boot/dts/marvell/db-falcon*

F:	arch/arm/boot/dts/marvell/kirkwood*

F:	arch/arm/configs/mvebu_*_defconfig

F:	arch/arm/mach-mvebu/

arch/arm64/boot/dts/marvell/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin-v7-emmc.dtb 
dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-gl-mv1000.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-turris-mox.dtb

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

dtb-$(CONFIG_ARCH_MVEBU) += db-falcon-carrier-a7k.dtb

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

dtb-$(CONFIG_ARCH_MVEBU) += armada-7040-mochabin.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-clearfog-gt-8k.dtb

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

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ exp_usb3_vbus: usb3-vbus { 


	usb3_phy: usb3-phy {

		compatible = "usb-nop-xceiv";

		#phy-cells = <0>;

		vcc-supply = <&exp_usb3_vbus>;

	};

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

+1 −1
Original line number Diff line number Diff line
@@ -37,11 +37,11 @@ reg_usb3_vbus: usb3-vbus { 


	usb3_phy: usb3-phy {

		compatible = "usb-nop-xceiv";

		#phy-cells = <0>;

		vcc-supply = <&reg_usb3_vbus>;

	};



	gpio-leds {

		pinctrl-names = "default";

		compatible = "gpio-leds";

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

		led1 {

arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts

+2 −7
Original line number Diff line number Diff line
@@ -26,16 +26,11 @@ memory@0 { 
	};



	vcc_sd_reg1: regulator {

		compatible = "regulator-gpio";

		compatible = "regulator-fixed";

		regulator-name = "vcc_sd1";

		regulator-min-microvolt = <1800000>;

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-boot-on;



		gpios-states = <0>;

		states = <1800000 0x1

			3300000 0x0>;

		enable-active-high;

	};



	keys {