Re: [PATCH] Revert ARM: OMAP3530evm: set pendown_state and debounce time for ads7846

2012-08-07 Thread Igor Grinberg 
On 08/07/12 04:42, Zumeng Chen wrote:
 于 2012年08月07日 04:22, Igor Grinberg 写道:
 1) The above commit introduced a common -get_pendown_state() function
 into the generic code, but that function was board-specific for the
 OMAP3EVM and thus broke most other boards using this code.

 2) The above commit was mis-merged introducing another bug which
 prevents the ads7846 driver probe function to succeed.
 The omap_ads7846_init() function frees the pendown GPIO in case there is
 no -get_pendown_state() function set by the caller (board specific
 code), so it can be requested later by the ads7846 driver.
 The above commit add a common -get_pendown_state() function without
 removing the gpio_free() call and thus once the ads7846 driver tries
 to use the pendown GPIO, it crashes as the pendown GPIO has not been
 requested.

 3) The above commit introduces NO new functionality as
 get_pendown_state() function is already implemented in a suitable way by
 the ads7846 driver and the debounce time handling has already been
 fixed by commit 97ee9f01 (ARM: OMAP: fix the ads7846 init code).
 Igor,
 
 I suspect these two patches(this and 97ee9f01) works well, and there
 is something new introduced in ads7846.c, I'll try to look at that new
 stuff in this weekend.
 
 Please refer to in-line comments:
 
 Regards,
 Zumeng

 This reverts commit 16aced80f6739beb2a6ff7b6f96c83ba80d331e8.

 Conflicts:
  arch/arm/mach-omap2/common-board-devices.c

 Solved by taking the working version prior to the above commit.

 Cc: Zumeng Chen zumeng.c...@windriver.com
 Cc: Arnd Bergmann a...@arndb.de
 Signed-off-by: Igor Grinberg grinb...@compulab.co.il
 ---
 Kevin, sorry for the late reply.
 How about the above commit message and the below patch?

 The patch applies cleanly to Tony's master branch (6 Aug 2012)
 or Kevin's kevin-omap-pm/for_3.6/fixes/ads7846
 after resetting two top most commits.

 This patch has been tested on both above branches on cm-t3730.
 Any other board tested will be greately appreciated.

 Also, if after all said in the commit message, you still don't
 want to revert the original patch, feel free to post your thoughts.

  arch/arm/mach-omap2/board-omap3evm.c   |1 +
  arch/arm/mach-omap2/common-board-devices.c |   11 ---
  arch/arm/mach-omap2/common-board-devices.h |1 -
  3 files changed, 1 insertions(+), 12 deletions(-)

 diff --git a/arch/arm/mach-omap2/board-omap3evm.c 
 b/arch/arm/mach-omap2/board-omap3evm.c
 index ef230a0..0d362e9 100644
 --- a/arch/arm/mach-omap2/board-omap3evm.c
 +++ b/arch/arm/mach-omap2/board-omap3evm.c
 @@ -58,6 +58,7 @@
  #include hsmmc.h
  #include common-board-devices.h
  
 +#define OMAP3_EVM_TS_GPIO   175
  #define OMAP3_EVM_EHCI_VBUS 22
  #define OMAP3_EVM_EHCI_SELECT   61
  
 diff --git a/arch/arm/mach-omap2/common-board-devices.c 
 b/arch/arm/mach-omap2/common-board-devices.c
 index 1473474..c187586 100644
 --- a/arch/arm/mach-omap2/common-board-devices.c
 +++ b/arch/arm/mach-omap2/common-board-devices.c
 @@ -35,16 +35,6 @@ static struct omap2_mcspi_device_config 
 ads7846_mcspi_config = {
  .turbo_mode = 0,
  };
  
 -/*
 - * ADS7846 driver maybe request a gpio according to the value
 - * of pdata-get_pendown_state, but we have done this. So set
 - * get_pendown_state to avoid twice gpio requesting.
 - */
 -static int omap3_get_pendown_state(void)
 -{
 -return !gpio_get_value(OMAP3_EVM_TS_GPIO);
 -}
 -
  static struct ads7846_platform_data ads7846_config = {
  .x_max  = 0x0fff,
  .y_max  = 0x0fff,
 @@ -55,7 +45,6 @@ static struct ads7846_platform_data ads7846_config = {
  .debounce_rep   = 1,
  .gpio_pendown   = -EINVAL,
  .keep_vref_on   = 1,
 -.get_pendown_state  = omap3_get_pendown_state,
 You remove this, then please look at the following codes:
 
 drivers/input/touchscreen/ads7846.c
 
 969 if (pdata-get_pendown_state) {
 970 ts-get_pendown_state = pdata-get_pendown_state;
 971 } else if (gpio_is_valid(pdata-gpio_pendown)) {
 972
 973 err = gpio_request_one(pdata-gpio_pendown, GPIOF_IN,
 ^^^, the driver will want to request again, then it should
 be error if i'm right.

This patch removes the get_pendown_state function pointer from
the ads7846_platform_data and gpio_free() fires as there is no
get_pendown_state and therefore there will be no problem to request
it again by the ads7846 driver.
So, no there will be no error and if you still doubt, please test.

 
 974 ads7846_pendown);
 975 if (err) {
 976 dev_err(spi-dev,
 977 failed to request/setup pendown GPIO%d: %d\n,
 978 pdata-gpio_pendown, err);
 979 return err;
 980 }
 981
 982 ts-gpio_pendown = pdata-gpio_pendown;
 983
 984 } else {

[...]


-- 
Regards,
Igor.
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] Revert ARM: OMAP3530evm: set pendown_state and debounce time for ads7846

2012-08-07 Thread Tony Lindgren 
* Kevin Hilman khil...@ti.com [120806 13:52]:
 
 The Overo boards were the ones that were crashing due to this bug since
 the pendown GPIO was the only one used in the bank.
 
 Tony, can you queue this up for v3.6-rc?  I have a version in my
 for_3.6/fixes/ads7846-2 branch with the tags above applied, based on v3.6-rc1.

Yes thanks pulling into fixes.

Tony
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] Revert ARM: OMAP3530evm: set pendown_state and debounce time for ads7846

2012-08-06 Thread Igor Grinberg 
1) The above commit introduced a common -get_pendown_state() function
into the generic code, but that function was board-specific for the
OMAP3EVM and thus broke most other boards using this code.

