[0/6] Macchiatobin updates

Commit Message

Gregory CLEMENT July 12, 2017, 4:54 p.m. UTC

Hi Russell King,
 
 On sam., juil. 08 2017, Russell King - ARM Linux <[e-mail]> wrote:

> This series, based upon the 4.12-rc6 backports branch in the MISL tree:
> - adds a maintainer entry for the Macchiatobin board.
> - adds GPIO interrupt support to the CP110s
> - adds the pinmux entries
> - corrects the 5V regulator GPIO entry
> - adds support for the I2C mux (used for the SFP slots)
> - adds PCIe support
>
> All entries include the appropriate pinmux and GPIO configuration.
>
> PCIe support has not been tested locally as I have no PCIe cards to
> test with; this patch includes support for the PCIe reset GPIO signal.
> If others can test that patch and let me know whether it works, I would
> be most grateful.
>

The first patch had been applied on mvebu/arm64-for-4.14.

Patch 2 to 6 had been applied on mvebu/dt64-for-4.14.

For the patch 4, I merged it with the patch that Thomas previously sent
because it was not in mainline yet even if it was on the backport
branch. The resulting patch is attached.
Finally I tested the last patch with an Ethernet PCIe card it worked
well, but the reset part was not tested as I don't know how it should be
tested.

As soon as the v4.13-rc1 will be released then the branches will be rebased
on it and renamed mvebu/arm64 and mvebu/dt64.

Thanks,

Gregory


>  MAINTAINERS                                        |  6 ++
>  arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts  | 89 +++++++++++++++++++++-
>  .../boot/dts/marvell/armada-cp110-master.dtsi      | 11 ++-
>  .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 11 ++-
>  4 files changed, 112 insertions(+), 5 deletions(-)
>
> -- 
> RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
> FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
> according to speedtest.net.

Patch

From e8f260a4b40e658ab473ff8509192dcc08862d68 Mon Sep 17 00:00:00 2001
From: Russell King <[e-mail]>
Date: Wed, 12 Jul 2017 14:56:55 +0200
Subject: [PATCH] arm64: dts: marvell: fix USB3 regulator definition on
 MacchiatoBin

Due to the lack of GPIO support, the USB3 regulator definition was
left unfinished in the MacchiatoBin DT description. Now that GPIO
support is available, this commit adjusts the Device Tree to properly
describe the USB3 regulator.

[[e-mail]: use commit log from Thomas]

Signed-off-by: Russell King <[e-mail]>
Signed-off-by: Thomas Petazzoni <[e-mail]>
Signed-off-by: Gregory CLEMENT <[e-mail]>
---
 arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
index fe91433d6fcd..da13ab2103aa 100644
--- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
@@ -46,6 +46,8 @@ 
 
 #include "armada-8040.dtsi"
 
+#include <dt-bindings/gpio/gpio.h>
+
 / {
 	model = "Marvell 8040 MACHIATOBin";
 	compatible = "marvell,armada8040-mcbin", "marvell,armada8040",
@@ -77,11 +79,13 @@ 
 
 	v_5v0_usb3_hst_vbus: regulator-usb3-vbus0 {
 		compatible = "regulator-fixed";
+		enable-active-high;
+		gpio = <&cpm_gpio2 15 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&cpm_xhci_vbus_pins>;
 		regulator-name = "v_5v0_usb3_hst_vbus";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
-		/* actually GPIO controlled, but 8k has no GPIO support yet */
-		regulator-always-on;
 		status = "okay";
 	};
 
@@ -136,6 +140,10 @@ 
 		marvell,pins = "mpp37", "mpp38";
 		marvell,function = "i2c0";
 	};
+	cpm_xhci_vbus_pins: xhci0-vbus-pins {
+		marvell,pins = "mpp47";
+		marvell,function = "gpio";
+	};
 	cpm_sdhci_pins: sdhci-pins {
 		marvell,pins = "mpp55", "mpp56", "mpp57", "mpp58", "mpp59",
 			       "mpp60", "mpp61";
-- 
2.13.2