Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1200772

[PATCH 4/5] ARM: tegra: use build-in device properties with rfkill_gpio

Show all headers | View raw

Pass the rfkill name and type to the device with properties
instead of driver specific platform data.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
CC: Alexandre Courbot <gnurou@gmail.com>
CC: Thierry Reding <thierry.reding@gmail.com>
CC: Stephen Warren <swarren@wwwdotorg.org>
---
 arch/arm/mach-tegra/board-paz00.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-tegra/board-paz00.c b/arch/arm/mach-tegra/board-paz00.c
index fbe74c6..5d8d3a4 100644
--- a/arch/arm/mach-tegra/board-paz00.c
+++ b/arch/arm/mach-tegra/board-paz00.c
@@ -17,23 +17,25 @@
  *
  */
 
+#include <linux/property.h>
 #include <linux/gpio/machine.h>
 #include <linux/platform_device.h>
-#include <linux/rfkill-gpio.h>
 
 #include "board.h"
 
-static struct rfkill_gpio_platform_data wifi_rfkill_platform_data = {
-	.name	= "wifi_rfkill",
-	.type	= RFKILL_TYPE_WLAN,
+static struct property_entry wifi_rfkill_prop[] = {
+	PROP_ENTRY_STRING("name", "wifi_rfkill"),
+	PROP_ENTRY_STRING("type", "wlan"),
+	{ },
+};
+
+static struct property_set wifi_rfkill_pset = {
+	.properties = wifi_rfkill_prop,
 };
 
 static struct platform_device wifi_rfkill_device = {
 	.name	= "rfkill_gpio",
 	.id	= -1,
-	.dev	= {
-		.platform_data = &wifi_rfkill_platform_data,
-	},
 };
 
 static struct gpiod_lookup_table wifi_gpio_lookup = {
@@ -47,6 +49,7 @@ static struct gpiod_lookup_table wifi_gpio_lookup = {
 
 void __init tegra_paz00_wifikill_init(void)
 {
+	device_add_property_set(&wifi_rfkill_device.dev, &wifi_rfkill_pset);
 	gpiod_add_lookup_table(&wifi_gpio_lookup);
 	platform_device_register(&wifi_rfkill_device);
 }
-- 
2.4.6

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/5] net: rfkill: gpio: replace platform data with build-in property Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2015-08-05 15:40 +0200
  [PATCH 1/5] device property: helper macros for property entry creation Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2015-08-05 15:40 +0200
    Re: [PATCH 1/5] device property: helper macros for property entry  creation Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2015-08-05 16:10 +0200
      Re: [PATCH 1/5] device property: helper macros for property entry  creation "Shevchenko, Andriy" <andriy.shevchenko@intel.com> - 2015-08-05 16:20 +0200
      Re: [PATCH 1/5] device property: helper macros for property entry  creation Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2015-08-06 09:50 +0200
        Re: [PATCH 1/5] device property: helper macros for property entry creation "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2015-08-07 23:50 +0200
  [PATCH 2/5] net: rfkill: add rfkill_find_type function Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2015-08-05 15:40 +0200
    Re: [PATCH 2/5] net: rfkill: add rfkill_find_type function Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2015-08-05 16:10 +0200
      Re: [PATCH 2/5] net: rfkill: add rfkill_find_type function Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2015-08-06 10:40 +0200
        Re: [PATCH 2/5] net: rfkill: add rfkill_find_type function Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2015-08-06 11:30 +0200
    Re: [PATCH 2/5] net: rfkill: add rfkill_find_type function Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2015-08-06 13:40 +0200
    Re: [PATCH 2/5] net: rfkill: add rfkill_find_type function Johannes Berg <johannes@sipsolutions.net> - 2015-08-13 11:30 +0200
      Re: [PATCH 2/5] net: rfkill: add rfkill_find_type function Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2015-08-13 14:40 +0200
  [PATCH 5/5] net: rfkill: gpio: remove rfkill_gpio_platform_data Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2015-08-05 15:40 +0200
    Re: [PATCH 5/5] net: rfkill: gpio: remove rfkill_gpio_platform_data Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2015-08-05 16:20 +0200
      Re: [PATCH 5/5] net: rfkill: gpio: remove rfkill_gpio_platform_data Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2015-08-06 09:30 +0200
  [PATCH 4/5] ARM: tegra: use build-in device properties with rfkill_gpio Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2015-08-05 15:50 +0200
  [PATCH 3/5] net: rfkill: gpio: get the name and type from device property Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2015-08-05 15:50 +0200

csiph-web