2) The above commit was mis-merged introducing another bug which
prevents the ads7846 driver probe function to succeed.
The omap_ads7846_init() function frees the pendown GPIO in case there is
no -get_pendown_state() function set by the caller (board specific
code), so it can be requested later by the ads7846 driver.
The above commit add a common -get_pendown_state() function without
removing the gpio_free() call and thus once the ads7846 driver tries
to use the pendown GPIO, it crashes as the pendown GPIO has not been
requested.

3) The above commit introduces NO new functionality as
get_pendown_state() function is already implemented in a suitable way by
the ads7846 driver and the debounce time handling has already been
fixed by commit 97ee9f01 (ARM: OMAP: fix the ads7846 init code).

This reverts commit 16aced80f6739beb2a6ff7b6f96c83ba80d331e8.

Conflicts:
arch/arm/mach-omap2/common-board-devices.c

Solved by taking the working version prior to the above commit.

Cc: Zumeng Chen zumeng.c...@windriver.com
Cc: Arnd Bergmann a...@arndb.de
Signed-off-by: Igor Grinberg grinb...@compulab.co.il
---
Kevin, sorry for the late reply.
How about the above commit message and the below patch?

The patch applies cleanly to Tony's master branch (6 Aug 2012)
or Kevin's kevin-omap-pm/for_3.6/fixes/ads7846
after resetting two top most commits.

This patch has been tested on both above branches on cm-t3730.
Any other board tested will be greately appreciated.

Also, if after all said in the commit message, you still don't
want to revert the original patch, feel free to post your thoughts.

 arch/arm/mach-omap2/board-omap3evm.c   |1 +
 arch/arm/mach-omap2/common-board-devices.c |   11 ---
 arch/arm/mach-omap2/common-board-devices.h |1 -
 3 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/arch/arm/mach-omap2/board-omap3evm.c 
b/arch/arm/mach-omap2/board-omap3evm.c
index ef230a0..0d362e9 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -58,6 +58,7 @@
 #include hsmmc.h
 #include common-board-devices.h
 
+#define OMAP3_EVM_TS_GPIO  175
 #define OMAP3_EVM_EHCI_VBUS22
 #define OMAP3_EVM_EHCI_SELECT  61
 
