From: Tony Lindgren <tony@atomide.com> To: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org Cc: Linus Walleij <linus.walleij@linaro.org>, linux-gpio@vger.kernel.org Subject: [PATCH 6/8] gpio: twl4030: Fix passing of pdata in the device tree case Date: Wed, 13 Nov 2013 18:35:35 -0800 [thread overview] Message-ID: <1384396537-3486-7-git-send-email-tony@atomide.com> (raw) In-Reply-To: <1384396537-3486-1-git-send-email-tony@atomide.com> We still have some legacy code needing the callback functions that won't work properly without platform data. To use platform data for twl4030-gpio, we need to not trash the possible data. Cc: Linus Walleij <linus.walleij@linaro.org> Cc: linux-gpio@vger.kernel.org Signed-off-by: Tony Lindgren <tony@atomide.com> --- If this looks OK, I'd like to merge this as a fix via arm-soc tree along with the other patches in this series as my later patches depend on patches in this series. --- drivers/gpio/gpio-twl4030.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/gpio-twl4030.c b/drivers/gpio/gpio-twl4030.c index 5738d5a..e6ecbe3 100644 --- a/drivers/gpio/gpio-twl4030.c +++ b/drivers/gpio/gpio-twl4030.c @@ -436,7 +436,8 @@ static int gpio_twl4030_debounce(u32 debounce, u8 mmc_cd) static int gpio_twl4030_remove(struct platform_device *pdev); -static struct twl4030_gpio_platform_data *of_gpio_twl4030(struct device *dev) +static struct twl4030_gpio_platform_data *of_gpio_twl4030(struct device *dev, + struct twl4030_gpio_platform_data *pdata) { struct twl4030_gpio_platform_data *omap_twl_info; @@ -444,6 +445,9 @@ static struct twl4030_gpio_platform_data *of_gpio_twl4030(struct device *dev) if (!omap_twl_info) return NULL; + if (pdata) + memcpy(omap_twl_info, pdata, sizeof(*omap_twl_info)); + omap_twl_info->use_leds = of_property_read_bool(dev->of_node, "ti,use-leds"); @@ -501,7 +505,7 @@ no_irqs: mutex_init(&priv->mutex); if (node) - pdata = of_gpio_twl4030(&pdev->dev); + pdata = of_gpio_twl4030(&pdev->dev, pdata); if (pdata == NULL) { dev_err(&pdev->dev, "Platform data is missing\n"); -- 1.8.1.1
WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 6/8] gpio: twl4030: Fix passing of pdata in the device tree case Date: Wed, 13 Nov 2013 18:35:35 -0800 [thread overview] Message-ID: <1384396537-3486-7-git-send-email-tony@atomide.com> (raw) In-Reply-To: <1384396537-3486-1-git-send-email-tony@atomide.com> We still have some legacy code needing the callback functions that won't work properly without platform data. To use platform data for twl4030-gpio, we need to not trash the possible data. Cc: Linus Walleij <linus.walleij@linaro.org> Cc: linux-gpio at vger.kernel.org Signed-off-by: Tony Lindgren <tony@atomide.com> --- If this looks OK, I'd like to merge this as a fix via arm-soc tree along with the other patches in this series as my later patches depend on patches in this series. --- drivers/gpio/gpio-twl4030.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/gpio-twl4030.c b/drivers/gpio/gpio-twl4030.c index 5738d5a..e6ecbe3 100644 --- a/drivers/gpio/gpio-twl4030.c +++ b/drivers/gpio/gpio-twl4030.c @@ -436,7 +436,8 @@ static int gpio_twl4030_debounce(u32 debounce, u8 mmc_cd) static int gpio_twl4030_remove(struct platform_device *pdev); -static struct twl4030_gpio_platform_data *of_gpio_twl4030(struct device *dev) +static struct twl4030_gpio_platform_data *of_gpio_twl4030(struct device *dev, + struct twl4030_gpio_platform_data *pdata) { struct twl4030_gpio_platform_data *omap_twl_info; @@ -444,6 +445,9 @@ static struct twl4030_gpio_platform_data *of_gpio_twl4030(struct device *dev) if (!omap_twl_info) return NULL; + if (pdata) + memcpy(omap_twl_info, pdata, sizeof(*omap_twl_info)); + omap_twl_info->use_leds = of_property_read_bool(dev->of_node, "ti,use-leds"); @@ -501,7 +505,7 @@ no_irqs: mutex_init(&priv->mutex); if (node) - pdata = of_gpio_twl4030(&pdev->dev); + pdata = of_gpio_twl4030(&pdev->dev, pdata); if (pdata == NULL) { dev_err(&pdev->dev, "Platform data is missing\n"); -- 1.8.1.1
next prev parent reply other threads:[~2013-11-14 2:35 UTC|newest] Thread overview: 98+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-11-14 2:35 [PATCH 0/8] Various omap device tree usability fixes for v3.13 merge window Tony Lindgren 2013-11-14 2:35 ` Tony Lindgren 2013-11-14 2:35 ` [PATCH 1/8] net: smc91x: Fix device tree based configuration so it's usable Tony Lindgren 2013-11-14 2:35 ` Tony Lindgren 2013-11-14 11:03 ` Mark Rutland 2013-11-14 11:03 ` Mark Rutland 2013-11-14 16:08 ` Tony Lindgren 2013-11-14 16:08 ` Tony Lindgren 2013-11-16 15:16 ` Tony Lindgren 2013-11-16 15:16 ` Tony Lindgren 2013-11-27 18:36 ` Tony Lindgren 2013-11-27 18:36 ` Tony Lindgren 2013-11-14 2:35 ` [PATCH 2/8] mmc: omap: Fix DMA configuration to not rely on device id Tony Lindgren 2013-11-14 2:35 ` Tony Lindgren 2013-11-18 18:47 ` Tony Lindgren 2013-11-18 18:47 ` Tony Lindgren 2013-11-26 23:33 ` Chris Ball 2013-11-26 23:33 ` Chris Ball 2013-11-26 23:52 ` Tony Lindgren 2013-11-26 23:52 ` Tony Lindgren 2013-11-27 20:57 ` Jarkko Nikula 2013-11-27 20:57 ` Jarkko Nikula 2013-11-27 21:37 ` Tony Lindgren 2013-11-27 21:37 ` Tony Lindgren 2013-11-28 17:02 ` Jarkko Nikula 2013-11-28 17:02 ` Jarkko Nikula 2013-11-29 16:34 ` Tony Lindgren 2013-11-29 16:34 ` Tony Lindgren 2013-11-27 21:47 ` Chris Ball 2013-11-27 21:47 ` Chris Ball 2013-11-27 21:59 ` Tony Lindgren 2013-11-27 21:59 ` Tony Lindgren 2013-11-28 16:13 ` Jarkko Nikula 2013-11-28 16:13 ` Jarkko Nikula 2013-11-29 17:13 ` Tony Lindgren 2013-11-29 17:13 ` Tony Lindgren 2013-11-30 0:38 ` Joel Fernandes 2013-11-30 0:38 ` Joel Fernandes 2013-11-30 17:33 ` Tony Lindgren 2013-11-30 17:33 ` Tony Lindgren 2013-11-14 2:35 ` [PATCH 3/8] mmc: omap: Fix I2C dependency and make driver usable with device tree Tony Lindgren 2013-11-14 2:35 ` Tony Lindgren 2013-11-14 11:05 ` Mark Rutland 2013-11-14 11:05 ` Mark Rutland 2013-11-14 17:25 ` Tony Lindgren 2013-11-14 17:25 ` Tony Lindgren 2013-11-26 23:34 ` Chris Ball 2013-11-26 23:34 ` Chris Ball [not found] ` <1384396537-3486-1-git-send-email-tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> 2013-11-14 2:35 ` [PATCH 4/8] i2c: omap: Fix missing device tree flags for omap2 Tony Lindgren 2013-11-14 2:35 ` Tony Lindgren [not found] ` <1384396537-3486-5-git-send-email-tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> 2013-11-14 6:58 ` Wolfram Sang 2013-11-14 6:58 ` Wolfram Sang 2013-11-14 17:34 ` Tony Lindgren 2013-11-14 17:34 ` Tony Lindgren [not found] ` <20131114173429.GF10317-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> 2013-11-14 17:49 ` Wolfram Sang 2013-11-14 17:49 ` Wolfram Sang 2013-11-14 17:53 ` Tony Lindgren 2013-11-14 17:53 ` Tony Lindgren 2013-11-14 11:07 ` Mark Rutland 2013-11-14 11:07 ` Mark Rutland 2013-11-14 17:30 ` Tony Lindgren 2013-11-14 17:30 ` Tony Lindgren 2013-11-14 2:35 ` [PATCH 5/8] gpio: twl4030: Fix regression for twl gpio output Tony Lindgren 2013-11-14 2:35 ` Tony Lindgren 2013-11-14 9:45 ` Peter Ujfalusi 2013-11-14 9:45 ` Peter Ujfalusi 2013-11-14 17:37 ` Tony Lindgren 2013-11-14 17:37 ` Tony Lindgren 2013-11-18 22:45 ` Linus Walleij 2013-11-18 22:45 ` Linus Walleij 2013-12-03 13:30 ` Roger Quadros 2013-12-03 13:30 ` Roger Quadros 2013-12-09 13:09 ` Linus Walleij 2013-12-09 13:09 ` Linus Walleij 2013-12-09 17:10 ` Tony Lindgren 2013-12-09 17:10 ` Tony Lindgren 2013-12-10 12:17 ` Linus Walleij 2013-12-10 12:17 ` Linus Walleij 2013-12-10 15:20 ` Tony Lindgren 2013-12-10 15:20 ` Tony Lindgren 2013-11-14 2:35 ` Tony Lindgren [this message] 2013-11-14 2:35 ` [PATCH 6/8] gpio: twl4030: Fix passing of pdata in the device tree case Tony Lindgren 2013-11-18 18:27 ` Tony Lindgren 2013-11-18 18:27 ` Tony Lindgren 2013-11-18 22:46 ` Linus Walleij 2013-11-18 22:46 ` Linus Walleij 2013-11-14 2:35 ` [PATCH 7/8] ARM: OMAP2+: Fix GPMC and simplify bootloader timings for 8250 and smc91x Tony Lindgren 2013-11-14 2:35 ` Tony Lindgren 2013-11-14 2:35 ` [PATCH 8/8] ARM: dts: Fix omap2 specific dtsi files by adding the missing entries Tony Lindgren 2013-11-14 2:35 ` Tony Lindgren 2013-11-14 23:08 ` [PATCH 9/8] i2c: Fix device tree binding for i2c-cbus-gpio Tony Lindgren 2013-11-14 23:08 ` Tony Lindgren [not found] ` <20131114230842.GU10317-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> 2013-11-15 18:49 ` Aaro Koskinen 2013-11-15 18:49 ` Aaro Koskinen 2013-11-15 22:26 ` Wolfram Sang 2013-11-15 22:26 ` Wolfram Sang 2013-11-15 22:30 ` Tony Lindgren 2013-11-15 22:30 ` Tony Lindgren
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=1384396537-3486-7-git-send-email-tony@atomide.com \ --to=tony@atomide.com \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-gpio@vger.kernel.org \ --cc=linux-omap@vger.kernel.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.