arm: omap2: n8x0: stop instantiating codec platform data
Subsystems (6)
PATCH 1/3 arm: omap2: n8x0: stop instantiating codec platform data
As of 0426370b58b2 ("ARM: dts: omap2420-n810: Correct the audio codec (tlv320aic33) node") the DTS properly specifies reset GPIO, and the device name in auxdata lookup table does not even match the one in device tree anymore, so stop instantiating it.
--- arch/arm/mach-omap2/board-n8x0.c | 5 ----- arch/arm/mach-omap2/common-board-devices.h | 2 -- arch/arm/mach-omap2/pdata-quirks.c | 1 - 3 files changed, 8 deletions(-)
arch/arm/mach-omap2/board-n8x0.c +0 -5
@@ -22,7 +22,6 @@#include <linux/platform_data/spi-omap2-mcspi.h> #include <linux/platform_data/mmc-omap.h> #include <linux/mfd/menelaus.h> -#include <sound/tlv320aic3x.h> #include <asm/mach/arch.h> #include <asm/mach-types.h>
@@ -567,10 +566,6 @@ struct menelaus_platform_data n8x0_menelaus_platform_data = { .late_init = n8x0_menelaus_late_init, }; -struct aic3x_pdata n810_aic33_data = { - .gpio_reset =118 , -}; -static int __init n8x0_late_initcall (void ) {if (!board_caps)
arch/arm/mach-omap2/common-board-devices.h +0 -2
@@ -2,12 +2,10 @@#ifndef __OMAP_COMMON_BOARD_DEVICES__#define __OMAP_COMMON_BOARD_DEVICES__ -#include <sound/tlv320aic3x.h> #include <linux/mfd/menelaus.h> void *n8x0_legacy_init (void );extern struct menelaus_platform_data n8x0_menelaus_platform_data; -extern struct aic3x_pdata n810_aic33_data;#endif /* __OMAP_COMMON_BOARD_DEVICES__ */
arch/arm/mach-omap2/pdata-quirks.c +0 -1
@@ -439,7 +439,6 @@ static struct of_dev_auxdata omap_auxdata_lookup[] = {#ifdef CONFIG_MACH_NOKIA_N8X0 OF_DEV_AUXDATA("ti,omap2420-mmc", 0x4809c000, "mmci-omap.0", NULL), OF_DEV_AUXDATA("menelaus", 0x72, "1-0072", &n8x0_menelaus_platform_data), -OF_DEV_AUXDATA ("tlv320aic3x" ,0x18 ,"2-0018" , &n810_aic33_data),#endif #ifdef CONFIG_ARCH_OMAP3 OF_DEV_AUXDATA("ti,omap2-iommu", 0x5d000000, "5d000000.mmu",
Signature · 1 line
2.38.1.273.g43a17bfeac-goog
PATCH 2/3 ASoC: tlv320aic3x: remove support for platform data
--- include/sound/tlv320aic3x.h | 65 ---------------------------------- sound/soc/codecs/tlv320aic3x.c | 12 +++---- sound/soc/codecs/tlv320aic3x.h | 43 ++++++++++++++++++++++ 3 files changed, 48 insertions(+), 72 deletions(-) delete mode 100644 include/sound/tlv320aic3x.h
include/sound/tlv320aic3x.h deleted +0 -65
@@ -1,65 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* Platform data for Texas Instruments TLV320AIC3x codec -* -* Author: Jarkko Nikula <[email protected]> -*/ -#ifndef __TLV320AIC3x_H__ -#define __TLV320AIC3x_H__ - -/* GPIO API */ -enum { -AIC3X_GPIO1_FUNC_DISABLED =0 , -AIC3X_GPIO1_FUNC_AUDIO_WORDCLK_ADC =1 , -AIC3X_GPIO1_FUNC_CLOCK_MUX =2 , -AIC3X_GPIO1_FUNC_CLOCK_MUX_DIV2 =3 , -AIC3X_GPIO1_FUNC_CLOCK_MUX_DIV4 =4 , -AIC3X_GPIO1_FUNC_CLOCK_MUX_DIV8 =5 , -AIC3X_GPIO1_FUNC_SHORT_CIRCUIT_IRQ =6 , -AIC3X_GPIO1_FUNC_AGC_NOISE_IRQ =7 , -AIC3X_GPIO1_FUNC_INPUT =8 , -AIC3X_GPIO1_FUNC_OUTPUT =9 , -AIC3X_GPIO1_FUNC_DIGITAL_MIC_MODCLK =10 , -AIC3X_GPIO1_FUNC_AUDIO_WORDCLK =11 , -AIC3X_GPIO1_FUNC_BUTTON_IRQ =12 , -AIC3X_GPIO1_FUNC_HEADSET_DETECT_IRQ =13 , -AIC3X_GPIO1_FUNC_HEADSET_DETECT_OR_BUTTON_IRQ =14 , -AIC3X_GPIO1_FUNC_ALL_IRQ =16 -}; - -enum { -AIC3X_GPIO2_FUNC_DISABLED =0 , -AIC3X_GPIO2_FUNC_HEADSET_DETECT_IRQ =2 , -AIC3X_GPIO2_FUNC_INPUT =3 , -AIC3X_GPIO2_FUNC_OUTPUT =4 , -AIC3X_GPIO2_FUNC_DIGITAL_MIC_INPUT =5 , -AIC3X_GPIO2_FUNC_AUDIO_BITCLK =8 , -AIC3X_GPIO2_FUNC_HEADSET_DETECT_OR_BUTTON_IRQ =9 , -AIC3X_GPIO2_FUNC_ALL_IRQ =10 , -AIC3X_GPIO2_FUNC_SHORT_CIRCUIT_OR_AGC_IRQ =11 , -AIC3X_GPIO2_FUNC_HEADSET_OR_BUTTON_PRESS_OR_SHORT_CIRCUIT_IRQ =12 , -AIC3X_GPIO2_FUNC_SHORT_CIRCUIT_IRQ =13 , -AIC3X_GPIO2_FUNC_AGC_NOISE_IRQ =14 , -AIC3X_GPIO2_FUNC_BUTTON_PRESS_IRQ =15 -}; - -enum aic3x_micbias_voltage { -AIC3X_MICBIAS_OFF =0 , -AIC3X_MICBIAS_2_0V =1 , -AIC3X_MICBIAS_2_5V =2 , -AIC3X_MICBIAS_AVDDV =3 , -}; - -struct aic3x_setup_data { -unsigned int gpio_func[2 ]; -}; - -struct aic3x_pdata { -int gpio_reset;/* < 0 if not used */ -struct aic3x_setup_data *setup; - -/* Selects the micbias voltage */ -enum aic3x_micbias_voltage micbias_vg; -}; - -#endif
sound/soc/codecs/tlv320aic3x.c +5 -7
@@ -45,7 +45,6 @@#include <sound/soc.h> #include <sound/initval.h> #include <sound/tlv.h> -#include <sound/tlv320aic3x.h> #include "tlv320aic3x.h"
@@ -66,6 +65,10 @@ struct aic3x_disable_nb {struct aic3x_priv *aic3x; }; +struct aic3x_setup_data { +unsigned int gpio_func[2 ]; +}; +/* codec private data */ struct aic3x_priv {struct snd_soc_component *component;
@@ -1748,7 +1751,6 @@ static const struct reg_sequence aic3007_class_d[] = {int aic3x_probe (struct device *dev,struct regmap *regmap,kernel_ulong_t driver_data) { -struct aic3x_pdata *pdata = dev->platform_data;struct aic3x_priv *aic3x;struct aic3x_setup_data *ai3x_setup;struct device_node *np = dev->of_node;
@@ -1768,11 +1770,7 @@ int aic3x_probe(struct device *dev, struct regmap *regmap, kernel_ulong_t driverregcache_cache_only (aic3x->regmap, true);dev_set_drvdata (dev, aic3x); -if (pdata) { - aic3x->gpio_reset = pdata->gpio_reset; - aic3x->setup = pdata->setup; - aic3x->micbias_vg = pdata->micbias_vg; - }else if (np) { +if (np) { ai3x_setup =devm_kzalloc (dev,sizeof (*ai3x_setup),GFP_KERNEL );if (!ai3x_setup)return -ENOMEM ;
sound/soc/codecs/tlv320aic3x.h +43 -0
47 lines not on this page · raw message
Signature · 1 line
2.38.1.273.g43a17bfeac-goog
PATCH 3/3 ASoC: tlv320aic3x: switch to using gpiod API
In reply to Dmitry TorokhovSwitch the driver from legacy gpio API that is deprecated to the newer gpiod API that respects line polarities described in ACPI/DT.
The driver still tries to support shared reset lines, by first trying to allocate the reset GPIO normally, and then non-exclusively, although the utility of such support is questionable, toggling reset line from one driver/instance will result in all chips being reset, potentially at an inopportune moment.
Note that this change depends on commit fbbbcd177a27 ("gpiolib: of: add quirk for locating reset lines with legacy bindings") to translate request for "reset" GPIO to the legacy name "gpio-reset" in case when proper name is not used.
--- sound/soc/codecs/tlv320aic3x.c | 108 ++++++++++++--------------------- 1 file changed, 39 insertions(+), 69 deletions(-)
sound/soc/codecs/tlv320aic3x.c +39 -69
@@ -32,12 +32,12 @@#include <linux/moduleparam.h> #include <linux/init.h> #include <linux/delay.h> +#include <linux/err.h> #include <linux/pm.h> #include <linux/i2c.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/regulator/consumer.h> #include <linux/of.h> -#include <linux/of_gpio.h> #include <linux/slab.h> #include <sound/core.h> #include <sound/pcm.h>
@@ -56,8 +56,6 @@ static const char *aic3x_supply_names[AIC3X_NUM_SUPPLIES] = { "DRVDD", /* ADC Analog and Output Driver Voltage */ }; -static LIST_HEAD (reset_list); -struct aic3x_priv ;struct aic3x_disable_nb {
@@ -80,9 +78,9 @@ struct aic3x_priv {unsigned int dai_fmt;unsigned int tdm_delay;unsigned int slot_width; -struct list_head list;int master; -int gpio_reset; +struct gpio_desc *gpio_reset; +bool shared_reset;int power;u16 model;
@@ -1369,8 +1367,8 @@ static int aic3x_regulator_event(struct notifier_block *nb,* Put codec to reset and require cache sync as at least one * of the supplies was disabled */ -if (gpio_is_valid (aic3x->gpio_reset)) -gpio_set_value (aic3x->gpio_reset,0 ); +if (aic3x->gpio_reset) +gpiod_set_value (aic3x->gpio_reset,1 );regcache_mark_dirty (aic3x->regmap); }
@@ -1390,9 +1388,9 @@ static int aic3x_set_power(struct snd_soc_component *component, int power) goto out; aic3x->power =1 ; -if (gpio_is_valid (aic3x->gpio_reset)) { +if (aic3x->gpio_reset) {udelay (1 ); -gpio_set_value (aic3x->gpio_reset,1 ); +gpiod_set_value (aic3x->gpio_reset,0 ); }/* Sync reg_cache with the hardware */
@@ -1598,19 +1596,6 @@ static int aic3x_init(struct snd_soc_component *component)return 0 ; } -static bool aic3x_is_shared_reset (struct aic3x_priv *aic3x) -{ -struct aic3x_priv *a; - -list_for_each_entry (a, &reset_list, list) { -if (gpio_is_valid (aic3x->gpio_reset) && - aic3x->gpio_reset == a->gpio_reset) -return true; - } - -return false; -} -static int aic3x_component_probe (struct snd_soc_component *component) {struct aic3x_priv *aic3x =snd_soc_component_get_drvdata (component);
@@ -1775,19 +1760,6 @@ int aic3x_probe(struct device *dev, struct regmap *regmap, kernel_ulong_t driverif (!ai3x_setup)return -ENOMEM ; - ret =of_get_named_gpio (np,"reset-gpios" ,0 ); -if (ret >=0 ) { - aic3x->gpio_reset = ret; - }else { - ret =of_get_named_gpio (np,"gpio-reset" ,0 ); -if (ret >0 ) { -dev_warn (dev,"Using deprecated property \"gpio-reset\", please update your DT" ); - aic3x->gpio_reset = ret; - }else { - aic3x->gpio_reset =-1 ; - } - } -if (of_property_read_u32_array (np,"ai3x-gpio-func" , ai3x_setup->gpio_func,2 ) >=0 ) { aic3x->setup = ai3x_setup;
@@ -1812,29 +1784,43 @@ int aic3x_probe(struct device *dev, struct regmap *regmap, kernel_ulong_t driver }else { aic3x->micbias_vg =AIC3X_MICBIAS_OFF ; } - - }else { - aic3x->gpio_reset =-1 ; } aic3x->model = driver_data; -if (gpio_is_valid (aic3x->gpio_reset) && - !aic3x_is_shared_reset (aic3x)) { - ret =gpio_request (aic3x->gpio_reset,"tlv320aic3x reset" ); -if (ret !=0 ) - goto err; -gpio_direction_output (aic3x->gpio_reset,0 ); + aic3x->gpio_reset =devm_gpiod_get_optional (dev,"reset" , +GPIOD_OUT_HIGH ); + ret =PTR_ERR_OR_ZERO (aic3x->gpio_reset); +if (ret) { +if (ret != -EBUSY ) +return ret; + +/* +* Apparently there are setups where the codec is sharing +* its reset line. Try to get it non-exclusively, although +* the utility of this is unclear: how do we make sure that +* resetting one chip will not disturb the others that share +* the same line? +*/ + aic3x->gpio_reset =devm_gpiod_get (dev,"reset" , +GPIOD_ASIS |GPIOD_FLAGS_BIT_NONEXCLUSIVE ); + ret =PTR_ERR_OR_ZERO (aic3x->gpio_reset); +if (ret) +return ret; + + aic3x->shared_reset = true; } +gpiod_set_consumer_name (aic3x->gpio_reset,"tlv320aic3x reset" ); +for (i =0 ; i <ARRAY_SIZE (aic3x->supplies); i++) aic3x->supplies[i].supply = aic3x_supply_names[i]; ret =devm_regulator_bulk_get (dev,ARRAY_SIZE (aic3x->supplies), aic3x->supplies); -if (ret !=0 ) { +if (ret) {dev_err (dev,"Failed to request supplies: %d\n" , ret); - goto err_gpio; +return ret; }aic3x_configure_ocmv (dev, aic3x);
@@ -1843,26 +1829,14 @@ int aic3x_probe(struct device *dev, struct regmap *regmap, kernel_ulong_t driver ret =regmap_register_patch (aic3x->regmap, aic3007_class_d,ARRAY_SIZE (aic3007_class_d));if (ret !=0 ) -dev_err (dev,"Failed to init class D: %d\n" , - ret); +dev_err (dev,"Failed to init class D: %d\n" , ret); } ret =devm_snd_soc_register_component (dev, &soc_component_dev_aic3x, &aic3x_dai,1 ); - -if (ret !=0 ) - goto err_gpio; - -INIT_LIST_HEAD (&aic3x->list); -list_add (&aic3x->list, &reset_list); +if (ret) +return ret;return 0 ; - -err_gpio: -if (gpio_is_valid (aic3x->gpio_reset) && - !aic3x_is_shared_reset (aic3x)) -gpio_free (aic3x->gpio_reset); -err: -return ret; }EXPORT_SYMBOL (aic3x_probe);
@@ -1870,13 +1844,9 @@ void aic3x_remove(struct device *dev) {struct aic3x_priv *aic3x =dev_get_drvdata (dev); -list_del (&aic3x->list); - -if (gpio_is_valid (aic3x->gpio_reset) && - !aic3x_is_shared_reset (aic3x)) { -gpio_set_value (aic3x->gpio_reset,0 ); -gpio_free (aic3x->gpio_reset); - } +/* Leave the codec in reset state */ +if (aic3x->gpio_reset && !aic3x->shared_reset) +gpiod_set_value (aic3x->gpio_reset,1 ); }EXPORT_SYMBOL (aic3x_remove);
Signature · 1 line
2.38.1.273.g43a17bfeac-goog
Mark Brown
maintainerQuoted 4 lines · Dmitry Torokhov
As of
0426370b58b2("ARM: dts: omap2420-n810: Correct the audio codec (tlv320aic33) node") the DTS properly specifies reset GPIO, and the device name in auxdata lookup table does not even match the one in device tree anymore, so stop instantiating it.
Tony, I guess it makes sense for this to go via ASoC if you're OK with it?
Tony Lindgren
maintainerQuoted 8 lines · Mark Brown
Quoted 4 lines · Dmitry Torokhov
As of
0426370b58b2("ARM: dts: omap2420-n810: Correct the audio codec (tlv320aic33) node") the DTS properly specifies reset GPIO, and the device name in auxdata lookup table does not even match the one in device tree anymore, so stop instantiating it.Tony, I guess it makes sense for this to go via ASoC if you're OK with it?
Yes please pick it via ASoC, I've acked the first patch.
Regards,
Tony
Quoted 4 lines · Dmitry Torokhov
As of
0426370b58b2("ARM: dts: omap2420-n810: Correct the audio codec (tlv320aic33) node") the DTS properly specifies reset GPIO, and the device name in auxdata lookup table does not even match the one in device tree anymore, so stop instantiating it.
Mark Brown
maintainerQuoted 6 lines · Dmitry Torokhov
As of
0426370b58b2("ARM: dts: omap2420-n810: Correct the audio codec (tlv320aic33) node") the DTS properly specifies reset GPIO, and the device name in auxdata lookup table does not even match the one in device tree anymore, so stop instantiating it.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/3] arm: omap2: n8x0: stop instantiating codec platform data
commit: faf3b5cb59f84e4056bd84f115a958bc99c61e65
[2/3] ASoC: tlv320aic3x: remove support for platform data
commit: 426c7bf45f207ac7a962e012dd482f7aaa3a3d5f
[3/3] ASoC: tlv320aic3x: switch to using gpiod API
commit: a984d8332d90afd2989e10b095ffdb2875d4bac8All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark