[PATCH] ARM: OMAP3: cm-t35: fix mux mode for DSS pins

Igor Grinberg grinberg at compulab.co.il
Sun Nov 6 04:25:39 EST 2011


Hi Tony,

This one is stand alone and can be applied to fixes.
I will re spin the rest in a couple of hours.

Thanks

On 10/19/11 18:46, Igor Grinberg wrote:
> OMAP pin mux configuration API has been used incorrectly resulting
> in wrong mux mode set for several DSS pins.
> 
> Signed-off-by: Igor Grinberg <grinberg at compulab.co.il>
> ---
>  arch/arm/mach-omap2/board-cm-t35.c |   32 ++++++++++++++++++--------------
>  1 files changed, 18 insertions(+), 14 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
> index 3201c9e..023b768 100644
> --- a/arch/arm/mach-omap2/board-cm-t35.c
> +++ b/arch/arm/mach-omap2/board-cm-t35.c
> @@ -600,24 +600,28 @@ static void __init cm_t3x_common_dss_mux_init(int mux_mode)
>  
>  static void __init cm_t35_init_mux(void)
>  {
> -	omap_mux_init_signal("gpio_70", OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT);
> -	omap_mux_init_signal("gpio_71", OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT);
> -	omap_mux_init_signal("gpio_72", OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT);
> -	omap_mux_init_signal("gpio_73", OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT);
> -	omap_mux_init_signal("gpio_74", OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT);
> -	omap_mux_init_signal("gpio_75", OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT);
> -	cm_t3x_common_dss_mux_init(OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT);
> +	int mux_mode = OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT;
> +
> +	omap_mux_init_signal("dss_data0.dss_data0", mux_mode);
> +	omap_mux_init_signal("dss_data1.dss_data1", mux_mode);
> +	omap_mux_init_signal("dss_data2.dss_data2", mux_mode);
> +	omap_mux_init_signal("dss_data3.dss_data3", mux_mode);
> +	omap_mux_init_signal("dss_data4.dss_data4", mux_mode);
> +	omap_mux_init_signal("dss_data5.dss_data5", mux_mode);
> +	cm_t3x_common_dss_mux_init(mux_mode);
>  }
>  
>  static void __init cm_t3730_init_mux(void)
>  {
> -	omap_mux_init_signal("sys_boot0", OMAP_MUX_MODE3 | OMAP_PIN_OUTPUT);
> -	omap_mux_init_signal("sys_boot1", OMAP_MUX_MODE3 | OMAP_PIN_OUTPUT);
> -	omap_mux_init_signal("sys_boot3", OMAP_MUX_MODE3 | OMAP_PIN_OUTPUT);
> -	omap_mux_init_signal("sys_boot4", OMAP_MUX_MODE3 | OMAP_PIN_OUTPUT);
> -	omap_mux_init_signal("sys_boot5", OMAP_MUX_MODE3 | OMAP_PIN_OUTPUT);
> -	omap_mux_init_signal("sys_boot6", OMAP_MUX_MODE3 | OMAP_PIN_OUTPUT);
> -	cm_t3x_common_dss_mux_init(OMAP_MUX_MODE3 | OMAP_PIN_OUTPUT);
> +	int mux_mode = OMAP_MUX_MODE3 | OMAP_PIN_OUTPUT;
> +
> +	omap_mux_init_signal("sys_boot0", mux_mode);
> +	omap_mux_init_signal("sys_boot1", mux_mode);
> +	omap_mux_init_signal("sys_boot3", mux_mode);
> +	omap_mux_init_signal("sys_boot4", mux_mode);
> +	omap_mux_init_signal("sys_boot5", mux_mode);
> +	omap_mux_init_signal("sys_boot6", mux_mode);
> +	cm_t3x_common_dss_mux_init(mux_mode);
>  }
>  #else
>  static inline void cm_t35_init_mux(void) {}

-- 
Regards,
Igor.



More information about the linux-arm-kernel mailing list