Merge tag 'mvebu-dt64-4.12-3' of git://git.infradead.org/linux-mvebu into fixes

Pull "mvebu dt64 for 4.12 (part 3)" from Gregory CLEMENT:

pinctrl and GPIO description for Armada 37xx SoCs

* tag 'mvebu-dt64-4.12-3' of git://git.infradead.org/linux-mvebu:
  ARM64: dts: marvell: armada37xx: add pinctrl definition
  ARM64: dts: marvell: Add pinctrl nodes for Armada 3700

diff --combined arch/arm64/boot/dts/marvell/armada-3720-db.dts
index cef5f976bc0f2afea9a85db88827c6e5529a87c4,01cdcb98416f3412ae2c81b0ecb452d8fad0eb7f..a89855f57091fac35d3ba4b9821fd2a902f5ed77
--- 1/arch/arm64/boot/dts/marvell/armada-3720-db.dts
--- 2/arch/arm64/boot/dts/marvell/armada-3720-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
@@@ -79,6 -79,8 +79,8 @@@
  };
  
  &i2c0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&i2c1_pins>;
        status = "okay";
  
        gpio_exp: pca9555@22 {
@@@ -113,6 -115,8 +115,8 @@@
  
  &spi0 {
        status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&spi_quad_pins>;
  
        m25p80@0 {
                compatible = "jedec,spi-nor";
@@@ -143,6 -147,8 +147,8 @@@
  
  /* Exported on the micro USB connector CON32 through an FTDI */
  &uart0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&uart1_pins>;
        status = "okay";
  };
  
@@@ -166,12 -172,6 +172,12 @@@
        status = "okay";
  };
  
 +/* CON27 */
 +&usb2 {
 +      status = "okay";
 +};
 +
 +
  &mdio {
        status = "okay";
        phy0: ethernet-phy@0 {
@@@ -184,6 -184,8 +190,8 @@@
  };
  
  &eth0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&rgmii_pins>;
        phy-mode = "rgmii-id";
        phy = <&phy0>;
        status = "okay";

diff --combined arch/arm64/boot/dts/marvell/armada-37xx.dtsi
index 58ae9e095af2a2a986082143789995cd5cc348d7,f581c74c0bb2bf709ebaa65d1143c6086e09ee0f..4d495ec39202d0c34b46996598466ec87d116eea
--- 1/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
--- 2/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
@@@ -161,16 -161,83 +161,83 @@@
                                #clock-cells = <1>;
                        };
  
-                       gpio1: gpio@13800 {
-                               compatible = "marvell,mvebu-gpio-3700",
+                       pinctrl_nb: pinctrl@13800 {
+                               compatible = "marvell,armada3710-nb-pinctrl",
                                "syscon", "simple-mfd";
-                               reg = <0x13800 0x500>;
+                               reg = <0x13800 0x100>, <0x13C00 0x20>;
+                               gpionb: gpio {
+                                       #gpio-cells = <2>;
+                                       gpio-ranges = <&pinctrl_nb 0 0 36>;
+                                       gpio-controller;
+                                       interrupts =
+                                       <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
+ 
+                               };
  
                                xtalclk: xtal-clk {
                                        compatible = "marvell,armada-3700-xtal-clock";
                                        clock-output-names = "xtal";
                                        #clock-cells = <0>;
                                };
+ 
+                               spi_quad_pins: spi-quad-pins {
+                                       groups = "spi_quad";
+                                       function = "spi";
+                               };
+ 
+                               i2c1_pins: i2c1-pins {
+                                       groups = "i2c1";
+                                       function = "i2c";
+                               };
+ 
+                               i2c2_pins: i2c2-pins {
+                                       groups = "i2c2";
+                                       function = "i2c";
+                               };
+ 
+                               uart1_pins: uart1-pins {
+                                       groups = "uart1";
+                                       function = "uart";
+                               };
+ 
+                               uart2_pins: uart2-pins {
+                                       groups = "uart2";
+                                       function = "uart";
+                               };
+                       };
+ 
+                       pinctrl_sb: pinctrl@18800 {
+                               compatible = "marvell,armada3710-sb-pinctrl",
+                               "syscon", "simple-mfd";
+                               reg = <0x18800 0x100>, <0x18C00 0x20>;
+                               gpiosb: gpio {
+                                       #gpio-cells = <2>;
+                                       gpio-ranges = <&pinctrl_sb 0 0 29>;
+                                       gpio-controller;
+                                       interrupts =
+                                       <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
+                               };
+ 
+                               rgmii_pins: mii-pins {
+                                       groups = "rgmii";
+                                       function = "mii";
+                               };
+ 
                        };
  
                        eth0: ethernet@30000 {
@@@ -205,13 -272,6 +272,13 @@@
                                status = "disabled";
                        };
  
 +                      usb2: usb@5e000 {
 +                              compatible = "marvell,armada-3700-ehci";
 +                              reg = <0x5e000 0x2000>;
 +                              interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
 +                              status = "disabled";
 +                      };
 +
                        xor@60900 {
                                compatible = "marvell,armada-3700-xor";
                                reg = <0x60900 0x100