summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2016-12-11 16:07:42 +0000
committerRussell King <rmk+kernel@armlinux.org.uk>2019-07-09 16:42:00 +0100
commit10617fd2ff3aa05f0908366c3f4187089e93411a (patch)
tree4e141eef35e0dca839b6b54ce7a264b336da4cec
parent6309d50b118629fa36d746203abe25908eda3f6b (diff)
arm64: dts: marvell: mcbin: add remainder of pinctrls
Add several pinctrls for functions brought out to connectors but not yet usable with the core DT description. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
-rw-r--r--arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi15
1 files changed, 14 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
index 7935faee7358..7bf09eb71f8f 100644
--- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
@@ -54,7 +54,7 @@
enable-active-high;
gpio = <&cp0_gpio2 15 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
- pinctrl-0 = <&cp0_xhci_vbus_pins>;
+ pinctrl-0 = <&cp0_xhci_vbus_pins &cp1_xhci_vbus_pins>;
regulator-name = "v_5v0_usb3_hst_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
@@ -201,6 +201,7 @@
marvell,pins = "mpp37", "mpp38";
marvell,function = "i2c0";
};
+ /* mpp40 - mss? */
cp0_uart1_pins: uart1-pins {
marvell,pins = "mpp40", "mpp41";
marvell,function = "uart1";
@@ -294,6 +295,14 @@
};
&cp1_pinctrl {
+ cp1_tdm_pins: tdm-pins { /* not currently implemented */
+ marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3", "mpp4", "mpp5";
+ marvell,function = "tdm";
+ };
+ cp1_uart0_pins: uart0-pins { /* J27 - not currently implemented */
+ marvell,pins = "mpp6", "mpp7";
+ marvell,function = "uart0";
+ };
cp1_sfpp1_pins: sfpp1-pins {
marvell,pins = "mpp8", "mpp10", "mpp11";
marvell,function = "gpio";
@@ -314,6 +323,10 @@
marvell,pins = "mpp26", "mpp27", "mpp28", "mpp29";
marvell,function = "gpio";
};
+ cp1_xhci_vbus_pins: xhci0-vbus-pins {
+ marvell,pins = "mpp30";
+ marvell,function = "gpio";
+ };
};
/* J27 UART header */