[PATCH v2 0/2] ARM: OMAP4 SDP/PandaBoard: Fix sys_nirq2 mux configuration

[PATCH v2 0/2] ARM: OMAP4 SDP/PandaBoard: Fix sys_nirq2 mux configuration

[Peter Ujfalusi]

Hello,

sys_nirq2 pin needs to be set to mode0 (instead of mode1 done in v1 patches).
To my surprise mode1 also worked, but it was not the correct mode.

I have kept the acks from Santosh since the idea behind of the patches are the
same, but now the mux mode is the correct one.

Regards,
Peter

---
Peter Ujfalusi (2):
  ARM: OMAP: board-4430sdp: MUX configuration for sys_nirq2
  ARM: OMAP: board-omap4panda: MUX configuration for sys_nirq2

 arch/arm/mach-omap2/board-4430sdp.c    |    3 +++
 arch/arm/mach-omap2/board-omap4panda.c |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)

-- 
1.7.8.6

[PATCH v2 1/2] ARM: OMAP: board-4430sdp: MUX configuration for sys_nirq2

[Peter Ujfalusi]

The sys_nirq2 is used for twl6040, make sure the pin is configured
correctly.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
---
 arch/arm/mach-omap2/board-4430sdp.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index c4e17641..72cd206 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -827,6 +827,9 @@ static void __init omap_4430sdp_display_init(void)
 #ifdef CONFIG_OMAP_MUX
 static struct omap_board_mux board_mux[] __initdata = {
 	OMAP4_MUX(USBB2_ULPITLL_CLK, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT),
+	/* NIRQ2 for twl6040 */
+	OMAP4_MUX(SYS_NIRQ2, OMAP_MUX_MODE0 |
+		  OMAP_PIN_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE),
 	{ .reg_offset = OMAP_MUX_TERMINATOR },
 };
 
-- 
1.7.8.6

[PATCH v2 1/2] ARM: OMAP: board-4430sdp: MUX configuration for sys_nirq2

[Kevin Hilman]

Peter Ujfalusi <peter.ujfalusi@ti.com> writes:

> The sys_nirq2 is used for twl6040, make sure the pin is configured
> correctly.
>
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> ---
>  arch/arm/mach-omap2/board-4430sdp.c |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
> index c4e17641..72cd206 100644
> --- a/arch/arm/mach-omap2/board-4430sdp.c
> +++ b/arch/arm/mach-omap2/board-4430sdp.c
> @@ -827,6 +827,9 @@ static void __init omap_4430sdp_display_init(void)
>  #ifdef CONFIG_OMAP_MUX
>  static struct omap_board_mux board_mux[] __initdata = {
>  	OMAP4_MUX(USBB2_ULPITLL_CLK, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT),
> +	/* NIRQ2 for twl6040 */
> +	OMAP4_MUX(SYS_NIRQ2, OMAP_MUX_MODE0 |
> +		  OMAP_PIN_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE),

Since this is TWL6030 specific, it should rather be done in TWL code
like I did for sys_nirq1:
   
   http://marc.info/?l=linux-omap&m=134090312118873&w=2

That would avoid having to do this in both board files.

I thought about adding sys_nirq2 in my patch too, but did not know how
to properly test it.

Kevin

>  	{ .reg_offset = OMAP_MUX_TERMINATOR },
>  };

[PATCH v2 1/2] ARM: OMAP: board-4430sdp: MUX configuration for sys_nirq2

[Shilimkar, Santosh]

