[PATCH v2 0/7] ASoC: QCOM: Add support for SC7180 lpass variant
We've common ASoC cpu driver for QCOM LPASS soc varaints. This patch chain add support for new variant SC7180 soc by doing the required modification in existing common lpass-cpu driver. Below is a brief summary of patch series:
PATCH v2 0001 ... 0004: Update lpass-cpu driver and documentation to make it more generic and support newer soc registers configuration. PATCH v2 0005 ... 0007: Add documentation and platform driver for newer SC7180 SOC variant.
Ajit Pandey (7): Documentation: device-tree: sound: Update lpass-cpu driver binding ASoC: qcom: Add common array to initialize soc based core clocks ASoC: qcom: lpass-cpu: Make "ahbix-clk" an optional clock. ASoC: qcom: lpass: Use regmap_field for i2sctl and dmactl registers include: dt-bindings: sound: Add sc7180-lpass bindings header device-tree: bindings: sound: lpass-cpu: Add new compatible soc ASoC: qcom: lpass-sc7180: Add platform driver for lpass audio
.../devicetree/bindings/sound/qcom,lpass-cpu.txt | 79 ------- .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 154 +++++++++++++ include/dt-bindings/sound/sc7180-lpass.h | 10 + sound/soc/qcom/Kconfig | 5 + sound/soc/qcom/Makefile | 2 + sound/soc/qcom/lpass-apq8016.c | 100 ++++++-- sound/soc/qcom/lpass-cpu.c | 116 ++++++---- sound/soc/qcom/lpass-lpaif-reg.h | 203 ++++++++++------- sound/soc/qcom/lpass-platform.c | 86 ++++--- sound/soc/qcom/lpass-sc7180.c | 252 +++++++++++++++++++++ sound/soc/qcom/lpass.h | 40 +++- 11 files changed, 790 insertions(+), 257 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt create mode 100644 Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml create mode 100644 include/dt-bindings/sound/sc7180-lpass.h create mode 100644 sound/soc/qcom/lpass-sc7180.c
Done the required cleanups to update lpass-cpu binding with newer yaml formats.
Signed-off-by: Ajit Pandey ajitp@codeaurora.org --- .../devicetree/bindings/sound/qcom,lpass-cpu.txt | 79 ------------- .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 131 +++++++++++++++++++++ 2 files changed, 131 insertions(+), 79 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt create mode 100644 Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml
diff --git a/Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt b/Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt deleted file mode 100644 index 32c2cdb..0000000 --- a/Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt +++ /dev/null @@ -1,79 +0,0 @@ -* Qualcomm Technologies LPASS CPU DAI - -This node models the Qualcomm Technologies Low-Power Audio SubSystem (LPASS). - -Required properties: - -- compatible : "qcom,lpass-cpu" or "qcom,apq8016-lpass-cpu" -- clocks : Must contain an entry for each entry in clock-names. -- clock-names : A list which must include the following entries: - * "ahbix-clk" - * "mi2s-osr-clk" - * "mi2s-bit-clk" - : required clocks for "qcom,lpass-cpu-apq8016" - * "ahbix-clk" - * "mi2s-bit-clk0" - * "mi2s-bit-clk1" - * "mi2s-bit-clk2" - * "mi2s-bit-clk3" - * "pcnoc-mport-clk" - * "pcnoc-sway-clk" - -- interrupts : Must contain an entry for each entry in - interrupt-names. -- interrupt-names : A list which must include the following entries: - * "lpass-irq-lpaif" -- pinctrl-N : One property must exist for each entry in - pinctrl-names. See ../pinctrl/pinctrl-bindings.txt - for details of the property values. -- pinctrl-names : Must contain a "default" entry. -- reg : Must contain an address for each entry in reg-names. -- reg-names : A list which must include the following entries: - * "lpass-lpaif" -- #address-cells : Must be 1 -- #size-cells : Must be 0 - - - -Optional properties: - -- qcom,adsp : Phandle for the audio DSP node - -By default, the driver uses up to 4 MI2S SD lines, for a total of 8 channels. -The SD lines to use can be configured by adding subnodes for each of the DAIs. - -Required properties for each DAI (represented by a subnode): -- reg : Must be one of the DAI IDs - (usually part of dt-bindings header) -- qcom,playback-sd-lines: List of serial data lines to use for playback - Each SD line should be represented by a number from 0-3. -- qcom,capture-sd-lines : List of serial data lines to use for capture - Each SD line should be represented by a number from 0-3. - -Note that adding a subnode changes the default to "no lines configured", -so both playback and capture lines should be configured when a subnode is added. - -Example: - -lpass@28100000 { - compatible = "qcom,lpass-cpu"; - clocks = <&lcc AHBIX_CLK>, <&lcc MI2S_OSR_CLK>, <&lcc MI2S_BIT_CLK>; - clock-names = "ahbix-clk", "mi2s-osr-clk", "mi2s-bit-clk"; - interrupts = <0 85 1>; - interrupt-names = "lpass-irq-lpaif"; - pinctrl-names = "default", "idle"; - pinctrl-0 = <&mi2s_default>; - pinctrl-1 = <&mi2s_idle>; - reg = <0x28100000 0x10000>; - reg-names = "lpass-lpaif"; - qcom,adsp = <&adsp>; - - #address-cells = <1>; - #size-cells = <0>; - - /* Optional to set different MI2S SD lines */ - dai@3 { - reg = <MI2S_QUATERNARY>; - qcom,playback-sd-lines = <0 1>; - }; -}; diff --git a/Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml b/Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file mode 100644 index 0000000..f2bcafc --- /dev/null +++ b/Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml @@ -0,0 +1,131 @@ +# SPDX-License-Identifier: GPL-2.0-only +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/qcom,lpass-cpu.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm LPASS CPU dai driver bindings + +maintainers: + - Srinivas Kandagatla srinivas.kandagatla@linaro.org + - Ajit Pandey ajitp@codeaurora.org + +description: + Qualcomm SOC Low-Power Audio SubSystem (LPASS) that consist of MI2S interface + for audio data transfer on external codecs. LPASS cpu driver is a module to + configure Low-Power Audio Interface(LPAIF) core registers across different + IP versions. + +properties: + compatible: + enum: + - qcom,lpass-cpu + - qcom,apq8016-lpass-cpu + + reg: + items: + - description: LPAIF core registers + + reg-names: + items: + - const: lpass-lpaif + + clocks: + items: + - description: AHBIX core clock for IPQ806X + - description: oscillator clock for MI2S external interfaces + - description: Bit clock for single MI2S dai in IPQ806X + - description: Bit clock for MI2S_PRIMARY dai interface + - description: Bit clock for MI2S_SECONDARY dai interface + - description: Bit clock for MI2S_TERTIARY dai interface + - description: Bit clock for MI2S_QUATERNARY dai interface + - description: NOC MPORT clock of LPASS core + - description: NOC SWAY clock of LPASS core + + clock-names: + items: + - const: ahbix-clk + - const: mi2s-osr-clk + - const: mi2s-bit-clk + - const: mi2s-bit-clk0 + - const: mi2s-bit-clk1 + - const: mi2s-bit-clk2 + - const: mi2s-bit-clk3 + - const: pcnoc-mport-clk + - const: pcnoc-sway-clk + + interrupts: + items: + - description: LPAIF DMA buffer interrupt + + interrupt-names: + items: + - const: lpass-irq-lpaif + + qcom,adsp: + maxItems: 1 + description: Phandle for the audio DSP node + + '#sound-dai-cells': + const: 1 + + child-node: + description: Required properties for each DAI + type: object + properties: + reg: + description: Must be one of the DAI ID + (Usually part of dtbindings header) + qcom,playback-sd-lines: + description: List of serial data lines to use for playback + Each SD line should be represented by a number from 0-3. + qcom,capture-sd-lines : + description: List of serial data lines to use for capture + Each SD line should be represented by a number from 0-3. + required: + -reg + # Note that adding a subnode changes the default to "no lines configured", + # so both playback and capture lines should be configured when a subnode + # is added. + + +required: + - compatible + - reg + - reg-names + - clocks + - clock-names + - interrupts + - interrupt-names + - sound-dai-cells + +optional: + - qcom,adsp + +examples: + lpass@28100000 { + compatible = "qcom,lpass-cpu"; + clocks = <&lcc AHBIX_CLK>, + <&lcc MI2S_OSR_CLK>, + <&lcc MI2S_BIT_CLK>; + + clock-names = "ahbix-clk", + "mi2s-osr-clk", + "mi2s-bit-clk"; + + interrupts = <0 85 1>; + interrupt-names = "lpass-irq-lpaif"; + + reg = <0x28100000 0x10000>; + reg-names = "lpass-lpaif"; + #sound-dai-cells = <1>; + qcom,adsp = <&adsp>; + + #address-cells = <1>; + #size-cells = <0>; + + /* Optional to set different MI2S SD lines */ + mi2s-quaternary@3 { + reg = <MI2S_QUATERNARY>; + qcom,playback-sd-lines = <0 1>; + };
On Thu, May 14, 2020 at 10:08:12PM +0530, Ajit Pandey wrote:
Done the required cleanups to update lpass-cpu binding with newer yaml formats.
Please do YAML conversions as the last thing in any patch series, there is quite a big backlog of reviews of YAML conversions so they can slow down the code development. It's good to do them, just try to make sure other patches don't depend on them.
Please submit patches using subject lines reflecting the style for the subsystem, this makes it easier for people to identify relevant patches. Look at what existing commits in the area you're changing are doing and make sure your subject lines visually resemble what they're doing. There's no need to resubmit to fix this alone.
On 5/14/2020 10:14 PM, Mark Brown wrote:
On Thu, May 14, 2020 at 10:08:12PM +0530, Ajit Pandey wrote:
Done the required cleanups to update lpass-cpu binding with newer yaml formats.
Please do YAML conversions as the last thing in any patch series, there is quite a big backlog of reviews of YAML conversions so they can slow down the code development. It's good to do them, just try to make sure other patches don't depend on them.
Please submit patches using subject lines reflecting the style for the subsystem, this makes it easier for people to identify relevant patches. Look at what existing commits in the area you're changing are doing and make sure your subject lines visually resemble what they're doing. There's no need to resubmit to fix this alone.
Ok.. we'll do the yaml conversion as a separate patch chain so that it won't block
merging of this feature in ASoC core.
lpass variants have their own soc specific clocks that needs to be enable for MI2S audio support. Added a common variable in drvdata to initialize such clocks using bulk clk api. Such clock names is still defined in variants specific data and needs to fetched during init.
Signed-off-by: Ajit Pandey ajitp@codeaurora.org --- sound/soc/qcom/lpass-apq8016.c | 39 +++++++++++++++++++-------------------- sound/soc/qcom/lpass.h | 10 +++++++--- 2 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/sound/soc/qcom/lpass-apq8016.c b/sound/soc/qcom/lpass-apq8016.c index b3610d0..8210e37 100644 --- a/sound/soc/qcom/lpass-apq8016.c +++ b/sound/soc/qcom/lpass-apq8016.c @@ -161,32 +161,27 @@ static int apq8016_lpass_free_dma_channel(struct lpass_data *drvdata, int chan) static int apq8016_lpass_init(struct platform_device *pdev) { struct lpass_data *drvdata = platform_get_drvdata(pdev); + struct lpass_variant *variant = drvdata->variant; struct device *dev = &pdev->dev; - int ret; + int ret, i;
- drvdata->pcnoc_mport_clk = devm_clk_get(dev, "pcnoc-mport-clk"); - if (IS_ERR(drvdata->pcnoc_mport_clk)) { - dev_err(dev, "error getting pcnoc-mport-clk: %ld\n", - PTR_ERR(drvdata->pcnoc_mport_clk)); - return PTR_ERR(drvdata->pcnoc_mport_clk); - }
- ret = clk_prepare_enable(drvdata->pcnoc_mport_clk); + drvdata->clks = devm_kcalloc(dev, variant->num_clks, + sizeof(*drvdata->clks), GFP_KERNEL); + drvdata->num_clks = variant->num_clks; + + for (i = 0; i < drvdata->num_clks; i++) + drvdata->clks[i].id = variant->clk_name[i]; + + ret = devm_clk_bulk_get(dev, drvdata->num_clks, drvdata->clks); if (ret) { - dev_err(dev, "Error enabling pcnoc-mport-clk: %d\n", ret); + dev_err(dev, "Failed to get clocks %d\n", ret); return ret; }
- drvdata->pcnoc_sway_clk = devm_clk_get(dev, "pcnoc-sway-clk"); - if (IS_ERR(drvdata->pcnoc_sway_clk)) { - dev_err(dev, "error getting pcnoc-sway-clk: %ld\n", - PTR_ERR(drvdata->pcnoc_sway_clk)); - return PTR_ERR(drvdata->pcnoc_sway_clk); - } - - ret = clk_prepare_enable(drvdata->pcnoc_sway_clk); + ret = clk_bulk_prepare_enable(drvdata->num_clks, drvdata->clks); if (ret) { - dev_err(dev, "Error enabling pcnoc_sway_clk: %d\n", ret); + dev_err(dev, "apq8016 clk_enable failed\n"); return ret; }
@@ -197,8 +192,7 @@ static int apq8016_lpass_exit(struct platform_device *pdev) { struct lpass_data *drvdata = platform_get_drvdata(pdev);
- clk_disable_unprepare(drvdata->pcnoc_mport_clk); - clk_disable_unprepare(drvdata->pcnoc_sway_clk); + clk_bulk_disable_unprepare(drvdata->num_clks, drvdata->clks);
return 0; } @@ -219,6 +213,11 @@ static int apq8016_lpass_exit(struct platform_device *pdev) .wrdma_reg_stride = 0x1000, .wrdma_channel_start = 5, .wrdma_channels = 2, + .clk_name = (const char*[]) { + "pcnoc-mport-clk", + "pcnoc-sway-clk", + }, + .num_clks = 2, .dai_driver = apq8016_lpass_cpu_dai_driver, .num_dai = ARRAY_SIZE(apq8016_lpass_cpu_dai_driver), .dai_osr_clk_names = (const char *[]) { diff --git a/sound/soc/qcom/lpass.h b/sound/soc/qcom/lpass.h index bd19ec5..450020e 100644 --- a/sound/soc/qcom/lpass.h +++ b/sound/soc/qcom/lpass.h @@ -51,9 +51,9 @@ struct lpass_data { /* used it for handling interrupt per dma channel */ struct snd_pcm_substream *substream[LPASS_MAX_DMA_CHANNELS];
- /* 8016 specific */ - struct clk *pcnoc_mport_clk; - struct clk *pcnoc_sway_clk; + /* SOC specific clock list */ + struct clk_bulk_data *clks; + int num_clks;
};
@@ -89,6 +89,10 @@ struct lpass_variant { int num_dai; const char * const *dai_osr_clk_names; const char * const *dai_bit_clk_names; + + /* SOC specific clocks configuration */ + const char **clk_name; + int num_clks; };
/* register the platform driver from the CPU DAI driver */
AHB-I/X bus clocks inside LPASS coreis not a mandatory clocks for SC7180 soc lpass variants, hence make it an optional one.
Signed-off-by: Ajit Pandey ajitp@codeaurora.org --- sound/soc/qcom/lpass-cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c index e00a4af..729ca78 100644 --- a/sound/soc/qcom/lpass-cpu.c +++ b/sound/soc/qcom/lpass-cpu.c @@ -594,7 +594,7 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) } }
- drvdata->ahbix_clk = devm_clk_get(dev, "ahbix-clk"); + drvdata->ahbix_clk = devm_clk_get_optional(dev, "ahbix-clk"); if (IS_ERR(drvdata->ahbix_clk)) { dev_err(dev, "error getting ahbix-clk: %ld\n", PTR_ERR(drvdata->ahbix_clk));
On Thu, May 14, 2020 at 10:08:14PM +0530, Ajit Pandey wrote:
AHB-I/X bus clocks inside LPASS coreis not a mandatory clocks for SC7180 soc lpass variants, hence make it an optional one.
Do we need to improve the checks in the rest of the code so that if the clock is missing on a SoC where it is actually mandatory we don't end up trying to start without it? Perhaps it's more trouble than it's worth though.
On 5/14/2020 10:15 PM, Mark Brown wrote:
On Thu, May 14, 2020 at 10:08:14PM +0530, Ajit Pandey wrote:
AHB-I/X bus clocks inside LPASS coreis not a mandatory clocks for SC7180 soc lpass variants, hence make it an optional one.
Do we need to improve the checks in the rest of the code so that if the clock is missing on a SoC where it is actually mandatory we don't end up trying to start without it? Perhaps it's more trouble than it's worth though. Agreed.. adding a case check with soc id or name definately make sense to avoid issue with soc where it's a mandatory one, I'll also look if this "ahbix-clk" can also be moved with other soc-based clocks array ? and can be enabled in soc specific driver.
On 14/05/2020 17:38, Ajit Pandey wrote:
AHB-I/X bus clocks inside LPASS coreis not a mandatory clocks for SC7180 soc lpass variants, hence make it an optional one.
Signed-off-by: Ajit Pandey ajitp@codeaurora.org
For some reason patch subject seems messed up!
I see two patches with same subject "[PATCH v2 2/7] ASoC: qcom: Add common array to initialize soc based core clocks" and totally different content and PATCH v2 3/7 is missing as well!
--srini
sound/soc/qcom/lpass-cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c index e00a4af..729ca78 100644 --- a/sound/soc/qcom/lpass-cpu.c +++ b/sound/soc/qcom/lpass-cpu.c @@ -594,7 +594,7 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) } }
- drvdata->ahbix_clk = devm_clk_get(dev, "ahbix-clk");
- drvdata->ahbix_clk = devm_clk_get_optional(dev, "ahbix-clk"); if (IS_ERR(drvdata->ahbix_clk)) { dev_err(dev, "error getting ahbix-clk: %ld\n", PTR_ERR(drvdata->ahbix_clk));
I2SCTL and DMACTL registers has different bits alignment for newer LPASS variants of SC7180 soc. Instead of adding extra overhead for calculating masks and shifts for newer variants registers layout we changed the approach to use regmap_field_write() API to update bit. Such API's will internally do the required bit shift and mask based on reg_field struct defined for bit fields. We'll define REG_FIELD() macros with bit layout for both lpass variants and use such macros to initialize register fields in variant specific driver callbacks. Also added new bitfieds values for I2SCTL and DMACTL registers and removed shifts and mask macros for such registers from header file.
Signed-off-by: Ajit Pandey ajitp@codeaurora.org --- sound/soc/qcom/lpass-apq8016.c | 61 ++++++++++++ sound/soc/qcom/lpass-cpu.c | 114 +++++++++++++--------- sound/soc/qcom/lpass-lpaif-reg.h | 203 ++++++++++++++++++++++++--------------- sound/soc/qcom/lpass-platform.c | 86 +++++++++++------ sound/soc/qcom/lpass.h | 30 ++++++ 5 files changed, 340 insertions(+), 154 deletions(-)
diff --git a/sound/soc/qcom/lpass-apq8016.c b/sound/soc/qcom/lpass-apq8016.c index 8210e37..3149645 100644 --- a/sound/soc/qcom/lpass-apq8016.c +++ b/sound/soc/qcom/lpass-apq8016.c @@ -124,6 +124,32 @@ }, };
+static int apq8016_init_dmactl_bitfields(struct lpaif_dmactl *dmactl, + struct regmap *map, + unsigned int reg) +{ + struct reg_field bursten = DMACTL_BURSTEN_FLD(reg); + struct reg_field wpscnt = DMACTL_WPSCNT_FLD(reg); + struct reg_field fifowm = DMACTL_FIFOWM_FLD(reg); + struct reg_field intf = DMACTL_AUDINTF_FLD(reg); + struct reg_field enable = DMACTL_ENABLE_FLD(reg); + struct reg_field dyncclk = DMACTL_DYNCLK_FLD(reg); + + dmactl->bursten = regmap_field_alloc(map, bursten); + dmactl->wpscnt = regmap_field_alloc(map, wpscnt); + dmactl->fifowm = regmap_field_alloc(map, fifowm); + dmactl->intf = regmap_field_alloc(map, intf); + dmactl->enable = regmap_field_alloc(map, enable); + dmactl->dyncclk = regmap_field_alloc(map, dyncclk); + + if (IS_ERR(dmactl->bursten) || IS_ERR(dmactl->wpscnt) || + IS_ERR(dmactl->fifowm) || IS_ERR(dmactl->intf) || + IS_ERR(dmactl->enable) || IS_ERR(dmactl->dyncclk)) + return -EINVAL; + + return 0; +} + static int apq8016_lpass_alloc_dma_channel(struct lpass_data *drvdata, int direction) { @@ -158,6 +184,39 @@ static int apq8016_lpass_free_dma_channel(struct lpass_data *drvdata, int chan) return 0; }
+static int sc7180_init_i2sctl_bitfields(struct lpaif_i2sctl *i2sctl, + struct regmap *map, unsigned int reg) +{ + struct reg_field loopback = I2SCTL_LOOPBACK_FLD(reg); + struct reg_field spken = I2SCTL_SPKEN_FLD(reg); + struct reg_field spkmode = I2SCTL_SPKMODE_FLD(reg); + struct reg_field spkmono = I2SCTL_SPKMONO_FLD(reg); + struct reg_field micen = I2SCTL_MICEN_FLD(reg); + struct reg_field micmode = I2SCTL_MICMODE_FLD(reg); + struct reg_field micmono = I2SCTL_MICMONO_FLD(reg); + struct reg_field wssrc = I2SCTL_WSSRC_FLD(reg); + struct reg_field bitwidth = I2SCTL_BITWIDTH_FLD(reg); + + i2sctl->loopback = regmap_field_alloc(map, loopback); + i2sctl->spken = regmap_field_alloc(map, spken); + i2sctl->spkmode = regmap_field_alloc(map, spkmode); + i2sctl->spkmono = regmap_field_alloc(map, spkmono); + i2sctl->micen = regmap_field_alloc(map, micen); + i2sctl->micmode = regmap_field_alloc(map, micmode); + i2sctl->micmono = regmap_field_alloc(map, micmono); + i2sctl->wssrc = regmap_field_alloc(map, wssrc); + i2sctl->bitwidth = regmap_field_alloc(map, bitwidth); + + if (IS_ERR(i2sctl->loopback) || IS_ERR(i2sctl->spken) || + IS_ERR(i2sctl->spkmode) || IS_ERR(i2sctl->spkmono) || + IS_ERR(i2sctl->micen) || IS_ERR(i2sctl->micmode) || + IS_ERR(i2sctl->micmono) || IS_ERR(i2sctl->wssrc) || + IS_ERR(i2sctl->bitwidth)) + return -EINVAL; + + return 0; +} + static int apq8016_lpass_init(struct platform_device *pdev) { struct lpass_data *drvdata = platform_get_drvdata(pdev); @@ -236,6 +295,8 @@ static int apq8016_lpass_exit(struct platform_device *pdev) .exit = apq8016_lpass_exit, .alloc_dma_channel = apq8016_lpass_alloc_dma_channel, .free_dma_channel = apq8016_lpass_free_dma_channel, + .init_i2sctl_fields = apq8016_init_i2sctl_bitfields, + .init_dmactl_fields = apq8016_init_dmactl_bitfields, };
static const struct of_device_id apq8016_lpass_cpu_device_id[] = { diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c index 729ca78..ac3c922 100644 --- a/sound/soc/qcom/lpass-cpu.c +++ b/sound/soc/qcom/lpass-cpu.c @@ -47,8 +47,18 @@ static int lpass_cpu_daiops_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai); + struct lpaif_i2sctl *i2sctl = drvdata->i2sctl[dai->driver->id]; + struct lpass_variant *v = drvdata->variant; int ret;
+ /* Initialize bitfields for dai I2SCTL register */ + ret = v->init_i2sctl_fields(i2sctl, drvdata->lpaif_map, + LPAIF_I2SCTL_REG(v, dai->driver->id)); + if (ret) { + dev_err(dai->dev, "error init i2sctl field: %d\n", ret); + return ret; + } + ret = clk_prepare_enable(drvdata->mi2s_osr_clk[dai->driver->id]); if (ret) { dev_err(dai->dev, "error in enabling mi2s osr clk: %d\n", ret); @@ -79,11 +89,11 @@ static int lpass_cpu_daiops_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai); + struct lpaif_i2sctl *i2sctl = drvdata->i2sctl[dai->driver->id]; snd_pcm_format_t format = params_format(params); unsigned int channels = params_channels(params); unsigned int rate = params_rate(params); unsigned int mode; - unsigned int regval; int bitwidth, ret;
bitwidth = snd_pcm_format_width(format); @@ -92,24 +102,41 @@ static int lpass_cpu_daiops_hw_params(struct snd_pcm_substream *substream, return bitwidth; }
- regval = LPAIF_I2SCTL_LOOPBACK_DISABLE | - LPAIF_I2SCTL_WSSRC_INTERNAL; + ret = regmap_field_write(i2sctl->loopback, + LPAIF_I2SCTL_LOOPBACK_DISABLE); + if (ret) { + dev_err(dai->dev, "error updating loopback field: %d\n", ret); + return ret; + } + + ret = regmap_field_write(i2sctl->wssrc, + LPAIF_I2SCTL_WSSRC_INTERNAL); + if (ret) { + dev_err(dai->dev, "error updating wssrc field: %d\n", ret); + return ret; + }
switch (bitwidth) { case 16: - regval |= LPAIF_I2SCTL_BITWIDTH_16; + bitwidth = LPAIF_I2SCTL_BITWIDTH_16; break; case 24: - regval |= LPAIF_I2SCTL_BITWIDTH_24; + bitwidth = LPAIF_I2SCTL_BITWIDTH_24; break; case 32: - regval |= LPAIF_I2SCTL_BITWIDTH_32; + bitwidth = LPAIF_I2SCTL_BITWIDTH_32; break; default: dev_err(dai->dev, "invalid bitwidth given: %d\n", bitwidth); return -EINVAL; }
+ ret = regmap_field_write(i2sctl->bitwidth, bitwidth); + if (ret) { + dev_err(dai->dev, "error updating bitwidth field: %d\n", ret); + return ret; + } + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) mode = drvdata->mi2s_playback_sd_mode[dai->driver->id]; else @@ -175,26 +202,30 @@ static int lpass_cpu_daiops_hw_params(struct snd_pcm_substream *substream, }
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - regval |= LPAIF_I2SCTL_SPKMODE(mode); + ret = regmap_field_write(i2sctl->spkmode, + LPAIF_I2SCTL_SPKMODE(mode));
if (channels >= 2) - regval |= LPAIF_I2SCTL_SPKMONO_STEREO; + ret = regmap_field_write(i2sctl->spkmono, + LPAIF_I2SCTL_SPKMONO_STEREO); else - regval |= LPAIF_I2SCTL_SPKMONO_MONO; + ret = regmap_field_write(i2sctl->spkmono, + LPAIF_I2SCTL_SPKMONO_MONO); } else { - regval |= LPAIF_I2SCTL_MICMODE(mode); + ret = regmap_field_write(i2sctl->micmode, + LPAIF_I2SCTL_MICMODE(mode));
if (channels >= 2) - regval |= LPAIF_I2SCTL_MICMONO_STEREO; + ret = regmap_field_write(i2sctl->micmono, + LPAIF_I2SCTL_MICMONO_STEREO); else - regval |= LPAIF_I2SCTL_MICMONO_MONO; + ret = regmap_field_write(i2sctl->micmono, + LPAIF_I2SCTL_MICMONO_MONO); }
- ret = regmap_write(drvdata->lpaif_map, - LPAIF_I2SCTL_REG(drvdata->variant, dai->driver->id), - regval); if (ret) { - dev_err(dai->dev, "error writing to i2sctl reg: %d\n", ret); + dev_err(dai->dev, "error writing to i2sctl channels mode: %d\n", + ret); return ret; }
@@ -228,22 +259,19 @@ static int lpass_cpu_daiops_prepare(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai); + struct lpaif_i2sctl *i2sctl = drvdata->i2sctl[dai->driver->id]; int ret; - unsigned int val, mask;
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - val = LPAIF_I2SCTL_SPKEN_ENABLE; - mask = LPAIF_I2SCTL_SPKEN_MASK; - } else { - val = LPAIF_I2SCTL_MICEN_ENABLE; - mask = LPAIF_I2SCTL_MICEN_MASK; + ret = regmap_field_write(i2sctl->spken, + LPAIF_I2SCTL_SPKEN_ENABLE); + } else { + ret = regmap_field_write(i2sctl->micen, + LPAIF_I2SCTL_MICEN_ENABLE); }
- ret = regmap_update_bits(drvdata->lpaif_map, - LPAIF_I2SCTL_REG(drvdata->variant, dai->driver->id), - mask, val); if (ret) - dev_err(dai->dev, "error writing to i2sctl reg: %d\n", ret); + dev_err(dai->dev, "error writing to i2sctl enable: %d\n", ret);
return ret; } @@ -252,25 +280,20 @@ static int lpass_cpu_daiops_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai); + struct lpaif_i2sctl *i2sctl = drvdata->i2sctl[dai->driver->id]; int ret = -EINVAL; - unsigned int val, mask;
switch (cmd) { case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - val = LPAIF_I2SCTL_SPKEN_ENABLE; - mask = LPAIF_I2SCTL_SPKEN_MASK; + ret = regmap_field_write(i2sctl->spken, + LPAIF_I2SCTL_SPKEN_ENABLE); } else { - val = LPAIF_I2SCTL_MICEN_ENABLE; - mask = LPAIF_I2SCTL_MICEN_MASK; + ret = regmap_field_write(i2sctl->micen, + LPAIF_I2SCTL_MICEN_ENABLE); } - - ret = regmap_update_bits(drvdata->lpaif_map, - LPAIF_I2SCTL_REG(drvdata->variant, - dai->driver->id), - mask, val); if (ret) dev_err(dai->dev, "error writing to i2sctl reg: %d\n", ret); @@ -279,17 +302,12 @@ static int lpass_cpu_daiops_trigger(struct snd_pcm_substream *substream, case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - val = LPAIF_I2SCTL_SPKEN_DISABLE; - mask = LPAIF_I2SCTL_SPKEN_MASK; + ret = regmap_field_write(i2sctl->spken, + LPAIF_I2SCTL_SPKEN_DISABLE); } else { - val = LPAIF_I2SCTL_MICEN_DISABLE; - mask = LPAIF_I2SCTL_MICEN_MASK; + ret = regmap_field_write(i2sctl->micen, + LPAIF_I2SCTL_MICEN_DISABLE); } - - ret = regmap_update_bits(drvdata->lpaif_map, - LPAIF_I2SCTL_REG(drvdata->variant, - dai->driver->id), - mask, val); if (ret) dev_err(dai->dev, "error writing to i2sctl reg: %d\n", ret); @@ -592,6 +610,12 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) PTR_ERR(drvdata->mi2s_bit_clk[dai_id])); return PTR_ERR(drvdata->mi2s_bit_clk[dai_id]); } + + /* Allocation for i2sctl regmap fields */ + drvdata->i2sctl[i] = devm_kzalloc(&pdev->dev, + sizeof(struct lpaif_i2sctl), + GFP_KERNEL); + }
drvdata->ahbix_clk = devm_clk_get_optional(dev, "ahbix-clk"); diff --git a/sound/soc/qcom/lpass-lpaif-reg.h b/sound/soc/qcom/lpass-lpaif-reg.h index 72a3e2f..95dde52f 100644 --- a/sound/soc/qcom/lpass-lpaif-reg.h +++ b/sound/soc/qcom/lpass-lpaif-reg.h @@ -12,15 +12,16 @@ (v->i2sctrl_reg_base + (addr) + v->i2sctrl_reg_stride * (port))
#define LPAIF_I2SCTL_REG(v, port) LPAIF_I2SCTL_REG_ADDR(v, 0x0, (port)) -#define LPAIF_I2SCTL_LOOPBACK_MASK 0x8000 -#define LPAIF_I2SCTL_LOOPBACK_SHIFT 15 -#define LPAIF_I2SCTL_LOOPBACK_DISABLE (0 << LPAIF_I2SCTL_LOOPBACK_SHIFT) -#define LPAIF_I2SCTL_LOOPBACK_ENABLE (1 << LPAIF_I2SCTL_LOOPBACK_SHIFT)
-#define LPAIF_I2SCTL_SPKEN_MASK 0x4000 -#define LPAIF_I2SCTL_SPKEN_SHIFT 14 -#define LPAIF_I2SCTL_SPKEN_DISABLE (0 << LPAIF_I2SCTL_SPKEN_SHIFT) -#define LPAIF_I2SCTL_SPKEN_ENABLE (1 << LPAIF_I2SCTL_SPKEN_SHIFT) +#define I2SCTL_LOOPBACK_FLD(reg) REG_FIELD(reg, 15, 15) +#define I2SCTL_LOOPBACK_V2_FLD(reg) REG_FIELD(reg, 17, 17) +#define LPAIF_I2SCTL_LOOPBACK_DISABLE 0 +#define LPAIF_I2SCTL_LOOPBACK_ENABLE 1 + +#define I2SCTL_SPKEN_FLD(reg) REG_FIELD(reg, 14, 14) +#define I2SCTL_SPKEN_V2_FLD(reg) REG_FIELD(reg, 16, 16) +#define LPAIF_I2SCTL_SPKEN_DISABLE 0 +#define LPAIF_I2SCTL_SPKEN_ENABLE 1
#define LPAIF_I2SCTL_MODE_NONE 0 #define LPAIF_I2SCTL_MODE_SD0 1 @@ -31,40 +32,51 @@ #define LPAIF_I2SCTL_MODE_QUAD23 6 #define LPAIF_I2SCTL_MODE_6CH 7 #define LPAIF_I2SCTL_MODE_8CH 8 - -#define LPAIF_I2SCTL_SPKMODE_MASK 0x3C00 -#define LPAIF_I2SCTL_SPKMODE_SHIFT 10 -#define LPAIF_I2SCTL_SPKMODE(mode) ((mode) << LPAIF_I2SCTL_SPKMODE_SHIFT) - -#define LPAIF_I2SCTL_SPKMONO_MASK 0x0200 -#define LPAIF_I2SCTL_SPKMONO_SHIFT 9 -#define LPAIF_I2SCTL_SPKMONO_STEREO (0 << LPAIF_I2SCTL_SPKMONO_SHIFT) -#define LPAIF_I2SCTL_SPKMONO_MONO (1 << LPAIF_I2SCTL_SPKMONO_SHIFT) - -#define LPAIF_I2SCTL_MICEN_MASK GENMASK(8, 8) -#define LPAIF_I2SCTL_MICEN_SHIFT 8 -#define LPAIF_I2SCTL_MICEN_DISABLE (0 << LPAIF_I2SCTL_MICEN_SHIFT) -#define LPAIF_I2SCTL_MICEN_ENABLE (1 << LPAIF_I2SCTL_MICEN_SHIFT) - -#define LPAIF_I2SCTL_MICMODE_MASK GENMASK(7, 4) -#define LPAIF_I2SCTL_MICMODE_SHIFT 4 -#define LPAIF_I2SCTL_MICMODE(mode) ((mode) << LPAIF_I2SCTL_MICMODE_SHIFT) - -#define LPAIF_I2SCTL_MIMONO_MASK GENMASK(3, 3) -#define LPAIF_I2SCTL_MICMONO_SHIFT 3 -#define LPAIF_I2SCTL_MICMONO_STEREO (0 << LPAIF_I2SCTL_MICMONO_SHIFT) -#define LPAIF_I2SCTL_MICMONO_MONO (1 << LPAIF_I2SCTL_MICMONO_SHIFT) - -#define LPAIF_I2SCTL_WSSRC_MASK 0x0004 -#define LPAIF_I2SCTL_WSSRC_SHIFT 2 -#define LPAIF_I2SCTL_WSSRC_INTERNAL (0 << LPAIF_I2SCTL_WSSRC_SHIFT) -#define LPAIF_I2SCTL_WSSRC_EXTERNAL (1 << LPAIF_I2SCTL_WSSRC_SHIFT) - -#define LPAIF_I2SCTL_BITWIDTH_MASK 0x0003 -#define LPAIF_I2SCTL_BITWIDTH_SHIFT 0 -#define LPAIF_I2SCTL_BITWIDTH_16 (0 << LPAIF_I2SCTL_BITWIDTH_SHIFT) -#define LPAIF_I2SCTL_BITWIDTH_24 (1 << LPAIF_I2SCTL_BITWIDTH_SHIFT) -#define LPAIF_I2SCTL_BITWIDTH_32 (2 << LPAIF_I2SCTL_BITWIDTH_SHIFT) +#define LPAIF_I2SCTL_MODE_10CH 9 +#define LPAIF_I2SCTL_MODE_12CH 10 +#define LPAIF_I2SCTL_MODE_14CH 11 +#define LPAIF_I2SCTL_MODE_16CH 12 +#define LPAIF_I2SCTL_MODE_SD4 13 +#define LPAIF_I2SCTL_MODE_SD5 14 +#define LPAIF_I2SCTL_MODE_SD6 15 +#define LPAIF_I2SCTL_MODE_SD7 16 +#define LPAIF_I2SCTL_MODE_QUAD45 17 +#define LPAIF_I2SCTL_MODE_QUAD47 18 +#define LPAIF_I2SCTL_MODE_8CH_2 19 + +#define I2SCTL_SPKMODE_FLD(reg) REG_FIELD(reg, 10, 13) +#define I2SCTL_SPKMODE_V2_FLD(reg) REG_FIELD(reg, 11, 15) +#define LPAIF_I2SCTL_SPKMODE(mode) mode + +#define I2SCTL_SPKMONO_FLD(reg) REG_FIELD(reg, 9, 9) +#define I2SCTL_SPKMONO_V2_FLD(reg) REG_FIELD(reg, 10, 10) +#define LPAIF_I2SCTL_SPKMONO_STEREO 0 +#define LPAIF_I2SCTL_SPKMONO_MONO 1 + +#define I2SCTL_MICEN_FLD(reg) REG_FIELD(reg, 8, 8) +#define I2SCTL_MICEN_V2_FLD(reg) REG_FIELD(reg, 9, 9) +#define LPAIF_I2SCTL_MICEN_DISABLE 0 +#define LPAIF_I2SCTL_MICEN_ENABLE 1 + +#define I2SCTL_MICMODE_FLD(reg) REG_FIELD(reg, 4, 7) +#define I2SCTL_MICMODE_V2_FLD(reg) REG_FIELD(reg, 4, 8) +#define LPAIF_I2SCTL_MICMODE(mode) mode + +#define I2SCTL_MICMONO_FLD(reg) REG_FIELD(reg, 3, 3) +#define I2SCTL_MICMONO_V2_FLD(reg) REG_FIELD(reg, 3, 3) +#define LPAIF_I2SCTL_MICMONO_STEREO 0 +#define LPAIF_I2SCTL_MICMONO_MONO 1 + +#define I2SCTL_WSSRC_FLD(reg) REG_FIELD(reg, 2, 2) +#define I2SCTL_WSSRC_V2_FLD(reg) REG_FIELD(reg, 2, 2) +#define LPAIF_I2SCTL_WSSRC_INTERNAL 0 +#define LPAIF_I2SCTL_WSSRC_EXTERNAL 1 + +#define I2SCTL_BITWIDTH_FLD(reg) REG_FIELD(reg, 0, 0) +#define I2SCTL_BITWIDTH_V2_FLD(reg) REG_FIELD(reg, 0, 0) +#define LPAIF_I2SCTL_BITWIDTH_16 0 +#define LPAIF_I2SCTL_BITWIDTH_24 1 +#define LPAIF_I2SCTL_BITWIDTH_32 2
/* LPAIF IRQ */ #define LPAIF_IRQ_REG_ADDR(v, addr, port) \ @@ -121,42 +133,73 @@ #define LPAIF_DMAPER_REG(v, chan, dir) __LPAIF_DMA_REG(v, chan, dir, PER) #define LPAIF_DMAPERCNT_REG(v, chan, dir) __LPAIF_DMA_REG(v, chan, dir, PERCNT)
-#define LPAIF_DMACTL_BURSTEN_MASK 0x800 -#define LPAIF_DMACTL_BURSTEN_SHIFT 11 -#define LPAIF_DMACTL_BURSTEN_SINGLE (0 << LPAIF_DMACTL_BURSTEN_SHIFT) -#define LPAIF_DMACTL_BURSTEN_INCR4 (1 << LPAIF_DMACTL_BURSTEN_SHIFT) - -#define LPAIF_DMACTL_WPSCNT_MASK 0x700 -#define LPAIF_DMACTL_WPSCNT_SHIFT 8 -#define LPAIF_DMACTL_WPSCNT_ONE (0 << LPAIF_DMACTL_WPSCNT_SHIFT) -#define LPAIF_DMACTL_WPSCNT_TWO (1 << LPAIF_DMACTL_WPSCNT_SHIFT) -#define LPAIF_DMACTL_WPSCNT_THREE (2 << LPAIF_DMACTL_WPSCNT_SHIFT) -#define LPAIF_DMACTL_WPSCNT_FOUR (3 << LPAIF_DMACTL_WPSCNT_SHIFT) -#define LPAIF_DMACTL_WPSCNT_SIX (5 << LPAIF_DMACTL_WPSCNT_SHIFT) -#define LPAIF_DMACTL_WPSCNT_EIGHT (7 << LPAIF_DMACTL_WPSCNT_SHIFT) - -#define LPAIF_DMACTL_AUDINTF_MASK 0x0F0 -#define LPAIF_DMACTL_AUDINTF_SHIFT 4 -#define LPAIF_DMACTL_AUDINTF(id) (id << LPAIF_DMACTL_AUDINTF_SHIFT) - -#define LPAIF_DMACTL_FIFOWM_MASK 0x00E -#define LPAIF_DMACTL_FIFOWM_SHIFT 1 -#define LPAIF_DMACTL_FIFOWM_1 (0 << LPAIF_DMACTL_FIFOWM_SHIFT) -#define LPAIF_DMACTL_FIFOWM_2 (1 << LPAIF_DMACTL_FIFOWM_SHIFT) -#define LPAIF_DMACTL_FIFOWM_3 (2 << LPAIF_DMACTL_FIFOWM_SHIFT) -#define LPAIF_DMACTL_FIFOWM_4 (3 << LPAIF_DMACTL_FIFOWM_SHIFT) -#define LPAIF_DMACTL_FIFOWM_5 (4 << LPAIF_DMACTL_FIFOWM_SHIFT) -#define LPAIF_DMACTL_FIFOWM_6 (5 << LPAIF_DMACTL_FIFOWM_SHIFT) -#define LPAIF_DMACTL_FIFOWM_7 (6 << LPAIF_DMACTL_FIFOWM_SHIFT) -#define LPAIF_DMACTL_FIFOWM_8 (7 << LPAIF_DMACTL_FIFOWM_SHIFT) - -#define LPAIF_DMACTL_ENABLE_MASK 0x1 -#define LPAIF_DMACTL_ENABLE_SHIFT 0 -#define LPAIF_DMACTL_ENABLE_OFF (0 << LPAIF_DMACTL_ENABLE_SHIFT) -#define LPAIF_DMACTL_ENABLE_ON (1 << LPAIF_DMACTL_ENABLE_SHIFT) - -#define LPAIF_DMACTL_DYNCLK_MASK BIT(12) -#define LPAIF_DMACTL_DYNCLK_SHIFT 12 -#define LPAIF_DMACTL_DYNCLK_OFF (0 << LPAIF_DMACTL_DYNCLK_SHIFT) -#define LPAIF_DMACTL_DYNCLK_ON (1 << LPAIF_DMACTL_DYNCLK_SHIFT) +#define DMACTL_BURSTEN_FLD(reg) REG_FIELD(reg, 11, 11) +#define DMACTL_BURSTEN_V2_FLD(reg) REG_FIELD(reg, 20, 20) +#define LPAIF_DMACTL_BURSTEN_SINGLE 0 +#define LPAIF_DMACTL_BURSTEN_INCR4 1 + +#define DMACTL_WPSCNT_FLD(reg) REG_FIELD(reg, 8, 10) +#define DMACTL_WPSCNT_V2_FLD(reg) REG_FIELD(reg, 16, 19) +#define LPAIF_DMACTL_WPSCNT_ONE 0 +#define LPAIF_DMACTL_WPSCNT_TWO 1 +#define LPAIF_DMACTL_WPSCNT_THREE 2 +#define LPAIF_DMACTL_WPSCNT_FOUR 3 +#define LPAIF_DMACTL_WPSCNT_SIX 5 +#define LPAIF_DMACTL_WPSCNT_EIGHT 7 +#define LPAIF_DMACTL_WPSCNT_TEN 9 +#define LPAIF_DMACTL_WPSCNT_TWELVE 11 +#define LPAIF_DMACTL_WPSCNT_FOURTEEN 13 +#define LPAIF_DMACTL_WPSCNT_SIXTEEN 15 + + +#define DMACTL_AUDINTF_FLD(reg) REG_FIELD(reg, 4, 7) +#define DMACTL_AUDINTF_V2_FLD(reg) REG_FIELD(reg, 12, 15) +#define LPAIF_DMACTL_AUDINTF(id) id + +#define DMACTL_FIFOWM_FLD(reg) REG_FIELD(reg, 1, 3) +#define DMACTL_FIFOWM_V2_FLD(reg) REG_FIELD(reg, 1, 5) +#define LPAIF_DMACTL_FIFOWM_1 0 +#define LPAIF_DMACTL_FIFOWM_2 1 +#define LPAIF_DMACTL_FIFOWM_3 2 +#define LPAIF_DMACTL_FIFOWM_4 3 +#define LPAIF_DMACTL_FIFOWM_5 4 +#define LPAIF_DMACTL_FIFOWM_6 5 +#define LPAIF_DMACTL_FIFOWM_7 6 +#define LPAIF_DMACTL_FIFOWM_8 7 +#define LPAIF_DMACTL_FIFOWM_9 8 +#define LPAIF_DMACTL_FIFOWM_10 9 +#define LPAIF_DMACTL_FIFOWM_11 10 +#define LPAIF_DMACTL_FIFOWM_12 11 +#define LPAIF_DMACTL_FIFOWM_13 12 +#define LPAIF_DMACTL_FIFOWM_14 13 +#define LPAIF_DMACTL_FIFOWM_15 14 +#define LPAIF_DMACTL_FIFOWM_16 15 +#define LPAIF_DMACTL_FIFOWM_17 16 +#define LPAIF_DMACTL_FIFOWM_18 17 +#define LPAIF_DMACTL_FIFOWM_19 18 +#define LPAIF_DMACTL_FIFOWM_20 19 +#define LPAIF_DMACTL_FIFOWM_21 20 +#define LPAIF_DMACTL_FIFOWM_22 21 +#define LPAIF_DMACTL_FIFOWM_23 22 +#define LPAIF_DMACTL_FIFOWM_24 23 +#define LPAIF_DMACTL_FIFOWM_25 24 +#define LPAIF_DMACTL_FIFOWM_26 25 +#define LPAIF_DMACTL_FIFOWM_27 26 +#define LPAIF_DMACTL_FIFOWM_28 27 +#define LPAIF_DMACTL_FIFOWM_29 28 +#define LPAIF_DMACTL_FIFOWM_30 29 +#define LPAIF_DMACTL_FIFOWM_31 30 +#define LPAIF_DMACTL_FIFOWM_32 31 + + +#define DMACTL_ENABLE_FLD(reg) REG_FIELD(reg, 0, 0) +#define DMACTL_ENABLE_V2_FLD(reg) REG_FIELD(reg, 0, 0) +#define LPAIF_DMACTL_ENABLE_OFF 0 +#define LPAIF_DMACTL_ENABLE_ON 1 + +#define DMACTL_DYNCLK_FLD(reg) REG_FIELD(reg, 12, 12) +#define DMACTL_DYNCLK_V2_FLD(reg) REG_FIELD(reg, 21, 21) +#define LPAIF_DMACTL_DYNCLK_OFF 0 +#define LPAIF_DMACTL_DYNCLK_ON 1 + #endif /* __LPASS_LPAIF_REG_H__ */ diff --git a/sound/soc/qcom/lpass-platform.c b/sound/soc/qcom/lpass-platform.c index 34f7fd1..3b2ec38 100644 --- a/sound/soc/qcom/lpass-platform.c +++ b/sound/soc/qcom/lpass-platform.c @@ -76,6 +76,23 @@ static int lpass_platform_pcmops_open(struct snd_soc_component *component, if (dma_ch < 0) return dma_ch;
+ drvdata->dmactl[dma_ch] = devm_kzalloc(soc_runtime->dev, + sizeof(struct lpaif_dmactl), + GFP_KERNEL); + if (drvdata->dmactl[dma_ch] == NULL) { + dev_err(soc_runtime->dev, "error allocating dmactl fields\n"); + return -ENOMEM; + } + + ret = v->init_dmactl_fields(drvdata->dmactl[dma_ch], + drvdata->lpaif_map, + LPAIF_DMACTL_REG(v, dma_ch, dir)); + if (ret) { + dev_err(soc_runtime->dev, + "error initializing dmactl fields: %d\n", ret); + return ret; + } + drvdata->substream[dma_ch] = substream;
ret = regmap_write(drvdata->lpaif_map, @@ -132,13 +149,19 @@ static int lpass_platform_pcmops_hw_params(struct snd_soc_component *component, struct lpass_variant *v = drvdata->variant; snd_pcm_format_t format = params_format(params); unsigned int channels = params_channels(params); - unsigned int regval; - int ch, dir = substream->stream; + struct lpaif_dmactl *dmactl; + int ch; int bitwidth; int ret, dma_port = pcm_data->i2s_port + v->dmactl_audif_start;
ch = pcm_data->dma_ch;
+ dmactl = drvdata->dmactl[ch]; + if (dmactl == NULL) { + dev_err(soc_runtime->dev, "invalid dma channel: %d\n", ch); + return -1; + } + bitwidth = snd_pcm_format_width(format); if (bitwidth < 0) { dev_err(soc_runtime->dev, "invalid bit width given: %d\n", @@ -146,25 +169,29 @@ static int lpass_platform_pcmops_hw_params(struct snd_soc_component *component, return bitwidth; }
- regval = LPAIF_DMACTL_BURSTEN_INCR4 | - LPAIF_DMACTL_AUDINTF(dma_port) | - LPAIF_DMACTL_FIFOWM_8; + ret = regmap_field_write(dmactl->bursten, LPAIF_DMACTL_BURSTEN_INCR4); + ret = regmap_field_write(dmactl->fifowm, LPAIF_DMACTL_FIFOWM_8); + ret = regmap_field_write(dmactl->intf, LPAIF_DMACTL_AUDINTF(dma_port));
switch (bitwidth) { case 16: switch (channels) { case 1: case 2: - regval |= LPAIF_DMACTL_WPSCNT_ONE; + ret = regmap_field_write(dmactl->wpscnt, + LPAIF_DMACTL_WPSCNT_ONE); break; case 4: - regval |= LPAIF_DMACTL_WPSCNT_TWO; + ret = regmap_field_write(dmactl->wpscnt, + LPAIF_DMACTL_WPSCNT_TWO); break; case 6: - regval |= LPAIF_DMACTL_WPSCNT_THREE; + ret = regmap_field_write(dmactl->wpscnt, + LPAIF_DMACTL_WPSCNT_THREE); break; case 8: - regval |= LPAIF_DMACTL_WPSCNT_FOUR; + ret = regmap_field_write(dmactl->wpscnt, + LPAIF_DMACTL_WPSCNT_FOUR); break; default: dev_err(soc_runtime->dev, @@ -177,19 +204,24 @@ static int lpass_platform_pcmops_hw_params(struct snd_soc_component *component, case 32: switch (channels) { case 1: - regval |= LPAIF_DMACTL_WPSCNT_ONE; + ret = regmap_field_write(dmactl->wpscnt, + LPAIF_DMACTL_WPSCNT_ONE); break; case 2: - regval |= LPAIF_DMACTL_WPSCNT_TWO; + ret = regmap_field_write(dmactl->wpscnt, + LPAIF_DMACTL_WPSCNT_TWO); break; case 4: - regval |= LPAIF_DMACTL_WPSCNT_FOUR; + ret = regmap_field_write(dmactl->wpscnt, + LPAIF_DMACTL_WPSCNT_FOUR); break; case 6: - regval |= LPAIF_DMACTL_WPSCNT_SIX; + ret = regmap_field_write(dmactl->wpscnt, + LPAIF_DMACTL_WPSCNT_SIX); break; case 8: - regval |= LPAIF_DMACTL_WPSCNT_EIGHT; + ret = regmap_field_write(dmactl->wpscnt, + LPAIF_DMACTL_WPSCNT_EIGHT); break; default: dev_err(soc_runtime->dev, @@ -204,10 +236,8 @@ static int lpass_platform_pcmops_hw_params(struct snd_soc_component *component, return -EINVAL; }
- ret = regmap_write(drvdata->lpaif_map, - LPAIF_DMACTL_REG(v, ch, dir), regval); if (ret) { - dev_err(soc_runtime->dev, "error writing to rdmactl reg: %d\n", + dev_err(soc_runtime->dev, "error writing to dmactl reg: %d\n", ret); return ret; } @@ -244,9 +274,11 @@ static int lpass_platform_pcmops_prepare(struct snd_soc_component *component, struct snd_pcm_runtime *rt = substream->runtime; struct lpass_pcm_data *pcm_data = rt->private_data; struct lpass_variant *v = drvdata->variant; + struct lpaif_dmactl *dmactl; int ret, ch, dir = substream->stream;
ch = pcm_data->dma_ch; + dmactl = drvdata->dmactl[ch];
ret = regmap_write(drvdata->lpaif_map, LPAIF_DMABASE_REG(v, ch, dir), @@ -275,9 +307,7 @@ static int lpass_platform_pcmops_prepare(struct snd_soc_component *component, return ret; }
- ret = regmap_update_bits(drvdata->lpaif_map, - LPAIF_DMACTL_REG(v, ch, dir), - LPAIF_DMACTL_ENABLE_MASK, LPAIF_DMACTL_ENABLE_ON); + ret = regmap_field_write(dmactl->enable, LPAIF_DMACTL_ENABLE_ON); if (ret) { dev_err(soc_runtime->dev, "error writing to rdmactl reg: %d\n", ret); @@ -296,9 +326,11 @@ static int lpass_platform_pcmops_trigger(struct snd_soc_component *component, struct snd_pcm_runtime *rt = substream->runtime; struct lpass_pcm_data *pcm_data = rt->private_data; struct lpass_variant *v = drvdata->variant; - int ret, ch, dir = substream->stream; + struct lpaif_dmactl *dmactl; + int ret, ch;
ch = pcm_data->dma_ch; + dmactl = drvdata->dmactl[ch];
switch (cmd) { case SNDRV_PCM_TRIGGER_START: @@ -324,10 +356,8 @@ static int lpass_platform_pcmops_trigger(struct snd_soc_component *component, return ret; }
- ret = regmap_update_bits(drvdata->lpaif_map, - LPAIF_DMACTL_REG(v, ch, dir), - LPAIF_DMACTL_ENABLE_MASK, - LPAIF_DMACTL_ENABLE_ON); + ret = regmap_field_write(dmactl->enable, + LPAIF_DMACTL_ENABLE_ON); if (ret) { dev_err(soc_runtime->dev, "error writing to rdmactl reg: %d\n", ret); @@ -337,10 +367,8 @@ static int lpass_platform_pcmops_trigger(struct snd_soc_component *component, case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - ret = regmap_update_bits(drvdata->lpaif_map, - LPAIF_DMACTL_REG(v, ch, dir), - LPAIF_DMACTL_ENABLE_MASK, - LPAIF_DMACTL_ENABLE_OFF); + ret = regmap_field_write(dmactl->enable, + LPAIF_DMACTL_ENABLE_OFF); if (ret) { dev_err(soc_runtime->dev, "error writing to rdmactl reg: %d\n", ret); diff --git a/sound/soc/qcom/lpass.h b/sound/soc/qcom/lpass.h index 450020e..30cb2ef 100644 --- a/sound/soc/qcom/lpass.h +++ b/sound/soc/qcom/lpass.h @@ -17,6 +17,27 @@ #define LPASS_MAX_MI2S_PORTS (8) #define LPASS_MAX_DMA_CHANNELS (8)
+struct lpaif_i2sctl { + struct regmap_field *loopback; + struct regmap_field *spken; + struct regmap_field *spkmode; + struct regmap_field *spkmono; + struct regmap_field *micen; + struct regmap_field *micmode; + struct regmap_field *micmono; + struct regmap_field *wssrc; + struct regmap_field *bitwidth; +}; + +struct lpaif_dmactl { + struct regmap_field *bursten; + struct regmap_field *wpscnt; + struct regmap_field *intf; + struct regmap_field *fifowm; + struct regmap_field *enable; + struct regmap_field *dyncclk; +}; + /* Both the CPU DAI and platform drivers will access this data */ struct lpass_data {
@@ -55,6 +76,9 @@ struct lpass_data { struct clk_bulk_data *clks; int num_clks;
+ /* Regmap fields of I2SCTL & DMACTL registers bitfields */ + struct lpaif_i2sctl *i2sctl[LPASS_MAX_MI2S_PORTS]; + struct lpaif_dmactl *dmactl[LPASS_MAX_DMA_CHANNELS]; };
/* Vairant data per each SOC */ @@ -93,6 +117,12 @@ struct lpass_variant { /* SOC specific clocks configuration */ const char **clk_name; int num_clks; + + /* SOC specific reg_fields initalizaion for control registers */ + int (*init_i2sctl_fields)(struct lpaif_i2sctl *i2sctl, + struct regmap *map, unsigned int reg); + int (*init_dmactl_fields)(struct lpaif_dmactl *dmactl, + struct regmap *map, unsigned int reg); };
/* register the platform driver from the CPU DAI driver */
On 14/05/2020 17:38, Ajit Pandey wrote:
I2SCTL and DMACTL registers has different bits alignment for newer LPASS variants of SC7180 soc. Instead of adding extra overhead for calculating masks and shifts for newer variants registers layout we changed the approach to use regmap_field_write() API to update bit. Such API's will internally do the required bit shift and mask based on reg_field struct defined for bit fields. We'll define REG_FIELD() macros with bit layout for both lpass variants and use such macros to initialize register fields in variant specific driver callbacks. Also added new bitfieds values for I2SCTL and DMACTL registers and removed shifts and mask macros for such registers from header file.
Signed-off-by: Ajit Pandey ajitp@codeaurora.org
sound/soc/qcom/lpass-apq8016.c | 61 ++++++++++++ sound/soc/qcom/lpass-cpu.c | 114 +++++++++++++--------- sound/soc/qcom/lpass-lpaif-reg.h | 203 ++++++++++++++++++++++++--------------- sound/soc/qcom/lpass-platform.c | 86 +++++++++++------ sound/soc/qcom/lpass.h | 30 ++++++ 5 files changed, 340 insertions(+), 154 deletions(-)
Thanks for moving this to regmap fields, looks clean! However this patch just removed support to lpass-ipq806x.c variant, which should to be taken care of while doing patches that apply to all variants.
diff --git a/sound/soc/qcom/lpass-apq8016.c b/sound/soc/qcom/lpass-apq8016.c index 8210e37..3149645 100644 --- a/sound/soc/qcom/lpass-apq8016.c +++ b/sound/soc/qcom/lpass-apq8016.c @@ -124,6 +124,32 @@ }, };
+static int apq8016_init_dmactl_bitfields(struct lpaif_dmactl *dmactl,
struct regmap *map,unsigned int reg)+{
- struct reg_field bursten = DMACTL_BURSTEN_FLD(reg);
- struct reg_field wpscnt = DMACTL_WPSCNT_FLD(reg);
- struct reg_field fifowm = DMACTL_FIFOWM_FLD(reg);
- struct reg_field intf = DMACTL_AUDINTF_FLD(reg);
- struct reg_field enable = DMACTL_ENABLE_FLD(reg);
- struct reg_field dyncclk = DMACTL_DYNCLK_FLD(reg);
- dmactl->bursten = regmap_field_alloc(map, bursten);
- dmactl->wpscnt = regmap_field_alloc(map, wpscnt);
- dmactl->fifowm = regmap_field_alloc(map, fifowm);
- dmactl->intf = regmap_field_alloc(map, intf);
- dmactl->enable = regmap_field_alloc(map, enable);
- dmactl->dyncclk = regmap_field_alloc(map, dyncclk);
My idea was to move this all regmap fields to variant structure and common code will do the regmap_filed_alloc rather than each variant duplicating the same code for each variant, also am guessing some of the members in the lpass_variant structure tp become redundant due to regmap field which can be removed as well.
ex :
struct lpass_variant { ... struct reg_field bursten ... };
in lpass-apq8016.c
we do static struct lpass_variant apq8016_data = {
.bursten = REG_FIELD(reg, 11, 11), ... }
in lpass-cpu.c we can do the real regmap_field_alloc asoc_qcom_lpass_cpu_platform_probe
- if (IS_ERR(dmactl->bursten) || IS_ERR(dmactl->wpscnt) ||
IS_ERR(dmactl->fifowm) || IS_ERR(dmactl->intf) ||IS_ERR(dmactl->enable) || IS_ERR(dmactl->dyncclk))return -EINVAL;- return 0;
+}
- static int apq8016_lpass_alloc_dma_channel(struct lpass_data *drvdata, int direction) {
@@ -158,6 +184,39 @@ static int apq8016_lpass_free_dma_channel(struct lpass_data *drvdata, int chan) return 0; }
+static int sc7180_init_i2sctl_bitfields(struct lpaif_i2sctl *i2sctl,
struct regmap *map, unsigned int reg)+{
Should this be apq8016_init_i2sctl_bitfields
Please make sure that you compile the code before sending it out!
--srini
Thanks Srini for reviewing the change.
On 5/18/2020 3:19 PM, Srinivas Kandagatla wrote:
On 14/05/2020 17:38, Ajit Pandey wrote:
I2SCTL and DMACTL registers has different bits alignment for newer LPASS variants of SC7180 soc. Instead of adding extra overhead for calculating masks and shifts for newer variants registers layout we changed the approach to use regmap_field_write() API to update bit. Such API's will internally do the required bit shift and mask based on reg_field struct defined for bit fields. We'll define REG_FIELD() macros with bit layout for both lpass variants and use such macros to initialize register fields in variant specific driver callbacks. Also added new bitfieds values for I2SCTL and DMACTL registers and removed shifts and mask macros for such registers from header file.
Signed-off-by: Ajit Pandey ajitp@codeaurora.org
sound/soc/qcom/lpass-apq8016.c | 61 ++++++++++++ sound/soc/qcom/lpass-cpu.c | 114 +++++++++++++--------- sound/soc/qcom/lpass-lpaif-reg.h | 203 ++++++++++++++++++++++++--------------- sound/soc/qcom/lpass-platform.c | 86 +++++++++++------ sound/soc/qcom/lpass.h | 30 ++++++ 5 files changed, 340 insertions(+), 154 deletions(-)
Thanks for moving this to regmap fields, looks clean! However this patch just removed support to lpass-ipq806x.c variant, which should to be taken care of while doing patches that apply to all variants.
Right. I will make the change as part of next patchset.
diff --git a/sound/soc/qcom/lpass-apq8016.c b/sound/soc/qcom/lpass-apq8016.c index 8210e37..3149645 100644 --- a/sound/soc/qcom/lpass-apq8016.c +++ b/sound/soc/qcom/lpass-apq8016.c @@ -124,6 +124,32 @@ }, }; +static int apq8016_init_dmactl_bitfields(struct lpaif_dmactl *dmactl, + struct regmap *map, + unsigned int reg) +{ + struct reg_field bursten = DMACTL_BURSTEN_FLD(reg); + struct reg_field wpscnt = DMACTL_WPSCNT_FLD(reg); + struct reg_field fifowm = DMACTL_FIFOWM_FLD(reg); + struct reg_field intf = DMACTL_AUDINTF_FLD(reg); + struct reg_field enable = DMACTL_ENABLE_FLD(reg); + struct reg_field dyncclk = DMACTL_DYNCLK_FLD(reg);
+ dmactl->bursten = regmap_field_alloc(map, bursten); + dmactl->wpscnt = regmap_field_alloc(map, wpscnt); + dmactl->fifowm = regmap_field_alloc(map, fifowm); + dmactl->intf = regmap_field_alloc(map, intf); + dmactl->enable = regmap_field_alloc(map, enable); + dmactl->dyncclk = regmap_field_alloc(map, dyncclk);
My idea was to move this all regmap fields to variant structure and common code will do the regmap_filed_alloc rather than each variant duplicating the same code for each variant, also am guessing some of the members in the lpass_variant structure tp become redundant due to regmap field which can be removed as well.
ex :
struct lpass_variant { ... struct reg_field bursten ... };
in lpass-apq8016.c
we do static struct lpass_variant apq8016_data = {
.bursten = REG_FIELD(reg, 11, 11), ... }
We can keep reg_field in lpass_variant, but assignment in the struct will be a problem as
reg is variable here. So, we need to expose an API in lpass_variant to assign reg_field.
regmap_field will still be in dmactl/i2sctl structs as it differs for different dma channel/i2s port
respectively. Please share your thoughts.
in lpass-cpu.c we can do the real regmap_field_alloc asoc_qcom_lpass_cpu_platform_probe
Yes, I will move regmap_field_alloc to lpass_cpu.c in next patchset.
+ if (IS_ERR(dmactl->bursten) || IS_ERR(dmactl->wpscnt) || + IS_ERR(dmactl->fifowm) || IS_ERR(dmactl->intf) || + IS_ERR(dmactl->enable) || IS_ERR(dmactl->dyncclk)) + return -EINVAL;
+ return 0; +}
static int apq8016_lpass_alloc_dma_channel(struct lpass_data *drvdata, int direction) { @@ -158,6 +184,39 @@ static int apq8016_lpass_free_dma_channel(struct lpass_data *drvdata, int chan) return 0; } +static int sc7180_init_i2sctl_bitfields(struct lpaif_i2sctl *i2sctl, + struct regmap *map, unsigned int reg) +{
Should this be apq8016_init_i2sctl_bitfields
Please make sure that you compile the code before sending it out!
Will take care in next patchset.
--srini
Thanks,
Rohit
Hello Srini,
On 6/27/2020 11:32 PM, Rohit Kumar wrote:
Thanks Srini for reviewing the change.
On 5/18/2020 3:19 PM, Srinivas Kandagatla wrote:
On 14/05/2020 17:38, Ajit Pandey wrote:
I2SCTL and DMACTL registers has different bits alignment for newer LPASS variants of SC7180 soc. Instead of adding extra overhead for calculating masks and shifts for newer variants registers layout we changed the approach to use regmap_field_write() API to update bit. Such API's will internally do the required bit shift and mask based on reg_field struct defined for bit fields. We'll define REG_FIELD() macros with bit layout for both lpass variants and use such macros to initialize register fields in variant specific driver callbacks. Also added new bitfieds values for I2SCTL and DMACTL registers and removed shifts and mask macros for such registers from header file.
Signed-off-by: Ajit Pandey ajitp@codeaurora.org
sound/soc/qcom/lpass-apq8016.c | 61 ++++++++++++ sound/soc/qcom/lpass-cpu.c | 114 +++++++++++++--------- sound/soc/qcom/lpass-lpaif-reg.h | 203 ++++++++++++++++++++++++--------------- sound/soc/qcom/lpass-platform.c | 86 +++++++++++------ sound/soc/qcom/lpass.h | 30 ++++++ 5 files changed, 340 insertions(+), 154 deletions(-)
Thanks for moving this to regmap fields, looks clean! However this patch just removed support to lpass-ipq806x.c variant, which should to be taken care of while doing patches that apply to all variants.
Right. I will make the change as part of next patchset.
diff --git a/sound/soc/qcom/lpass-apq8016.c b/sound/soc/qcom/lpass-apq8016.c index 8210e37..3149645 100644 --- a/sound/soc/qcom/lpass-apq8016.c +++ b/sound/soc/qcom/lpass-apq8016.c @@ -124,6 +124,32 @@ }, }; +static int apq8016_init_dmactl_bitfields(struct lpaif_dmactl *dmactl, + struct regmap *map, + unsigned int reg) +{ + struct reg_field bursten = DMACTL_BURSTEN_FLD(reg); + struct reg_field wpscnt = DMACTL_WPSCNT_FLD(reg); + struct reg_field fifowm = DMACTL_FIFOWM_FLD(reg); + struct reg_field intf = DMACTL_AUDINTF_FLD(reg); + struct reg_field enable = DMACTL_ENABLE_FLD(reg); + struct reg_field dyncclk = DMACTL_DYNCLK_FLD(reg);
+ dmactl->bursten = regmap_field_alloc(map, bursten); + dmactl->wpscnt = regmap_field_alloc(map, wpscnt); + dmactl->fifowm = regmap_field_alloc(map, fifowm); + dmactl->intf = regmap_field_alloc(map, intf); + dmactl->enable = regmap_field_alloc(map, enable); + dmactl->dyncclk = regmap_field_alloc(map, dyncclk);
My idea was to move this all regmap fields to variant structure and common code will do the regmap_filed_alloc rather than each variant duplicating the same code for each variant, also am guessing some of the members in the lpass_variant structure tp become redundant due to regmap field which can be removed as well.
ex :
struct lpass_variant { ... struct reg_field bursten ... };
in lpass-apq8016.c
we do static struct lpass_variant apq8016_data = {
.bursten = REG_FIELD(reg, 11, 11), ... }
We can keep reg_field in lpass_variant, but assignment in the struct will be a problem as
reg is variable here. So, we need to expose an API in lpass_variant to assign reg_field.
regmap_field will still be in dmactl/i2sctl structs as it differs for different dma channel/i2s port
respectively. Please share your thoughts.
While making changes, I felt like there is no significance of keeping reg_field variables inside
lpass_variant struct. Below are the reasons:
* We anyway have to expose an API to fill the regfields as reg is variable in REG_FIELD(reg, 11, 11)
* In case of sc7180, RD_DMA and WR_DMA control register has different field mask. So, values
different for playback and capture. I was thinking of exposing an API which will just fill the reg_field
in the struct passed something like this:
static void apq8016_init_dmactl_regfields(struct lpaif_dmactl_regfields *dmactl, unsigned int reg, int dir) { struct reg_field bursten = DMACTL_BURSTEN_FLD(reg); struct reg_field wpscnt = DMACTL_WPSCNT_FLD(reg); struct reg_field fifowm = DMACTL_FIFOWM_FLD(reg); struct reg_field intf = DMACTL_AUDINTF_FLD(reg); struct reg_field enable = DMACTL_ENABLE_FLD(reg); struct reg_field dyncclk = DMACTL_DYNCLK_FLD(reg);
dmactl->bursten = bursten; dmactl->wpscnt = wpscnt; dmactl->fifowm = fifowm; dmactl->intf = intf; dmactl->enable = enable; dmactl->dyncclk = dyncclk; }
This will be called by lpass-platform.c where we can do regmap_field_alloc.
So, we will have common function for regmap_field_alloc. Please share your inputs.
in lpass-cpu.c we can do the real regmap_field_alloc asoc_qcom_lpass_cpu_platform_probe
Yes, I will move regmap_field_alloc to lpass_cpu.c in next patchset.
+ if (IS_ERR(dmactl->bursten) || IS_ERR(dmactl->wpscnt) || + IS_ERR(dmactl->fifowm) || IS_ERR(dmactl->intf) || + IS_ERR(dmactl->enable) || IS_ERR(dmactl->dyncclk)) + return -EINVAL;
+ return 0; +}
static int apq8016_lpass_alloc_dma_channel(struct lpass_data *drvdata, int direction) { @@ -158,6 +184,39 @@ static int apq8016_lpass_free_dma_channel(struct lpass_data *drvdata, int chan) return 0; } +static int sc7180_init_i2sctl_bitfields(struct lpaif_i2sctl *i2sctl, + struct regmap *map, unsigned int reg) +{
Should this be apq8016_init_i2sctl_bitfields
Please make sure that you compile the code before sending it out!
Will take care in next patchset.
--srini
Thanks,
Rohit
Thanks,
Rohit
Add header defining dai-id and mclk id for SC7180 lpass soc.
Signed-off-by: Ajit Pandey ajitp@codeaurora.org --- include/dt-bindings/sound/sc7180-lpass.h | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 include/dt-bindings/sound/sc7180-lpass.h
diff --git a/include/dt-bindings/sound/sc7180-lpass.h b/include/dt-bindings/sound/sc7180-lpass.h new file mode 100644 index 0000000..7d988f6 --- /dev/null +++ b/include/dt-bindings/sound/sc7180-lpass.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __DT_SC7180_LPASS_H +#define __DT_SC7180_LPASS_H + +#define MI2S_PRIMARY 0 +#define MI2S_SECONDARY 1 + +#define LPASS_MCLK0 0 + +#endif /* __DT_APQ8016_LPASS_H */
On Thu, May 14, 2020 at 10:08:16PM +0530, Ajit Pandey wrote:
+#define MI2S_PRIMARY 0 +#define MI2S_SECONDARY 1
+#define LPASS_MCLK0 0
These look like they could use namespacing. Is primary/secondary perhaps something that could be a boolean property?
On 5/14/2020 10:18 PM, Mark Brown wrote:
On Thu, May 14, 2020 at 10:08:16PM +0530, Ajit Pandey wrote:
+#define MI2S_PRIMARY 0 +#define MI2S_SECONDARY 1
+#define LPASS_MCLK0 0
These look like they could use namespacing. Is primary/secondary perhaps something that could be a boolean property?
Primary/secondary is a dai id and can be from 0-4 (SC7180 soc driver support only 0-1 at present). Such id is mainly used in dtsi and machine driver to do dai id based configuration for a soc hence we placed them in dt headers file for now.
On 14/05/2020 17:38, Ajit Pandey wrote:
Add header defining dai-id and mclk id for SC7180 lpass soc.
Signed-off-by: Ajit Pandey ajitp@codeaurora.org
include/dt-bindings/sound/sc7180-lpass.h | 10 ++++++++++
Why not reuse or rename include/dt-bindings/sound/apq8016-lpass.h to include/dt-bindings/sound/lpass.h and reuse across all the LPASS variants?
--srini
1 file changed, 10 insertions(+) create mode 100644 include/dt-bindings/sound/sc7180-lpass.h
diff --git a/include/dt-bindings/sound/sc7180-lpass.h b/include/dt-bindings/sound/sc7180-lpass.h new file mode 100644 index 0000000..7d988f6 --- /dev/null +++ b/include/dt-bindings/sound/sc7180-lpass.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __DT_SC7180_LPASS_H +#define __DT_SC7180_LPASS_H
+#define MI2S_PRIMARY 0 +#define MI2S_SECONDARY 1
+#define LPASS_MCLK0 0
+#endif /* __DT_APQ8016_LPASS_H */
SC7180 soc variants of LPASS uses lpass-cpu node but required few extra devictree configuration. Update bindings documents with sc7180 compatible string specific dts properties.
Signed-off-by: Ajit Pandey ajitp@codeaurora.org --- .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 25 +++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml b/Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml index f2bcafc..5246d59 100644 --- a/Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml @@ -21,6 +21,7 @@ properties: enum: - qcom,lpass-cpu - qcom,apq8016-lpass-cpu + - qcom,lpass-cpu-sc7180
reg: items: @@ -66,6 +67,14 @@ properties: maxItems: 1 description: Phandle for the audio DSP node
+ iommus: + maxItems: 1 + description: Phandle to apps_smmu node with sid mask + + power-domains: + maxItems: 1 + description: Phandle for power domain node + '#sound-dai-cells': const: 1
@@ -102,6 +111,17 @@ required: optional: - qcom,adsp
+if: + properties: + compatible: + contains: + const: qcom,lpass-cpu-sc7180 + +then: + required: + - iommus + - power-domains + examples: lpass@28100000 { compatible = "qcom,lpass-cpu"; @@ -114,7 +134,10 @@ examples: "mi2s-bit-clk";
interrupts = <0 85 1>; - interrupt-names = "lpass-irq-lpaif"; + interrupt-names = "lpass-irq-lpaif"; + + iommus = <&apps_smmu 0x1020 0>; + power-domains = <&lpass_hm LPASS_CORE_HM_GDSCR>;
reg = <0x28100000 0x10000>; reg-names = "lpass-lpaif";
Create a platform driver for configuring sc7180 lpass core I2S and DMA configuration to support playback & capture to external codecs connected over primary & secondary MI2S interfaces.
Signed-off-by: Ajit Pandey ajitp@codeaurora.org --- sound/soc/qcom/Kconfig | 5 + sound/soc/qcom/Makefile | 2 + sound/soc/qcom/lpass-sc7180.c | 252 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 259 insertions(+) create mode 100644 sound/soc/qcom/lpass-sc7180.c
diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig index f51b28d..17f44ea 100644 --- a/sound/soc/qcom/Kconfig +++ b/sound/soc/qcom/Kconfig @@ -24,6 +24,11 @@ config SND_SOC_LPASS_APQ8016 select SND_SOC_LPASS_CPU select SND_SOC_LPASS_PLATFORM
+config SND_SOC_LPASS_SC7180 + tristate + select SND_SOC_LPASS_CPU + select SND_SOC_LPASS_PLATFORM + config SND_SOC_STORM tristate "ASoC I2S support for Storm boards" depends on SND_SOC_QCOM diff --git a/sound/soc/qcom/Makefile b/sound/soc/qcom/Makefile index 41b2c7a..7972c94 100644 --- a/sound/soc/qcom/Makefile +++ b/sound/soc/qcom/Makefile @@ -4,11 +4,13 @@ snd-soc-lpass-cpu-objs := lpass-cpu.o snd-soc-lpass-platform-objs := lpass-platform.o snd-soc-lpass-ipq806x-objs := lpass-ipq806x.o snd-soc-lpass-apq8016-objs := lpass-apq8016.o +snd-soc-lpass-sc7180-objs := lpass-sc7180.o
obj-$(CONFIG_SND_SOC_LPASS_CPU) += snd-soc-lpass-cpu.o obj-$(CONFIG_SND_SOC_LPASS_PLATFORM) += snd-soc-lpass-platform.o obj-$(CONFIG_SND_SOC_LPASS_IPQ806X) += snd-soc-lpass-ipq806x.o obj-$(CONFIG_SND_SOC_LPASS_APQ8016) += snd-soc-lpass-apq8016.o +obj-$(CONFIG_SND_SOC_LPASS_SC7180) += snd-soc-lpass-sc7180.o
# Machine snd-soc-storm-objs := storm.o diff --git a/sound/soc/qcom/lpass-sc7180.c b/sound/soc/qcom/lpass-sc7180.c new file mode 100644 index 0000000..f483c2b --- /dev/null +++ b/sound/soc/qcom/lpass-sc7180.c @@ -0,0 +1,252 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (c) 2020, The Linux Foundation. All rights reserved. + * + * lpass-sc7180.c -- ALSA SoC platform-machine driver for QTi LPASS + */ + +#include <linux/clk.h> +#include <linux/device.h> +#include <linux/err.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <dt-bindings/sound/sc7180-lpass.h> +#include <sound/pcm.h> +#include <sound/soc.h> + +#include "lpass-lpaif-reg.h" +#include "lpass.h" + +static struct snd_soc_dai_driver sc7180_lpass_cpu_dai_driver[] = { + [MI2S_PRIMARY] = { + .id = MI2S_PRIMARY, + .name = "Primary MI2S", + .playback = { + .stream_name = "Primary Playback", + .formats = SNDRV_PCM_FMTBIT_S16, + .rates = SNDRV_PCM_RATE_48000, + .rate_min = 48000, + .rate_max = 48000, + .channels_min = 2, + .channels_max = 2, + }, + .capture = { + .stream_name = "Primary Capture", + .formats = SNDRV_PCM_FMTBIT_S16, + .rates = SNDRV_PCM_RATE_48000, + .rate_min = 48000, + .rate_max = 48000, + .channels_min = 2, + .channels_max = 2, + }, + .probe = &asoc_qcom_lpass_cpu_dai_probe, + .ops = &asoc_qcom_lpass_cpu_dai_ops, + }, + + [MI2S_SECONDARY] = { + .id = MI2S_SECONDARY, + .name = "Secondary MI2S", + .playback = { + .stream_name = "Secondary Playback", + .formats = SNDRV_PCM_FMTBIT_S16, + .rates = SNDRV_PCM_RATE_48000, + .rate_min = 48000, + .rate_max = 48000, + .channels_min = 2, + .channels_max = 2, + }, + .probe = &asoc_qcom_lpass_cpu_dai_probe, + .ops = &asoc_qcom_lpass_cpu_dai_ops, + }, +}; + +static int sc7180_init_dmactl_bitfields(struct lpaif_dmactl *dmactl, + struct regmap *map, + unsigned int reg) +{ + struct reg_field bursten = DMACTL_BURSTEN_V2_FLD(reg); + struct reg_field wpscnt = DMACTL_WPSCNT_V2_FLD(reg); + struct reg_field fifowm = DMACTL_FIFOWM_V2_FLD(reg); + struct reg_field intf = DMACTL_AUDINTF_V2_FLD(reg); + struct reg_field enable = DMACTL_ENABLE_V2_FLD(reg); + struct reg_field dyncclk = DMACTL_DYNCLK_V2_FLD(reg); + + dmactl->bursten = regmap_field_alloc(map, bursten); + dmactl->wpscnt = regmap_field_alloc(map, wpscnt); + dmactl->fifowm = regmap_field_alloc(map, fifowm); + dmactl->intf = regmap_field_alloc(map, intf); + dmactl->enable = regmap_field_alloc(map, enable); + dmactl->dyncclk = regmap_field_alloc(map, dyncclk); + + if (IS_ERR(dmactl->bursten) || IS_ERR(dmactl->wpscnt) || + IS_ERR(dmactl->fifowm) || IS_ERR(dmactl->intf) || + IS_ERR(dmactl->enable) || IS_ERR(dmactl->dyncclk)) + return -EINVAL; + + return 0; +} + +static int sc7180_lpass_alloc_dma_channel(struct lpass_data *drvdata, + int direction) +{ + struct lpass_variant *v = drvdata->variant; + int chan = 0; + + if (direction == SNDRV_PCM_STREAM_PLAYBACK) { + chan = find_first_zero_bit(&drvdata->dma_ch_bit_map, + v->rdma_channels); + + if (chan >= v->rdma_channels) + return -EBUSY; + } else { + chan = find_next_zero_bit(&drvdata->dma_ch_bit_map, + v->wrdma_channel_start + + v->wrdma_channels, + v->wrdma_channel_start); + + if (chan >= v->wrdma_channel_start + v->wrdma_channels) + return -EBUSY; + } + + set_bit(chan, &drvdata->dma_ch_bit_map); + + return chan; +} + +static int sc7180_lpass_free_dma_channel(struct lpass_data *drvdata, int chan) +{ + clear_bit(chan, &drvdata->dma_ch_bit_map); + + return 0; +} + +static int sc7180_init_i2sctl_bitfields(struct lpaif_i2sctl *i2sctl, + struct regmap *map, unsigned int reg) +{ + struct reg_field loopback = I2SCTL_LOOPBACK_V2_FLD(reg); + struct reg_field spken = I2SCTL_SPKEN_V2_FLD(reg); + struct reg_field spkmode = I2SCTL_SPKMODE_V2_FLD(reg); + struct reg_field spkmono = I2SCTL_SPKMONO_V2_FLD(reg); + struct reg_field micen = I2SCTL_MICEN_V2_FLD(reg); + struct reg_field micmode = I2SCTL_MICMODE_V2_FLD(reg); + struct reg_field micmono = I2SCTL_MICMONO_V2_FLD(reg); + struct reg_field wssrc = I2SCTL_WSSRC_V2_FLD(reg); + struct reg_field bitwidth = I2SCTL_BITWIDTH_V2_FLD(reg); + + i2sctl->loopback = regmap_field_alloc(map, loopback); + i2sctl->spken = regmap_field_alloc(map, spken); + i2sctl->spkmode = regmap_field_alloc(map, spkmode); + i2sctl->spkmono = regmap_field_alloc(map, spkmono); + i2sctl->micen = regmap_field_alloc(map, micen); + i2sctl->micmode = regmap_field_alloc(map, micmode); + i2sctl->micmono = regmap_field_alloc(map, micmono); + i2sctl->wssrc = regmap_field_alloc(map, wssrc); + i2sctl->bitwidth = regmap_field_alloc(map, bitwidth); + + if (IS_ERR(i2sctl->loopback) || IS_ERR(i2sctl->spken) || + IS_ERR(i2sctl->spkmode) || IS_ERR(i2sctl->spkmono) || + IS_ERR(i2sctl->micen) || IS_ERR(i2sctl->micmode) || + IS_ERR(i2sctl->micmono) || IS_ERR(i2sctl->wssrc) || + IS_ERR(i2sctl->bitwidth)) + return -EINVAL; + + return 0; +} + +static int sc7180_lpass_init(struct platform_device *pdev) +{ + struct lpass_data *drvdata = platform_get_drvdata(pdev); + struct lpass_variant *variant = drvdata->variant; + struct device *dev = &pdev->dev; + int ret, i; + + drvdata->clks = devm_kcalloc(dev, variant->num_clks, + sizeof(*drvdata->clks), GFP_KERNEL); + drvdata->num_clks = variant->num_clks; + + for (i = 0; i < drvdata->num_clks; i++) + drvdata->clks[i].id = variant->clk_name[i]; + + ret = devm_clk_bulk_get(dev, drvdata->num_clks, drvdata->clks); + if (ret) { + dev_err(dev, "Failed to get clocks %d\n", ret); + return ret; + } + + ret = clk_bulk_prepare_enable(drvdata->num_clks, drvdata->clks); + if (ret) { + dev_err(dev, "sc7180 clk_enable failed\n"); + return ret; + } + + return 0; +} + +static int sc7180_lpass_exit(struct platform_device *pdev) +{ + struct lpass_data *drvdata = platform_get_drvdata(pdev); + + clk_bulk_disable_unprepare(drvdata->num_clks, drvdata->clks); + + return 0; +} + +static struct lpass_variant sc7180_data = { + .i2sctrl_reg_base = 0x1000, + .i2sctrl_reg_stride = 0x1000, + .i2s_ports = 3, + .irq_reg_base = 0x9000, + .irq_reg_stride = 0x1000, + .irq_ports = 3, + .rdma_reg_base = 0xC000, + .rdma_reg_stride = 0x1000, + .rdma_channels = 5, + .dmactl_audif_start = 1, + .wrdma_reg_base = 0x18000, + .wrdma_reg_stride = 0x1000, + .wrdma_channel_start = 5, + .wrdma_channels = 4, + .clk_name = (const char*[]) { + "noc", + "audio-core", + "sysnoc_mport", + }, + .num_clks = 3, + .dai_driver = sc7180_lpass_cpu_dai_driver, + .num_dai = ARRAY_SIZE(sc7180_lpass_cpu_dai_driver), + .dai_osr_clk_names = (const char *[]) { + "mclk0", + "null", + }, + .dai_bit_clk_names = (const char *[]) { + "pri_ibit", + "sec_ibit", + }, + .init = sc7180_lpass_init, + .exit = sc7180_lpass_exit, + .alloc_dma_channel = sc7180_lpass_alloc_dma_channel, + .free_dma_channel = sc7180_lpass_free_dma_channel, + .init_i2sctl_fields = sc7180_init_i2sctl_bitfields, + .init_dmactl_fields = sc7180_init_dmactl_bitfields, +}; + +static const struct of_device_id sc7180_lpass_cpu_device_id[] = { + {.compatible = "qcom,lpass-cpu-sc7180", .data = &sc7180_data}, + {} +}; + +static struct platform_driver sc7180_lpass_cpu_platform_driver = { + .driver = { + .name = "sc7180-lpass-cpu", + .of_match_table = of_match_ptr(sc7180_lpass_cpu_device_id), + }, + .probe = asoc_qcom_lpass_cpu_platform_probe, + .remove = asoc_qcom_lpass_cpu_platform_probe, +}; + +module_platform_driver(sc7180_lpass_cpu_platform_driver); + +MODULE_DESCRIPTION("SC7180 LPASS CPU DRIVER"); +MODULE_LICENSE("GPL v2");
participants (4)
-
Ajit Pandey -
Mark Brown -
Rohit Kumar -
Srinivas Kandagatla