| Message ID | 1252090411-24740-1-git-send-email-sudhakar.raj@ti.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
Hello. Sudhakar Rajashekhara wrote: > On the latest DA850/OMAP-L138 EVM (Beta) the GPIO pin > number of LCD panel power has changed. This patch takes > care of this change. Software will support only Beta > versions of DA850/OMAP-L138 EVM. > In the process, add the missing entry for data pin 0 > in da850_lcdcntl_pins structure. > Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com> [...] > diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c > index 192d719..9fbac35 100644 > --- a/arch/arm/mach-davinci/da850.c > +++ b/arch/arm/mach-davinci/da850.c > @@ -506,8 +506,8 @@ static const struct mux_config da850_pins[] = { > MUX_CFG(DA850, EMA_WAIT_1, 6, 24, 15, 1, false) > MUX_CFG(DA850, NEMA_CS_2, 7, 0, 15, 1, false) > /* GPIO function */ > + MUX_CFG(DA850, GPIO2_8, 5, 28, 15, 8, false) > MUX_CFG(DA850, GPIO2_15, 5, 0, 15, 8, false) > - MUX_CFG(DA850, GPIO8_10, 18, 28, 15, 8, false) > MUX_CFG(DA850, GPIO4_0, 10, 28, 15, 8, false) > MUX_CFG(DA850, GPIO4_1, 10, 24, 15, 8, false) > #endif > @@ -555,12 +555,12 @@ const short da850_mcasp_pins[] __initdata = { > }; > > const short da850_lcdcntl_pins[] __initdata = { > - DA850_LCD_D_1, DA850_LCD_D_2, DA850_LCD_D_3, DA850_LCD_D_4, > - DA850_LCD_D_5, DA850_LCD_D_6, DA850_LCD_D_7, DA850_LCD_D_8, > - DA850_LCD_D_9, DA850_LCD_D_10, DA850_LCD_D_11, DA850_LCD_D_12, > - DA850_LCD_D_13, DA850_LCD_D_14, DA850_LCD_D_15, DA850_LCD_PCLK, > - DA850_LCD_HSYNC, DA850_LCD_VSYNC, DA850_NLCD_AC_ENB_CS, DA850_GPIO2_15, > - DA850_GPIO8_10, > + DA850_LCD_D_0, DA850_LCD_D_1, DA850_LCD_D_2, DA850_LCD_D_3, > + DA850_LCD_D_4, DA850_LCD_D_5, DA850_LCD_D_6, DA850_LCD_D_7, > + DA850_LCD_D_8, DA850_LCD_D_9, DA850_LCD_D_10, DA850_LCD_D_11, > + DA850_LCD_D_12, DA850_LCD_D_13, DA850_LCD_D_14, DA850_LCD_D_15, > + DA850_LCD_PCLK, DA850_LCD_HSYNC, DA850_LCD_VSYNC, DA850_NLCD_AC_ENB_CS, > + DA850_GPIO2_8, DA850_GPIO2_15, Please don't add GPIO pins here. It should be a generic device specific pin list, not including any board specific GPIO bindings -- any such bindings must be described in the board file (naturally). WBR, Sergei
Sergei Shtylyov <sshtylyov@ru.mvista.com> writes: > Hello. > > Sudhakar Rajashekhara wrote: > >> On the latest DA850/OMAP-L138 EVM (Beta) the GPIO pin >> number of LCD panel power has changed. This patch takes >> care of this change. Software will support only Beta >> versions of DA850/OMAP-L138 EVM. > >> In the process, add the missing entry for data pin 0 >> in da850_lcdcntl_pins structure. > >> Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com> > > [...] > >> diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c >> index 192d719..9fbac35 100644 >> --- a/arch/arm/mach-davinci/da850.c >> +++ b/arch/arm/mach-davinci/da850.c >> @@ -506,8 +506,8 @@ static const struct mux_config da850_pins[] = { >> MUX_CFG(DA850, EMA_WAIT_1, 6, 24, 15, 1, false) >> MUX_CFG(DA850, NEMA_CS_2, 7, 0, 15, 1, false) >> /* GPIO function */ >> + MUX_CFG(DA850, GPIO2_8, 5, 28, 15, 8, false) >> MUX_CFG(DA850, GPIO2_15, 5, 0, 15, 8, false) >> - MUX_CFG(DA850, GPIO8_10, 18, 28, 15, 8, false) >> MUX_CFG(DA850, GPIO4_0, 10, 28, 15, 8, false) >> MUX_CFG(DA850, GPIO4_1, 10, 24, 15, 8, false) >> #endif >> @@ -555,12 +555,12 @@ const short da850_mcasp_pins[] __initdata = { >> }; >> const short da850_lcdcntl_pins[] __initdata = { >> - DA850_LCD_D_1, DA850_LCD_D_2, DA850_LCD_D_3, DA850_LCD_D_4, >> - DA850_LCD_D_5, DA850_LCD_D_6, DA850_LCD_D_7, DA850_LCD_D_8, >> - DA850_LCD_D_9, DA850_LCD_D_10, DA850_LCD_D_11, DA850_LCD_D_12, >> - DA850_LCD_D_13, DA850_LCD_D_14, DA850_LCD_D_15, DA850_LCD_PCLK, >> - DA850_LCD_HSYNC, DA850_LCD_VSYNC, DA850_NLCD_AC_ENB_CS, DA850_GPIO2_15, >> - DA850_GPIO8_10, >> + DA850_LCD_D_0, DA850_LCD_D_1, DA850_LCD_D_2, DA850_LCD_D_3, >> + DA850_LCD_D_4, DA850_LCD_D_5, DA850_LCD_D_6, DA850_LCD_D_7, >> + DA850_LCD_D_8, DA850_LCD_D_9, DA850_LCD_D_10, DA850_LCD_D_11, >> + DA850_LCD_D_12, DA850_LCD_D_13, DA850_LCD_D_14, DA850_LCD_D_15, >> + DA850_LCD_PCLK, DA850_LCD_HSYNC, DA850_LCD_VSYNC, DA850_NLCD_AC_ENB_CS, >> + DA850_GPIO2_8, DA850_GPIO2_15, > > Please don't add GPIO pins here. It should be a generic device > specific pin list, not including any board specific GPIO bindings -- > any such bindings must be described in the board file (naturally). Completely agree. Kevin
Hello. Kevin Hilman wrote: >>> On the latest DA850/OMAP-L138 EVM (Beta) the GPIO pin >>> number of LCD panel power has changed. This patch takes >>> care of this change. Software will support only Beta >>> versions of DA850/OMAP-L138 EVM. >>> >>> In the process, add the missing entry for data pin 0 >>> in da850_lcdcntl_pins structure. >>> >>> Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com> >>> >> [...] >> >> >>> diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c >>> index 192d719..9fbac35 100644 >>> --- a/arch/arm/mach-davinci/da850.c >>> +++ b/arch/arm/mach-davinci/da850.c >>> @@ -506,8 +506,8 @@ static const struct mux_config da850_pins[] = { >>> MUX_CFG(DA850, EMA_WAIT_1, 6, 24, 15, 1, false) >>> MUX_CFG(DA850, NEMA_CS_2, 7, 0, 15, 1, false) >>> /* GPIO function */ >>> + MUX_CFG(DA850, GPIO2_8, 5, 28, 15, 8, false) >>> MUX_CFG(DA850, GPIO2_15, 5, 0, 15, 8, false) >>> - MUX_CFG(DA850, GPIO8_10, 18, 28, 15, 8, false) >>> MUX_CFG(DA850, GPIO4_0, 10, 28, 15, 8, false) >>> MUX_CFG(DA850, GPIO4_1, 10, 24, 15, 8, false) >>> #endif >>> @@ -555,12 +555,12 @@ const short da850_mcasp_pins[] __initdata = { >>> }; >>> const short da850_lcdcntl_pins[] __initdata = { >>> - DA850_LCD_D_1, DA850_LCD_D_2, DA850_LCD_D_3, DA850_LCD_D_4, >>> - DA850_LCD_D_5, DA850_LCD_D_6, DA850_LCD_D_7, DA850_LCD_D_8, >>> - DA850_LCD_D_9, DA850_LCD_D_10, DA850_LCD_D_11, DA850_LCD_D_12, >>> - DA850_LCD_D_13, DA850_LCD_D_14, DA850_LCD_D_15, DA850_LCD_PCLK, >>> - DA850_LCD_HSYNC, DA850_LCD_VSYNC, DA850_NLCD_AC_ENB_CS, DA850_GPIO2_15, >>> - DA850_GPIO8_10, >>> + DA850_LCD_D_0, DA850_LCD_D_1, DA850_LCD_D_2, DA850_LCD_D_3, >>> + DA850_LCD_D_4, DA850_LCD_D_5, DA850_LCD_D_6, DA850_LCD_D_7, >>> + DA850_LCD_D_8, DA850_LCD_D_9, DA850_LCD_D_10, DA850_LCD_D_11, >>> + DA850_LCD_D_12, DA850_LCD_D_13, DA850_LCD_D_14, DA850_LCD_D_15, >>> + DA850_LCD_PCLK, DA850_LCD_HSYNC, DA850_LCD_VSYNC, DA850_NLCD_AC_ENB_CS, >>> + DA850_GPIO2_8, DA850_GPIO2_15, >>> >> Please don't add GPIO pins here. It should be a generic device >> specific pin list, not including any board specific GPIO bindings -- >> any such bindings must be described in the board file (naturally). >> > > Completely agree. > Eh, then why you commited the initial patch with these GPIO pins in the first place? :-) > Kevin > WBR, Sergei
Sergei Shtylyov <sshtylyov@ru.mvista.com> writes: > Hello. > > Kevin Hilman wrote: > >>>> On the latest DA850/OMAP-L138 EVM (Beta) the GPIO pin >>>> number of LCD panel power has changed. This patch takes >>>> care of this change. Software will support only Beta >>>> versions of DA850/OMAP-L138 EVM. >>>> In the process, add the missing entry for data pin 0 >>>> in da850_lcdcntl_pins structure. >>>> Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com> >>>> >>> [...] >>> >>> >>>> diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c >>>> index 192d719..9fbac35 100644 >>>> --- a/arch/arm/mach-davinci/da850.c >>>> +++ b/arch/arm/mach-davinci/da850.c >>>> @@ -506,8 +506,8 @@ static const struct mux_config da850_pins[] = { >>>> MUX_CFG(DA850, EMA_WAIT_1, 6, 24, 15, 1, false) >>>> MUX_CFG(DA850, NEMA_CS_2, 7, 0, 15, 1, false) >>>> /* GPIO function */ >>>> + MUX_CFG(DA850, GPIO2_8, 5, 28, 15, 8, false) >>>> MUX_CFG(DA850, GPIO2_15, 5, 0, 15, 8, false) >>>> - MUX_CFG(DA850, GPIO8_10, 18, 28, 15, 8, false) >>>> MUX_CFG(DA850, GPIO4_0, 10, 28, 15, 8, false) >>>> MUX_CFG(DA850, GPIO4_1, 10, 24, 15, 8, false) >>>> #endif >>>> @@ -555,12 +555,12 @@ const short da850_mcasp_pins[] __initdata = { >>>> }; >>>> const short da850_lcdcntl_pins[] __initdata = { >>>> - DA850_LCD_D_1, DA850_LCD_D_2, DA850_LCD_D_3, DA850_LCD_D_4, >>>> - DA850_LCD_D_5, DA850_LCD_D_6, DA850_LCD_D_7, DA850_LCD_D_8, >>>> - DA850_LCD_D_9, DA850_LCD_D_10, DA850_LCD_D_11, DA850_LCD_D_12, >>>> - DA850_LCD_D_13, DA850_LCD_D_14, DA850_LCD_D_15, DA850_LCD_PCLK, >>>> - DA850_LCD_HSYNC, DA850_LCD_VSYNC, DA850_NLCD_AC_ENB_CS, DA850_GPIO2_15, >>>> - DA850_GPIO8_10, >>>> + DA850_LCD_D_0, DA850_LCD_D_1, DA850_LCD_D_2, DA850_LCD_D_3, >>>> + DA850_LCD_D_4, DA850_LCD_D_5, DA850_LCD_D_6, DA850_LCD_D_7, >>>> + DA850_LCD_D_8, DA850_LCD_D_9, DA850_LCD_D_10, DA850_LCD_D_11, >>>> + DA850_LCD_D_12, DA850_LCD_D_13, DA850_LCD_D_14, DA850_LCD_D_15, >>>> + DA850_LCD_PCLK, DA850_LCD_HSYNC, DA850_LCD_VSYNC, DA850_NLCD_AC_ENB_CS, >>>> + DA850_GPIO2_8, DA850_GPIO2_15, >>>> >>> Please don't add GPIO pins here. It should be a generic device >>> specific pin list, not including any board specific GPIO bindings -- >>> any such bindings must be described in the board file (naturally). >>> >> >> Completely agree. >> > > Eh, then why you commited the initial patch with these GPIO pins in > the first place? :-) > Because I didn't pay close enough attention. Thanks for catching this. Kevin
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 192d719..9fbac35 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -506,8 +506,8 @@ static const struct mux_config da850_pins[] = { MUX_CFG(DA850, EMA_WAIT_1, 6, 24, 15, 1, false) MUX_CFG(DA850, NEMA_CS_2, 7, 0, 15, 1, false) /* GPIO function */ + MUX_CFG(DA850, GPIO2_8, 5, 28, 15, 8, false) MUX_CFG(DA850, GPIO2_15, 5, 0, 15, 8, false) - MUX_CFG(DA850, GPIO8_10, 18, 28, 15, 8, false) MUX_CFG(DA850, GPIO4_0, 10, 28, 15, 8, false) MUX_CFG(DA850, GPIO4_1, 10, 24, 15, 8, false) #endif @@ -555,12 +555,12 @@ const short da850_mcasp_pins[] __initdata = { }; const short da850_lcdcntl_pins[] __initdata = { - DA850_LCD_D_1, DA850_LCD_D_2, DA850_LCD_D_3, DA850_LCD_D_4, - DA850_LCD_D_5, DA850_LCD_D_6, DA850_LCD_D_7, DA850_LCD_D_8, - DA850_LCD_D_9, DA850_LCD_D_10, DA850_LCD_D_11, DA850_LCD_D_12, - DA850_LCD_D_13, DA850_LCD_D_14, DA850_LCD_D_15, DA850_LCD_PCLK, - DA850_LCD_HSYNC, DA850_LCD_VSYNC, DA850_NLCD_AC_ENB_CS, DA850_GPIO2_15, - DA850_GPIO8_10, + DA850_LCD_D_0, DA850_LCD_D_1, DA850_LCD_D_2, DA850_LCD_D_3, + DA850_LCD_D_4, DA850_LCD_D_5, DA850_LCD_D_6, DA850_LCD_D_7, + DA850_LCD_D_8, DA850_LCD_D_9, DA850_LCD_D_10, DA850_LCD_D_11, + DA850_LCD_D_12, DA850_LCD_D_13, DA850_LCD_D_14, DA850_LCD_D_15, + DA850_LCD_PCLK, DA850_LCD_HSYNC, DA850_LCD_VSYNC, DA850_NLCD_AC_ENB_CS, + DA850_GPIO2_8, DA850_GPIO2_15, -1 }; diff --git a/arch/arm/mach-davinci/include/mach/mux.h b/arch/arm/mach-davinci/include/mach/mux.h index 7732832..fc8eb16 100644 --- a/arch/arm/mach-davinci/include/mach/mux.h +++ b/arch/arm/mach-davinci/include/mach/mux.h @@ -872,8 +872,8 @@ enum davinci_da850_index { DA850_NEMA_CS_2, /* GPIO function */ + DA850_GPIO2_8, DA850_GPIO2_15, - DA850_GPIO8_10, DA850_GPIO4_0, DA850_GPIO4_1, };
On the latest DA850/OMAP-L138 EVM (Beta) the GPIO pin number of LCD panel power has changed. This patch takes care of this change. Software will support only Beta versions of DA850/OMAP-L138 EVM. In the process, add the missing entry for data pin 0 in da850_lcdcntl_pins structure. Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com> --- arch/arm/mach-davinci/da850.c | 14 +++++++------- arch/arm/mach-davinci/include/mach/mux.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-)