spi: cs42l43: Refactor accessing the SDCA extension properties
Subsystems (4)
PATCH 1/3 spi: cs42l43: Refactor accessing the SDCA extension properties
Refactor accessing the SDCA extension properties to make it easier to access multiple properties to assist with future features. Return the node itself and allow the caller to read the actual properties.
--- drivers/spi/spi-cs42l43.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-)
drivers/spi/spi-cs42l43.c +9 -16
@@ -246,11 +246,10 @@ static size_t cs42l43_spi_max_length(struct spi_device *spi)return CS42L43_SPI_MAX_LENGTH ; } -static bool cs42l43_has_sidecar (struct fwnode_handle *fwnode) +static struct fwnode_handle *cs42l43_find_xu_node (struct fwnode_handle *fwnode) {static const u32 func_smart_amp =0x1 ;struct fwnode_handle *child_fwnode, *ext_fwnode; -unsigned int val;u32 function;int ret;
@@ -266,21 +265,12 @@ static bool cs42l43_has_sidecar(struct fwnode_handle *fwnode)if (!ext_fwnode)continue ; - ret =fwnode_property_read_u32 (ext_fwnode, -"01fa-sidecar-instances" , - &val); - -fwnode_handle_put (ext_fwnode); - -if (ret) -continue ; -fwnode_handle_put (child_fwnode); -return !!val; +return ext_fwnode; } -return false; +return NULL ; }static void cs42l43_release_of_node (void *data)
@@ -298,7 +288,8 @@ static int cs42l43_spi_probe(struct platform_device *pdev)struct cs42l43 *cs42l43 =dev_get_drvdata (pdev->dev.parent);struct cs42l43_spi *priv;struct fwnode_handle *fwnode =dev_fwnode (cs42l43->dev); -bool has_sidecar =cs42l43_has_sidecar (fwnode); + struct fwnode_handle *xu_fwnode __free(fwnode_handle) = cs42l43_find_xu_node(fwnode); +int nsidecars =0 ;int ret; priv =devm_kzalloc (&pdev->dev,sizeof (*priv),GFP_KERNEL );
@@ -350,7 +341,9 @@ static int cs42l43_spi_probe(struct platform_device *pdev)return ret; } -if (has_sidecar) { +fwnode_property_read_u32 (xu_fwnode,"01fa-sidecar-instances" , &nsidecars); + +if (nsidecars) { ret =software_node_register (&cs42l43_gpiochip_swnode);if (ret) return dev_err_probe(priv->dev, ret,
@@ -373,7 +366,7 @@ static int cs42l43_spi_probe(struct platform_device *pdev)return dev_err_probe (priv->dev, ret,"Failed to register SPI controller\n" ); -if (has_sidecar) { +if (nsidecars) {if (!spi_new_device (priv->ctlr, &l_info))return dev_err_probe (priv->dev, -ENODEV ,"Failed to create left amp slave\n" );
Signature · 1 line
2.39.2
PATCH 2/3 spi: cs42l43: Add speaker id support to the bridge configuration
From: Simon Trimmer <[email protected]>
OEMs can connect a number of types of speakers to the sidecar cs35l56 amplifiers and a different speaker requires a different firmware configuration.
When the cs42l43 ACPI includes a property indicating a particular type of speaker has been installed this should be passed to the cs35l56 driver instances as a device property.
--- drivers/spi/spi-cs42l43.c | 74 ++++++++++++++++++++++++++++----------- 1 file changed, 53 insertions(+), 21 deletions(-)
drivers/spi/spi-cs42l43.c +53 -21
@@ -9,6 +9,7 @@#include <linux/array_size.h> #include <linux/bits.h> #include <linux/bitfield.h> +#include <linux/cleanup.h> #include <linux/device.h> #include <linux/errno.h> #include <linux/gpio/machine.h>
@@ -44,28 +45,10 @@ static const unsigned int cs42l43_clock_divs[] = {2 ,2 ,4 ,6 ,8 ,10 ,12 ,14 ,16 ,18 ,20 ,22 ,24 ,26 ,28 ,30 }; -static const struct software_node ampl = { - .name ="cs35l56-left" , -}; - -static const struct software_node ampr = { - .name ="cs35l56-right" , -}; - -static struct spi_board_info ampl_info = { +static struct spi_board_info amp_info_template = { .modalias ="cs35l56" , .max_speed_hz =11 *HZ_PER_MHZ , - .chip_select =0 , .mode =SPI_MODE_0 , - .swnode = &l, -}; - -static struct spi_board_info ampr_info = { - .modalias ="cs35l56" , - .max_speed_hz =11 *HZ_PER_MHZ , - .chip_select =1 , - .mode =SPI_MODE_0 , - .swnode = &r, }; static const struct software_node cs42l43_gpiochip_swnode = {
@@ -273,6 +256,39 @@ static struct fwnode_handle *cs42l43_find_xu_node(struct fwnode_handle *fwnode)return NULL ; } +static struct spi_board_info *cs42l43_create_bridge_amp (struct cs42l43_spi *priv, +const char *const name, +int cs,int spkid) +{ +struct property_entry *props =NULL ; +struct software_node *swnode; +struct spi_board_info *info; + +if (spkid >=0 ) { + props =devm_kmalloc (priv->dev,sizeof (*props),GFP_KERNEL ); +if (!props) +return NULL ; + + *props =PROPERTY_ENTRY_U32 ("cirrus,speaker-id" , spkid); + } + + swnode =devm_kmalloc (priv->dev,sizeof (*swnode),GFP_KERNEL ); +if (!swnode) +return NULL ; + + *swnode =SOFTWARE_NODE (name, props,NULL ); + + info =devm_kmemdup (priv->dev, &_info_template, +sizeof (amp_info_template),GFP_KERNEL ); +if (!info) +return NULL ; + + info->chip_select = cs; + info->swnode = swnode; + +return info; +} +static void cs42l43_release_of_node (void *data) {fwnode_handle_put (data);
@@ -367,11 +383,27 @@ static int cs42l43_spi_probe(struct platform_device *pdev) "Failed to register SPI controller\n");if (nsidecars) { -if (!spi_new_device (priv->ctlr, &l_info)) +struct spi_board_info *ampl_info; +struct spi_board_info *ampr_info; +int spkid = -EINVAL ; + +fwnode_property_read_u32 (xu_fwnode,"01fa-spk-id-val" , &spkid); + +dev_dbg (priv->dev,"Found speaker ID %d\n" , spkid); + + ampl_info =cs42l43_create_bridge_amp (priv,"cs35l56-left" ,0 , spkid); +if (!ampl_info) +return -ENOMEM ; + + ampr_info =cs42l43_create_bridge_amp (priv,"cs35l56-right" ,1 , spkid); +if (!ampr_info) +return -ENOMEM ; + +if (!spi_new_device (priv->ctlr, ampl_info))return dev_err_probe (priv->dev, -ENODEV ,"Failed to create left amp slave\n" ); -if (!spi_new_device (priv->ctlr, &r_info)) +if (!spi_new_device (priv->ctlr, ampr_info))return dev_err_probe (priv->dev, -ENODEV ,"Failed to create right amp slave\n" ); }
Signature · 1 line
2.39.2
Mark Brown
maintainerRe: [PATCH 2/3] spi: cs42l43: Add speaker id support to the bridge configuration
Quoted 5 lines · Charles Keepax
From: Simon Trimmer <[email protected]>
OEMs can connect a number of types of speakers to the sidecar cs35l56 amplifiers and a different speaker requires a different firmware configuration.
This doesn't apply against current code, please check and resend.
RE: [PATCH 2/3] spi: cs42l43: Add speaker id support to the bridge configuration
Quoted 8 lines · Mark Brown
Quoted 5 lines · Charles Keepax
From: Simon Trimmer <[email protected]>
OEMs can connect a number of types of speakers to the sidecar cs35l56 amplifiers and a different speaker requires a different firmware configuration.
This doesn't apply against current code, please check and resend.
I'll catchup with Charles about this tomorrow (hopefully) - the snag seems to be that an ancestor has been taken for integration via the linux-spi tree
https://lore.kernel.org/all/[email protected]/
-Simon
PATCH 3/3 ASoC: cs35l56: Attempt to read from cirrus,speaker-id device property first
In reply to Charles KeepaxFrom: Simon Trimmer <[email protected]>
When cs35l56 is connected via cs42l43 there isn't an ACPI node for the cs35l56 so all properties are under the cs42l43 ACPI node. We're adding a property as a way for the cs42l43 driver to pass this info in via a software node.
--- sound/soc/codecs/cs35l56-shared.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
sound/soc/codecs/cs35l56-shared.c +8 -1
@@ -853,9 +853,16 @@ EXPORT_SYMBOL_NS_GPL(cs35l56_hw_init, SND_SOC_CS35L56_SHARED);int cs35l56_get_speaker_id (struct cs35l56_base *cs35l56_base) {struct gpio_descs *descs; -int speaker_id; +u32 speaker_id;int i, ret; +/* Attempt to read the speaker type from a device property first */ + ret =device_property_read_u32 (cs35l56_base->dev,"cirrus,speaker-id" , &speaker_id); +if (!ret) { +dev_dbg (cs35l56_base->dev,"Speaker ID = %d\n" , speaker_id); +return speaker_id; + } +/* Read the speaker type qualifier from the motherboard GPIOs */ descs =gpiod_get_array_optional (cs35l56_base->dev,"spk-id" ,GPIOD_IN );if (!descs) {
Signature · 1 line
2.39.2
Mark Brown
maintainerRe: (subset) [PATCH 1/3] spi: cs42l43: Refactor accessing the SDCA extension properties
In reply to Charles KeepaxQuoted 5 lines · Charles Keepax
Refactor accessing the SDCA extension properties to make it easier to access multiple properties to assist with future features. Return the node itself and allow the caller to read the actual properties.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[3/3] ASoC: cs35l56: Attempt to read from cirrus,speaker-id device property first
commit: c38082bf223fb4a3f2bdf1f79650af53d3499dea
All 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
Mark Brown
maintainerRe: (subset) [PATCH 1/3] spi: cs42l43: Refactor accessing the SDCA extension properties
In reply to Charles KeepaxQuoted 5 lines · Charles Keepax
Refactor accessing the SDCA extension properties to make it easier to access multiple properties to assist with future features. Return the node itself and allow the caller to read the actual properties.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next
Thanks!
[1/3] spi: cs42l43: Refactor accessing the SDCA extension properties
commit: 6914ee9cd1b0c91bd2fb4dbe204947c3c31259e1
[2/3] spi: cs42l43: Add speaker id support to the bridge configuration
(no commit info)
All 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