diff --git a/arch/arm/mach-omap2/common-board-devices.c 
b/arch/arm/mach-omap2/common-board-devices.c
index 1473474..c187586 100644
--- a/arch/arm/mach-omap2/common-board-devices.c
+++ b/arch/arm/mach-omap2/common-board-devices.c
@@ -35,16 +35,6 @@ static struct omap2_mcspi_device_config ads7846_mcspi_config 
= {
.turbo_mode = 0,
 };
 
-/*
- * ADS7846 driver maybe request a gpio according to the value
- * of pdata-get_pendown_state, but we have done this. So set
- * get_pendown_state to avoid twice gpio requesting.
- */
-static int omap3_get_pendown_state(void)
-{
-   return !gpio_get_value(OMAP3_EVM_TS_GPIO);
-}
-
 static struct ads7846_platform_data ads7846_config = {
.x_max  = 0x0fff,
.y_max  = 0x0fff,
@@ -55,7 +45,6 @@ static struct ads7846_platform_data ads7846_config = {
.debounce_rep   = 1,
.gpio_pendown   = -EINVAL,
.keep_vref_on   = 1,
-   .get_pendown_state  = omap3_get_pendown_state,
 };
 
 static struct spi_board_info ads7846_spi_board_info __initdata = {
diff --git a/arch/arm/mach-omap2/common-board-devices.h 
b/arch/arm/mach-omap2/common-board-devices.h
index 4c4ef6a..a0b4a428 100644
--- a/arch/arm/mach-omap2/common-board-devices.h
+++ b/arch/arm/mach-omap2/common-board-devices.h
@@ -4,7 +4,6 @@
 #include twl-common.h
 
 #define NAND_BLOCK_SIZESZ_128K
-#define OMAP3_EVM_TS_GPIO  175
 
 struct mtd_partition;
 struct ads7846_platform_data;
-- 
1.7.3.4

--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] Revert ARM: OMAP3530evm: set pendown_state and debounce time for ads7846

2012-08-06 Thread Kevin Hilman 
Igor Grinberg grinb...@compulab.co.il writes:

 1) The above commit introduced a common -get_pendown_state() function
 into the generic code, but that function was board-specific for the
 OMAP3EVM and thus broke most other boards using this code.

 2) The above commit was mis-merged introducing another bug which
 prevents the ads7846 driver probe function to succeed.
 The omap_ads7846_init() function frees the pendown GPIO in case there is
 no -get_pendown_state() function set by the caller (board specific
 code), so it can be requested later by the ads7846 driver.
 The above commit add a common -get_pendown_state() function without
 removing the gpio_free() call and thus once the ads7846 driver tries
 to use the pendown GPIO, it crashes as the pendown GPIO has not been
 requested.

 3) The above commit introduces NO new functionality as
 get_pendown_state() function is already implemented in a suitable way by
 the ads7846 driver and the debounce time handling has already been
 fixed by commit 97ee9f01 (ARM: OMAP: fix the ads7846 init code).

 This reverts commit 16aced80f6739beb2a6ff7b6f96c83ba80d331e8.

 Conflicts:
   arch/arm/mach-omap2/common-board-devices.c

 Solved by taking the working version prior to the above commit.

 Cc: Zumeng Chen zumeng.c...@windriver.com
 Cc: Arnd Bergmann a...@arndb.de
 Signed-off-by: Igor Grinberg grinb...@compulab.co.il
 ---
 Kevin, sorry for the late reply.
 How about the above commit message and the below patch?

 The patch applies cleanly to Tony's master branch (6 Aug 2012)
 or Kevin's kevin-omap-pm/for_3.6/fixes/ads7846
 after resetting two top most commits.

Now that v3.6-rc1 is out, it should probalby be applied on top of -rc1.
I've taken care of that and tested as well.

 This patch has been tested on both above branches on cm-t3730.
 Any other board tested will be greately appreciated.

 Also, if after all said in the commit message, you still don't
 want to revert the original patch, feel free to post your thoughts.

After all the digging I did, I agree that the revert is the best
solution.  

While it's a slightly different problem/bug, I think the gpio_free() in
common-board-devices.c should still be unconditonal since the
gpio_request() is now unconditional.  That can be a separate patch though.

Acked-by: Kevin Hilman khil...@ti.com
Tested-by: Kevin Hilman khil...@ti.com

Tested on 3430/n900, 3530/Overo, 3730/Overo STORM, 3730/BB-xM.

