[PATCHv3 0/5] net: rfkill: gpio: cleanup and a few new acpi ids

[PATCHv3 0/5] net: rfkill: gpio: cleanup and a few new acpi ids

[Heikki Krogerus]

Hi,

I hope this one is OK with everyone.

Changes since v2:
- Instead of changing the driver to use only indexed gpios, just
  hard-coding the names.

Changes since v1:
- Removed the gpio entries from arch/arm/mach-tegra/board-paz00.c


Heikki Krogerus (5):
  ARM: tegra: remove obsolete gpio entries
  net: rfkill: gpio: remove unused and obsolete platform parameters
  net: rfkill: gpio: add ACPI ID for GPS module on Lenovo Miix2
  net: rfkill: gpio: add ACPI IDs for a Broadcom bluetooth chip
  net: rfkill: gpio: hard-code the gpio names

 arch/arm/mach-tegra/board-paz00.c |  4 +---
 include/linux/rfkill-gpio.h       | 10 ----------
 net/rfkill/rfkill-gpio.c          | 40 +++++++++------------------------------
 3 files changed, 10 insertions(+), 44 deletions(-)

-- 
1.9.1

[PATCHv3 1/5] ARM: tegra: remove obsolete gpio entries

[Heikki Krogerus]

After moving to description based gpio interface in
rfkill-gpio, the gpio numbers are not used any more.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Marc Dietrich <marvin24@gmx.de>
Acked-by: Stephen Warren <swarren@nvidia.com>
---
 arch/arm/mach-tegra/board-paz00.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/arm/mach-tegra/board-paz00.c b/arch/arm/mach-tegra/board-paz00.c
index e4dec9f..9c6029b 100644
--- a/arch/arm/mach-tegra/board-paz00.c
+++ b/arch/arm/mach-tegra/board-paz00.c
@@ -23,9 +23,7 @@
 #include "board.h"
 
 static struct rfkill_gpio_platform_data wifi_rfkill_platform_data = {
-	.name		= "wifi_rfkill",
-	.reset_gpio	= 25, /* PD1 */
-	.shutdown_gpio	= 85, /* PK5 */
+	.name	= "wifi_rfkill",
 	.type	= RFKILL_TYPE_WLAN,
 };
 
-- 
1.9.1

[PATCHv3 2/5] net: rfkill: gpio: remove unused and obsolete platform parameters

[Heikki Krogerus]

After upgrading to descriptor based gpios, the gpio numbers
are not used anymore. The power_clk_name and the platform
specific setup and close hooks are not used by anybody, and
we should not encourage use of such things, so removing them.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 include/linux/rfkill-gpio.h | 10 ----------
 net/rfkill/rfkill-gpio.c    | 15 +--------------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/include/linux/rfkill-gpio.h b/include/linux/rfkill-gpio.h
index 4d09f6e..20bcb55 100644
--- a/include/linux/rfkill-gpio.h
+++ b/include/linux/rfkill-gpio.h
@@ -27,21 +27,11 @@
  * struct rfkill_gpio_platform_data - platform data for rfkill gpio device.
  * for unused gpio's, the expected value is -1.
  * @name:		name for the gpio rf kill instance
- * @reset_gpio:		GPIO which is used for reseting rfkill switch
- * @shutdown_gpio:	GPIO which is used for shutdown of rfkill switch
- * @power_clk_name:	[optional] name of clk to turn off while blocked
- * @gpio_runtime_close:	clean up platform specific gpio configuration
- * @gpio_runtime_setup:	set up platform specific gpio configuration
  */
 
 struct rfkill_gpio_platform_data {
 	char			*name;
-	int			reset_gpio;
-	int			shutdown_gpio;
-	const char		*power_clk_name;
 	enum rfkill_type	type;
-	void	(*gpio_runtime_close)(struct platform_device *);
-	int	(*gpio_runtime_setup)(struct platform_device *);
 };
 
 #endif /* __RFKILL_GPIO_H */
diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
index bd2a5b9..0adda44 100644
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -87,7 +87,6 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
 {
 	struct rfkill_gpio_platform_data *pdata = pdev->dev.platform_data;
 	struct rfkill_gpio_data *rfkill;
-	const char *clk_name = NULL;
 	struct gpio_desc *gpio;
 	int ret;
 	int len;
@@ -101,7 +100,6 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
 		if (ret)
 			return ret;
 	} else if (pdata) {
-		clk_name = pdata->power_clk_name;
 		rfkill->name = pdata->name;
 		rfkill->type = pdata->type;
 	} else {
@@ -120,7 +118,7 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
 	snprintf(rfkill->reset_name, len + 6 , "%s_reset", rfkill->name);
 	snprintf(rfkill->shutdown_name, len + 9, "%s_shutdown", rfkill->name);
 
-	rfkill->clk = devm_clk_get(&pdev->dev, clk_name);
+	rfkill->clk = devm_clk_get(&pdev->dev, NULL);
 
 	gpio = devm_gpiod_get_index(&pdev->dev, rfkill->reset_name, 0);
 	if (!IS_ERR(gpio)) {
@@ -146,14 +144,6 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
 		return -EINVAL;
 	}
 
-	if (pdata && pdata->gpio_runtime_setup) {
-		ret = pdata->gpio_runtime_setup(pdev);
-		if (ret) {
-			dev_err(&pdev->dev, "can't set up gpio\n");
-			return ret;
-		}
-	}
-
 	rfkill->rfkill_dev = rfkill_alloc(rfkill->name, &pdev->dev,
 					  rfkill->type, &rfkill_gpio_ops,
 					  rfkill);
@@ -174,10 +164,7 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
 static int rfkill_gpio_remove(struct platform_device *pdev)
 {
 	struct rfkill_gpio_data *rfkill = platform_get_drvdata(pdev);
-	struct rfkill_gpio_platform_data *pdata = pdev->dev.platform_data;
 
-	if (pdata && pdata->gpio_runtime_close)
-		pdata->gpio_runtime_close(pdev);
 	rfkill_unregister(rfkill->rfkill_dev);
 	rfkill_destroy(rfkill->rfkill_dev);
 
-- 
1.9.1

Re: [PATCHv3 2/5] net: rfkill: gpio: remove unused and obsolete platform parameters

[Linus Walleij]

On Tue, Apr 1, 2014 at 4:02 PM, Heikki Krogerus
<heikki.krogerus@linux.intel.com> wrote:

> After upgrading to descriptor based gpios, the gpio numbers
> are not used anymore. The power_clk_name and the platform
> specific setup and close hooks are not used by anybody, and
> we should not encourage use of such things, so removing them.
>
> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

[PATCHv3 3/5] net: rfkill: gpio: add ACPI ID for GPS module on Lenovo Miix2

[Heikki Krogerus]

On Lenovo Miix 2 8", BCM4752 is renamed LNV4752.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 net/rfkill/rfkill-gpio.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
index 0adda44..fec3dbf 100644
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -173,6 +173,7 @@ static int rfkill_gpio_remove(struct platform_device *pdev)
 
 static const struct acpi_device_id rfkill_acpi_match[] = {
 	{ "BCM4752", RFKILL_TYPE_GPS },
+	{ "LNV4752", RFKILL_TYPE_GPS },
 	{ },
 };
 
-- 
1.9.1

[PATCHv3 4/5] net: rfkill: gpio: add ACPI IDs for a Broadcom bluetooth chip

[Heikki Krogerus]

This adds ACPI IDs for Broadcom bluetooth chip BCM43241 used
on various Baytrail based boards such as Lenovo Miix 2 and
Asus Transformer Book T100TA.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 net/rfkill/rfkill-gpio.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
index fec3dbf..436bffb 100644
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -171,11 +171,16 @@ static int rfkill_gpio_remove(struct platform_device *pdev)
 	return 0;
 }
 
+#ifdef CONFIG_ACPI
 static const struct acpi_device_id rfkill_acpi_match[] = {
+	{ "BCM2E1A", RFKILL_TYPE_BLUETOOTH },
+	{ "BCM2E39", RFKILL_TYPE_BLUETOOTH },
+	{ "BCM2E3D", RFKILL_TYPE_BLUETOOTH },
 	{ "BCM4752", RFKILL_TYPE_GPS },
 	{ "LNV4752", RFKILL_TYPE_GPS },
 	{ },
 };
+#endif
 
 static struct platform_driver rfkill_gpio_driver = {
 	.probe = rfkill_gpio_probe,
-- 
1.9.1

[PATCHv3 5/5] net: rfkill: gpio: hard-code the gpio names

[Heikki Krogerus]

There is no need to dynamically generate the names. This
will fix a static checker warning..

net/rfkill/rfkill-gpio.c:144 rfkill_gpio_probe()
    warn: variable dereferenced before check 'rfkill->name'

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 net/rfkill/rfkill-gpio.c | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
index 436bffb..9c4a5eb 100644
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -36,8 +36,6 @@ struct rfkill_gpio_data {
 	struct gpio_desc	*shutdown_gpio;
 
 	struct rfkill		*rfkill_dev;
-	char			*reset_name;
-	char			*shutdown_name;
 	struct clk		*clk;
 
 	bool			clk_enabled;
@@ -89,7 +87,6 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
 	struct rfkill_gpio_data *rfkill;
 	struct gpio_desc *gpio;
 	int ret;
-	int len;
 
 	rfkill = devm_kzalloc(&pdev->dev, sizeof(*rfkill), GFP_KERNEL);
 	if (!rfkill)
@@ -106,21 +103,9 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
 		return -ENODEV;
 	}
 
-	len = strlen(rfkill->name);
-	rfkill->reset_name = devm_kzalloc(&pdev->dev, len + 7, GFP_KERNEL);
-	if (!rfkill->reset_name)
-		return -ENOMEM;
-
-	rfkill->shutdown_name = devm_kzalloc(&pdev->dev, len + 10, GFP_KERNEL);
-	if (!rfkill->shutdown_name)
-		return -ENOMEM;
-
-	snprintf(rfkill->reset_name, len + 6 , "%s_reset", rfkill->name);
-	snprintf(rfkill->shutdown_name, len + 9, "%s_shutdown", rfkill->name);
-
 	rfkill->clk = devm_clk_get(&pdev->dev, NULL);
 
-	gpio = devm_gpiod_get_index(&pdev->dev, rfkill->reset_name, 0);
+	gpio = devm_gpiod_get_index(&pdev->dev, "reset", 0);
 	if (!IS_ERR(gpio)) {
 		ret = gpiod_direction_output(gpio, 0);
 		if (ret)
@@ -128,7 +113,7 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
 		rfkill->reset_gpio = gpio;
 	}
 
-	gpio = devm_gpiod_get_index(&pdev->dev, rfkill->shutdown_name, 1);
+	gpio = devm_gpiod_get_index(&pdev->dev, "shutdown", 1);
 	if (!IS_ERR(gpio)) {
 		ret = gpiod_direction_output(gpio, 0);
 		if (ret)
-- 
1.9.1

Re: [PATCHv3 5/5] net: rfkill: gpio: hard-code the gpio names

[Linus Walleij]

On Tue, Apr 1, 2014 at 4:02 PM, Heikki Krogerus
<heikki.krogerus@linux.intel.com> wrote:

> There is no need to dynamically generate the names. This
> will fix a static checker warning..
>
> net/rfkill/rfkill-gpio.c:144 rfkill_gpio_probe()
>     warn: variable dereferenced before check 'rfkill->name'
>
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>

Excellent,
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

Re: [PATCHv3 0/5] net: rfkill: gpio: cleanup and a few new acpi ids

[Alexandre Courbot]

Negative number of added lines, temporary string buffers removal, and
use of the gpiod interface: lots of stuff to like here!

Acked-by: Alexandre Courbot <acourbot@nvidia.com>

On Tue, Apr 1, 2014 at 11:02 PM, Heikki Krogerus
<heikki.krogerus@linux.intel.com> wrote:
> Hi,
>
> I hope this one is OK with everyone.
>
> Changes since v2:
> - Instead of changing the driver to use only indexed gpios, just
>   hard-coding the names.
>
> Changes since v1:
> - Removed the gpio entries from arch/arm/mach-tegra/board-paz00.c
>
>
> Heikki Krogerus (5):
>   ARM: tegra: remove obsolete gpio entries
>   net: rfkill: gpio: remove unused and obsolete platform parameters
>   net: rfkill: gpio: add ACPI ID for GPS module on Lenovo Miix2
>   net: rfkill: gpio: add ACPI IDs for a Broadcom bluetooth chip
>   net: rfkill: gpio: hard-code the gpio names
>
>  arch/arm/mach-tegra/board-paz00.c |  4 +---
>  include/linux/rfkill-gpio.h       | 10 ----------
>  net/rfkill/rfkill-gpio.c          | 40 +++++++++------------------------------
>  3 files changed, 10 insertions(+), 44 deletions(-)
>
> --
> 1.9.1
>

Re: [PATCHv3 0/5] net: rfkill: gpio: cleanup and a few new acpi ids

[Johannes Berg]

On Tue, 2014-04-01 at 17:02 +0300, Heikki Krogerus wrote:
> Hi,
> 
> I hope this one is OK with everyone.

It's fine with me. Are you expecting me to pick up any of these patches,
or do you want them to go through some other tree? Either way is fine
with me, but the first patch looks like something I probably shouldn't
be taking.

johannes

Re: [PATCHv3 0/5] net: rfkill: gpio: cleanup and a few new acpi ids

[Heikki Krogerus]

Hi,

On Tue, Apr 08, 2014 at 10:37:55AM +0200, Johannes Berg wrote:
> On Tue, 2014-04-01 at 17:02 +0300, Heikki Krogerus wrote:
> > I hope this one is OK with everyone.
> 
> It's fine with me. Are you expecting me to pick up any of these patches,
> or do you want them to go through some other tree? Either way is fine
> with me, but the first patch looks like something I probably shouldn't
> be taking.

The second patch depends on it.

Stephen! Are you expecting any changes to board-paz00.c in this kernel
cycle? If not, I think it would be easiest if Johannes, you take the
whole set. What do you guys think?


Thanks,

-- 
heikki

Re: [PATCHv3 0/5] net: rfkill: gpio: cleanup and a few new acpi ids

[Stephen Warren]

On 04/09/2014 04:01 AM, Heikki Krogerus wrote:
> Hi,
> 
> On Tue, Apr 08, 2014 at 10:37:55AM +0200, Johannes Berg wrote:
>> On Tue, 2014-04-01 at 17:02 +0300, Heikki Krogerus wrote:
>>> I hope this one is OK with everyone.
>>
>> It's fine with me. Are you expecting me to pick up any of these patches,
>> or do you want them to go through some other tree? Either way is fine
>> with me, but the first patch looks like something I probably shouldn't
>> be taking.
> 
> The second patch depends on it.
> 
> Stephen! Are you expecting any changes to board-paz00.c in this kernel
> cycle? If not, I think it would be easiest if Johannes, you take the
> whole set. What do you guys think?

I can't predict the future, but the chances are pretty slim - that file
is pretty tiny and doesn't have much churn.

The best approach is to put this series in its own topic branch. Then,
if any conflict does come up, I can simply merge the branch into the
Tegra treee and apply the conflicting patches on top.

Re: [PATCHv3 0/5] net: rfkill: gpio: cleanup and a few new acpi ids

[Johannes Berg]

On Wed, 2014-04-09 at 09:32 -0600, Stephen Warren wrote:

> > Stephen! Are you expecting any changes to board-paz00.c in this kernel
> > cycle? If not, I think it would be easiest if Johannes, you take the
> > whole set. What do you guys think?
> 
> I can't predict the future, but the chances are pretty slim - that file
> is pretty tiny and doesn't have much churn.
> 
> The best approach is to put this series in its own topic branch. Then,
> if any conflict does come up, I can simply merge the branch into the
> Tegra treee and apply the conflicting patches on top.

Ok, I'll do that. Shout now if you don't want these patches merged :)

johannes

Re: [PATCHv3 0/5] net: rfkill: gpio: cleanup and a few new acpi ids

[Johannes Berg]

On Tue, 2014-04-01 at 17:02 +0300, Heikki Krogerus wrote:
> Hi,
> 
> I hope this one is OK with everyone.

Looks good to me, all applied.

It's in jberg/mac80211-next.git rfkill-gpio-cleanups branch, in case
anybody needs this separately. John isn't taking pull requests for -next
until after -rc1, at which point I'll send it to him.

johannes