Commit d4dcfc7c authored by Olof Johansson's avatar Olof Johansson
Browse files

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

mvebu dt64 for 4.21 (part 1)

 - complete the description of the clearfog-gt-8k board (Armada 8040
   based board)
 - declare eMMC on espressobin (Armada 3720 based board) which still
   need to be enable by the bootloader as it is not present on all the
   board.
 - add a new version of the Macchiatobin (Armada 8040 based board): the
   Single Shot (without the 10G 3310 PHYs).

* tag 'mvebu-dt64-4.21-1' of git://git.infradead.org/linux-mvebu

:
  arm64: dts: clearfog-gt-8k: describe mini-PCIe CON2 USB
  arm64: dts: add support for Macchiatobin Single Shot board
  arm64: dts: marvell: armada-37xx: Enable emmc on espressobin
  arm64: dts: marvell: armada37xx: Add emmc/sdio pinctrl definition
  arm64: dts: clearfog-gt-8k: enable mini-PCIe CON2 USB
  arm64: dts: clearfog-gt-8k: 1G eth PHY reset signal
  arm64: dts: clearfog-gt-8k: fix USB regulator gpio polarity

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e7828317 dfc1259a

arch/arm64/boot/dts/marvell/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,4 +6,5 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-7040-db.dtb 
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-8080-db.dtb

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

+22 −0
Original line number Diff line number Diff line
@@ -60,9 +60,31 @@ 
	cd-gpios = <&gpionb 3 GPIO_ACTIVE_LOW>;

	marvell,pad-type = "sd";

	vqmmc-supply = <&vcc_sd_reg1>;



	pinctrl-names = "default";

	pinctrl-0 = <&sdio_pins>;

	status = "okay";

};



/* 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>;

/*

 * This eMMC is not populated on all boards, so disable it by

 * default and let the bootloader enable it, if it is present

 */

	status = "disabled";

};



&spi0 {

	status = "okay";

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

+10 −0
Original line number Diff line number Diff line
@@ -234,6 +234,11 @@ 
					groups = "uart2";

					function = "uart";

				};



				mmc_pins: mmc-pins {

					groups = "emmc_nb";

					function = "emmc";

				};

			};



			nb_pm: syscon@14000 {
@@ -266,6 +271,11 @@ 
					function = "mii";

				};



				sdio_pins: sdio-pins {

					groups = "sdio_sb";

					function = "sdio";

				};



			};



			eth0: ethernet@30000 {

arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts

+21 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 


	v_5v0_usb3_hst_vbus: regulator-usb3-vbus0 {

		compatible = "regulator-fixed";

		gpio = <&cp0_gpio2 15 GPIO_ACTIVE_HIGH>;

		gpio = <&cp0_gpio2 15 GPIO_ACTIVE_LOW>;

		pinctrl-names = "default";

		pinctrl-0 = <&cp0_xhci_vbus_pins>;

		regulator-name = "v_5v0_usb3_hst_vbus";
@@ -246,6 +246,18 @@ 
		gpios = <1 GPIO_ACTIVE_HIGH>;

		output-high;

	};



	lte_reset {

		gpio-hog;

		gpios = <2 GPIO_ACTIVE_LOW>;

		output-low;

	};



	lte_disable {

		gpio-hog;

		gpios = <21 GPIO_ACTIVE_LOW>;

		output-low;

	};

};



&cp0_ethernet {
@@ -270,6 +282,10 @@ 
	vqmmc-supply = <&v_3_3>;

};



&cp0_usb3_1 {

	status = "okay";

};



&cp1_pinctrl {

	/*

	 * MPP Bus:
@@ -333,6 +349,10 @@ 
		 */

		marvell,reg-init = <3 16 0 0x1017>;

		reg = <0>;

		pinctrl-names = "default";

		pinctrl-0 = <&cp0_copper_eth_phy_reset>;

		reset-gpios = <&cp1_gpio1 11 GPIO_ACTIVE_LOW>;

		reset-assert-us = <10000>;

	};



	switch0: switch0@4 {

arch/arm64/boot/dts/marvell/armada-8040-mcbin-singleshot.dts

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

/*

 * Copyright (C) 2016 Marvell Technology Group Ltd.

 *

 * Device Tree file for MACCHIATOBin Armada 8040 community board platform

 */



#include "armada-8040-mcbin.dtsi"



/ {

	model = "Marvell 8040 MACCHIATOBin Single-shot";

	compatible = "marvell,armada8040-mcbin-singleshot",

			"marvell,armada8040-mcbin", "marvell,armada8040",

			"marvell,armada-ap806-quad", "marvell,armada-ap806";

};



&cp0_eth0 {

	status = "okay";

	phy-mode = "10gbase-kr";

	managed = "in-band-status";

	sfp = <&sfp_eth0>;

};



&cp1_eth0 {

	status = "okay";

	phy-mode = "10gbase-kr";

	managed = "in-band-status";

	sfp = <&sfp_eth1>;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE