pinctrl: madera: Use local copy of pdata
Subsystems (3)
Charles Keepax
maintainerPATCH 1/3 pinctrl: madera: Use local copy of pdata
A local copy of the pdata exists and it should be used rather than pulling a fresh copy.
--- drivers/pinctrl/cirrus/pinctrl-madera-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pinctrl/cirrus/pinctrl-madera-core.c +2 -2
@@ -986,7 +986,7 @@ static struct pinctrl_desc madera_pin_desc = {static int madera_pin_probe (struct platform_device *pdev) {struct madera *madera =dev_get_drvdata (pdev->dev.parent); -const struct madera_pdata *pdata =dev_get_platdata (madera->dev); +const struct madera_pdata *pdata = &madera->pdata;struct madera_pin_private *priv;int ret;
@@ -1037,7 +1037,7 @@ static int madera_pin_probe(struct platform_device *pdev) }/* if the configuration is provided through pdata, apply it */ -if (pdata && pdata->gpio_configs) { +if (pdata->gpio_configs) { ret =pinctrl_register_mappings (pdata->gpio_configs, pdata->n_gpio_configs);if (ret) {
Signature · 1 line
2.11.0
Charles Keepax
maintainerPATCH 2/3 pinctrl: madera: Add configuration for Cirrus Logic CS47L15
From: Richard Fitzgerald <[email protected]>
This adds the pinctrl configuration for the CS47L15 codec to the madera pinctrl driver.
--- drivers/pinctrl/cirrus/Kconfig | 3 +++ drivers/pinctrl/cirrus/Makefile | 3 +++ drivers/pinctrl/cirrus/pinctrl-cs47l15.c | 40 ++++++++++++++++++++++++++++ drivers/pinctrl/cirrus/pinctrl-madera-core.c | 4 +++ drivers/pinctrl/cirrus/pinctrl-madera.h | 1 + 5 files changed, 51 insertions(+) create mode 100644 drivers/pinctrl/cirrus/pinctrl-cs47l15.c
drivers/pinctrl/cirrus/Kconfig +3 -0
@@ -15,6 +15,9 @@ config PINCTRL_MADERA select PINMUX select GENERIC_PINCONF +config PINCTRL_CS47L15 + bool + config PINCTRL_CS47L35 bool
drivers/pinctrl/cirrus/Makefile +3 -0
@@ -3,6 +3,9 @@ obj-$(CONFIG_PINCTRL_LOCHNAGAR) += pinctrl-lochnagar.o pinctrl-madera-objs := pinctrl-madera-core.o +ifeq ($(CONFIG_PINCTRL_CS47L15),y) +pinctrl-madera-objs += pinctrl-cs47l15.o +endif ifeq ($(CONFIG_PINCTRL_CS47L35),y) pinctrl-madera-objs += pinctrl-cs47l35.o endif
drivers/pinctrl/cirrus/pinctrl-cs47l15.c new file +40 -0
@@ -0,0 +1,40 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Pinctrl for Cirrus Logic CS47L15 +* +* Copyright (C) 2018-2019 Cirrus Logic, Inc. and +* Cirrus Logic International Semiconductor Ltd. +*/ + +#include <linux/err.h> +#include <linux/mfd/madera/core.h> + +#include "pinctrl-madera.h" + +/* +* The alt func groups are the most commonly used functions we place these at +* the lower function indexes for convenience, and the less commonly used gpio +* functions at higher indexes. +* +* To stay consistent with the datasheet the function names are the same as +* the group names for that function's pins +* +* Note - all 1 less than in datasheet because these are zero-indexed +*/ +static const unsigned int cs47l15_aif1_pins[] = {0 ,1 ,2 ,3 }; +static const unsigned int cs47l15_aif2_pins[] = {4 ,5 ,6 ,7 }; +static const unsigned int cs47l15_aif3_pins[] = {8 ,9 ,10 ,11 }; +static const unsigned int cs47l15_spk1_pins[] = {12 ,13 ,14 }; + +static const struct madera_pin_groups cs47l15_pin_groups[] = { + {"aif1" , cs47l15_aif1_pins,ARRAY_SIZE (cs47l15_aif1_pins) }, + {"aif2" , cs47l15_aif2_pins,ARRAY_SIZE (cs47l15_aif2_pins) }, + {"aif3" , cs47l15_aif3_pins,ARRAY_SIZE (cs47l15_aif3_pins) }, + {"pdmspk1" , cs47l15_spk1_pins,ARRAY_SIZE (cs47l15_spk1_pins) }, +}; + +const struct madera_pin_chip cs47l15_pin_chip = { + .n_pins =CS47L15_NUM_GPIOS , + .pin_groups = cs47l15_pin_groups, + .n_pin_groups =ARRAY_SIZE (cs47l15_pin_groups), +};
drivers/pinctrl/cirrus/pinctrl-madera-core.c +4 -0
@@ -1004,6 +1004,10 @@ static int madera_pin_probe(struct platform_device *pdev) pdev->dev.of_node = madera->dev->of_node;switch (madera->type) { +case CS47L15 : +if (IS_ENABLED (CONFIG_PINCTRL_CS47L15 )) + priv->chip = &cs47l15_pin_chip; +break ;case CS47L35 :if (IS_ENABLED (CONFIG_PINCTRL_CS47L35 )) priv->chip = &cs47l35_pin_chip;
drivers/pinctrl/cirrus/pinctrl-madera.h +1 -0
@@ -30,6 +30,7 @@ struct madera_pin_private {struct pinctrl_dev *pctl; }; +extern const struct madera_pin_chip cs47l15_pin_chip;extern const struct madera_pin_chip cs47l35_pin_chip;extern const struct madera_pin_chip cs47l85_pin_chip;extern const struct madera_pin_chip cs47l90_pin_chip;
Signature · 1 line
2.11.0
Re: [PATCH 2/3] pinctrl: madera: Add configuration for Cirrus Logic CS47L15
Quoted 7 lines · Charles Keepax
From: Richard Fitzgerald <[email protected]>
This adds the pinctrl configuration for the CS47L15 codec to the madera pinctrl driver.
Signed-off-by Richard Fitzgerald <[email protected]>Signed-off-by Charles Keepax <[email protected]>
Patch applied.
Yours,
Linus Walleij
Charles Keepax
maintainerPATCH 3/3 pinctrl: madera: Add configuration for Cirrus Logic CS47L92
In reply to Charles KeepaxThis adds the pinctrl configuration for the CS47L92 codec to the madera pinctrl driver.
--- drivers/pinctrl/cirrus/Kconfig | 3 +++ drivers/pinctrl/cirrus/Makefile | 3 +++ drivers/pinctrl/cirrus/pinctrl-cs47l92.c | 40 ++++++++++++++++++++++++++++ drivers/pinctrl/cirrus/pinctrl-madera-core.c | 16 +++++++++++ drivers/pinctrl/cirrus/pinctrl-madera.h | 1 + 5 files changed, 63 insertions(+) create mode 100644 drivers/pinctrl/cirrus/pinctrl-cs47l92.c
drivers/pinctrl/cirrus/Kconfig +3 -0
@@ -26,3 +26,6 @@ config PINCTRL_CS47L85 config PINCTRL_CS47L90 bool + +config PINCTRL_CS47L92 + bool
drivers/pinctrl/cirrus/Makefile +3 -0
@@ -15,5 +15,8 @@ endif ifeq ($(CONFIG_PINCTRL_CS47L90),y) pinctrl-madera-objs += pinctrl-cs47l90.o endif +ifeq ($(CONFIG_PINCTRL_CS47L92),y) +pinctrl-madera-objs += pinctrl-cs47l92.o +endif obj-$(CONFIG_PINCTRL_MADERA) += pinctrl-madera.o
drivers/pinctrl/cirrus/pinctrl-cs47l92.c new file +40 -0
@@ -0,0 +1,40 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Pinctrl for Cirrus Logic CS47L92 +* +* Copyright (C) 2018-2019 Cirrus Logic, Inc. and +* Cirrus Logic International Semiconductor Ltd. +*/ + +#include <linux/err.h> +#include <linux/mfd/madera/core.h> + +#include "pinctrl-madera.h" + +/* +* The alt func groups are the most commonly used functions we place these at +* the lower function indexes for convenience, and the less commonly used gpio +* functions at higher indexes. +* +* To stay consistent with the datasheet the function names are the same as +* the group names for that function's pins +* +* Note - all 1 less than in datasheet because these are zero-indexed +*/ +static const unsigned int cs47l92_spk1_pins[] = {2 ,3 }; +static const unsigned int cs47l92_aif1_pins[] = {4 ,5 ,6 ,7 }; +static const unsigned int cs47l92_aif2_pins[] = {8 ,9 ,10 ,11 }; +static const unsigned int cs47l92_aif3_pins[] = {12 ,13 ,14 ,15 }; + +static const struct madera_pin_groups cs47l92_pin_groups[] = { + {"aif1" , cs47l92_aif1_pins,ARRAY_SIZE (cs47l92_aif1_pins) }, + {"aif2" , cs47l92_aif2_pins,ARRAY_SIZE (cs47l92_aif2_pins) }, + {"aif3" , cs47l92_aif3_pins,ARRAY_SIZE (cs47l92_aif3_pins) }, + {"pdmspk1" , cs47l92_spk1_pins,ARRAY_SIZE (cs47l92_spk1_pins) }, +}; + +const struct madera_pin_chip cs47l92_pin_chip = { + .n_pins =CS47L92_NUM_GPIOS , + .pin_groups = cs47l92_pin_groups, + .n_pin_groups =ARRAY_SIZE (cs47l92_pin_groups), +};
drivers/pinctrl/cirrus/pinctrl-madera-core.c +16 -0
@@ -396,6 +396,16 @@ static const struct { .group_names = madera_pin_single_group_names, .func = 0x157 }, + { + .name = "aux-pdm-clk", + .group_names = madera_pin_single_group_names, + .func = 0x280 + }, + { + .name = "aux-pdm-dat", + .group_names = madera_pin_single_group_names, + .func = 0x281 + }, }; static u16 madera_pin_make_drv_str(struct madera_pin_private *priv,
@@ -1022,6 +1032,12 @@ static int madera_pin_probe(struct platform_device *pdev)if (IS_ENABLED (CONFIG_PINCTRL_CS47L90 )) priv->chip = &cs47l90_pin_chip;break ; +case CS42L92 : +case CS47L92 : +case CS47L93 : +if (IS_ENABLED (CONFIG_PINCTRL_CS47L92 )) + priv->chip = &cs47l92_pin_chip; +break ;default :break ; }
drivers/pinctrl/cirrus/pinctrl-madera.h +1 -0
@@ -34,5 +34,6 @@ extern const struct madera_pin_chip cs47l15_pin_chip;extern const struct madera_pin_chip cs47l35_pin_chip;extern const struct madera_pin_chip cs47l85_pin_chip;extern const struct madera_pin_chip cs47l90_pin_chip; +extern const struct madera_pin_chip cs47l92_pin_chip;#endif
Signature · 1 line
2.11.0
Re: [PATCH 3/3] pinctrl: madera: Add configuration for Cirrus Logic CS47L92
Quoted 4 lines · Charles Keepax
This adds the pinctrl configuration for the CS47L92 codec to the madera pinctrl driver.
Signed-off-by Charles Keepax <[email protected]>
Patch applied.
Yours,
Linus Walleij
Quoted 4 lines · Charles Keepax
A local copy of the pdata exists and it should be used rather than pulling a fresh copy.
Signed-off-by Charles Keepax <[email protected]>
Patch applied.
Yours,
Linus Walleij