aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-11-13 09:59:40 -0500
committerLinus Walleij <linus.walleij@linaro.org>2013-11-26 15:01:55 -0500
commita12f703c5a27e2061fd0ea77200e5e2f8cfee54b (patch)
tree7fe922b21ee34e0c1a1ea6971adc91d1f92df695 /arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi
parenta45cb698a7db6c623214a5345a32a4ce724ca560 (diff)
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>
Diffstat (limited to 'arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi')
-rw-r--r--arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi13
1 files changed, 13 insertions, 0 deletions
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 @@
41 ste,output = <OUTPUT_LOW>; 41 ste,output = <OUTPUT_LOW>;
42 }; 42 };
43 43
44 slpm_wkup_pdis_en: slpm_wkup_pdis_en {
45 ste,sleep = <SLPM_ENABLED>;
46 ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
47 ste,sleep-pull-disable = <SLPM_PDIS_ENABLED>;
48 };
49
44 slpm_in_pu: slpm_in_pu { 50 slpm_in_pu: slpm_in_pu {
45 ste,sleep = <SLPM_ENABLED>; 51 ste,sleep = <SLPM_ENABLED>;
46 ste,sleep-input = <SLPM_INPUT_PULLUP>; 52 ste,sleep-input = <SLPM_INPUT_PULLUP>;
@@ -54,6 +60,13 @@
54 ste,sleep-pull-disable = <SLPM_PDIS_DISABLED>; 60 ste,sleep-pull-disable = <SLPM_PDIS_DISABLED>;
55 }; 61 };
56 62
63 slpm_in_wkup_pdis_en: slpm_in_wkup_pdis_en {
64 ste,sleep = <SLPM_ENABLED>;
65 ste,sleep-input = <SLPM_DIR_INPUT>;
66 ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
67 ste,sleep-pull-disable = <SLPM_PDIS_ENABLED>;
68 };
69
57 slpm_out_lo: slpm_out_lo { 70 slpm_out_lo: slpm_out_lo {
58 ste,sleep = <SLPM_ENABLED>; 71 ste,sleep = <SLPM_ENABLED>;
59 ste,sleep-output = <SLPM_OUTPUT_LOW>; 72 ste,sleep-output = <SLPM_OUTPUT_LOW>;