The Overo boards were the ones that were crashing due to this bug since
the pendown GPIO was the only one used in the bank.

Tony, can you queue this up for v3.6-rc?  I have a version in my
for_3.6/fixes/ads7846-2 branch with the tags above applied, based on v3.6-rc1.

Thanks

Kevin

  arch/arm/mach-omap2/board-omap3evm.c   |1 +
  arch/arm/mach-omap2/common-board-devices.c |   11 ---
  arch/arm/mach-omap2/common-board-devices.h |1 -
  3 files changed, 1 insertions(+), 12 deletions(-)

 diff --git a/arch/arm/mach-omap2/board-omap3evm.c 
 b/arch/arm/mach-omap2/board-omap3evm.c
 index ef230a0..0d362e9 100644
 --- a/arch/arm/mach-omap2/board-omap3evm.c
 +++ b/arch/arm/mach-omap2/board-omap3evm.c
 @@ -58,6 +58,7 @@
  #include hsmmc.h
  #include common-board-devices.h
  
 +#define OMAP3_EVM_TS_GPIO175
  #define OMAP3_EVM_EHCI_VBUS  22
  #define OMAP3_EVM_EHCI_SELECT61
  
 diff --git a/arch/arm/mach-omap2/common-board-devices.c 
 b/arch/arm/mach-omap2/common-board-devices.c
 index 1473474..c187586 100644
 --- a/arch/arm/mach-omap2/common-board-devices.c
 +++ b/arch/arm/mach-omap2/common-board-devices.c
 @@ -35,16 +35,6 @@ static struct omap2_mcspi_device_config 
 ads7846_mcspi_config = {
   .turbo_mode = 0,
  };
  
 -/*
 - * ADS7846 driver maybe request a gpio according to the value
 - * of pdata-get_pendown_state, but we have done this. So set
 - * get_pendown_state to avoid twice gpio requesting.
 - */
 -static int omap3_get_pendown_state(void)
 -{
 - return !gpio_get_value(OMAP3_EVM_TS_GPIO);
 -}
 -
  static struct ads7846_platform_data ads7846_config = {
   .x_max  = 0x0fff,
   .y_max  = 0x0fff,
 @@ -55,7 +45,6 @@ static struct ads7846_platform_data ads7846_config = {
   .debounce_rep   = 1,
   .gpio_pendown   = -EINVAL,
   .keep_vref_on   = 1,
 - .get_pendown_state  = omap3_get_pendown_state,
  };
  
  static struct spi_board_info ads7846_spi_board_info __initdata = {
 diff --git a/arch/arm/mach-omap2/common-board-devices.h 
 b/arch/arm/mach-omap2/common-board-devices.h
 index 4c4ef6a..a0b4a428 100644
 --- a/arch/arm/mach-omap2/common-board-devices.h
 +++ b/arch/arm/mach-omap2/common-board-devices.h
 @@ -4,7 +4,6 @@
  #include twl-common.h
  
  #define NAND_BLOCK_SIZE  SZ_128K
 -#define OMAP3_EVM_TS_GPIO175
  
  struct mtd_partition;
  struct ads7846_platform_data;
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org

Re: [PATCH] Revert ARM: OMAP3530evm: set pendown_state and debounce time for ads7846

2012-08-06 Thread Zumeng Chen 
于 2012年08月07日 04:22, Igor Grinberg 写道:
 1) The above commit introduced a common -get_pendown_state() function
 into the generic code, but that function was board-specific for the
 OMAP3EVM and thus broke most other boards using this code.

 2) The above commit was mis-merged introducing another bug which
 prevents the ads7846 driver probe function to succeed.
 The omap_ads7846_init() function frees the pendown GPIO in case there is
 no -get_pendown_state() function set by the caller (board specific
 code), so it can be requested later by the ads7846 driver.
 The above commit add a common -get_pendown_state() function without
 removing the gpio_free() call and thus once the ads7846 driver tries
 to use the pendown GPIO, it crashes as the pendown GPIO has not been
 requested.

 3) The above commit introduces NO new functionality as
 get_pendown_state() function is already implemented in a suitable way by
 the ads7846 driver and the debounce time handling has already been
 fixed by commit 97ee9f01 (ARM: OMAP: fix the ads7846 init code).
Igor,

I suspect these two patches(this and 97ee9f01) works well, and there
is something new introduced in ads7846.c, I'll try to look at that new
stuff in this weekend.

