| Message ID | 1382890469-25286-2-git-send-email-sre@debian.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun 2013-10-27 17:14:26, Sebastian Reichel wrote: > From: Luciano Coelho <coelho@ti.com> > > Move the wl1251 part of the wl12xx platform data structure into a new > structure specifically for wl1251. Change the platform data built-in > block and board files accordingly. > > Cc: Tony Lindgren <tony@atomide.com> > Signed-off-by: Luciano Coelho <coelho@ti.com> > Acked-by: Tony Lindgren <tony@atomide.com> > Reviewed-by: Felipe Balbi <balbi@ti.com> Reviewed-by: Pavel Machek <pavel@ucw.cz>
* Sebastian Reichel <sre@debian.org> [131027 09:15]: > From: Luciano Coelho <coelho@ti.com> > > Move the wl1251 part of the wl12xx platform data structure into a new > structure specifically for wl1251. Change the platform data built-in > block and board files accordingly. > > Cc: Tony Lindgren <tony@atomide.com> > Signed-off-by: Luciano Coelho <coelho@ti.com> > Acked-by: Tony Lindgren <tony@atomide.com> > Reviewed-by: Felipe Balbi <balbi@ti.com> > --- > arch/arm/mach-omap2/board-omap3pandora.c | 4 +-- > arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +- > drivers/net/wireless/ti/wilink_platform_data.c | 37 +++++++++++++++++++++----- > drivers/net/wireless/ti/wl1251/sdio.c | 12 ++++----- > drivers/net/wireless/ti/wl1251/spi.c | 2 +- > include/linux/wl12xx.h | 22 ++++++++++++++- > 6 files changed, 62 insertions(+), 17 deletions(-) > > diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c > index de1bc6b..24f3c1b 100644 > --- a/arch/arm/mach-omap2/board-omap3pandora.c > +++ b/arch/arm/mach-omap2/board-omap3pandora.c > @@ -536,7 +536,7 @@ static struct spi_board_info omap3pandora_spi_board_info[] __initdata = { > > static void __init pandora_wl1251_init(void) > { > - struct wl12xx_platform_data pandora_wl1251_pdata; > + struct wl1251_platform_data pandora_wl1251_pdata; > int ret; > > memset(&pandora_wl1251_pdata, 0, sizeof(pandora_wl1251_pdata)); > @@ -550,7 +550,7 @@ static void __init pandora_wl1251_init(void) > goto fail_irq; > > pandora_wl1251_pdata.use_eeprom = true; > - ret = wl12xx_set_platform_data(&pandora_wl1251_pdata); > + ret = wl1251_set_platform_data(&pandora_wl1251_pdata); > if (ret < 0) > goto fail_irq; > > diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c > index 65e3627..0d8e7d2 100644 > --- a/arch/arm/mach-omap2/board-rx51-peripherals.c > +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c > @@ -82,7 +82,7 @@ enum { > RX51_SPI_MIPID, /* LCD panel */ > }; > > -static struct wl12xx_platform_data wl1251_pdata; > +static struct wl1251_platform_data wl1251_pdata; > static struct tsc2005_platform_data tsc2005_pdata; > > #if defined(CONFIG_SENSORS_LIS3_I2C) || defined(CONFIG_SENSORS_LIS3_I2C_MODULE) If this is not going into v3.13, these will cause conflicts with the mach-omap2/board-*.c files for v3.14. So it might be best to do a minimal header patch first that can be merged in by both linux-omap and wireless trees. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Nov 14, 2013 at 10:51:33AM -0800, Tony Lindgren wrote: > [...] > > If this is not going into v3.13, these will cause conflicts > with the mach-omap2/board-*.c files for v3.14. > > So it might be best to do a minimal header patch first that > can be merged in by both linux-omap and wireless trees. I guess this patch is pretty minimal. It also seems to be acked by the involved Maintainers, so maybe just merge Patch 1 without the other patches? This does not solve the problem with the struct modification from the second patch, but I guess it's the more intrusive patch. -- Sebastian
* Sebastian Reichel <sre@debian.org> [131114 15:04]: > On Thu, Nov 14, 2013 at 10:51:33AM -0800, Tony Lindgren wrote: > > [...] > > > > If this is not going into v3.13, these will cause conflicts > > with the mach-omap2/board-*.c files for v3.14. > > > > So it might be best to do a minimal header patch first that > > can be merged in by both linux-omap and wireless trees. > > I guess this patch is pretty minimal. It also seems to be acked by > the involved Maintainers, so maybe just merge Patch 1 without the > other patches? > > This does not solve the problem with the struct modification from > the second patch, but I guess it's the more intrusive patch. Once at least the first two patches are ready, how about I queue them after -rc1 and set up an immutable branch that can be merged in by linux-omap tree and the wireless tree? Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Nov 14, 2013 at 03:22:18PM -0800, Tony Lindgren wrote: > * Sebastian Reichel <sre@debian.org> [131114 15:04]: > > On Thu, Nov 14, 2013 at 10:51:33AM -0800, Tony Lindgren wrote: > > > [...] > > > > > > If this is not going into v3.13, these will cause conflicts > > > with the mach-omap2/board-*.c files for v3.14. > > > > > > So it might be best to do a minimal header patch first that > > > can be merged in by both linux-omap and wireless trees. > > > > I guess this patch is pretty minimal. It also seems to be acked by > > the involved Maintainers, so maybe just merge Patch 1 without the > > other patches? > > > > This does not solve the problem with the struct modification from > > the second patch, but I guess it's the more intrusive patch. > > Once at least the first two patches are ready, how about I queue > them after -rc1 and set up an immutable branch that can be merged > in by linux-omap tree and the wireless tree? That sounds reasonable to me.
On Fri, Nov 15, 2013 at 09:32:55AM -0500, John W. Linville wrote: > On Thu, Nov 14, 2013 at 03:22:18PM -0800, Tony Lindgren wrote: > > * Sebastian Reichel <sre@debian.org> [131114 15:04]: > > > On Thu, Nov 14, 2013 at 10:51:33AM -0800, Tony Lindgren wrote: > > > > [...] > > > > > > > > If this is not going into v3.13, these will cause conflicts > > > > with the mach-omap2/board-*.c files for v3.14. > > > > > > > > So it might be best to do a minimal header patch first that > > > > can be merged in by both linux-omap and wireless trees. > > > > > > I guess this patch is pretty minimal. It also seems to be acked by > > > the involved Maintainers, so maybe just merge Patch 1 without the > > > other patches? > > > > > > This does not solve the problem with the struct modification from > > > the second patch, but I guess it's the more intrusive patch. > > > > Once at least the first two patches are ready, how about I queue > > them after -rc1 and set up an immutable branch that can be merged > > in by linux-omap tree and the wireless tree? > > That sounds reasonable to me. So what changes do you request for those patches? I will try to update them as soon as possible. -- Sebastian
* John W. Linville <linville@tuxdriver.com> [131115 06:46]: > On Thu, Nov 14, 2013 at 03:22:18PM -0800, Tony Lindgren wrote: > > * Sebastian Reichel <sre@debian.org> [131114 15:04]: > > > On Thu, Nov 14, 2013 at 10:51:33AM -0800, Tony Lindgren wrote: > > > > [...] > > > > > > > > If this is not going into v3.13, these will cause conflicts > > > > with the mach-omap2/board-*.c files for v3.14. > > > > > > > > So it might be best to do a minimal header patch first that > > > > can be merged in by both linux-omap and wireless trees. > > > > > > I guess this patch is pretty minimal. It also seems to be acked by > > > the involved Maintainers, so maybe just merge Patch 1 without the > > > other patches? > > > > > > This does not solve the problem with the struct modification from > > > the second patch, but I guess it's the more intrusive patch. > > > > Once at least the first two patches are ready, how about I queue > > them after -rc1 and set up an immutable branch that can be merged > > in by linux-omap tree and the wireless tree? > > That sounds reasonable to me. OK sorry it took a while, I was chasing bugs and did not get around to doing this until now. I've applied only the first two patches from the v2 set of patches later on in this thread against v3.13-rc1 into a signed tag wl1251-pdata-signed here: http://git.kernel.org/cgit/linux/kernel/git/tmlind/linux-omap.git/tag/?id=wl1251-pdata-signed John, please feel free to pull the branch above also into the wireless tree so you can apply the remaining wl1251 patches from Sebastian. This way things keep working without creating merge conflicts with the linux-omap tree. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index de1bc6b..24f3c1b 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c @@ -536,7 +536,7 @@ static struct spi_board_info omap3pandora_spi_board_info[] __initdata = { static void __init pandora_wl1251_init(void) { - struct wl12xx_platform_data pandora_wl1251_pdata; + struct wl1251_platform_data pandora_wl1251_pdata; int ret; memset(&pandora_wl1251_pdata, 0, sizeof(pandora_wl1251_pdata)); @@ -550,7 +550,7 @@ static void __init pandora_wl1251_init(void) goto fail_irq; pandora_wl1251_pdata.use_eeprom = true; - ret = wl12xx_set_platform_data(&pandora_wl1251_pdata); + ret = wl1251_set_platform_data(&pandora_wl1251_pdata); if (ret < 0) goto fail_irq; diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index 65e3627..0d8e7d2 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c @@ -82,7 +82,7 @@ enum { RX51_SPI_MIPID, /* LCD panel */ }; -static struct wl12xx_platform_data wl1251_pdata; +static struct wl1251_platform_data wl1251_pdata; static struct tsc2005_platform_data tsc2005_pdata; #if defined(CONFIG_SENSORS_LIS3_I2C) || defined(CONFIG_SENSORS_LIS3_I2C_MODULE) diff --git a/drivers/net/wireless/ti/wilink_platform_data.c b/drivers/net/wireless/ti/wilink_platform_data.c index 998e958..a92bd3e 100644 --- a/drivers/net/wireless/ti/wilink_platform_data.c +++ b/drivers/net/wireless/ti/wilink_platform_data.c @@ -23,17 +23,17 @@ #include <linux/err.h> #include <linux/wl12xx.h> -static struct wl12xx_platform_data *platform_data; +static struct wl12xx_platform_data *wl12xx_platform_data; int __init wl12xx_set_platform_data(const struct wl12xx_platform_data *data) { - if (platform_data) + if (wl12xx_platform_data) return -EBUSY; if (!data) return -EINVAL; - platform_data = kmemdup(data, sizeof(*data), GFP_KERNEL); - if (!platform_data) + wl12xx_platform_data = kmemdup(data, sizeof(*data), GFP_KERNEL); + if (!wl12xx_platform_data) return -ENOMEM; return 0; @@ -41,9 +41,34 @@ int __init wl12xx_set_platform_data(const struct wl12xx_platform_data *data) struct wl12xx_platform_data *wl12xx_get_platform_data(void) { - if (!platform_data) + if (!wl12xx_platform_data) return ERR_PTR(-ENODEV); - return platform_data; + return wl12xx_platform_data; } EXPORT_SYMBOL(wl12xx_get_platform_data); + +static struct wl1251_platform_data *wl1251_platform_data; + +int __init wl1251_set_platform_data(const struct wl1251_platform_data *data) +{ + if (wl1251_platform_data) + return -EBUSY; + if (!data) + return -EINVAL; + + wl1251_platform_data = kmemdup(data, sizeof(*data), GFP_KERNEL); + if (!wl1251_platform_data) + return -ENOMEM; + + return 0; +} + +struct wl1251_platform_data *wl1251_get_platform_data(void) +{ + if (!wl1251_platform_data) + return ERR_PTR(-ENODEV); + + return wl1251_platform_data; +} +EXPORT_SYMBOL(wl1251_get_platform_data); diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c index e2b3d9c..b75a37a 100644 --- a/drivers/net/wireless/ti/wl1251/sdio.c +++ b/drivers/net/wireless/ti/wl1251/sdio.c @@ -227,7 +227,7 @@ static int wl1251_sdio_probe(struct sdio_func *func, struct wl1251 *wl; struct ieee80211_hw *hw; struct wl1251_sdio *wl_sdio; - const struct wl12xx_platform_data *wl12xx_board_data; + const struct wl1251_platform_data *wl1251_board_data; hw = wl1251_alloc_hw(); if (IS_ERR(hw)) @@ -254,11 +254,11 @@ static int wl1251_sdio_probe(struct sdio_func *func, wl->if_priv = wl_sdio; wl->if_ops = &wl1251_sdio_ops; - wl12xx_board_data = wl12xx_get_platform_data(); - if (!IS_ERR(wl12xx_board_data)) { - wl->set_power = wl12xx_board_data->set_power; - wl->irq = wl12xx_board_data->irq; - wl->use_eeprom = wl12xx_board_data->use_eeprom; + wl1251_board_data = wl1251_get_platform_data(); + if (!IS_ERR(wl1251_board_data)) { + wl->set_power = wl1251_board_data->set_power; + wl->irq = wl1251_board_data->irq; + wl->use_eeprom = wl1251_board_data->use_eeprom; } if (wl->irq) { diff --git a/drivers/net/wireless/ti/wl1251/spi.c b/drivers/net/wireless/ti/wl1251/spi.c index c7dc6fe..6bbbfe6 100644 --- a/drivers/net/wireless/ti/wl1251/spi.c +++ b/drivers/net/wireless/ti/wl1251/spi.c @@ -238,7 +238,7 @@ static const struct wl1251_if_operations wl1251_spi_ops = { static int wl1251_spi_probe(struct spi_device *spi) { - struct wl12xx_platform_data *pdata; + struct wl1251_platform_data *pdata; struct ieee80211_hw *hw; struct wl1251 *wl; int ret; diff --git a/include/linux/wl12xx.h b/include/linux/wl12xx.h index a54fe82..b516b4f 100644 --- a/include/linux/wl12xx.h +++ b/include/linux/wl12xx.h @@ -48,11 +48,15 @@ enum { WL12XX_TCXOCLOCK_33_6 = 7, /* 33.6 MHz */ }; -struct wl12xx_platform_data { +struct wl1251_platform_data { void (*set_power)(bool enable); /* SDIO only: IRQ number if WLAN_IRQ line is used, 0 for SDIO IRQs */ int irq; bool use_eeprom; +}; + +struct wl12xx_platform_data { + int irq; int board_ref_clock; int board_tcxo_clock; unsigned long platform_quirks; @@ -68,6 +72,10 @@ int wl12xx_set_platform_data(const struct wl12xx_platform_data *data); struct wl12xx_platform_data *wl12xx_get_platform_data(void); +int wl1251_set_platform_data(const struct wl1251_platform_data *data); + +struct wl1251_platform_data *wl1251_get_platform_data(void); + #else static inline @@ -82,6 +90,18 @@ struct wl12xx_platform_data *wl12xx_get_platform_data(void) return ERR_PTR(-ENODATA); } +static inline +int wl1251_set_platform_data(const struct wl1251_platform_data *data) +{ + return -ENOSYS; +} + +static inline +struct wl1251_platform_data *wl1251_get_platform_data(void) +{ + return ERR_PTR(-ENODATA); +} + #endif #endif