From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 02/10] ARM: ux500: Strip out duplicate touch screen platform information
Date: Tue, 2 Oct 2012 09:13:15 +0100 [thread overview]
Message-ID: <1349165603-24401-3-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1349165603-24401-1-git-send-email-lee.jones@linaro.org>
We're currently carrying two 'struct bu21013_platform_device's which
are identical for no apparent reason. Here we remove the extra burden
and apply the same information to the two different instances of the
bu21012_tp driver registration.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
arch/arm/mach-ux500/board-mop500-stuib.c | 22 +++-------------------
1 file changed, 3 insertions(+), 19 deletions(-)
diff --git a/arch/arm/mach-ux500/board-mop500-stuib.c b/arch/arm/mach-ux500/board-mop500-stuib.c
index 8c97977..564f57d 100644
--- a/arch/arm/mach-ux500/board-mop500-stuib.c
+++ b/arch/arm/mach-ux500/board-mop500-stuib.c
@@ -162,18 +162,6 @@ static struct bu21013_platform_device tsc_plat_device = {
.y_flip = true,
};
-static struct bu21013_platform_device tsc_plat2_device = {
- .cs_en = bu21013_gpio_board_init,
- .cs_dis = bu21013_gpio_board_exit,
- .irq_read_val = bu21013_read_pin_val,
- .irq = NOMADIK_GPIO_TO_IRQ(TOUCH_GPIO_PIN),
- .touch_x_max = TOUCH_XMAX,
- .touch_y_max = TOUCH_YMAX,
- .ext_clk = false,
- .x_flip = false,
- .y_flip = true,
-};
-
static struct i2c_board_info __initdata u8500_i2c3_devices_stuib[] = {
{
I2C_BOARD_INFO("bu21013_tp", 0x5C),
@@ -181,21 +169,17 @@ static struct i2c_board_info __initdata u8500_i2c3_devices_stuib[] = {
},
{
I2C_BOARD_INFO("bu21013_tp", 0x5D),
- .platform_data = &tsc_plat2_device,
+ .platform_data = &tsc_plat_device,
},
};
void __init mop500_stuib_init(void)
{
- if (machine_is_hrefv60()) {
+ if (machine_is_hrefv60())
tsc_plat_device.cs_pin = HREFV60_TOUCH_RST_GPIO;
- tsc_plat2_device.cs_pin = HREFV60_TOUCH_RST_GPIO;
- } else {
+ else
tsc_plat_device.cs_pin = GPIO_BU21013_CS;
- tsc_plat2_device.cs_pin = GPIO_BU21013_CS;
-
- }
mop500_uib_i2c_add(0, mop500_i2c0_devices_stuib,
ARRAY_SIZE(mop500_i2c0_devices_stuib));
--
1.7.9.5
next prev parent reply other threads:[~2012-10-02 8:13 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-02 8:13 [PATCH 00/10] Platform data clean-up and UIB device enablement Lee Jones
2012-10-02 8:13 ` [PATCH 01/10] ARM: ux500: Move all Device Tree booting into cpu-db8500 Lee Jones
2012-10-02 8:55 ` Linus Walleij
2012-10-02 8:13 ` Lee Jones [this message]
2012-10-02 9:07 ` [PATCH 02/10] ARM: ux500: Strip out duplicate touch screen platform information Linus Walleij
2012-10-02 8:13 ` [PATCH 03/10] Input: bu21013_ts - Request a regulator that actually exists Lee Jones
2012-10-02 9:16 ` Linus Walleij
2012-10-02 8:13 ` [PATCH 04/10] Input: bu21013_ts - Move GPIO init and exit functions into the driver Lee Jones
2012-10-02 9:18 ` Linus Walleij
2012-10-02 8:13 ` [PATCH 05/10] Input: bu21013_ts - Add support for Device Tree booting Lee Jones
2012-10-02 9:20 ` Linus Walleij
2012-10-02 8:13 ` [PATCH 06/10] Documentation: Detail permitted DT properties for the BU21013 Touch Screen Lee Jones
2012-10-02 9:21 ` Linus Walleij
2012-10-02 8:13 ` [PATCH 07/10] ARM: ux500: Create a new Device Tree include file for boards supporting STUIBs Lee Jones
2012-10-02 10:57 ` Linus Walleij
2012-10-02 8:13 ` [PATCH 08/10] ARM: ux500: Stop calling the UIB init function when using Device Tree Lee Jones
2012-10-02 10:57 ` Linus Walleij
2012-10-02 12:15 ` Lee Jones
2012-10-02 12:58 ` Linus Walleij
2012-10-02 8:13 ` [PATCH 09/10] ARM: ux500: Add all bu21013 touch screen components to supported Device Trees Lee Jones
2012-10-02 10:58 ` Linus Walleij
2012-10-02 8:13 ` [PATCH 10/10] ARM: ux500: Stop informing the regulator subsystem that we have full constraints Lee Jones
2012-10-02 11:00 ` Linus Walleij
2012-10-02 11:44 ` [PATCH 00/10] Platform data clean-up and UIB device enablement Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1349165603-24401-3-git-send-email-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).