diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2014-02-03 09:43:22 -0500 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2014-02-04 14:50:32 -0500 |
| commit | b2985cf7f08325519405942770d203da8fd46fa8 (patch) | |
| tree | be7fcb12400c32092bdb386968a87ba2a9fe5ddc | |
| parent | e2377c8107e33ac4ace7ec7ee86101d7c70fbbf9 (diff) | |
ARM: ux500: move AB8500 audio interface 1 settings to DT
This moves the pin muxing and configuration for audio interface
one over to the device tree as a hog configuration.
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | arch/arm/boot/dts/ste-href-ab8500.dtsi | 20 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-pins.c | 10 |
2 files changed, 19 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/ste-href-ab8500.dtsi b/arch/arm/boot/dts/ste-href-ab8500.dtsi index cdf2b3fd22dc..3aae4ec5bcc9 100644 --- a/arch/arm/boot/dts/ste-href-ab8500.dtsi +++ b/arch/arm/boot/dts/ste-href-ab8500.dtsi | |||
| @@ -33,7 +33,8 @@ | |||
| 33 | <&gpio26_default_mode>, | 33 | <&gpio26_default_mode>, |
| 34 | <&gpio35_default_mode>, | 34 | <&gpio35_default_mode>, |
| 35 | <&ycbcr_default_mode>, | 35 | <&ycbcr_default_mode>, |
| 36 | <&pwm_default_mode>; | 36 | <&pwm_default_mode>, |
| 37 | <&adi1_default_mode>; | ||
| 37 | 38 | ||
| 38 | /* | 39 | /* |
| 39 | * Pins 2, 4, 10, 11, 12, 13, 16, 24, 25, 36, 37, 38, 39 and 42 | 40 | * Pins 2, 4, 10, 11, 12, 13, 16, 24, 25, 36, 37, 38, 39 and 42 |
| @@ -283,6 +284,23 @@ | |||
| 283 | }; | 284 | }; |
| 284 | }; | 285 | }; |
| 285 | }; | 286 | }; |
| 287 | /* This sets up audio interface 1 */ | ||
| 288 | adi1 { | ||
| 289 | adi1_default_mode: adi1_default { | ||
| 290 | default_mux { | ||
| 291 | ste,function = "adi1"; | ||
| 292 | ste,pins = "adi1_d_1"; | ||
| 293 | }; | ||
| 294 | default_cfg { | ||
| 295 | ste,pins = "GPIO17_P5", | ||
| 296 | "GPIO18_R5", | ||
| 297 | "GPIO19_U5", | ||
| 298 | "GPIO20_T5"; | ||
| 299 | input-enable; | ||
| 300 | bias-pull-down; | ||
| 301 | }; | ||
| 302 | }; | ||
| 303 | }; | ||
| 286 | }; | 304 | }; |
| 287 | }; | 305 | }; |
| 288 | }; | 306 | }; |
diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index b75089faf956..d0b262242ab7 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c | |||
| @@ -57,16 +57,6 @@ static struct pinctrl_map __initdata ab8500_pinmap[] = { | |||
| 57 | AB8500_PIN_STATE("GPIO3_U9", in_pd, "regulator.36", PINCTRL_STATE_SLEEP), | 57 | AB8500_PIN_STATE("GPIO3_U9", in_pd, "regulator.36", PINCTRL_STATE_SLEEP), |
| 58 | 58 | ||
| 59 | /* | 59 | /* |
| 60 | * pins 17,18,19 and 20 are muxed in AUDIO interface 1 | ||
| 61 | * configured in INPUT PULL DOWN | ||
| 62 | */ | ||
| 63 | AB8500_MUX_HOG("adi1_d_1", "adi1"), | ||
| 64 | AB8500_PIN_HOG("GPIO17_P5", in_pd), | ||
| 65 | AB8500_PIN_HOG("GPIO18_R5", in_pd), | ||
| 66 | AB8500_PIN_HOG("GPIO19_U5", in_pd), | ||
| 67 | AB8500_PIN_HOG("GPIO20_T5", in_pd), | ||
| 68 | |||
| 69 | /* | ||
| 70 | * pins 21,22 and 23 are muxed in USB UICC | 60 | * pins 21,22 and 23 are muxed in USB UICC |
| 71 | * configured in INPUT PULL DOWN | 61 | * configured in INPUT PULL DOWN |
| 72 | */ | 62 | */ |