diff mbox series

[v5,5/6] clk: qcom: lpassaudiocc-sc7280: Merge lpasscc into lpass_aon

Message ID 1674218806-7711-6-git-send-email-quic_srivasam@quicinc.com
State New
Headers
Series Add resets for ADSP based audio clock controller driver |

Commit Message

Srinivasa Rao Mandadapu Jan. 20, 2023, 12:46 p.m. UTC 
  Merge lpasscc clocks into lpass_aon clk_regmap structure as they
are using same register space.
In existing implementation, lpasscc clocks and lpass_aon clocks are
being registered exclusively and overlapping if both of them are
to be used.
This is required to avoid such overlapping and to register
lpasscc clocks and lpass_aon clocks simultaneously.

Fixes: 4ab43d171181 ("clk: qcom: Add lpass clock controller driver for SC7280")
Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam@quicinc.com>
Tested-by: Mohammad Rafi Shaik <quic_mohs@quicinc.com>
---
 drivers/clk/qcom/lpassaudiocc-sc7280.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

Comments

kernel test robot Jan. 21, 2023, 5:34 a.m. UTC | #1 
Hi Srinivasa,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on clk/clk-next]
[also build test ERROR on linus/master v6.2-rc4 next-20230120]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Srinivasa-Rao-Mandadapu/dt-bindings-clock-qcom-sc7280-lpasscc-Add-qcom-adsp-pil-mode-property/20230120-204835
base:   https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next
patch link:    https://lore.kernel.org/r/1674218806-7711-6-git-send-email-quic_srivasam%40quicinc.com
patch subject: [PATCH v5 5/6] clk: qcom: lpassaudiocc-sc7280: Merge lpasscc into lpass_aon
config: arc-randconfig-r043-20230119 (https://download.01.org/0day-ci/archive/20230121/202301211339.VDhvfKMQ-lkp@intel.com/config)
compiler: arceb-elf-gcc (GCC) 12.1.0
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # https://github.com/intel-lab-lkp/linux/commit/9163f9ad677af61b97b9ea5ef569722f277a7d20
        git remote add linux-review https://github.com/intel-lab-lkp/linux
        git fetch --no-tags linux-review Srinivasa-Rao-Mandadapu/dt-bindings-clock-qcom-sc7280-lpasscc-Add-qcom-adsp-pil-mode-property/20230120-204835
        git checkout 9163f9ad677af61b97b9ea5ef569722f277a7d20
        # save the config file
        mkdir build_dir && cp config build_dir/.config
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=arc olddefconfig
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=arc SHELL=/bin/bash

If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

   drivers/clk/qcom/lpassaudiocc-sc7280.c: In function 'lpass_aon_cc_sc7280_probe':
>> drivers/clk/qcom/lpassaudiocc-sc7280.c:831:17: error: 'res' undeclared (first use in this function); did you mean 'ret'?
     831 |                 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cc");
         |                 ^~~
         |                 ret
   drivers/clk/qcom/lpassaudiocc-sc7280.c:831:17: note: each undeclared identifier is reported only once for each function it appears in


vim +831 drivers/clk/qcom/lpassaudiocc-sc7280.c

   819	
   820	static int lpass_aon_cc_sc7280_probe(struct platform_device *pdev)
   821	{
   822		const struct qcom_cc_desc *desc;
   823		struct regmap *regmap;
   824		int ret;
   825	
   826		ret = lpass_audio_setup_runtime_pm(pdev);
   827		if (ret)
   828			return ret;
   829	
   830		if (of_property_read_bool(pdev->dev.of_node, "qcom,adsp-pil-mode")) {
 > 831			res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cc");
   832			if (res) {
   833				lpass_audio_cc_sc7280_regmap_config.name = "cc";
   834				desc = &lpass_cc_sc7280_desc;
   835				return qcom_cc_probe(pdev, desc);
   836			}
   837		}
   838	
   839		lpass_audio_cc_sc7280_regmap_config.name = "lpasscc_aon";
   840		lpass_audio_cc_sc7280_regmap_config.max_register = 0xa0008;
   841		desc = &lpass_aon_cc_sc7280_desc;
   842	
   843		regmap = qcom_cc_map(pdev, desc);
   844		if (IS_ERR(regmap)) {
   845			ret = PTR_ERR(regmap);
   846			goto exit;
   847		}
   848	
   849		clk_lucid_pll_configure(&lpass_aon_cc_pll, regmap, &lpass_aon_cc_pll_config);
   850	
   851		ret = qcom_cc_really_probe(pdev, &lpass_aon_cc_sc7280_desc, regmap);
   852		if (ret) {
   853			dev_err(&pdev->dev, "Failed to register LPASS AON CC clocks\n");
   854			goto exit;
   855		}
   856	
   857		pm_runtime_mark_last_busy(&pdev->dev);
   858	exit:
   859		pm_runtime_put_autosuspend(&pdev->dev);
   860	
   861		return ret;
   862	}
   863
kernel test robot Jan. 21, 2023, 7:27 a.m. UTC | #2 
Hi Srinivasa,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on clk/clk-next]
[also build test ERROR on linus/master v6.2-rc4 next-20230120]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Srinivasa-Rao-Mandadapu/dt-bindings-clock-qcom-sc7280-lpasscc-Add-qcom-adsp-pil-mode-property/20230120-204835
base:   https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next
patch link:    https://lore.kernel.org/r/1674218806-7711-6-git-send-email-quic_srivasam%40quicinc.com
patch subject: [PATCH v5 5/6] clk: qcom: lpassaudiocc-sc7280: Merge lpasscc into lpass_aon
config: arm-randconfig-r006-20230119 (https://download.01.org/0day-ci/archive/20230121/202301211545.p4v6zuaX-lkp@intel.com/config)
compiler: clang version 16.0.0 (https://github.com/llvm/llvm-project 4196ca3278f78c6e19246e54ab0ecb364e37d66a)
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # install arm cross compiling tool for clang build
        # apt-get install binutils-arm-linux-gnueabi
        # https://github.com/intel-lab-lkp/linux/commit/9163f9ad677af61b97b9ea5ef569722f277a7d20
        git remote add linux-review https://github.com/intel-lab-lkp/linux
        git fetch --no-tags linux-review Srinivasa-Rao-Mandadapu/dt-bindings-clock-qcom-sc7280-lpasscc-Add-qcom-adsp-pil-mode-property/20230120-204835
        git checkout 9163f9ad677af61b97b9ea5ef569722f277a7d20
        # save the config file
        mkdir build_dir && cp config build_dir/.config
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=arm olddefconfig
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=arm SHELL=/bin/bash drivers/clk/qcom/

If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

>> drivers/clk/qcom/lpassaudiocc-sc7280.c:831:3: error: use of undeclared identifier 'res'; did you mean 'ret'?
                   res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cc");
                   ^~~
                   ret
   drivers/clk/qcom/lpassaudiocc-sc7280.c:824:6: note: 'ret' declared here
           int ret;
               ^
>> drivers/clk/qcom/lpassaudiocc-sc7280.c:831:7: error: incompatible pointer to integer conversion assigning to 'int' from 'struct resource *' [-Wint-conversion]
                   res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cc");
                       ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   drivers/clk/qcom/lpassaudiocc-sc7280.c:832:7: error: use of undeclared identifier 'res'; did you mean 'ret'?
                   if (res) {
                       ^~~
                       ret
   drivers/clk/qcom/lpassaudiocc-sc7280.c:824:6: note: 'ret' declared here
           int ret;
               ^
   3 errors generated.


vim +831 drivers/clk/qcom/lpassaudiocc-sc7280.c

   819	
   820	static int lpass_aon_cc_sc7280_probe(struct platform_device *pdev)
   821	{
   822		const struct qcom_cc_desc *desc;
   823		struct regmap *regmap;
   824		int ret;
   825	
   826		ret = lpass_audio_setup_runtime_pm(pdev);
   827		if (ret)
   828			return ret;
   829	
   830		if (of_property_read_bool(pdev->dev.of_node, "qcom,adsp-pil-mode")) {
 > 831			res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cc");
   832			if (res) {
   833				lpass_audio_cc_sc7280_regmap_config.name = "cc";
   834				desc = &lpass_cc_sc7280_desc;
   835				return qcom_cc_probe(pdev, desc);
   836			}
   837		}
   838	
   839		lpass_audio_cc_sc7280_regmap_config.name = "lpasscc_aon";
   840		lpass_audio_cc_sc7280_regmap_config.max_register = 0xa0008;
   841		desc = &lpass_aon_cc_sc7280_desc;
   842	
   843		regmap = qcom_cc_map(pdev, desc);
   844		if (IS_ERR(regmap)) {
   845			ret = PTR_ERR(regmap);
   846			goto exit;
   847		}
   848	
   849		clk_lucid_pll_configure(&lpass_aon_cc_pll, regmap, &lpass_aon_cc_pll_config);
   850	
   851		ret = qcom_cc_really_probe(pdev, &lpass_aon_cc_sc7280_desc, regmap);
   852		if (ret) {
   853			dev_err(&pdev->dev, "Failed to register LPASS AON CC clocks\n");
   854			goto exit;
   855		}
   856	
   857		pm_runtime_mark_last_busy(&pdev->dev);
   858	exit:
   859		pm_runtime_put_autosuspend(&pdev->dev);
   860	
   861		return ret;
   862	}
   863
diff mbox series

Patch

diff --git a/drivers/clk/qcom/lpassaudiocc-sc7280.c b/drivers/clk/qcom/lpassaudiocc-sc7280.c
index 1339f92..732ecc4 100644
--- a/drivers/clk/qcom/lpassaudiocc-sc7280.c
+++ b/drivers/clk/qcom/lpassaudiocc-sc7280.c
@@ -660,6 +660,8 @@  static struct clk_regmap *lpass_aon_cc_sc7280_clocks[] = {
 	[LPASS_AON_CC_TX_MCLK_2X_CLK] = &lpass_aon_cc_tx_mclk_2x_clk.clkr,
 	[LPASS_AON_CC_TX_MCLK_CLK] = &lpass_aon_cc_tx_mclk_clk.clkr,
 	[LPASS_AON_CC_TX_MCLK_RCG_CLK_SRC] = &lpass_aon_cc_tx_mclk_rcg_clk_src.clkr,
+	[LPASS_Q6_AHBM_CLK] = &lpass_q6ss_ahbm_clk.clkr,
+	[LPASS_Q6_AHBS_CLK] = &lpass_q6ss_ahbs_clk.clkr,
 };
 
 static struct gdsc *lpass_aon_cc_sc7280_gdscs[] = {
@@ -826,10 +828,12 @@  static int lpass_aon_cc_sc7280_probe(struct platform_device *pdev)
 		return ret;
 
 	if (of_property_read_bool(pdev->dev.of_node, "qcom,adsp-pil-mode")) {
-		lpass_audio_cc_sc7280_regmap_config.name = "cc";
-		desc = &lpass_cc_sc7280_desc;
-		ret = qcom_cc_probe(pdev, desc);
-		goto exit;
+		res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cc");
+		if (res) {
+			lpass_audio_cc_sc7280_regmap_config.name = "cc";
+			desc = &lpass_cc_sc7280_desc;
+			return qcom_cc_probe(pdev, desc);
+		}
 	}
 
 	lpass_audio_cc_sc7280_regmap_config.name = "lpasscc_aon";