ASoC: codecs: wsa884x: Allow sharing reset GPIO

On some boards with multiple WSA8840/WSA8845 speakers, the reset
(shutdown) GPIO is shared between two speakers. Use the reset
controller framework and its "reset-gpio" driver to handle this case.
This allows bring-up and proper handling of all WSA884x speakers on
X1E80100-CRD board.

Cc: Bartosz Golaszewski <brgl@bgdev.pl>
Cc: Sean Anderson <sean.anderson@seco.com>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://msgid.link/r/20240129115216.96479-7-krzysztof.kozlowski@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Krzysztof Kozlowski and committed by

Mark Brown 2 years ago 0dae534c 26c8a435

+43 -10

1 changed file

expand all

sound

soc

codecs

wsa884x.c

+43 -10

sound/soc/codecs/wsa884x.c

··· 13 13 #include <linux/pm_runtime.h> 14 14 #include <linux/regmap.h> 15 15 #include <linux/regulator/consumer.h> 16 + #include <linux/reset.h> 16 17 #include <linux/slab.h> 17 18 #include <linux/soundwire/sdw.h> 18 19 #include <linux/soundwire/sdw_registers.h> ··· 700 699 struct sdw_stream_runtime *sruntime; 701 700 struct sdw_port_config port_config[WSA884X_MAX_SWR_PORTS]; 702 701 struct gpio_desc *sd_n; 702 + struct reset_control *sd_reset; 703 703 bool port_prepared[WSA884X_MAX_SWR_PORTS]; 704 704 bool port_enable[WSA884X_MAX_SWR_PORTS]; 705 705 unsigned int variant; ··· 1801 1799 }, 1802 1800 }; 1803 1801 1804 - static void wsa884x_gpio_powerdown(void *data) 1802 + static void wsa884x_reset_powerdown(void *data) 1805 1803 { 1806 - gpiod_direction_output(data, 1); 1804 + struct wsa884x_priv *wsa884x = data; 1805 + 1806 + if (wsa884x->sd_reset) 1807 + reset_control_assert(wsa884x->sd_reset); 1808 + else 1809 + gpiod_direction_output(wsa884x->sd_n, 1); 1810 + } 1811 + 1812 + static void wsa884x_reset_deassert(struct wsa884x_priv *wsa884x) 1813 + { 1814 + if (wsa884x->sd_reset) 1815 + reset_control_deassert(wsa884x->sd_reset); 1816 + else 1817 + gpiod_direction_output(wsa884x->sd_n, 0); 1807 1818 } 1808 1819 1809 1820 static void wsa884x_regulator_disable(void *data) 1810 1821 { 1811 1822 regulator_bulk_disable(WSA884X_SUPPLIES_NUM, data); 1823 + } 1824 + 1825 + static int wsa884x_get_reset(struct device *dev, struct wsa884x_priv *wsa884x) 1826 + { 1827 + wsa884x->sd_reset = devm_reset_control_get_optional_shared(dev, NULL); 1828 + if (IS_ERR(wsa884x->sd_reset)) 1829 + return dev_err_probe(dev, PTR_ERR(wsa884x->sd_reset), 1830 + "Failed to get reset\n"); 1831 + else if (wsa884x->sd_reset) 1832 + return 0; 1833 + /* 1834 + * else: NULL, so use the backwards compatible way for powerdown-gpios, 1835 + * which does not handle sharing GPIO properly. 1836 + */ 1837 + wsa884x->sd_n = devm_gpiod_get_optional(dev, "powerdown", 1838 + GPIOD_OUT_HIGH); 1839 + if (IS_ERR(wsa884x->sd_n)) 1840 + return dev_err_probe(dev, PTR_ERR(wsa884x->sd_n), 1841 + "Shutdown Control GPIO not found\n"); 1842 + 1843 + return 0; 1812 1844 } 1813 1845 1814 1846 static int wsa884x_probe(struct sdw_slave *pdev, ··· 1874 1838 if (ret) 1875 1839 return ret; 1876 1840 1877 - wsa884x->sd_n = devm_gpiod_get_optional(dev, "powerdown", 1878 - GPIOD_OUT_HIGH); 1879 - if (IS_ERR(wsa884x->sd_n)) 1880 - return dev_err_probe(dev, PTR_ERR(wsa884x->sd_n), 1881 - "Shutdown Control GPIO not found\n"); 1841 + ret = wsa884x_get_reset(dev, wsa884x); 1842 + if (ret) 1843 + return ret; 1882 1844 1883 1845 dev_set_drvdata(dev, wsa884x); 1884 1846 wsa884x->slave = pdev; ··· 1892 1858 pdev->prop.sink_dpn_prop = wsa884x_sink_dpn_prop; 1893 1859 pdev->prop.scp_int1_mask = SDW_SCP_INT1_BUS_CLASH | SDW_SCP_INT1_PARITY; 1894 1860 1895 - /* Bring out of reset */ 1896 - gpiod_direction_output(wsa884x->sd_n, 0); 1897 - ret = devm_add_action_or_reset(dev, wsa884x_gpio_powerdown, wsa884x->sd_n); 1861 + wsa884x_reset_deassert(wsa884x); 1862 + ret = devm_add_action_or_reset(dev, wsa884x_reset_powerdown, wsa884x); 1898 1863 if (ret) 1899 1864 return ret; 1900 1865

Configure Feed

Configure Feed