ARM: berlin: move pinctrl to simple-mfd nodes

Now with proper support for simple-mfd probed pinctrl driver, move
to the new soc-pinctrl and system-pinctrl nodes.
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

arch/arm/boot/dts/berlin2.dtsi

@@ -357,10 +357,14 @@ chip: chip-control@ea0000 {
 			clocks = <&refclk>;
 			clock-names = "refclk";
 
+			soc_pinctrl: pin-controller {
+				compatible = "marvell,berlin2-soc-pinctrl";
+
 				emmc_pmux: emmc-pmux {
 					groups = "G26";
 					function = "emmc";
 				};
+			};
 
 			chip_rst: reset {
 				compatible = "marvell,berlin2-reset";
@@ -449,6 +453,8 @@ sysctrl: system-controller@d000 {
 				compatible = "marvell,berlin2-system-ctrl", "simple-mfd", "syscon";
 				reg = <0xd000 0x100>;
 
+				sys_pinctrl: pin-controller {
+					compatible = "marvell,berlin2-system-pinctrl";
 					uart0_pmux: uart0-pmux {
 						groups = "GSM4";
 						function = "uart0";
@@ -458,12 +464,12 @@ uart1_pmux: uart1-pmux {
 						groups = "GSM5";
 						function = "uart1";
 					};
-
 					uart2_pmux: uart2-pmux {
 						groups = "GSM3";
 						function = "uart2";
 					};
 				};
+			};
 
 			sic: interrupt-controller@e000 {
 				compatible = "snps,dw-apb-ictl";

arch/arm/boot/dts/berlin2cd.dtsi

@@ -301,10 +301,14 @@ chip: chip-control@ea0000 {
 			clocks = <&refclk>;
 			clock-names = "refclk";
 
+			soc_pinctrl: pin-controller {
+				compatible = "marvell,berlin2cd-soc-pinctrl";
+
 				uart0_pmux: uart0-pmux {
 					groups = "G6";
 					function = "uart0";
 				};
+			};
 
 			chip_rst: reset {
 				compatible = "marvell,berlin2-reset";
@@ -395,6 +399,10 @@ uart1: serial@a000 {
 			sysctrl: system-controller@d000 {
 				compatible = "marvell,berlin2cd-system-ctrl", "simple-mfd", "syscon";
 				reg = <0xd000 0x100>;
+
+				sys_pinctrl: pin-controller {
+					compatible = "marvell,berlin2cd-system-pinctrl";
+				};
 			};
 
 			sic: interrupt-controller@e000 {

arch/arm/boot/dts/berlin2q.dtsi

@@ -366,6 +366,9 @@ chip: chip-control@ea0000 {
 			clocks = <&refclk>;
 			clock-names = "refclk";
 
+			soc_pinctrl: pin-controller {
+				compatible = "marvell,berlin2q-soc-pinctrl";
+
 				twsi0_pmux: twsi0-pmux {
 					groups = "G6";
 					function = "twsi0";
@@ -375,6 +378,7 @@ twsi1_pmux: twsi1-pmux {
 					groups = "G7";
 					function = "twsi1";
 				};
+			};
 
 			chip_rst: reset {
 				compatible = "marvell,berlin2-reset";
@@ -533,6 +537,9 @@ sysctrl: pin-controller@d000 {
 				compatible = "marvell,berlin2q-system-ctrl", "simple-mfd", "syscon";
 				reg = <0xd000 0x100>;
 
+				sys_pinctrl: pin-controller {
+					compatible = "marvell,berlin2q-system-pinctrl";
+
 					uart0_pmux: uart0-pmux {
 						groups = "GSM12";
 						function = "uart0";
@@ -553,6 +560,7 @@ twsi3_pmux: twsi3-pmux {
 						function = "twsi3";
 					};
 				};
+			};
 
 			sic: interrupt-controller@e000 {
 				compatible = "snps,dw-apb-ictl";