linux-kernel - Re: [PATCH 3/5] Input: bu21013_ts - Add support for Device Tree booting

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20121123155258.GE28552@gmail.com>
Date:	Fri, 23 Nov 2012 15:52:58 +0000
From:	Lee Jones <lee.jones@...aro.org>
To:	linux-kernel@...r.kernel.org
Cc:	Dmitry Torokhov <dmitry.torokhov@...il.com>,
	linux-input@...r.kernel.org
Subject: Re: [PATCH 3/5] Input: bu21013_ts - Add support for Device Tree
 booting

On Wed, 14 Nov 2012, Lee Jones wrote:

> Now we can register the BU21013_ts touch screen when booting with
> Device Tree enabled. Here we parse all the necessary components
> previously expected to be passed from platform data.
> 
> Cc: Dmitry Torokhov <dmitry.torokhov@...il.com>
> Cc: linux-input@...r.kernel.org
> Acked-by: Arnd Bergmann <arnd@...db.de>
> Acked-by: Linus Walleij <linus.walleij@...aro.org>
> Signed-off-by: Lee Jones <lee.jones@...aro.org>
> ---
>  drivers/input/touchscreen/bu21013_ts.c |   39 ++++++++++++++++++++++++++++----
>  1 file changed, 35 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/input/touchscreen/bu21013_ts.c b/drivers/input/touchscreen/bu21013_ts.c
> index 5d8fc75..afef874 100644
> --- a/drivers/input/touchscreen/bu21013_ts.c
> +++ b/drivers/input/touchscreen/bu21013_ts.c
> @@ -15,6 +15,8 @@
>  #include <linux/regulator/consumer.h>
>  #include <linux/module.h>
>  #include <linux/gpio.h>
> +#include <linux/of.h>
> +#include <linux/of_gpio.h>
>  
>  /* Reference tracking for multiple displays. */
>  static int bu21013_devices = 0;
> @@ -487,13 +489,33 @@ static void bu21013_free_irq(struct bu21013_ts_data *bu21013_data)
>   * This function used to initializes the i2c-client touchscreen
>   * driver and returns integer.
>   */
> +static void __devinit bu21013_of_probe(struct device_node *np,
> +				struct bu21013_platform_device *pdata)
> +{
> +	pdata->y_flip = pdata->x_flip = false;
> +
> +	if (of_get_property(np, "rohm,flip-x", NULL))
> +		pdata->x_flip = true;
> +
> +	if (of_get_property(np, "rohm,flip-y", NULL))
> +		pdata->y_flip = true;
> +
> +	of_property_read_u32(np, "rohm,touch-max-x", &pdata->touch_x_max);
> +	of_property_read_u32(np, "rohm,touch-max-y", &pdata->touch_y_max);
> +
> +	pdata->touch_pin = of_get_named_gpio(np, "touch-gpio", 0);
> +	pdata->cs_pin = of_get_named_gpio(np, "reset-gpio", 0);
> +
> +	pdata->ext_clk = false;
> +}
> +
>  static int __devinit bu21013_probe(struct i2c_client *client,
>  					const struct i2c_device_id *id)
>  {
>  	struct bu21013_ts_data *bu21013_data;
>  	struct input_dev *in_dev;
> -	const struct bu21013_platform_device *pdata =
> -					client->dev.platform_data;
> +	struct device_node *np = client->dev.of_node;
> +	struct bu21013_platform_device *pdata = client->dev.platform_data;
>  	int error;
>  
>  	if (!i2c_check_functionality(client->adapter,
> @@ -503,8 +525,17 @@ static int __devinit bu21013_probe(struct i2c_client *client,
>  	}
>  
>  	if (!pdata) {
> -		dev_err(&client->dev, "platform data not defined\n");
> -		return -EINVAL;
> +		if (np) {
> +			pdata = devm_kzalloc(&client->dev, sizeof(*pdata),
> +					GFP_KERNEL);
> +			if (!pdata)
> +				return -ENOMEM;
> +
> +			bu21013_of_probe(np, pdata);
> +		} else {
> +			dev_err(&client->dev, "no device tree or platform data\n");
> +			return -EINVAL;
> +		}
>  	}
>  
>  	pdata->irq = gpio_to_irq(pdata->touch_pin);
> -- 
> 1.7.9.5
> 

Friendly poke for Dmitry.

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/