From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755370AbbLAAYf (ORCPT ); Mon, 30 Nov 2015 19:24:35 -0500 Received: from mailout4.w1.samsung.com ([210.118.77.14]:13115 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751710AbbLAAYc (ORCPT ); Mon, 30 Nov 2015 19:24:32 -0500 X-AuditID: cbfec7f4-f79026d00000418a-c4-565ce8bce79f Subject: Re: [PATCH 02/10] ASoC: samsung/smartq: use dynamic registration To: Arnd Bergmann , linux-arm-kernel@lists.infradead.org References: <1448467615-447097-1-git-send-email-arnd@arndb.de> <1448467615-447097-3-git-send-email-arnd@arndb.de> Cc: linux-kernel@vger.kernel.org, Kukjin Kim , Mark Brown , Vasily Khoruzhick , Charles Keepax , Tomasz Figa , Ben Dooks , linux-samsung-soc@vger.kernel.org From: Krzysztof Kozlowski Message-id: <565CE8B8.3090903@samsung.com> Date: Tue, 01 Dec 2015 09:24:24 +0900 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-version: 1.0 In-reply-to: <1448467615-447097-3-git-send-email-arnd@arndb.de> Content-type: text/plain; charset=windows-1252 Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpkkeLIzCtJLcpLzFFi42I5/e/4Vd09L2LCDPY+YbNoPfaM0eLvpGPs Fg9utTJZTH0IFPs35Qa7xesXhhb9j18zW2x6fI3V4vKuOWwWM87vY7L43PqPzYHb4/evSYwe sxsusng8ezmZyWPnrLvsHptWdbJ5bF5S7/Fy4m82j74tqxg9Pm+SC+CM4rJJSc3JLEst0rdL 4Mr4cGcqS0GHTsWxzqUsDYwdKl2MnBwSAiYS15r2MkLYYhIX7q1n62Lk4hASWMoo8XHXLnYI 5ymjxI8LK5hBqoQFPCU2v93NAmKLCLhLrJs+jxXEFhIolji/fxczSAOzwCYmia0b/7OBJNgE jCU2L18CZvMKaEnsbtgFto5FQFXi9sYtYHFRgQiJiRMaWCFqBCV+TL4HtoBTwF5i0rW3QDUc QEP1JO5f1AIJMwvIS2xe85Z5AqPALCQdsxCqZiGpWsDIvIpRNLU0uaA4KT3XUK84Mbe4NC9d Lzk/dxMjJGK+7GBcfMzqEKMAB6MSD6/k2pgwIdbEsuLK3EOMEhzMSiK8Kk+AQrwpiZVVqUX5 8UWlOanFhxilOViUxHnn7nofIiSQnliSmp2aWpBaBJNl4uCUamD02+9W84/78KqFFflMbQHi nk/mbRSQ1W9PvvHm1BHmu1I89jmPihXdZ0ucYtt4TPN84wGutrdiAQs+5bRtm5ngfyWx6ut/ ge6vbucZ/lguzhUVuTLjfdzazWrab/LuJ03ccPnarwnK+7OumgZfSRD5lD1tlf6uGLXL3cfK wx26Y7ZMUWQx5spRYinOSDTUYi4qTgQARH6Yp5QCAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 26.11.2015 01:06, Arnd Bergmann wrote: > As a prerequisite for moving s3c64xx into multiplatform configurations, > we need to change the smartq audio driver to stop using hardcoded > gpio numbers from the header file, and instead pass the gpio data > through platform_data. > > In order to do that, we also move the code to use module_platform_driver > and register the platform device using platform_device_register_simple > and register the gpios through the gpiod API. > > Signed-off-by: Arnd Bergmann > Acked-by: Mark Brown > --- > arch/arm/mach-s3c64xx/mach-smartq.c | 13 +++++++ > sound/soc/samsung/smartq_wm8987.c | 77 +++++++++++++------------------------ > 2 files changed, 40 insertions(+), 50 deletions(-) > > diff --git a/arch/arm/mach-s3c64xx/mach-smartq.c b/arch/arm/mach-s3c64xx/mach-smartq.c > index acdfb5fac40f..96784e7f894a 100644 > --- a/arch/arm/mach-s3c64xx/mach-smartq.c > +++ b/arch/arm/mach-s3c64xx/mach-smartq.c > @@ -12,6 +12,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -383,6 +384,15 @@ void __init smartq_map_io(void) > smartq_lcd_mode_set(); > } > > +static struct gpiod_lookup_table smartq_audio_gpios = { > + .dev_id = "smartq-audio", > + .table = { > + GPIO_LOOKUP("GPL", 12, "headphone detect", 0), > + GPIO_LOOKUP("GPK", 12, "amplifiers shutdown", 0), > + { }, > + }, > +}; > + > void __init smartq_machine_init(void) > { > s3c_i2c0_set_platdata(NULL); > @@ -402,4 +412,7 @@ void __init smartq_machine_init(void) > > pwm_add_table(smartq_pwm_lookup, ARRAY_SIZE(smartq_pwm_lookup)); > platform_add_devices(smartq_devices, ARRAY_SIZE(smartq_devices)); > + > + gpiod_add_lookup_table(&smartq_audio_gpios); > + platform_device_register_simple("smartq-audio", -1, NULL, 0); > } > diff --git a/sound/soc/samsung/smartq_wm8987.c b/sound/soc/samsung/smartq_wm8987.c > index a0fe37fbed9f..c6769b16eb19 100644 > --- a/sound/soc/samsung/smartq_wm8987.c > +++ b/sound/soc/samsung/smartq_wm8987.c > @@ -13,15 +13,12 @@ > * > */ > > -#include > +#include > #include > > #include > #include > > -#include > -#include > - > #include "i2s.h" > #include "../codecs/wm8750.h" > > @@ -96,7 +93,7 @@ static struct snd_soc_jack_pin smartq_jack_pins[] = { > > static struct snd_soc_jack_gpio smartq_jack_gpios[] = { > { > - .gpio = S3C64XX_GPL(12), > + .gpio = -1, > .name = "headphone detect", > .report = SND_JACK_HEADPHONE, > .debounce_time = 200, > @@ -113,7 +110,9 @@ static int smartq_speaker_event(struct snd_soc_dapm_widget *w, > struct snd_kcontrol *k, > int event) > { > - gpio_set_value(S3C64XX_GPK(12), SND_SOC_DAPM_EVENT_OFF(event)); > + struct gpio_desc *gpio = snd_soc_card_get_drvdata(&snd_soc_smartq); > + > + gpiod_set_value(gpio, SND_SOC_DAPM_EVENT_OFF(event)); > > return 0; > } > @@ -199,62 +198,40 @@ static struct snd_soc_card snd_soc_smartq = { > .num_controls = ARRAY_SIZE(wm8987_smartq_controls), > }; > > -static struct platform_device *smartq_snd_device; > - > -static int __init smartq_init(void) > +static int smartq_probe(struct platform_device *pdev) > { > + struct gpio_desc *gpio; > int ret; > > - if (!machine_is_smartq7() && !machine_is_smartq5()) { > - pr_info("Only SmartQ is supported by this ASoC driver\n"); > - return -ENODEV; > - } > - > - smartq_snd_device = platform_device_alloc("soc-audio", -1); > - if (!smartq_snd_device) > - return -ENOMEM; > - > - platform_set_drvdata(smartq_snd_device, &snd_soc_smartq); > - > - ret = platform_device_add(smartq_snd_device); > - if (ret) { > - platform_device_put(smartq_snd_device); > - return ret; > - } > + platform_set_drvdata(pdev, &snd_soc_smartq); > > /* Initialise GPIOs used by amplifiers */ > - ret = gpio_request(S3C64XX_GPK(12), "amplifiers shutdown"); > - if (ret) { > - dev_err(&smartq_snd_device->dev, "Failed to register GPK12\n"); > - goto err_unregister_device; > + gpio = devm_gpiod_get(&pdev->dev, "amplifiers shutdown", > + GPIOD_OUT_HIGH); > + if (IS_ERR(gpio)) { > + dev_err(&pdev->dev, "Failed to register GPK12\n"); > + ret = PTR_ERR(gpio); > + goto out; > } > + snd_soc_card_set_drvdata(&snd_soc_smartq, gpio); > > - /* Disable amplifiers */ > - ret = gpio_direction_output(S3C64XX_GPK(12), 1); > - if (ret) { > - dev_err(&smartq_snd_device->dev, "Failed to configure GPK12\n"); > - goto err_free_gpio_amp_shut; > - } > - > - return 0; > - > -err_free_gpio_amp_shut: > - gpio_free(S3C64XX_GPK(12)); > -err_unregister_device: > - platform_device_unregister(smartq_snd_device); > + ret = devm_snd_soc_register_card(&pdev->dev, &snd_soc_smartq); > + if (ret) > + dev_err(&pdev->dev, "Failed to register card\n"); > > +out: > return ret; > } > > -static void __exit smartq_exit(void) > -{ > - gpio_free(S3C64XX_GPK(12)); > - > - platform_device_unregister(smartq_snd_device); > -} > +static struct platform_driver smartq_driver = { > + .driver = { > + .name = "smartq-audio", > + .owner = THIS_MODULE, The owner should not be needed (coccicheck should also complain). Rest looks good, so: Reviewed-by: Krzysztof Kozlowski Best regards, Krzysztof