diff for duplicates of <4FD98BD0.7090901@windriver.com> diff --git a/a/1.txt b/N1/1.txt index 64fd038..e9bebf4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1,6 @@ -于 2012年06月14日 14:31, Hiremath, Vaibhav 写道: +? 2012?06?14? 14:31, Hiremath, Vaibhav ??: > On Thu, Jun 14, 2012 at 10:16:55, Zumeng Chen wrote: ->> 于 2012年06月13日 20:18, Hiremath, Vaibhav 写道: +>> ? 2012?06?13? 20:18, Hiremath, Vaibhav ??: >>> On Wed, Jun 13, 2012 at 07:14:10, Zumeng Chen wrote: >>>> From: Zumeng Chen<zumeng.chen@windriver.com> >>>> @@ -52,7 +52,7 @@ > No, not really. > > In the same commit, the debounce time is already handled as an argument to -> the function omap_ads7846_init(), and that’s the way it should be. +> the function omap_ads7846_init(), and that?s the way it should be. That means you'd like to implement the same get_pendown_state for every omap3 board? Currently, board_pdata is NULL. @@ -71,3 +71,11 @@ Zumeng > > Thanks, > Vaibhav + +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: ads7846-common.diff +Type: text/x-patch +Size: 2373 bytes +Desc: not available +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120614/4c860188/attachment.bin> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index 424d1e2..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,3 +0,0 @@ -Content-Type: text/x-patch; name="ads7846-common.diff" -Content-Transfer-Encoding: 7bit -Content-Disposition: attachment; filename="ads7846-common.diff" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index c67d990..0000000 --- a/a/2.txt +++ /dev/null @@ -1,73 +0,0 @@ -diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c -index 56cce1e..887bd35 100644 ---- a/arch/arm/mach-omap2/board-omap3evm.c -+++ b/arch/arm/mach-omap2/board-omap3evm.c -@@ -58,7 +58,6 @@ - #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 719f62e..8cf0140 100644 ---- a/arch/arm/mach-omap2/common-board-devices.c -+++ b/arch/arm/mach-omap2/common-board-devices.c -@@ -34,6 +34,11 @@ - static struct omap2_mcspi_device_config ads7846_mcspi_config = { - .turbo_mode = 0, - }; -+ -+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, -@@ -45,6 +50,7 @@ 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 = { -@@ -63,17 +69,14 @@ void __init omap_ads7846_init(int bus_num, int gpio_pendown, int gpio_debounce, - struct spi_board_info *spi_bi = &ads7846_spi_board_info; - int err; - -- if (board_pdata && board_pdata->get_pendown_state) { -- err = gpio_request_one(gpio_pendown, GPIOF_IN, "TSPenDown"); -- if (err) { -- pr_err("Couldn't obtain gpio for TSPenDown: %d\n", err); -- return; -- } -- gpio_export(gpio_pendown, 0); -- -- if (gpio_debounce) -- gpio_set_debounce(gpio_pendown, gpio_debounce); -+ err = gpio_request_one(gpio_pendown, GPIOF_IN, "TSPenDown"); -+ if (err) { -+ pr_err("Couldn't obtain gpio for TSPenDown: %d\n", err); -+ return; - } -+ gpio_export(gpio_pendown, 0); -+ if (gpio_debounce) -+ gpio_set_debounce(gpio_pendown, gpio_debounce); - - spi_bi->bus_num = bus_num; - spi_bi->irq = gpio_to_irq(gpio_pendown); -diff --git a/arch/arm/mach-omap2/common-board-devices.h b/arch/arm/mach-omap2/common-board-devices.h -index a0b4a428..4c4ef6a 100644 ---- a/arch/arm/mach-omap2/common-board-devices.h -+++ b/arch/arm/mach-omap2/common-board-devices.h -@@ -4,6 +4,7 @@ - #include "twl-common.h" - - #define NAND_BLOCK_SIZE SZ_128K -+#define OMAP3_EVM_TS_GPIO 175 - - struct mtd_partition; - struct ads7846_platform_data; diff --git a/a/content_digest b/N1/content_digest index 415dcc8..22ae01d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,34 +1,18 @@ + "ref\0zumeng.chen@gmail.com\0" "ref\01339551850-20827-1-git-send-email-zumeng.chen@gmail.com\0" "ref\01339551850-20827-6-git-send-email-zumeng.chen@gmail.com\0" "ref\079CD15C6BA57404B839C016229A409A83EA4F07F@DBDE01.ent.ti.com\0" "ref\04FD96CBF.5040106@windriver.com\0" "ref\079CD15C6BA57404B839C016229A409A83EA4FC98@DBDE01.ent.ti.com\0" - "From\0Zumeng Chen <zumeng.chen@windriver.com>\0" - "Subject\0Re: [PATCH V2 5/5] Input: ads7846: set proper debounce time in driver level\0" + "From\0zumeng.chen@windriver.com (Zumeng Chen)\0" + "Subject\0[PATCH V2 5/5] Input: ads7846: set proper debounce time in driver level\0" "Date\0Thu, 14 Jun 2012 14:59:28 +0800\0" - "To\0Hiremath" - Vaibhav <hvaibhav@ti.com> - " mike@compulab.co.il <mike@compulab.co.il>\0" - "Cc\0Zumeng Chen <zumeng.chen@gmail.com>" - tony@atomide.com <tony@atomide.com> - Hunter - Jon <jon-hunter@ti.com> - grinberg@compulab.co.il <grinberg@compulab.co.il> - linux-omap@vger.kernel.org <linux-omap@vger.kernel.org> - linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> - Hilman - Kevin <khilman@ti.com> - Syed Mohammed - Khasim <khasim@ti.com> - Gupta - Ajay Kumar <ajay.gupta@ti.com> - dmitry.torokhov@gmail.com <dmitry.torokhov@gmail.com> - " linux-input@vger.kernel.org <linux-input@vger.kernel.org>\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" - "\344\272\216 2012\345\271\26406\346\234\21014\346\227\245 14:31, Hiremath, Vaibhav \345\206\231\351\201\223:\n" + "? 2012?06?14? 14:31, Hiremath, Vaibhav ??:\n" "> On Thu, Jun 14, 2012 at 10:16:55, Zumeng Chen wrote:\n" - ">> \344\272\216 2012\345\271\26406\346\234\21013\346\227\245 20:18, Hiremath, Vaibhav \345\206\231\351\201\223:\n" + ">> ? 2012?06?13? 20:18, Hiremath, Vaibhav ??:\n" ">>> On Wed, Jun 13, 2012 at 07:14:10, Zumeng Chen wrote:\n" ">>>> From: Zumeng Chen<zumeng.chen@windriver.com>\n" ">>>>\n" @@ -80,7 +64,7 @@ "> No, not really.\n" ">\n" "> In the same commit, the debounce time is already handled as an argument to \n" - "> the function omap_ads7846_init(), and that\342\200\231s the way it should be.\n" + "> the function omap_ads7846_init(), and that?s the way it should be.\n" "That means you'd like to implement the same get_pendown_state for every\n" "omap3 board? Currently, board_pdata is NULL.\n" "\n" @@ -98,82 +82,14 @@ "> So no need for #ifdefs in driver...\n" ">\n" "> Thanks,\n" - > Vaibhav - "\01:2\0" - "fn\0ads7846-common.diff\0" - "b\0" - "diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c\n" - "index 56cce1e..887bd35 100644\n" - "--- a/arch/arm/mach-omap2/board-omap3evm.c\n" - "+++ b/arch/arm/mach-omap2/board-omap3evm.c\n" - "@@ -58,7 +58,6 @@\n" - " #include \"hsmmc.h\"\n" - " #include \"common-board-devices.h\"\n" - " \n" - "-#define OMAP3_EVM_TS_GPIO\t175\n" - " #define OMAP3_EVM_EHCI_VBUS\t22\n" - " #define OMAP3_EVM_EHCI_SELECT\t61\n" - " \n" - "diff --git a/arch/arm/mach-omap2/common-board-devices.c b/arch/arm/mach-omap2/common-board-devices.c\n" - "index 719f62e..8cf0140 100644\n" - "--- a/arch/arm/mach-omap2/common-board-devices.c\n" - "+++ b/arch/arm/mach-omap2/common-board-devices.c\n" - "@@ -34,6 +34,11 @@\n" - " static struct omap2_mcspi_device_config ads7846_mcspi_config = {\n" - " \t.turbo_mode\t= 0,\n" - " };\n" - "+\t\n" - "+static int omap3_get_pendown_state(void)\n" - "+{\n" - "+\treturn !gpio_get_value(OMAP3_EVM_TS_GPIO);\n" - "+}\n" - " \n" - " static struct ads7846_platform_data ads7846_config = {\n" - " \t.x_max\t\t\t= 0x0fff,\n" - "@@ -45,6 +50,7 @@ static struct ads7846_platform_data ads7846_config = {\n" - " \t.debounce_rep\t\t= 1,\n" - " \t.gpio_pendown\t\t= -EINVAL,\n" - " \t.keep_vref_on\t\t= 1,\n" - "+\t.get_pendown_state\t= &omap3_get_pendown_state,\n" - " };\n" - " \n" - " static struct spi_board_info ads7846_spi_board_info __initdata = {\n" - "@@ -63,17 +69,14 @@ void __init omap_ads7846_init(int bus_num, int gpio_pendown, int gpio_debounce,\n" - " \tstruct spi_board_info *spi_bi = &ads7846_spi_board_info;\n" - " \tint err;\n" - " \n" - "-\tif (board_pdata && board_pdata->get_pendown_state) {\n" - "-\t\terr = gpio_request_one(gpio_pendown, GPIOF_IN, \"TSPenDown\");\n" - "-\t\tif (err) {\n" - "-\t\t\tpr_err(\"Couldn't obtain gpio for TSPenDown: %d\\n\", err);\n" - "-\t\t\treturn;\n" - "-\t\t}\n" - "-\t\tgpio_export(gpio_pendown, 0);\n" - "-\n" - "-\t\tif (gpio_debounce)\n" - "-\t\t\tgpio_set_debounce(gpio_pendown, gpio_debounce);\n" - "+\terr = gpio_request_one(gpio_pendown, GPIOF_IN, \"TSPenDown\");\n" - "+\tif (err) {\n" - "+\t\tpr_err(\"Couldn't obtain gpio for TSPenDown: %d\\n\", err);\n" - "+\t\treturn;\n" - " \t}\n" - "+\tgpio_export(gpio_pendown, 0);\n" - "+\tif (gpio_debounce)\n" - "+\t\tgpio_set_debounce(gpio_pendown, gpio_debounce);\n" - " \n" - " \tspi_bi->bus_num\t= bus_num;\n" - " \tspi_bi->irq\t= gpio_to_irq(gpio_pendown);\n" - "diff --git a/arch/arm/mach-omap2/common-board-devices.h b/arch/arm/mach-omap2/common-board-devices.h\n" - "index a0b4a428..4c4ef6a 100644\n" - "--- a/arch/arm/mach-omap2/common-board-devices.h\n" - "+++ b/arch/arm/mach-omap2/common-board-devices.h\n" - "@@ -4,6 +4,7 @@\n" - " #include \"twl-common.h\"\n" - " \n" - " #define NAND_BLOCK_SIZE\tSZ_128K\n" - "+#define OMAP3_EVM_TS_GPIO\t175\n" - " \n" - " struct mtd_partition;\n" - struct ads7846_platform_data; + "> Vaibhav\n" + "\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: ads7846-common.diff\n" + "Type: text/x-patch\n" + "Size: 2373 bytes\n" + "Desc: not available\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120614/4c860188/attachment.bin> -b0c5b6c986f81fc2fc9812b7710df9619c21f1071a73fb698bb5456d85b927a4 +a947351e3f66331c326d98c3da9a114b9e4e86dbfc2e72168773857dc01f0942
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.