From: marek.vasut@gmail.com (Marek Vasut)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 5/5] colibri-pxa3xx: add touchscreen support
Date: Thu, 8 Jul 2010 22:03:40 +0200 [thread overview]
Message-ID: <201007082203.40209.marek.vasut@gmail.com> (raw)
In-Reply-To: <201007081904.16262.pieterg@gmx.com>
Dne ?t 8. ?ervence 2010 19:04:16 pieterg napsal(a):
> Signed-off-by: pieter <p.grimmerink@inepro.com>
> ---
> arch/arm/mach-pxa/colibri-pxa300.c | 2 +
> arch/arm/mach-pxa/colibri-pxa320.c | 1 +
> arch/arm/mach-pxa/colibri-pxa3xx.c | 31
> ++++++++++++++++++++++++++++++
> arch/arm/mach-pxa/include/mach/colibri.h | 6 +++++
> 4 files changed, 40 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/colibri-pxa300.c
> b/arch/arm/mach-pxa/colibri-pxa300.c
> index 27f403d..edd48e2 100644
> --- a/arch/arm/mach-pxa/colibri-pxa300.c
> +++ b/arch/arm/mach-pxa/colibri-pxa300.c
> @@ -229,6 +229,8 @@ void __init colibri_pxa300_init(void)
> mfp_to_gpio(MFP_PIN_GPIO13));
> colibri_pxa300_init_uart();
> colibri_pxa300_init_i2c();
> + if (cpu_is_pxa310())
> + colibri_pxa3xx_init_touchscreen();
Is the indent ok here? did you run the patches through checkpatch.pl ?
> }
>
> MACHINE_START(COLIBRI300, "Toradex Colibri PXA300")
> diff --git a/arch/arm/mach-pxa/colibri-pxa320.c
> b/arch/arm/mach-pxa/colibri-pxa320.c
> index 0755087..43fadf6 100644
> --- a/arch/arm/mach-pxa/colibri-pxa320.c
> +++ b/arch/arm/mach-pxa/colibri-pxa320.c
> @@ -229,6 +229,7 @@ void __init colibri_pxa320_init(void)
> mfp_to_gpio(MFP_PIN_GPIO28));
> colibri_pxa320_init_uart();
> colibri_pxa320_init_i2c();
> + colibri_pxa3xx_init_touchscreen();
> }
>
> MACHINE_START(COLIBRI320, "Toradex Colibri PXA320")
> diff --git a/arch/arm/mach-pxa/colibri-pxa3xx.c
> b/arch/arm/mach-pxa/colibri-pxa3xx.c
> index 199afa2..097aef5 100644
> --- a/arch/arm/mach-pxa/colibri-pxa3xx.c
> +++ b/arch/arm/mach-pxa/colibri-pxa3xx.c
> @@ -198,3 +198,34 @@ void __init colibri_pxa3xx_init_nand(void)
> }
> #endif
>
> +#if defined(CONFIG_INPUT_TOUCHSCREEN)
> +
> +#if defined(CONFIG_TOUCHSCREEN_WM97XX) || \
> + defined(CONFIG_TOUCHSCREEN_WM97XX_MODULE)
> +static struct platform_device colibri_ts_wm97xx_device = {
> + .name = "wm97xx-ts",
> + .id = -1,
> +};
> +#endif
> +
> +#if defined(CONFIG_TOUCHSCREEN_UCB1400) || \
> + defined(CONFIG_TOUCHSCREEN_UCB1400_MODULE)
> +static struct platform_device colibri_ts_ucb1400_device = {
> + .name = "ucb1400_core",
> + .id = -1,
> +};
> +#endif
> +
> +void __init colibri_pxa3xx_init_touchscreen(void)
> +{
> +#if defined(CONFIG_TOUCHSCREEN_WM97XX) || \
> + defined(CONFIG_TOUCHSCREEN_WM97XX_MODULE)
> + platform_device_register(&colibri_ts_wm97xx_device);
> +#endif
> +#if defined(CONFIG_TOUCHSCREEN_UCB1400) || \
> + defined(CONFIG_TOUCHSCREEN_UCB1400_MODULE)
> + platform_device_register(&colibri_ts_ucb1400_device);
> +#endif
> +}
> +
> +#endif
> diff --git a/arch/arm/mach-pxa/include/mach/colibri.h
> b/arch/arm/mach-pxa/include/mach/colibri.h
> index 5f2ba8d..299dab9 100644
> --- a/arch/arm/mach-pxa/include/mach/colibri.h
> +++ b/arch/arm/mach-pxa/include/mach/colibri.h
> @@ -30,6 +30,12 @@ extern void colibri_pxa3xx_init_nand(void);
> static inline void colibri_pxa3xx_init_nand(void) {}
> #endif
>
> +#if defined(CONFIG_INPUT_TOUCHSCREEN)
> +extern void colibri_pxa3xx_init_touchscreen(void);
> +#else
> +static inline void colibri_pxa3xx_init_touchscreen(void) {}
> +#endif
> +
> /* physical memory regions */
> #define COLIBRI_SDRAM_BASE 0xa0000000 /* SDRAM region */
It looks correct ...
Acked-by: Marek Vasut <marek.vasut@gmail.com>
next prev parent reply other threads:[~2010-07-08 20:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-08 17:04 [PATCH 5/5] colibri-pxa3xx: add touchscreen support pieterg
2010-07-08 20:03 ` Marek Vasut [this message]
2010-07-08 20:45 ` pieterg
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=201007082203.40209.marek.vasut@gmail.com \
--to=marek.vasut@gmail.com \
--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).