ARM: ux500: move MUSB pin config to device tree

This moves the MUSB pin control table out of the board file
and into the device tree. Tie the config to the on-chip MUSB
device rather than the ab8500-usb device which is off-chip.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

4 files changed, 79 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/ste-href-family-pinctrl.dtsi b/arch/arm/boot/dts/ste-href-family-pinctrl.dtsi
index 7408d3a898a5..6868fec95d64 100644
--- a/arch/arm/boot/dts/ste-href-family-pinctrl.dtsi
+++ b/arch/arm/boot/dts/ste-href-family-pinctrl.dtsi
@@ -488,6 +488,61 @@
                                         };
                                 };
                         };
+
+
+                        musb {
+                                musb_default_mode: musb_default {
+                                        default_mux {
+                                                ste,function = "usb";
+                                                ste,pins = "usb_a_1";
+                                        };
+                                        default_cfg1 {
+                                                ste,pins =
+                                                "GPIO256_AF28", /* NXT */
+                                                "GPIO258_AD29", /* XCLK */
+                                                "GPIO259_AC29", /* DIR */
+                                                "GPIO260_AD28", /* DAT7 */
+                                                "GPIO261_AD26", /* DAT6 */
+                                                "GPIO262_AE26", /* DAT5 */
+                                                "GPIO263_AG29", /* DAT4 */
+                                                "GPIO264_AE27", /* DAT3 */
+                                                "GPIO265_AD27", /* DAT2 */
+                                                "GPIO266_AC28", /* DAT1 */
+                                                "GPIO267_AC27"; /* DAT0 */
+                                                ste,config = <&in_nopull>;
+                                        };
+                                        default_cfg2 {
+                                                ste,pins = "GPIO257_AE29"; /* STP */
+                                                ste,config = <&out_hi>;
+                                        };
+                                };
+
+                                musb_sleep_mode: musb_sleep {
+                                        sleep_cfg1 {
+                                                ste,pins =
+                                                "GPIO256_AF28", /* NXT */
+                                                "GPIO258_AD29", /* XCLK */
+                                                "GPIO259_AC29"; /* DIR */
+                                                ste,config = <&slpm_wkup_pdis_en>;
+                                        };
+                                        sleep_cfg2 {
+                                                ste,pins = "GPIO257_AE29"; /* STP */
+                                                ste,config = <&slpm_out_hi_wkup_pdis>;
+                                        };
+                                        sleep_cfg3 {
+                                                ste,pins =
+                                                "GPIO260_AD28", /* DAT7 */
+                                                "GPIO261_AD26", /* DAT6 */
+                                                "GPIO262_AE26", /* DAT5 */
+                                                "GPIO263_AG29", /* DAT4 */
+                                                "GPIO264_AE27", /* DAT3 */
+                                                "GPIO265_AD27", /* DAT2 */
+                                                "GPIO266_AC28", /* DAT1 */
+                                                "GPIO267_AC27"; /* DAT0 */
+                                                ste,config = <&slpm_in_wkup_pdis_en>;
+                                        };
+                                };
+                        };
                 };
         };
 };
diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi
index 85260846deae..4fda2d933488 100644
--- a/arch/arm/boot/dts/ste-href.dtsi
+++ b/arch/arm/boot/dts/ste-href.dtsi
@@ -30,6 +30,12 @@
         };
 
         soc {
+                usb_per5@a03e0000 {
+                        pinctrl-names = "default", "sleep";
+                        pinctrl-0 = <&musb_default_mode>;
+                        pinctrl-1 = <&musb_sleep_mode>;
+                };
+
                 uart@80120000 {
                         pinctrl-names = "default", "sleep";
                         pinctrl-0 = <&uart0_default_mode>;
diff --git a/arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi b/arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi
index 9aea983e78b5..9f3e87573f86 100644
--- a/arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi
+++ b/arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi
@@ -41,6 +41,12 @@
                 ste,output = <OUTPUT_LOW>;
         };
 
+        slpm_wkup_pdis_en: slpm_wkup_pdis_en {
+                ste,sleep = <SLPM_ENABLED>;
+                ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
+                ste,sleep-pull-disable = <SLPM_PDIS_ENABLED>;
+        };
+
         slpm_in_pu: slpm_in_pu {
                 ste,sleep = <SLPM_ENABLED>;
                 ste,sleep-input = <SLPM_INPUT_PULLUP>;
@@ -54,6 +60,13 @@
                 ste,sleep-pull-disable = <SLPM_PDIS_DISABLED>;
         };
 
+        slpm_in_wkup_pdis_en: slpm_in_wkup_pdis_en {
+                ste,sleep = <SLPM_ENABLED>;
+                ste,sleep-input = <SLPM_DIR_INPUT>;
+                ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
+                ste,sleep-pull-disable = <SLPM_PDIS_ENABLED>;
+        };
+
         slpm_out_lo: slpm_out_lo {
                 ste,sleep = <SLPM_ENABLED>;
                 ste,sleep-output = <SLPM_OUTPUT_LOW>;
diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
index 65180b2bc409..4763b805e754 100644
--- a/arch/arm/boot/dts/ste-snowball.dts
+++ b/arch/arm/boot/dts/ste-snowball.dts
@@ -85,6 +85,11 @@
         };
 
         soc {
+                usb_per5@a03e0000 {
+                        pinctrl-names = "default", "sleep";
+                        pinctrl-0 = <&musb_default_mode>;
+                        pinctrl-1 = <&musb_sleep_mode>;
+                };
 
                 sound {
                         compatible = "stericsson,snd-soc-mop500";