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 <[email protected]>
---
arch/arm/mach-ux500/board-mop500-pins.c | 17 ++++++-----------
1 file 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 947bd9e..3f92308 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[] = {
DB8500_PIN_SLEEP("GPIO4_AH6", slpm_in_wkup_pdis, "uart1"),
DB8500_PIN_SLEEP("GPIO5_AG6", slpm_out_wkup_pdis, "uart1"),
/* MSP1 for ALSA codec */
- DB8500_MUX("msp1txrx_a_1", "msp1", "ux500-msp-i2s.1"),
- DB8500_MUX("msp1_a_1", "msp1", "ux500-msp-i2s.1"),
- DB8500_PIN("GPIO33_AF2", out_lo_slpm_nowkup, "ux500-msp-i2s.1"),
- DB8500_PIN("GPIO34_AE1", in_nopull_slpm_nowkup, "ux500-msp-i2s.1"),
- DB8500_PIN("GPIO35_AE2", in_nopull_slpm_nowkup, "ux500-msp-i2s.1"),
- DB8500_PIN("GPIO36_AG2", in_nopull_slpm_nowkup, "ux500-msp-i2s.1"),
- /* MSP1 sleep state */
- DB8500_PIN_SLEEP("GPIO33_AF2", slpm_out_lo_wkup, "ux500-msp-i2s.1"),
- DB8500_PIN_SLEEP("GPIO34_AE1", slpm_in_nopull_wkup, "ux500-msp-i2s.1"),
- DB8500_PIN_SLEEP("GPIO35_AE2", slpm_in_nopull_wkup, "ux500-msp-i2s.1"),
- DB8500_PIN_SLEEP("GPIO36_AG2", slpm_in_nopull_wkup, "ux500-msp-i2s.1"),
+ DB8500_MUX_HOG("msp1txrx_a_1", "msp1"),
+ DB8500_MUX_HOG("msp1_a_1", "msp1"),
+ DB8500_PIN_HOG("GPIO33_AF2", out_lo_slpm_nowkup),
+ DB8500_PIN_HOG("GPIO34_AE1", in_nopull_slpm_nowkup),
+ DB8500_PIN_HOG("GPIO35_AE2", in_nopull_slpm_nowkup),
+ DB8500_PIN_HOG("GPIO36_AG2", in_nopull_slpm_nowkup),
/* Mux in LCD data lines 8 thru 11 and LCDA CLK for MCDE TVOUT */
DB8500_MUX("lcd_d8_d11_a_1", "lcd", "mcde-tvout"),
DB8500_MUX("lcdaclk_b_1", "lcda", "mcde-tvout"),
--
1.8.2
On Wed, May 08, 2013 at 11:09:53AM +0200, Fabio Baltieri wrote:
> 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.
This presumably needs to go along with the ASoC side of this change but
as I said in reply to that this isn't an obvious improvement.
On Wed, May 8, 2013 at 11:09 AM, Fabio Baltieri
<[email protected]> wrote:
> 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 <[email protected]>
Applied to my ux500-pinctrl branch.
I need to refresh the entire pinctrl setup anyway, so will make
big changes in this file, and need to keep it in my tree.
Yours,
Linus Walleij
On Wed, May 15, 2013 at 09:35:17PM +0200, Linus Walleij wrote:
> On Wed, May 8, 2013 at 11:09 AM, Fabio Baltieri
> <[email protected]> wrote:
>
> > 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 <[email protected]>
>
> Applied to my ux500-pinctrl branch.
Thanks Linus,
This one was actually sort-of related to the ASoC patch to drop sleep
pin state control from the ux500 ASoC driver. Would you be able to
check that one too?
The subject is:
[PATCH 3/6] ASoC: ux500: Drop pinctrl sleep support
There are no dependency issues by applying this and the other in
different trees, but I'd like to close the discussion on the other one.
Thanks,
Fabio
--
Fabio Baltieri