Please refer to in-line comments:

Regards,
Zumeng

 This reverts commit 16aced80f6739beb2a6ff7b6f96c83ba80d331e8.

 Conflicts:
   arch/arm/mach-omap2/common-board-devices.c

 Solved by taking the working version prior to the above commit.

 Cc: Zumeng Chen zumeng.c...@windriver.com
 Cc: Arnd Bergmann a...@arndb.de
 Signed-off-by: Igor Grinberg grinb...@compulab.co.il
 ---
 Kevin, sorry for the late reply.
 How about the above commit message and the below patch?

 The patch applies cleanly to Tony's master branch (6 Aug 2012)
 or Kevin's kevin-omap-pm/for_3.6/fixes/ads7846
 after resetting two top most commits.

 This patch has been tested on both above branches on cm-t3730.
 Any other board tested will be greately appreciated.

 Also, if after all said in the commit message, you still don't
 want to revert the original patch, feel free to post your thoughts.

  arch/arm/mach-omap2/board-omap3evm.c   |1 +
  arch/arm/mach-omap2/common-board-devices.c |   11 ---
  arch/arm/mach-omap2/common-board-devices.h |1 -
  3 files changed, 1 insertions(+), 12 deletions(-)

 diff --git a/arch/arm/mach-omap2/board-omap3evm.c 
 b/arch/arm/mach-omap2/board-omap3evm.c
 index ef230a0..0d362e9 100644
 --- a/arch/arm/mach-omap2/board-omap3evm.c
 +++ b/arch/arm/mach-omap2/board-omap3evm.c
 @@ -58,6 +58,7 @@
  #include hsmmc.h
  #include common-board-devices.h
  
 +#define OMAP3_EVM_TS_GPIO175
  #define OMAP3_EVM_EHCI_VBUS  22
  #define OMAP3_EVM_EHCI_SELECT61
  
 diff --git a/arch/arm/mach-omap2/common-board-devices.c 
 b/arch/arm/mach-omap2/common-board-devices.c
 index 1473474..c187586 100644
 --- a/arch/arm/mach-omap2/common-board-devices.c
 +++ b/arch/arm/mach-omap2/common-board-devices.c
 @@ -35,16 +35,6 @@ static struct omap2_mcspi_device_config 
 ads7846_mcspi_config = {
   .turbo_mode = 0,
  };
  
 -/*
 - * ADS7846 driver maybe request a gpio according to the value
 - * of pdata-get_pendown_state, but we have done this. So set
 - * get_pendown_state to avoid twice gpio requesting.
 - */
 -static int omap3_get_pendown_state(void)
 -{
 - return !gpio_get_value(OMAP3_EVM_TS_GPIO);
 -}
 -
  static struct ads7846_platform_data ads7846_config = {
   .x_max  = 0x0fff,
   .y_max  = 0x0fff,
 @@ -55,7 +45,6 @@ static struct ads7846_platform_data ads7846_config = {
   .debounce_rep   = 1,
   .gpio_pendown   = -EINVAL,
   .keep_vref_on   = 1,
 - .get_pendown_state  = omap3_get_pendown_state,
You remove this, then please look at the following codes:

drivers/input/touchscreen/ads7846.c

969 if (pdata-get_pendown_state) {
970 ts-get_pendown_state = pdata-get_pendown_state;
971 } else if (gpio_is_valid(pdata-gpio_pendown)) {
972
973 err = gpio_request_one(pdata-gpio_pendown, GPIOF_IN,
^^^, the driver will want to request again, then it should
be error if i'm right.

974 ads7846_pendown);
975 if (err) {
976 dev_err(spi-dev,
977 failed to request/setup pendown GPIO%d: %d\n,
978 pdata-gpio_pendown, err);
979 return err;
980 }
981
982 ts-gpio_pendown = pdata-gpio_pendown;
983
984 } else {

Regards,
Zumeng
  };
  
  static struct spi_board_info ads7846_spi_board_info __initdata = {
 diff --git a/arch/arm/mach-omap2/common-board-devices.h 
 b/arch/arm/mach-omap2/common-board-devices.h
 index 4c4ef6a..a0b4a428 100644
 --- a/arch/arm/mach-omap2/common-board-devices.h
 +++ b/arch/arm/mach-omap2/common-board-devices.h
 @@ -4,7 +4,6 @@
  #include twl-common.h
  
  #define NAND_BLOCK_SIZE  SZ_128K
 -#define OMAP3_EVM_TS_GPIO175
  
  struct mtd_partition;
  struct ads7846_platform_data;

--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org

Re: [PATCH] Revert ARM: OMAP3530evm: set pendown_state and debounce time for ads7846

2012-08-06 Thread Zumeng Chen 

于 2012年08月07日 04:52, Kevin Hilman 写道:

Igor Grinberggrinb...@compulab.co.il  writes:


1) The above commit introduced a common -get_pendown_state() function
into the generic code, but that function was board-specific for the
OMAP3EVM and thus broke most other boards using this code.

2) The above commit was mis-merged introducing another bug which
prevents the ads7846 driver probe function to succeed.
The omap_ads7846_init() function frees the pendown GPIO in case there is
no -get_pendown_state() function set by the caller (board specific
code), so it can be requested later by the ads7846 driver.
The above commit add a common -get_pendown_state() function without
removing the gpio_free() call and thus once the ads7846 driver tries
to use the pendown GPIO, it crashes as the pendown GPIO has not been
requested.

3) The above commit introduces NO new functionality as
get_pendown_state() function is already implemented in a suitable way by
the ads7846 driver and the debounce time handling has already been
fixed by commit 97ee9f01 (ARM: OMAP: fix the ads7846 init code).