On Fri, Jul 6, 2012 at 7:46 PM, Kevin Hilman <khilman@ti.com> wrote:
> Peter Ujfalusi <peter.ujfalusi@ti.com> writes:
>
>> The sys_nirq2 is used for twl6040, make sure the pin is configured
>> correctly.
>>
>> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
>> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
>> ---
>>  arch/arm/mach-omap2/board-4430sdp.c |    3 +++
>>  1 files changed, 3 insertions(+), 0 deletions(-)
>>
>> diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
>> index c4e17641..72cd206 100644
>> --- a/arch/arm/mach-omap2/board-4430sdp.c
>> +++ b/arch/arm/mach-omap2/board-4430sdp.c
>> @@ -827,6 +827,9 @@ static void __init omap_4430sdp_display_init(void)
>>  #ifdef CONFIG_OMAP_MUX
>>  static struct omap_board_mux board_mux[] __initdata = {
>>       OMAP4_MUX(USBB2_ULPITLL_CLK, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT),
>> +     /* NIRQ2 for twl6040 */
>> +     OMAP4_MUX(SYS_NIRQ2, OMAP_MUX_MODE0 |
>> +               OMAP_PIN_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE),
>
> Since this is TWL6030 specific, it should rather be done in TWL code
> like I did for sys_nirq1:
>
>    http://marc.info/?l=linux-omap&m=134090312118873&w=2
>
> That would avoid having to do this in both board files.
>
Though the pin is TWL specific, it need not be same on
different board with different SOCs. Especially when you need to
set MUX mode etc. So doing from board file is still better
since TWL6030/40 can be connected to non OMAP4 devices
where the muxing can be different.

With current know boards with TWL6030/40, this is not
a strong requirement though.

Regards
Santosh

[PATCH v2 1/2] ARM: OMAP: board-4430sdp: MUX configuration for sys_nirq2

[Peter Ujfalusi]

On 07/06/2012 04:33 PM, Shilimkar, Santosh wrote:
>> Since this is TWL6030 specific, it should rather be done in TWL code
>> like I did for sys_nirq1:
>>
>>    http://marc.info/?l=linux-omap&m=134090312118873&w=2
>>
>> That would avoid having to do this in both board files.
>>
> Though the pin is TWL specific, it need not be same on
> different board with different SOCs. Especially when you need to
> set MUX mode etc. So doing from board file is still better
> since TWL6030/40 can be connected to non OMAP4 devices
> where the muxing can be different.
> 
> With current know boards with TWL6030/40, this is not
> a strong requirement though.

There can be board which has twl6030 but does not have twl6040.
The twl6040 is the recommended audio solution for OMAP4+ systems but it can be
replaced by other codec on some boards.
This is the reason I have put the mux configuration into the board files for
sys_nirq2 (which is in these cases are used to handle the interrupt from twl6040).

-- 
P?ter

[PATCH v2 1/2] ARM: OMAP: board-4430sdp: MUX configuration for sys_nirq2

[Tony Lindgren]

* Peter Ujfalusi <peter.ujfalusi@ti.com> [120709 02:43]:
> On 07/06/2012 04:33 PM, Shilimkar, Santosh wrote:
> >> Since this is TWL6030 specific, it should rather be done in TWL code
> >> like I did for sys_nirq1:
> >>
> >>    http://marc.info/?l=linux-omap&m=134090312118873&w=2
> >>
> >> That would avoid having to do this in both board files.
> >>
> > Though the pin is TWL specific, it need not be same on
> > different board with different SOCs. Especially when you need to
> > set MUX mode etc. So doing from board file is still better
> > since TWL6030/40 can be connected to non OMAP4 devices
> > where the muxing can be different.
> > 
> > With current know boards with TWL6030/40, this is not
> > a strong requirement though.
> 
> There can be board which has twl6030 but does not have twl6040.
> The twl6040 is the recommended audio solution for OMAP4+ systems but it can be
> replaced by other codec on some boards.
> This is the reason I have put the mux configuration into the board files for
> sys_nirq2 (which is in these cases are used to handle the interrupt from twl6040).

OK I'll apply these into devel-board branch.

Tony

[PATCH v2 1/2] ARM: OMAP: board-4430sdp: MUX configuration for sys_nirq2

[Kevin Hilman]

Peter Ujfalusi <peter.ujfalusi@ti.com> writes:

> On 07/06/2012 04:33 PM, Shilimkar, Santosh wrote:
>>> Since this is TWL6030 specific, it should rather be done in TWL code
>>> like I did for sys_nirq1:
>>>
>>>    http://marc.info/?l=linux-omap&m=134090312118873&w=2
>>>
>>> That would avoid having to do this in both board files.
>>>
>> Though the pin is TWL specific, it need not be same on
>> different board with different SOCs. Especially when you need to
>> set MUX mode etc. So doing from board file is still better
>> since TWL6030/40 can be connected to non OMAP4 devices
>> where the muxing can be different.
>> 
>> With current know boards with TWL6030/40, this is not
>> a strong requirement though.
>
> There can be board which has twl6030 but does not have twl6040.
> The twl6040 is the recommended audio solution for OMAP4+ systems but it can be
> replaced by other codec on some boards.
> This is the reason I have put the mux configuration into the board files for
> sys_nirq2 (which is in these cases are used to handle the interrupt from twl6040).

OK, sounds right.  Thanks for the clarification.

Kevin

[PATCH v2 2/2] ARM: OMAP: board-omap4panda: MUX configuration for sys_nirq2

[Peter Ujfalusi]

The sys_nirq2 is used for twl6040, make sure the pin is configured
correctly.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
---
 arch/arm/mach-omap2/board-omap4panda.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index 982fb26..b627cdc 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -379,6 +379,9 @@ static struct omap_board_mux board_mux[] __initdata = {
 	OMAP4_MUX(DPM_EMU18, OMAP_PIN_OUTPUT | OMAP_MUX_MODE5),
 	/* dispc2_data0 */
 	OMAP4_MUX(DPM_EMU19, OMAP_PIN_OUTPUT | OMAP_MUX_MODE5),
+	/* NIRQ2 for twl6040 */
+	OMAP4_MUX(SYS_NIRQ2, OMAP_MUX_MODE0 |
+		  OMAP_PIN_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE),
 	{ .reg_offset = OMAP_MUX_TERMINATOR },
 };
 
-- 
1.7.8.6