diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2014-02-03 16:51:58 -0500 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2014-02-04 14:50:39 -0500 |
| commit | 1f04159e9e23901ff09514cfc9d7962a38b25c06 (patch) | |
| tree | 9644ab0dd723e36b5fe9a4d734a1266bc08b4b09 /arch | |
| parent | c7bb47aa0145ccb5e725f79cc7775d1093467467 (diff) | |
ARM: ux500: move AB8500 DMIC settings to DT
This move the AB8500 DMIC (microphone) pin setup from the board
file to the device tree.
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/ste-href-ab8500.dtsi | 25 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-pins.c | 24 |
2 files changed, 24 insertions, 25 deletions
diff --git a/arch/arm/boot/dts/ste-href-ab8500.dtsi b/arch/arm/boot/dts/ste-href-ab8500.dtsi index 9cf12d5d0923..6222b8e951c2 100644 --- a/arch/arm/boot/dts/ste-href-ab8500.dtsi +++ b/arch/arm/boot/dts/ste-href-ab8500.dtsi | |||
| @@ -35,7 +35,8 @@ | |||
| 35 | <&ycbcr_default_mode>, | 35 | <&ycbcr_default_mode>, |
| 36 | <&pwm_default_mode>, | 36 | <&pwm_default_mode>, |
| 37 | <&adi1_default_mode>, | 37 | <&adi1_default_mode>, |
| 38 | <&usbuicc_default_mode>; | 38 | <&usbuicc_default_mode>, |
| 39 | <&dmic_default_mode>; | ||
| 39 | 40 | ||
| 40 | /* | 41 | /* |
| 41 | * Pins 2, 4, 10, 11, 12, 13, 16, 24, 25, 36, 37, 38, 39 and 42 | 42 | * Pins 2, 4, 10, 11, 12, 13, 16, 24, 25, 36, 37, 38, 39 and 42 |
| @@ -318,6 +319,28 @@ | |||
| 318 | }; | 319 | }; |
| 319 | }; | 320 | }; |
| 320 | }; | 321 | }; |
| 322 | /* This sets up the microphone pins */ | ||
| 323 | dmic { | ||
| 324 | dmic_default_mode: dmic_default { | ||
| 325 | default_mux { | ||
| 326 | ste,function = "dmic"; | ||
| 327 | ste,pins = "dmic12_d_1", | ||
| 328 | "dmic34_d_1", | ||
| 329 | "dmic56_d_1"; | ||
| 330 | }; | ||
| 331 | default_cfg { | ||
| 332 | ste,pins = "GPIO27_J6", | ||
| 333 | "GPIO28_K6", | ||
| 334 | "GPIO29_G6", | ||
| 335 | "GPIO30_H6", | ||
| 336 | "GPIO31_F5", | ||
| 337 | "GPIO32_G5"; | ||
| 338 | input-enable; | ||
| 339 | bias-pull-down; | ||
| 340 | }; | ||
| 341 | }; | ||
| 342 | }; | ||
| 343 | |||
| 321 | }; | 344 | }; |
| 322 | }; | 345 | }; |
| 323 | }; | 346 | }; |
diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index 443b1f4b828a..851f530e6e16 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c | |||
| @@ -57,30 +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 27,28 are muxed in DMIC12 | ||
| 61 | * configured in INPUT PULL DOWN | ||
| 62 | */ | ||
| 63 | AB8500_MUX_HOG("dmic12_d_1", "dmic"), | ||
| 64 | AB8500_PIN_HOG("GPIO27_J6", in_pd), | ||
| 65 | AB8500_PIN_HOG("GPIO28_K6", in_pd), | ||
| 66 | |||
| 67 | /* | ||
| 68 | * pins 29,30 are muxed in DMIC34 | ||
| 69 | * configured in INPUT PULL DOWN | ||
| 70 | */ | ||
| 71 | AB8500_MUX_HOG("dmic34_d_1", "dmic"), | ||
| 72 | AB8500_PIN_HOG("GPIO29_G6", in_pd), | ||
| 73 | AB8500_PIN_HOG("GPIO30_H6", in_pd), | ||
| 74 | |||
| 75 | /* | ||
| 76 | * pins 31,32 are muxed in DMIC56 | ||
| 77 | * configured in INPUT PULL DOWN | ||
| 78 | */ | ||
| 79 | AB8500_MUX_HOG("dmic56_d_1", "dmic"), | ||
| 80 | AB8500_PIN_HOG("GPIO31_F5", in_pd), | ||
| 81 | AB8500_PIN_HOG("GPIO32_G5", in_pd), | ||
| 82 | |||
| 83 | /* | ||
| 84 | * pins 34 is muxed in EXTCPENA | 60 | * pins 34 is muxed in EXTCPENA |
| 85 | * configured INPUT PULL DOWN | 61 | * configured INPUT PULL DOWN |
| 86 | */ | 62 | */ |