This reverts commit 16aced80f6739beb2a6ff7b6f96c83ba80d331e8.

Conflicts:
arch/arm/mach-omap2/common-board-devices.c

Solved by taking the working version prior to the above commit.

Cc: Zumeng Chenzumeng.c...@windriver.com
Cc: Arnd Bergmanna...@arndb.de
Signed-off-by: Igor Grinberggrinb...@compulab.co.il
---
Kevin, sorry for the late reply.
How about the above commit message and the below patch?

The patch applies cleanly to Tony's master branch (6 Aug 2012)
or Kevin's kevin-omap-pm/for_3.6/fixes/ads7846
after resetting two top most commits.

Now that v3.6-rc1 is out, it should probalby be applied on top of -rc1.
I've taken care of that and tested as well.


This patch has been tested on both above branches on cm-t3730.
Any other board tested will be greately appreciated.

Also, if after all said in the commit message, you still don't
want to revert the original patch, feel free to post your thoughts.

After all the digging I did, I agree that the revert is the best
solution.

While it's a slightly different problem/bug, I think the gpio_free() in
common-board-devices.c should still be unconditonal since the
gpio_request() is now unconditional.  That can be a separate patch though.

Absolutely right, acked this.

Regards,
Zumeng


Acked-by: Kevin Hilmankhil...@ti.com
Tested-by: Kevin Hilmankhil...@ti.com

Tested on 3430/n900, 3530/Overo, 3730/Overo STORM, 3730/BB-xM.

The Overo boards were the ones that were crashing due to this bug since
the pendown GPIO was the only one used in the bank.

Tony, can you queue this up for v3.6-rc?  I have a version in my
for_3.6/fixes/ads7846-2 branch with the tags above applied, based on v3.6-rc1.

Thanks

Kevin


  arch/arm/mach-omap2/board-omap3evm.c   |1 +
  arch/arm/mach-omap2/common-board-devices.c |   11 ---
  arch/arm/mach-omap2/common-board-devices.h |1 -
  3 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/arch/arm/mach-omap2/board-omap3evm.c 
b/arch/arm/mach-omap2/board-omap3evm.c
index ef230a0..0d362e9 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -58,6 +58,7 @@
  #include hsmmc.h
  #include common-board-devices.h

+#define OMAP3_EVM_TS_GPIO  175
  #define OMAP3_EVM_EHCI_VBUS   22
  #define OMAP3_EVM_EHCI_SELECT 61

diff --git a/arch/arm/mach-omap2/common-board-devices.c 
b/arch/arm/mach-omap2/common-board-devices.c
index 1473474..c187586 100644
--- a/arch/arm/mach-omap2/common-board-devices.c
+++ b/arch/arm/mach-omap2/common-board-devices.c
@@ -35,16 +35,6 @@ static struct omap2_mcspi_device_config ads7846_mcspi_config 
= {
.turbo_mode = 0,
  };

