diff options
| author | Fabio Baltieri <fabio.baltieri@linaro.org> | 2013-05-08 05:09:53 -0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-05-27 08:08:29 -0400 |
| commit | af86e10cdd35dea3d9c63311daf6de2cc41ac6a8 (patch) | |
| tree | 29b979c89cecdc84efcbb01eeff3f9fb8585f88e /arch/arm/mach-ux500 | |
| parent | e4aa937ec75df0eea0bee03bffa3303ad36c986b (diff) | |
ARM: ux500: update MSP1 pinctrl defintions
Update MSP1 pinctrl definitions in mop500_family_pinmap by removing
sleep state and setting default ones as pin hogs, as those are used by
both ux500-msp-i2s.1 and ux500-msp-i2s.3.
Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-pins.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index 947bd9eca079..3f92308eee36 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c | |||
| @@ -174,17 +174,12 @@ static struct pinctrl_map __initdata mop500_family_pinmap[] = { | |||
| 174 | DB8500_PIN_SLEEP("GPIO4_AH6", slpm_in_wkup_pdis, "uart1"), | 174 | DB8500_PIN_SLEEP("GPIO4_AH6", slpm_in_wkup_pdis, "uart1"), |
| 175 | DB8500_PIN_SLEEP("GPIO5_AG6", slpm_out_wkup_pdis, "uart1"), | 175 | DB8500_PIN_SLEEP("GPIO5_AG6", slpm_out_wkup_pdis, "uart1"), |
| 176 | /* MSP1 for ALSA codec */ | 176 | /* MSP1 for ALSA codec */ |
| 177 | DB8500_MUX("msp1txrx_a_1", "msp1", "ux500-msp-i2s.1"), | 177 | DB8500_MUX_HOG("msp1txrx_a_1", "msp1"), |
| 178 | DB8500_MUX("msp1_a_1", "msp1", "ux500-msp-i2s.1"), | 178 | DB8500_MUX_HOG("msp1_a_1", "msp1"), |
| 179 | DB8500_PIN("GPIO33_AF2", out_lo_slpm_nowkup, "ux500-msp-i2s.1"), | 179 | DB8500_PIN_HOG("GPIO33_AF2", out_lo_slpm_nowkup), |
| 180 | DB8500_PIN("GPIO34_AE1", in_nopull_slpm_nowkup, "ux500-msp-i2s.1"), | 180 | DB8500_PIN_HOG("GPIO34_AE1", in_nopull_slpm_nowkup), |
| 181 | DB8500_PIN("GPIO35_AE2", in_nopull_slpm_nowkup, "ux500-msp-i2s.1"), | 181 | DB8500_PIN_HOG("GPIO35_AE2", in_nopull_slpm_nowkup), |
| 182 | DB8500_PIN("GPIO36_AG2", in_nopull_slpm_nowkup, "ux500-msp-i2s.1"), | 182 | DB8500_PIN_HOG("GPIO36_AG2", in_nopull_slpm_nowkup), |
| 183 | /* MSP1 sleep state */ | ||
| 184 | DB8500_PIN_SLEEP("GPIO33_AF2", slpm_out_lo_wkup, "ux500-msp-i2s.1"), | ||
| 185 | DB8500_PIN_SLEEP("GPIO34_AE1", slpm_in_nopull_wkup, "ux500-msp-i2s.1"), | ||
| 186 | DB8500_PIN_SLEEP("GPIO35_AE2", slpm_in_nopull_wkup, "ux500-msp-i2s.1"), | ||
| 187 | DB8500_PIN_SLEEP("GPIO36_AG2", slpm_in_nopull_wkup, "ux500-msp-i2s.1"), | ||
| 188 | /* Mux in LCD data lines 8 thru 11 and LCDA CLK for MCDE TVOUT */ | 183 | /* Mux in LCD data lines 8 thru 11 and LCDA CLK for MCDE TVOUT */ |
| 189 | DB8500_MUX("lcd_d8_d11_a_1", "lcd", "mcde-tvout"), | 184 | DB8500_MUX("lcd_d8_d11_a_1", "lcd", "mcde-tvout"), |
| 190 | DB8500_MUX("lcdaclk_b_1", "lcda", "mcde-tvout"), | 185 | DB8500_MUX("lcdaclk_b_1", "lcda", "mcde-tvout"), |