* [PATCH 0/5] OMAP3EVM: Board bug fixes/enhancements
@ 2011-01-25 17:37 ` Vaibhav Hiremath
0 siblings, 0 replies; 26+ messages in thread
From: Vaibhav Hiremath @ 2011-01-25 17:37 UTC (permalink / raw)
To: linux-arm-kernel
The current linux-omap/master is broken for lots of features/modules
and also there are few enhancements required with addition of AM/DM37x
family of devices.
- Migrate TWL gpio_xxx api to gpio_xx_cansleep
- TSC: Driver init fails due to missing VIO regulator
- TSC: Wakeup is broken, enable the wakeup capability
- DSS: Addition of Mux changes for AM/DM37x
- Make Backlight gpio off in default state
Note: Resetting the revision of patches since this is first bundled series.
Vaibhav Hiremath (5):
OMAP:board-omap3evm: Change TWL related gpio API's to gpio*_cansleep
OMAP3EVM: Add vio regulator supply required for ads7846 TSC driver
AM/DM37x: DSS mux configuration for >Rev-B processor cards
OMAP3EVM: Made backlight GPIO default state to off
OMAP3EVM: Set TSC wakeup option in pad config
arch/arm/mach-omap2/board-omap3evm.c | 80 +++++++++++++++++++++++++++++-----
1 files changed, 69 insertions(+), 11 deletions(-)
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 1/5] OMAP:board-omap3evm: Change TWL related gpio API's to gpio*_cansleep
2011-01-25 17:37 ` Vaibhav Hiremath
@ 2011-01-25 17:37 ` Vaibhav Hiremath
-1 siblings, 0 replies; 26+ messages in thread
From: Vaibhav Hiremath @ 2011-01-25 17:37 UTC (permalink / raw)
To: linux-omap; +Cc: linux-arm-kernel, Vaibhav Hiremath
Since TWL GPIO's can go into sleep, and using normal
gpio_get/set_value() API will lead to kernel dump (WARN_ON()).
So replacing standard gpio_get/set_value() to
gpio_get/set_value_cansleep().
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
---
arch/arm/mach-omap2/board-omap3evm.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 97e0f65..8d2e413 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -268,9 +268,9 @@ static int omap3_evm_enable_lcd(struct omap_dss_device *dssdev)
gpio_set_value(OMAP3EVM_LCD_PANEL_ENVDD, 0);
if (get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2)
- gpio_set_value(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 0);
+ gpio_set_value_cansleep(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 0);
else
- gpio_set_value(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 1);
+ gpio_set_value_cansleep(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 1);
lcd_enabled = 1;
return 0;
@@ -281,9 +281,9 @@ static void omap3_evm_disable_lcd(struct omap_dss_device *dssdev)
gpio_set_value(OMAP3EVM_LCD_PANEL_ENVDD, 1);
if (get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2)
- gpio_set_value(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 1);
+ gpio_set_value_cansleep(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 1);
else
- gpio_set_value(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 0);
+ gpio_set_value_cansleep(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 0);
lcd_enabled = 0;
}
@@ -322,7 +322,7 @@ static int omap3_evm_enable_dvi(struct omap_dss_device *dssdev)
return -EINVAL;
}
- gpio_set_value(OMAP3EVM_DVI_PANEL_EN_GPIO, 1);
+ gpio_set_value_cansleep(OMAP3EVM_DVI_PANEL_EN_GPIO, 1);
dvi_enabled = 1;
return 0;
@@ -330,7 +330,7 @@ static int omap3_evm_enable_dvi(struct omap_dss_device *dssdev)
static void omap3_evm_disable_dvi(struct omap_dss_device *dssdev)
{
- gpio_set_value(OMAP3EVM_DVI_PANEL_EN_GPIO, 0);
+ gpio_set_value_cansleep(OMAP3EVM_DVI_PANEL_EN_GPIO, 0);
dvi_enabled = 0;
}
--
1.6.2.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 1/5] OMAP:board-omap3evm: Change TWL related gpio API's to gpio*_cansleep
@ 2011-01-25 17:37 ` Vaibhav Hiremath
0 siblings, 0 replies; 26+ messages in thread
From: Vaibhav Hiremath @ 2011-01-25 17:37 UTC (permalink / raw)
To: linux-arm-kernel
Since TWL GPIO's can go into sleep, and using normal
gpio_get/set_value() API will lead to kernel dump (WARN_ON()).
So replacing standard gpio_get/set_value() to
gpio_get/set_value_cansleep().
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
---
arch/arm/mach-omap2/board-omap3evm.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 97e0f65..8d2e413 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -268,9 +268,9 @@ static int omap3_evm_enable_lcd(struct omap_dss_device *dssdev)
gpio_set_value(OMAP3EVM_LCD_PANEL_ENVDD, 0);
if (get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2)
- gpio_set_value(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 0);
+ gpio_set_value_cansleep(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 0);
else
- gpio_set_value(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 1);
+ gpio_set_value_cansleep(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 1);
lcd_enabled = 1;
return 0;
@@ -281,9 +281,9 @@ static void omap3_evm_disable_lcd(struct omap_dss_device *dssdev)
gpio_set_value(OMAP3EVM_LCD_PANEL_ENVDD, 1);
if (get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2)
- gpio_set_value(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 1);
+ gpio_set_value_cansleep(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 1);
else
- gpio_set_value(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 0);
+ gpio_set_value_cansleep(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 0);
lcd_enabled = 0;
}
@@ -322,7 +322,7 @@ static int omap3_evm_enable_dvi(struct omap_dss_device *dssdev)
return -EINVAL;
}
- gpio_set_value(OMAP3EVM_DVI_PANEL_EN_GPIO, 1);
+ gpio_set_value_cansleep(OMAP3EVM_DVI_PANEL_EN_GPIO, 1);
dvi_enabled = 1;
return 0;
@@ -330,7 +330,7 @@ static int omap3_evm_enable_dvi(struct omap_dss_device *dssdev)
static void omap3_evm_disable_dvi(struct omap_dss_device *dssdev)
{
- gpio_set_value(OMAP3EVM_DVI_PANEL_EN_GPIO, 0);
+ gpio_set_value_cansleep(OMAP3EVM_DVI_PANEL_EN_GPIO, 0);
dvi_enabled = 0;
}
--
1.6.2.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH 1/5] OMAP:board-omap3evm: Change TWL related gpio API's to gpio*_cansleep
2011-01-25 17:37 ` Vaibhav Hiremath
@ 2011-01-28 7:56 ` Varadarajan, Charulatha
-1 siblings, 0 replies; 26+ messages in thread
From: Varadarajan, Charulatha @ 2011-01-28 7:56 UTC (permalink / raw)
To: Vaibhav Hiremath; +Cc: linux-omap, linux-arm-kernel
On Tue, Jan 25, 2011 at 23:07, Vaibhav Hiremath <hvaibhav@ti.com> wrote:
> Since TWL GPIO's can go into sleep, and using normal
> gpio_get/set_value() API will lead to kernel dump (WARN_ON()).
> So replacing standard gpio_get/set_value() to
> gpio_get/set_value_cansleep().
>
> Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Reviewed-by: Charulatha V <charu@ti.com>
> ---
> arch/arm/mach-omap2/board-omap3evm.c | 12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 1/5] OMAP:board-omap3evm: Change TWL related gpio API's to gpio*_cansleep
@ 2011-01-28 7:56 ` Varadarajan, Charulatha
0 siblings, 0 replies; 26+ messages in thread
From: Varadarajan, Charulatha @ 2011-01-28 7:56 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jan 25, 2011 at 23:07, Vaibhav Hiremath <hvaibhav@ti.com> wrote:
> Since TWL GPIO's can go into sleep, and using normal
> gpio_get/set_value() API will lead to kernel dump (WARN_ON()).
> So replacing standard gpio_get/set_value() to
> gpio_get/set_value_cansleep().
>
> Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Reviewed-by: Charulatha V <charu@ti.com>
> ---
> ?arch/arm/mach-omap2/board-omap3evm.c | ? 12 ++++++------
> ?1 files changed, 6 insertions(+), 6 deletions(-)
>
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 2/5] OMAP3EVM: Add vio regulator supply required for ads7846 TSC driver
2011-01-25 17:37 ` Vaibhav Hiremath
@ 2011-01-25 17:37 ` Vaibhav Hiremath
-1 siblings, 0 replies; 26+ messages in thread
From: Vaibhav Hiremath @ 2011-01-25 17:37 UTC (permalink / raw)
To: linux-omap; +Cc: linux-arm-kernel, Vaibhav Hiremath
Add vio regulator supply, needed for ads7846 touchscreen controller
driver.
Tested on OMAP3 (ES3.1 Si) RevG version of EVM.
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
---
arch/arm/mach-omap2/board-omap3evm.c | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 8d2e413..dcef454 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -571,6 +571,25 @@ static struct regulator_init_data omap3_evm_vpll2 = {
.consumer_supplies = &omap3_evm_vpll2_supply,
};
+/* ads7846 on SPI */
+static struct regulator_consumer_supply omap3evm_vio_supply =
+ REGULATOR_SUPPLY("vcc", "spi1.0");
+
+/* VIO for ads7846 */
+static struct regulator_init_data omap3evm_vio = {
+ .constraints = {
+ .min_uV = 1800000,
+ .max_uV = 1800000,
+ .apply_uV = true,
+ .valid_modes_mask = REGULATOR_MODE_NORMAL
+ | REGULATOR_MODE_STANDBY,
+ .valid_ops_mask = REGULATOR_CHANGE_MODE
+ | REGULATOR_CHANGE_STATUS,
+ },
+ .num_consumer_supplies = 1,
+ .consumer_supplies = &omap3evm_vio_supply,
+};
+
static struct twl4030_platform_data omap3evm_twldata = {
.irq_base = TWL4030_IRQ_BASE,
.irq_end = TWL4030_IRQ_END,
@@ -583,6 +602,7 @@ static struct twl4030_platform_data omap3evm_twldata = {
.codec = &omap3evm_codec_data,
.vdac = &omap3_evm_vdac,
.vpll2 = &omap3_evm_vpll2,
+ .vio = &omap3evm_vio,
};
static struct i2c_board_info __initdata omap3evm_i2c_boardinfo[] = {
--
1.6.2.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 2/5] OMAP3EVM: Add vio regulator supply required for ads7846 TSC driver
@ 2011-01-25 17:37 ` Vaibhav Hiremath
0 siblings, 0 replies; 26+ messages in thread
From: Vaibhav Hiremath @ 2011-01-25 17:37 UTC (permalink / raw)
To: linux-arm-kernel
Add vio regulator supply, needed for ads7846 touchscreen controller
driver.
Tested on OMAP3 (ES3.1 Si) RevG version of EVM.
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
---
arch/arm/mach-omap2/board-omap3evm.c | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 8d2e413..dcef454 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -571,6 +571,25 @@ static struct regulator_init_data omap3_evm_vpll2 = {
.consumer_supplies = &omap3_evm_vpll2_supply,
};
+/* ads7846 on SPI */
+static struct regulator_consumer_supply omap3evm_vio_supply =
+ REGULATOR_SUPPLY("vcc", "spi1.0");
+
+/* VIO for ads7846 */
+static struct regulator_init_data omap3evm_vio = {
+ .constraints = {
+ .min_uV = 1800000,
+ .max_uV = 1800000,
+ .apply_uV = true,
+ .valid_modes_mask = REGULATOR_MODE_NORMAL
+ | REGULATOR_MODE_STANDBY,
+ .valid_ops_mask = REGULATOR_CHANGE_MODE
+ | REGULATOR_CHANGE_STATUS,
+ },
+ .num_consumer_supplies = 1,
+ .consumer_supplies = &omap3evm_vio_supply,
+};
+
static struct twl4030_platform_data omap3evm_twldata = {
.irq_base = TWL4030_IRQ_BASE,
.irq_end = TWL4030_IRQ_END,
@@ -583,6 +602,7 @@ static struct twl4030_platform_data omap3evm_twldata = {
.codec = &omap3evm_codec_data,
.vdac = &omap3_evm_vdac,
.vpll2 = &omap3_evm_vpll2,
+ .vio = &omap3evm_vio,
};
static struct i2c_board_info __initdata omap3evm_i2c_boardinfo[] = {
--
1.6.2.4
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 3/5] AM/DM37x: DSS mux configuration for >Rev-B processor cards
2011-01-25 17:37 ` Vaibhav Hiremath
@ 2011-01-25 17:37 ` Vaibhav Hiremath
-1 siblings, 0 replies; 26+ messages in thread
From: Vaibhav Hiremath @ 2011-01-25 17:37 UTC (permalink / raw)
To: linux-omap; +Cc: linux-arm-kernel, Vaibhav Hiremath
To support higher resolution (e.g 720P@60), on OMAP36x (AM/DM37x)
DSS data bus has been muxed with sys_boot pins.
DSS[18-23] => DSS[0-5]
sys_boot[0,1 3-5] => DSS[18-23]
EVM revision >=RevB adopt this mux changes, which is going to ship outside.
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
---
arch/arm/mach-omap2/board-omap3evm.c | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index dcef454..0d235bc 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -705,7 +705,7 @@ static struct ehci_hcd_omap_platform_data ehci_pdata __initdata = {
};
#ifdef CONFIG_OMAP_MUX
-static struct omap_board_mux board_mux[] __initdata = {
+static struct omap_board_mux omap35x_board_mux[] __initdata = {
OMAP3_MUX(SYS_NIRQ, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLUP |
OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
OMAP_PIN_OFF_WAKEUPENABLE),
@@ -717,6 +717,32 @@ static struct omap_board_mux board_mux[] __initdata = {
OMAP_PIN_OFF_NONE),
{ .reg_offset = OMAP_MUX_TERMINATOR },
};
+
+static struct omap_board_mux omap36x_board_mux[] __initdata = {
+ OMAP3_MUX(SYS_NIRQ, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLUP |
+ OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
+ OMAP_PIN_OFF_WAKEUPENABLE),
+ OMAP3_MUX(MCSPI1_CS1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
+ OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW),
+ /* AM/DM37x EVM: DSS data bus muxed with sys_boot */
+ OMAP3_MUX(DSS_DATA18, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
+ OMAP3_MUX(DSS_DATA19, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
+ OMAP3_MUX(DSS_DATA22, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
+ OMAP3_MUX(DSS_DATA21, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
+ OMAP3_MUX(DSS_DATA22, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
+ OMAP3_MUX(DSS_DATA23, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
+ OMAP3_MUX(SYS_BOOT0, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
+ OMAP3_MUX(SYS_BOOT1, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
+ OMAP3_MUX(SYS_BOOT3, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
+ OMAP3_MUX(SYS_BOOT4, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
+ OMAP3_MUX(SYS_BOOT5, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
+ OMAP3_MUX(SYS_BOOT6, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
+
+ { .reg_offset = OMAP_MUX_TERMINATOR },
+};
+#else
+#define omap35x_board_mux NULL
+#define omap36x_board_mux NULL
#endif
static struct omap_musb_board_data musb_board_data = {
@@ -728,7 +754,11 @@ static struct omap_musb_board_data musb_board_data = {
static void __init omap3_evm_init(void)
{
omap3_evm_get_revision();
- omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
+
+ if (cpu_is_omap3630())
+ omap3_mux_init(omap36x_board_mux, OMAP_PACKAGE_CBB);
+ else
+ omap3_mux_init(omap35x_board_mux, OMAP_PACKAGE_CBB);
omap3_evm_i2c_init();
--
1.6.2.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 3/5] AM/DM37x: DSS mux configuration for >Rev-B processor cards
@ 2011-01-25 17:37 ` Vaibhav Hiremath
0 siblings, 0 replies; 26+ messages in thread
From: Vaibhav Hiremath @ 2011-01-25 17:37 UTC (permalink / raw)
To: linux-arm-kernel
To support higher resolution (e.g 720P at 60), on OMAP36x (AM/DM37x)
DSS data bus has been muxed with sys_boot pins.
DSS[18-23] => DSS[0-5]
sys_boot[0,1 3-5] => DSS[18-23]
EVM revision >=RevB adopt this mux changes, which is going to ship outside.
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
---
arch/arm/mach-omap2/board-omap3evm.c | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index dcef454..0d235bc 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -705,7 +705,7 @@ static struct ehci_hcd_omap_platform_data ehci_pdata __initdata = {
};
#ifdef CONFIG_OMAP_MUX
-static struct omap_board_mux board_mux[] __initdata = {
+static struct omap_board_mux omap35x_board_mux[] __initdata = {
OMAP3_MUX(SYS_NIRQ, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLUP |
OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
OMAP_PIN_OFF_WAKEUPENABLE),
@@ -717,6 +717,32 @@ static struct omap_board_mux board_mux[] __initdata = {
OMAP_PIN_OFF_NONE),
{ .reg_offset = OMAP_MUX_TERMINATOR },
};
+
+static struct omap_board_mux omap36x_board_mux[] __initdata = {
+ OMAP3_MUX(SYS_NIRQ, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLUP |
+ OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
+ OMAP_PIN_OFF_WAKEUPENABLE),
+ OMAP3_MUX(MCSPI1_CS1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
+ OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW),
+ /* AM/DM37x EVM: DSS data bus muxed with sys_boot */
+ OMAP3_MUX(DSS_DATA18, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
+ OMAP3_MUX(DSS_DATA19, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
+ OMAP3_MUX(DSS_DATA22, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
+ OMAP3_MUX(DSS_DATA21, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
+ OMAP3_MUX(DSS_DATA22, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
+ OMAP3_MUX(DSS_DATA23, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
+ OMAP3_MUX(SYS_BOOT0, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
+ OMAP3_MUX(SYS_BOOT1, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
+ OMAP3_MUX(SYS_BOOT3, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
+ OMAP3_MUX(SYS_BOOT4, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
+ OMAP3_MUX(SYS_BOOT5, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
+ OMAP3_MUX(SYS_BOOT6, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
+
+ { .reg_offset = OMAP_MUX_TERMINATOR },
+};
+#else
+#define omap35x_board_mux NULL
+#define omap36x_board_mux NULL
#endif
static struct omap_musb_board_data musb_board_data = {
@@ -728,7 +754,11 @@ static struct omap_musb_board_data musb_board_data = {
static void __init omap3_evm_init(void)
{
omap3_evm_get_revision();
- omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
+
+ if (cpu_is_omap3630())
+ omap3_mux_init(omap36x_board_mux, OMAP_PACKAGE_CBB);
+ else
+ omap3_mux_init(omap35x_board_mux, OMAP_PACKAGE_CBB);
omap3_evm_i2c_init();
--
1.6.2.4
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 4/5] OMAP3EVM: Made backlight GPIO default state to off
2011-01-25 17:37 ` Vaibhav Hiremath
@ 2011-01-25 17:37 ` Vaibhav Hiremath
-1 siblings, 0 replies; 26+ messages in thread
From: Vaibhav Hiremath @ 2011-01-25 17:37 UTC (permalink / raw)
To: linux-omap; +Cc: linux-arm-kernel, Vaibhav Hiremath
If you choose default output to DVI, the LCD backlight used to
stay on, since panel->disable function never gets called.
So, during init put backlight GPIO to off state and the driver
code will decide which output to enable.
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
---
arch/arm/mach-omap2/board-omap3evm.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 0d235bc..2a2efa9 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -444,6 +444,8 @@ static struct platform_device leds_gpio = {
static int omap3evm_twl_gpio_setup(struct device *dev,
unsigned gpio, unsigned ngpio)
{
+ int r;
+
/* gpio + 0 is "mmc0_cd" (input/IRQ) */
omap_mux_init_gpio(63, OMAP_PIN_INPUT);
mmc[0].gpio_cd = gpio + 0;
@@ -459,8 +461,12 @@ static int omap3evm_twl_gpio_setup(struct device *dev,
*/
/* TWL4030_GPIO_MAX + 0 == ledA, LCD Backlight control */
- gpio_request(gpio + TWL4030_GPIO_MAX, "EN_LCD_BKL");
- gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0);
+ r = gpio_request(gpio + TWL4030_GPIO_MAX, "EN_LCD_BKL");
+ if (!r)
+ r = gpio_direction_output(gpio + TWL4030_GPIO_MAX,
+ (get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2) ? 1 : 0);
+ if (r)
+ printk(KERN_ERR "failed to get/set lcd_bkl gpio\n");
/* gpio + 7 == DVI Enable */
gpio_request(gpio + 7, "EN_DVI");
--
1.6.2.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 4/5] OMAP3EVM: Made backlight GPIO default state to off
@ 2011-01-25 17:37 ` Vaibhav Hiremath
0 siblings, 0 replies; 26+ messages in thread
From: Vaibhav Hiremath @ 2011-01-25 17:37 UTC (permalink / raw)
To: linux-arm-kernel
If you choose default output to DVI, the LCD backlight used to
stay on, since panel->disable function never gets called.
So, during init put backlight GPIO to off state and the driver
code will decide which output to enable.
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
---
arch/arm/mach-omap2/board-omap3evm.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 0d235bc..2a2efa9 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -444,6 +444,8 @@ static struct platform_device leds_gpio = {
static int omap3evm_twl_gpio_setup(struct device *dev,
unsigned gpio, unsigned ngpio)
{
+ int r;
+
/* gpio + 0 is "mmc0_cd" (input/IRQ) */
omap_mux_init_gpio(63, OMAP_PIN_INPUT);
mmc[0].gpio_cd = gpio + 0;
@@ -459,8 +461,12 @@ static int omap3evm_twl_gpio_setup(struct device *dev,
*/
/* TWL4030_GPIO_MAX + 0 == ledA, LCD Backlight control */
- gpio_request(gpio + TWL4030_GPIO_MAX, "EN_LCD_BKL");
- gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0);
+ r = gpio_request(gpio + TWL4030_GPIO_MAX, "EN_LCD_BKL");
+ if (!r)
+ r = gpio_direction_output(gpio + TWL4030_GPIO_MAX,
+ (get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2) ? 1 : 0);
+ if (r)
+ printk(KERN_ERR "failed to get/set lcd_bkl gpio\n");
/* gpio + 7 == DVI Enable */
gpio_request(gpio + 7, "EN_DVI");
--
1.6.2.4
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 5/5] OMAP3EVM: Set TSC wakeup option in pad config
2011-01-25 17:37 ` Vaibhav Hiremath
@ 2011-01-25 17:37 ` Vaibhav Hiremath
-1 siblings, 0 replies; 26+ messages in thread
From: Vaibhav Hiremath @ 2011-01-25 17:37 UTC (permalink / raw)
To: linux-omap; +Cc: linux-arm-kernel, Vaibhav Hiremath
Set OMAP_PIN_OFF_WAKEUPENABLE to enable the wake-up
functionality from touchscreen controller.
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
---
arch/arm/mach-omap2/board-omap3evm.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 2a2efa9..5eddf93 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -716,7 +716,8 @@ static struct omap_board_mux omap35x_board_mux[] __initdata = {
OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
OMAP_PIN_OFF_WAKEUPENABLE),
OMAP3_MUX(MCSPI1_CS1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
- OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW),
+ OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
+ OMAP_PIN_OFF_WAKEUPENABLE),
OMAP3_MUX(SYS_BOOT5, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
OMAP_PIN_OFF_NONE),
OMAP3_MUX(GPMC_WAIT2, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
@@ -729,7 +730,8 @@ static struct omap_board_mux omap36x_board_mux[] __initdata = {
OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
OMAP_PIN_OFF_WAKEUPENABLE),
OMAP3_MUX(MCSPI1_CS1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
- OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW),
+ OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
+ OMAP_PIN_OFF_WAKEUPENABLE),
/* AM/DM37x EVM: DSS data bus muxed with sys_boot */
OMAP3_MUX(DSS_DATA18, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
OMAP3_MUX(DSS_DATA19, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
--
1.6.2.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 5/5] OMAP3EVM: Set TSC wakeup option in pad config
@ 2011-01-25 17:37 ` Vaibhav Hiremath
0 siblings, 0 replies; 26+ messages in thread
From: Vaibhav Hiremath @ 2011-01-25 17:37 UTC (permalink / raw)
To: linux-arm-kernel
Set OMAP_PIN_OFF_WAKEUPENABLE to enable the wake-up
functionality from touchscreen controller.
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
---
arch/arm/mach-omap2/board-omap3evm.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 2a2efa9..5eddf93 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -716,7 +716,8 @@ static struct omap_board_mux omap35x_board_mux[] __initdata = {
OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
OMAP_PIN_OFF_WAKEUPENABLE),
OMAP3_MUX(MCSPI1_CS1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
- OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW),
+ OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
+ OMAP_PIN_OFF_WAKEUPENABLE),
OMAP3_MUX(SYS_BOOT5, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
OMAP_PIN_OFF_NONE),
OMAP3_MUX(GPMC_WAIT2, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
@@ -729,7 +730,8 @@ static struct omap_board_mux omap36x_board_mux[] __initdata = {
OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
OMAP_PIN_OFF_WAKEUPENABLE),
OMAP3_MUX(MCSPI1_CS1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
- OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW),
+ OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
+ OMAP_PIN_OFF_WAKEUPENABLE),
/* AM/DM37x EVM: DSS data bus muxed with sys_boot */
OMAP3_MUX(DSS_DATA18, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
OMAP3_MUX(DSS_DATA19, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
--
1.6.2.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH 5/5] OMAP3EVM: Set TSC wakeup option in pad config
2011-01-25 17:37 ` Vaibhav Hiremath
@ 2011-01-27 18:42 ` Kevin Hilman
-1 siblings, 0 replies; 26+ messages in thread
From: Kevin Hilman @ 2011-01-27 18:42 UTC (permalink / raw)
To: Vaibhav Hiremath; +Cc: linux-omap, linux-arm-kernel
Vaibhav Hiremath <hvaibhav@ti.com> writes:
> Set OMAP_PIN_OFF_WAKEUPENABLE to enable the wake-up
> functionality from touchscreen controller.
>
> Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
> ---
> arch/arm/mach-omap2/board-omap3evm.c | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
> index 2a2efa9..5eddf93 100644
> --- a/arch/arm/mach-omap2/board-omap3evm.c
> +++ b/arch/arm/mach-omap2/board-omap3evm.c
> @@ -716,7 +716,8 @@ static struct omap_board_mux omap35x_board_mux[] __initdata = {
> OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
> OMAP_PIN_OFF_WAKEUPENABLE),
> OMAP3_MUX(MCSPI1_CS1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
> - OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW),
> + OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
> + OMAP_PIN_OFF_WAKEUPENABLE),
This hunk doesn't apply because the code below (SYS_BOOT5, etc.) doesn't
exist in upstream code.
Kevin
> OMAP3_MUX(SYS_BOOT5, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
> OMAP_PIN_OFF_NONE),
> OMAP3_MUX(GPMC_WAIT2, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
> @@ -729,7 +730,8 @@ static struct omap_board_mux omap36x_board_mux[] __initdata = {
> OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
> OMAP_PIN_OFF_WAKEUPENABLE),
> OMAP3_MUX(MCSPI1_CS1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
> - OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW),
> + OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
> + OMAP_PIN_OFF_WAKEUPENABLE),
> /* AM/DM37x EVM: DSS data bus muxed with sys_boot */
> OMAP3_MUX(DSS_DATA18, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
> OMAP3_MUX(DSS_DATA19, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
^ permalink raw reply [flat|nested] 26+ messages in thread* [PATCH 5/5] OMAP3EVM: Set TSC wakeup option in pad config
@ 2011-01-27 18:42 ` Kevin Hilman
0 siblings, 0 replies; 26+ messages in thread
From: Kevin Hilman @ 2011-01-27 18:42 UTC (permalink / raw)
To: linux-arm-kernel
Vaibhav Hiremath <hvaibhav@ti.com> writes:
> Set OMAP_PIN_OFF_WAKEUPENABLE to enable the wake-up
> functionality from touchscreen controller.
>
> Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
> ---
> arch/arm/mach-omap2/board-omap3evm.c | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
> index 2a2efa9..5eddf93 100644
> --- a/arch/arm/mach-omap2/board-omap3evm.c
> +++ b/arch/arm/mach-omap2/board-omap3evm.c
> @@ -716,7 +716,8 @@ static struct omap_board_mux omap35x_board_mux[] __initdata = {
> OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
> OMAP_PIN_OFF_WAKEUPENABLE),
> OMAP3_MUX(MCSPI1_CS1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
> - OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW),
> + OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
> + OMAP_PIN_OFF_WAKEUPENABLE),
This hunk doesn't apply because the code below (SYS_BOOT5, etc.) doesn't
exist in upstream code.
Kevin
> OMAP3_MUX(SYS_BOOT5, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
> OMAP_PIN_OFF_NONE),
> OMAP3_MUX(GPMC_WAIT2, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
> @@ -729,7 +730,8 @@ static struct omap_board_mux omap36x_board_mux[] __initdata = {
> OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
> OMAP_PIN_OFF_WAKEUPENABLE),
> OMAP3_MUX(MCSPI1_CS1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
> - OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW),
> + OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
> + OMAP_PIN_OFF_WAKEUPENABLE),
> /* AM/DM37x EVM: DSS data bus muxed with sys_boot */
> OMAP3_MUX(DSS_DATA18, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
> OMAP3_MUX(DSS_DATA19, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 5/5] OMAP3EVM: Set TSC wakeup option in pad config
2011-01-27 18:42 ` Kevin Hilman
@ 2011-02-17 22:19 ` Tony Lindgren
-1 siblings, 0 replies; 26+ messages in thread
From: Tony Lindgren @ 2011-02-17 22:19 UTC (permalink / raw)
To: Kevin Hilman; +Cc: Vaibhav Hiremath, linux-omap, linux-arm-kernel
* Kevin Hilman <khilman@ti.com> [110127 10:41]:
> Vaibhav Hiremath <hvaibhav@ti.com> writes:
>
> > Set OMAP_PIN_OFF_WAKEUPENABLE to enable the wake-up
> > functionality from touchscreen controller.
> >
> > Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
> > ---
> > arch/arm/mach-omap2/board-omap3evm.c | 6 ++++--
> > 1 files changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
> > index 2a2efa9..5eddf93 100644
> > --- a/arch/arm/mach-omap2/board-omap3evm.c
> > +++ b/arch/arm/mach-omap2/board-omap3evm.c
> > @@ -716,7 +716,8 @@ static struct omap_board_mux omap35x_board_mux[] __initdata = {
> > OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
> > OMAP_PIN_OFF_WAKEUPENABLE),
> > OMAP3_MUX(MCSPI1_CS1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
> > - OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW),
> > + OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
> > + OMAP_PIN_OFF_WAKEUPENABLE),
>
> This hunk doesn't apply because the code below (SYS_BOOT5, etc.) doesn't
> exist in upstream code.
Looks like this applies on top of current omap-for-linus with the mcspi changes
in. So I've applied all the omap3evm related patches.
I had to resolve few changes manually with wl12xx changes, can you guys please
check that everything is working? Pushing them into the devel-board branch.
Regards,
Tony
^ permalink raw reply [flat|nested] 26+ messages in thread* [PATCH 5/5] OMAP3EVM: Set TSC wakeup option in pad config
@ 2011-02-17 22:19 ` Tony Lindgren
0 siblings, 0 replies; 26+ messages in thread
From: Tony Lindgren @ 2011-02-17 22:19 UTC (permalink / raw)
To: linux-arm-kernel
* Kevin Hilman <khilman@ti.com> [110127 10:41]:
> Vaibhav Hiremath <hvaibhav@ti.com> writes:
>
> > Set OMAP_PIN_OFF_WAKEUPENABLE to enable the wake-up
> > functionality from touchscreen controller.
> >
> > Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
> > ---
> > arch/arm/mach-omap2/board-omap3evm.c | 6 ++++--
> > 1 files changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
> > index 2a2efa9..5eddf93 100644
> > --- a/arch/arm/mach-omap2/board-omap3evm.c
> > +++ b/arch/arm/mach-omap2/board-omap3evm.c
> > @@ -716,7 +716,8 @@ static struct omap_board_mux omap35x_board_mux[] __initdata = {
> > OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
> > OMAP_PIN_OFF_WAKEUPENABLE),
> > OMAP3_MUX(MCSPI1_CS1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
> > - OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW),
> > + OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
> > + OMAP_PIN_OFF_WAKEUPENABLE),
>
> This hunk doesn't apply because the code below (SYS_BOOT5, etc.) doesn't
> exist in upstream code.
Looks like this applies on top of current omap-for-linus with the mcspi changes
in. So I've applied all the omap3evm related patches.
I had to resolve few changes manually with wl12xx changes, can you guys please
check that everything is working? Pushing them into the devel-board branch.
Regards,
Tony
^ permalink raw reply [flat|nested] 26+ messages in thread* RE: [PATCH 5/5] OMAP3EVM: Set TSC wakeup option in pad config
2011-02-17 22:19 ` Tony Lindgren
@ 2011-02-22 6:01 ` Hiremath, Vaibhav
-1 siblings, 0 replies; 26+ messages in thread
From: Hiremath, Vaibhav @ 2011-02-22 6:01 UTC (permalink / raw)
To: Tony Lindgren, Hilman, Kevin; +Cc: linux-omap, linux-arm-kernel
> -----Original Message-----
> From: Tony Lindgren [mailto:tony@atomide.com]
> Sent: Friday, February 18, 2011 3:50 AM
> To: Hilman, Kevin
> Cc: Hiremath, Vaibhav; linux-omap@vger.kernel.org; linux-arm-
> kernel@lists.infradead.org
> Subject: Re: [PATCH 5/5] OMAP3EVM: Set TSC wakeup option in pad config
>
> * Kevin Hilman <khilman@ti.com> [110127 10:41]:
> > Vaibhav Hiremath <hvaibhav@ti.com> writes:
> >
> > > Set OMAP_PIN_OFF_WAKEUPENABLE to enable the wake-up
> > > functionality from touchscreen controller.
> > >
> > > Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
> > > ---
> > > arch/arm/mach-omap2/board-omap3evm.c | 6 ++++--
> > > 1 files changed, 4 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-
> omap2/board-omap3evm.c
> > > index 2a2efa9..5eddf93 100644
> > > --- a/arch/arm/mach-omap2/board-omap3evm.c
> > > +++ b/arch/arm/mach-omap2/board-omap3evm.c
> > > @@ -716,7 +716,8 @@ static struct omap_board_mux omap35x_board_mux[]
> __initdata = {
> > > OMAP_PIN_OFF_INPUT_PULLUP |
> OMAP_PIN_OFF_OUTPUT_LOW |
> > > OMAP_PIN_OFF_WAKEUPENABLE),
> > > OMAP3_MUX(MCSPI1_CS1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
> > > - OMAP_PIN_OFF_INPUT_PULLUP |
> OMAP_PIN_OFF_OUTPUT_LOW),
> > > + OMAP_PIN_OFF_INPUT_PULLUP |
> OMAP_PIN_OFF_OUTPUT_LOW |
> > > + OMAP_PIN_OFF_WAKEUPENABLE),
> >
> > This hunk doesn't apply because the code below (SYS_BOOT5, etc.) doesn't
> > exist in upstream code.
>
> Looks like this applies on top of current omap-for-linus with the mcspi
> changes
> in. So I've applied all the omap3evm related patches.
>
> I had to resolve few changes manually with wl12xx changes, can you guys
> please
> check that everything is working? Pushing them into the devel-board branch.
>
[Hiremath, Vaibhav] Thanks Tony for merging all these patches.
I have tested it here at my end on RevG version of EVM. Also I have verified NFS mount on both <RevD & RevG EVM's without any issues.
Thanks,
Vaibhav
> Regards,
>
> Tony
^ permalink raw reply [flat|nested] 26+ messages in thread* [PATCH 5/5] OMAP3EVM: Set TSC wakeup option in pad config
@ 2011-02-22 6:01 ` Hiremath, Vaibhav
0 siblings, 0 replies; 26+ messages in thread
From: Hiremath, Vaibhav @ 2011-02-22 6:01 UTC (permalink / raw)
To: linux-arm-kernel
> -----Original Message-----
> From: Tony Lindgren [mailto:tony at atomide.com]
> Sent: Friday, February 18, 2011 3:50 AM
> To: Hilman, Kevin
> Cc: Hiremath, Vaibhav; linux-omap at vger.kernel.org; linux-arm-
> kernel at lists.infradead.org
> Subject: Re: [PATCH 5/5] OMAP3EVM: Set TSC wakeup option in pad config
>
> * Kevin Hilman <khilman@ti.com> [110127 10:41]:
> > Vaibhav Hiremath <hvaibhav@ti.com> writes:
> >
> > > Set OMAP_PIN_OFF_WAKEUPENABLE to enable the wake-up
> > > functionality from touchscreen controller.
> > >
> > > Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
> > > ---
> > > arch/arm/mach-omap2/board-omap3evm.c | 6 ++++--
> > > 1 files changed, 4 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-
> omap2/board-omap3evm.c
> > > index 2a2efa9..5eddf93 100644
> > > --- a/arch/arm/mach-omap2/board-omap3evm.c
> > > +++ b/arch/arm/mach-omap2/board-omap3evm.c
> > > @@ -716,7 +716,8 @@ static struct omap_board_mux omap35x_board_mux[]
> __initdata = {
> > > OMAP_PIN_OFF_INPUT_PULLUP |
> OMAP_PIN_OFF_OUTPUT_LOW |
> > > OMAP_PIN_OFF_WAKEUPENABLE),
> > > OMAP3_MUX(MCSPI1_CS1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
> > > - OMAP_PIN_OFF_INPUT_PULLUP |
> OMAP_PIN_OFF_OUTPUT_LOW),
> > > + OMAP_PIN_OFF_INPUT_PULLUP |
> OMAP_PIN_OFF_OUTPUT_LOW |
> > > + OMAP_PIN_OFF_WAKEUPENABLE),
> >
> > This hunk doesn't apply because the code below (SYS_BOOT5, etc.) doesn't
> > exist in upstream code.
>
> Looks like this applies on top of current omap-for-linus with the mcspi
> changes
> in. So I've applied all the omap3evm related patches.
>
> I had to resolve few changes manually with wl12xx changes, can you guys
> please
> check that everything is working? Pushing them into the devel-board branch.
>
[Hiremath, Vaibhav] Thanks Tony for merging all these patches.
I have tested it here at my end on RevG version of EVM. Also I have verified NFS mount on both <RevD & RevG EVM's without any issues.
Thanks,
Vaibhav
> Regards,
>
> Tony
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 0/5] OMAP3EVM: Board bug fixes/enhancements
2011-01-25 17:37 ` Vaibhav Hiremath
@ 2011-01-27 18:41 ` Kevin Hilman
-1 siblings, 0 replies; 26+ messages in thread
From: Kevin Hilman @ 2011-01-27 18:41 UTC (permalink / raw)
To: Vaibhav Hiremath; +Cc: linux-omap, linux-arm-kernel
Vaibhav Hiremath <hvaibhav@ti.com> writes:
> The current linux-omap/master is broken for lots of features/modules
> and also there are few enhancements required with addition of AM/DM37x
> family of devices.
>
> - Migrate TWL gpio_xxx api to gpio_xx_cansleep
> - TSC: Driver init fails due to missing VIO regulator
> - TSC: Wakeup is broken, enable the wakeup capability
> - DSS: Addition of Mux changes for AM/DM37x
> - Make Backlight gpio off in default state
>
> Note: Resetting the revision of patches since this is first bundled series.
Again, please state exactly what tree and commit this applies to, as it
does not apply cleanly to l-o master.
Specifically,
> Vaibhav Hiremath (5):
> OMAP:board-omap3evm: Change TWL related gpio API's to gpio*_cansleep
> OMAP3EVM: Add vio regulator supply required for ads7846 TSC driver
> AM/DM37x: DSS mux configuration for >Rev-B processor cards
This one doesn't apply without fuzz.
> OMAP3EVM: Made backlight GPIO default state to off
> OMAP3EVM: Set TSC wakeup option in pad config
And this one doesn't apply as it seems to apply on top of code that
doesn't exist upstream.
Kevin
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 0/5] OMAP3EVM: Board bug fixes/enhancements
@ 2011-01-27 18:41 ` Kevin Hilman
0 siblings, 0 replies; 26+ messages in thread
From: Kevin Hilman @ 2011-01-27 18:41 UTC (permalink / raw)
To: linux-arm-kernel
Vaibhav Hiremath <hvaibhav@ti.com> writes:
> The current linux-omap/master is broken for lots of features/modules
> and also there are few enhancements required with addition of AM/DM37x
> family of devices.
>
> - Migrate TWL gpio_xxx api to gpio_xx_cansleep
> - TSC: Driver init fails due to missing VIO regulator
> - TSC: Wakeup is broken, enable the wakeup capability
> - DSS: Addition of Mux changes for AM/DM37x
> - Make Backlight gpio off in default state
>
> Note: Resetting the revision of patches since this is first bundled series.
Again, please state exactly what tree and commit this applies to, as it
does not apply cleanly to l-o master.
Specifically,
> Vaibhav Hiremath (5):
> OMAP:board-omap3evm: Change TWL related gpio API's to gpio*_cansleep
> OMAP3EVM: Add vio regulator supply required for ads7846 TSC driver
> AM/DM37x: DSS mux configuration for >Rev-B processor cards
This one doesn't apply without fuzz.
> OMAP3EVM: Made backlight GPIO default state to off
> OMAP3EVM: Set TSC wakeup option in pad config
And this one doesn't apply as it seems to apply on top of code that
doesn't exist upstream.
Kevin
^ permalink raw reply [flat|nested] 26+ messages in thread
* RE: [PATCH 0/5] OMAP3EVM: Board bug fixes/enhancements
2011-01-27 18:41 ` Kevin Hilman
@ 2011-01-27 18:46 ` Hiremath, Vaibhav
-1 siblings, 0 replies; 26+ messages in thread
From: Hiremath, Vaibhav @ 2011-01-27 18:46 UTC (permalink / raw)
To: Hilman, Kevin; +Cc: linux-omap, linux-arm-kernel
> -----Original Message-----
> From: Hilman, Kevin
> Sent: Friday, January 28, 2011 12:12 AM
> To: Hiremath, Vaibhav
> Cc: linux-omap@vger.kernel.org; linux-arm-kernel@lists.infradead.org
> Subject: Re: [PATCH 0/5] OMAP3EVM: Board bug fixes/enhancements
>
> Vaibhav Hiremath <hvaibhav@ti.com> writes:
>
> > The current linux-omap/master is broken for lots of features/modules
> > and also there are few enhancements required with addition of AM/DM37x
> > family of devices.
> >
> > - Migrate TWL gpio_xxx api to gpio_xx_cansleep
> > - TSC: Driver init fails due to missing VIO regulator
> > - TSC: Wakeup is broken, enable the wakeup capability
> > - DSS: Addition of Mux changes for AM/DM37x
> > - Make Backlight gpio off in default state
> >
> > Note: Resetting the revision of patches since this is first bundled
> series.
>
> Again, please state exactly what tree and commit this applies to, as it
> does not apply cleanly to l-o master.
>
> Specifically,
>
> > Vaibhav Hiremath (5):
> > OMAP:board-omap3evm: Change TWL related gpio API's to gpio*_cansleep
> > OMAP3EVM: Add vio regulator supply required for ads7846 TSC driver
> > AM/DM37x: DSS mux configuration for >Rev-B processor cards
>
> This one doesn't apply without fuzz.
>
> > OMAP3EVM: Made backlight GPIO default state to off
> > OMAP3EVM: Set TSC wakeup option in pad config
>
> And this one doesn't apply as it seems to apply on top of code that
> doesn't exist upstream.
>
[Hiremath, Vaibhav] Kevin,
You should first apply Ethernet-reset patch first, and then all patches will get applied cleanly. I have tested it here at my end.
Since you already acked Ethernet patch, I thought it will make its way to mainline before all these patches. And also while posting, I posted Ethernet patch again first and then this series.
Thanks,
Vaibhav
> Kevin
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 0/5] OMAP3EVM: Board bug fixes/enhancements
@ 2011-01-27 18:46 ` Hiremath, Vaibhav
0 siblings, 0 replies; 26+ messages in thread
From: Hiremath, Vaibhav @ 2011-01-27 18:46 UTC (permalink / raw)
To: linux-arm-kernel
> -----Original Message-----
> From: Hilman, Kevin
> Sent: Friday, January 28, 2011 12:12 AM
> To: Hiremath, Vaibhav
> Cc: linux-omap at vger.kernel.org; linux-arm-kernel at lists.infradead.org
> Subject: Re: [PATCH 0/5] OMAP3EVM: Board bug fixes/enhancements
>
> Vaibhav Hiremath <hvaibhav@ti.com> writes:
>
> > The current linux-omap/master is broken for lots of features/modules
> > and also there are few enhancements required with addition of AM/DM37x
> > family of devices.
> >
> > - Migrate TWL gpio_xxx api to gpio_xx_cansleep
> > - TSC: Driver init fails due to missing VIO regulator
> > - TSC: Wakeup is broken, enable the wakeup capability
> > - DSS: Addition of Mux changes for AM/DM37x
> > - Make Backlight gpio off in default state
> >
> > Note: Resetting the revision of patches since this is first bundled
> series.
>
> Again, please state exactly what tree and commit this applies to, as it
> does not apply cleanly to l-o master.
>
> Specifically,
>
> > Vaibhav Hiremath (5):
> > OMAP:board-omap3evm: Change TWL related gpio API's to gpio*_cansleep
> > OMAP3EVM: Add vio regulator supply required for ads7846 TSC driver
> > AM/DM37x: DSS mux configuration for >Rev-B processor cards
>
> This one doesn't apply without fuzz.
>
> > OMAP3EVM: Made backlight GPIO default state to off
> > OMAP3EVM: Set TSC wakeup option in pad config
>
> And this one doesn't apply as it seems to apply on top of code that
> doesn't exist upstream.
>
[Hiremath, Vaibhav] Kevin,
You should first apply Ethernet-reset patch first, and then all patches will get applied cleanly. I have tested it here at my end.
Since you already acked Ethernet patch, I thought it will make its way to mainline before all these patches. And also while posting, I posted Ethernet patch again first and then this series.
Thanks,
Vaibhav
> Kevin
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 0/5] OMAP3EVM: Board bug fixes/enhancements
2011-01-27 18:46 ` Hiremath, Vaibhav
@ 2011-01-27 20:05 ` Kevin Hilman
-1 siblings, 0 replies; 26+ messages in thread
From: Kevin Hilman @ 2011-01-27 20:05 UTC (permalink / raw)
To: Hiremath, Vaibhav; +Cc: linux-omap, linux-arm-kernel
Hi Vaibhav,
"Hiremath, Vaibhav" <hvaibhav@ti.com> writes:
[...]
>>
>> > OMAP3EVM: Made backlight GPIO default state to off
>> > OMAP3EVM: Set TSC wakeup option in pad config
>>
>> And this one doesn't apply as it seems to apply on top of code that
>> doesn't exist upstream.
>>
>
> You should first apply Ethernet-reset patch first, and then all
> patches will get applied cleanly. I have tested it here at my end.
OK, sorry to have missed that one.
In the future, dependencies need to be clearly stated in the patch 0
cover letter. When reviewers/maintainers are looking at lots of
patches, it is not easy to keep context for all the patches and series
arriving on the list. Additional information such as dependencies and
change history are extremely valuable to reviewers & maintainers.
> Since you already acked Ethernet patch, I thought it will make its way
> to mainline before all these patches. And also while posting, I posted
> Ethernet patch again first and then this series.
It will likely make it's way upstream sooner since it's a regression
fix, however, it is not yet queued anywhere so dependencies on it should
be clearly stated here.
Thanks,
Kevin
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 0/5] OMAP3EVM: Board bug fixes/enhancements
@ 2011-01-27 20:05 ` Kevin Hilman
0 siblings, 0 replies; 26+ messages in thread
From: Kevin Hilman @ 2011-01-27 20:05 UTC (permalink / raw)
To: linux-arm-kernel
Hi Vaibhav,
"Hiremath, Vaibhav" <hvaibhav@ti.com> writes:
[...]
>>
>> > OMAP3EVM: Made backlight GPIO default state to off
>> > OMAP3EVM: Set TSC wakeup option in pad config
>>
>> And this one doesn't apply as it seems to apply on top of code that
>> doesn't exist upstream.
>>
>
> You should first apply Ethernet-reset patch first, and then all
> patches will get applied cleanly. I have tested it here at my end.
OK, sorry to have missed that one.
In the future, dependencies need to be clearly stated in the patch 0
cover letter. When reviewers/maintainers are looking at lots of
patches, it is not easy to keep context for all the patches and series
arriving on the list. Additional information such as dependencies and
change history are extremely valuable to reviewers & maintainers.
> Since you already acked Ethernet patch, I thought it will make its way
> to mainline before all these patches. And also while posting, I posted
> Ethernet patch again first and then this series.
It will likely make it's way upstream sooner since it's a regression
fix, however, it is not yet queued anywhere so dependencies on it should
be clearly stated here.
Thanks,
Kevin
^ permalink raw reply [flat|nested] 26+ messages in thread