-/*
- * ADS7846 driver maybe request a gpio according to the value
- * of pdata-get_pendown_state, but we have done this. So set
- * get_pendown_state to avoid twice gpio requesting.
- */
-static int omap3_get_pendown_state(void)
-{
-   return !gpio_get_value(OMAP3_EVM_TS_GPIO);
-}
-
  static struct ads7846_platform_data ads7846_config = {
.x_max  = 0x0fff,
.y_max  = 0x0fff,
@@ -55,7 +45,6 @@ static struct ads7846_platform_data ads7846_config = {
.debounce_rep   = 1,
.gpio_pendown   = -EINVAL,
.keep_vref_on   = 1,
-   .get_pendown_state  =omap3_get_pendown_state,
  };

  static struct spi_board_info ads7846_spi_board_info __initdata = {
diff --git a/arch/arm/mach-omap2/common-board-devices.h 
b/arch/arm/mach-omap2/common-board-devices.h
index 4c4ef6a..a0b4a428 100644
--- a/arch/arm/mach-omap2/common-board-devices.h
+++ b/arch/arm/mach-omap2/common-board-devices.h
@@ -4,7 +4,6 @@
  #include twl-common.h

  #define NAND_BLOCK_SIZE   SZ_128K
-#define OMAP3_EVM_TS_GPIO  175

  struct mtd_partition;
  struct ads7846_platform_data;


--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to

Re: [PATCH] Revert ARM: OMAP3530evm: set pendown_state and debounce time for ads7846

2012-08-06 Thread Igor Grinberg 
On 08/06/12 23:52, Kevin Hilman wrote:
 Igor Grinberg grinb...@compulab.co.il writes:
 
 1) The above commit introduced a common -get_pendown_state() function
 into the generic code, but that function was board-specific for the
 OMAP3EVM and thus broke most other boards using this code.

 2) The above commit was mis-merged introducing another bug which
 prevents the ads7846 driver probe function to succeed.
 The omap_ads7846_init() function frees the pendown GPIO in case there is
 no -get_pendown_state() function set by the caller (board specific
 code), so it can be requested later by the ads7846 driver.
 The above commit add a common -get_pendown_state() function without
 removing the gpio_free() call and thus once the ads7846 driver tries
 to use the pendown GPIO, it crashes as the pendown GPIO has not been
 requested.

 3) The above commit introduces NO new functionality as
 get_pendown_state() function is already implemented in a suitable way by
 the ads7846 driver and the debounce time handling has already been
 fixed by commit 97ee9f01 (ARM: OMAP: fix the ads7846 init code).

 This reverts commit 16aced80f6739beb2a6ff7b6f96c83ba80d331e8.

 Conflicts:
  arch/arm/mach-omap2/common-board-devices.c

 Solved by taking the working version prior to the above commit.

 Cc: Zumeng Chen zumeng.c...@windriver.com
 Cc: Arnd Bergmann a...@arndb.de
 Signed-off-by: Igor Grinberg grinb...@compulab.co.il
 ---
 Kevin, sorry for the late reply.
 How about the above commit message and the below patch?

 The patch applies cleanly to Tony's master branch (6 Aug 2012)
 or Kevin's kevin-omap-pm/for_3.6/fixes/ads7846
 after resetting two top most commits.
 
 Now that v3.6-rc1 is out, it should probalby be applied on top of -rc1.
 I've taken care of that and tested as well.
 
 This patch has been tested on both above branches on cm-t3730.
 Any other board tested will be greately appreciated.

 Also, if after all said in the commit message, you still don't
 want to revert the original patch, feel free to post your thoughts.
 
 After all the digging I did, I agree that the revert is the best
 solution.  
 
 While it's a slightly different problem/bug, I think the gpio_free() in
 common-board-devices.c should still be unconditonal since the
 gpio_request() is now unconditional.  That can be a separate patch though.

Well, the logic behind the conditional gpio_free() is:
if a board specific code provides a board specific get_pendown_state()
function (which is different from the one in the ads7846 driver),
that board will not need to re-request the pendown GPIO (duplicate code).
If we free the pendown GPIO unconditionally, then the board specific code
will have to re-request it.
So, I think, no - it should be conditional.

 
 Acked-by: Kevin Hilman khil...@ti.com
 Tested-by: Kevin Hilman khil...@ti.com
 
 Tested on 3430/n900, 3530/Overo, 3730/Overo STORM, 3730/BB-xM.

Thanks!

[...]


-- 
Regards,
Igor.
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html