Merge remote-tracking branch 'pinctrl/for-next'

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/boot/dts/sama5d2.dtsi
index c1f0cba402892086b7aa7df48e49e696c8cc6196,cc05cde0f9a4145436f5b3807d78e056b140094e..35b89a2d8a73b1112655fcecaa969e9697d6682b
--- 1/arch/arm/boot/dts/sama5d2.dtsi
--- 2/arch/arm/boot/dts/sama5d2.dtsi
+++ b/arch/arm/boot/dts/sama5d2.dtsi
@@@ -1054,21 -922,19 +1054,35 @@@
                                status = "disabled";
                        };
  
 +                      tdes@fc044000 {
 +                              compatible = "atmel,at91sam9g46-tdes";
 +                              reg = <0xfc044000 0x100>;
 +                              interrupts = <11 IRQ_TYPE_LEVEL_HIGH 0>;
 +                              dmas = <&dma0
 +                                      (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
 +                                       AT91_XDMAC_DT_PERID(28))>,
 +                                     <&dma0
 +                                      (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
 +                                       AT91_XDMAC_DT_PERID(29))>;
 +                              dma-names = "tx", "rx";
 +                              clocks = <&tdes_clk>;
 +                              clock-names = "tdes_clk";
 +                              status = "okay";
 +                      };
++
+                       pioA: pinctrl@fc038000 {
+                               compatible = "atmel,sama5d2-pinctrl";
+                               reg = <0xfc038000 0x600>;
+                               interrupts = <18 IRQ_TYPE_LEVEL_HIGH 7>,
+                                            <68 IRQ_TYPE_LEVEL_HIGH 7>,
+                                            <69 IRQ_TYPE_LEVEL_HIGH 7>,
+                                            <70 IRQ_TYPE_LEVEL_HIGH 7>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                               clocks = <&pioA_clk>;
+                       };
                };
        };
  };

diff --cc drivers/pinctrl/uniphier/pinctrl-ph1-sld8.c
Simple merge