media: iris: Add support for multiple clock sources

vpu4 depends on more than one clock source. Thus far hardware versions
up to vpu3x have been clocked by a single source.
This adds support for multiple clocks by,
- Adding a lookup table
- Configuring OPP table for video device with different video clocks
- Setting OPP for multiple clocks during dev_pm_opp_set_opp()

This patch extends the support for multiple clocks in driver, which
would be used in subsequent patch for kaanapali, when the platform data
is prepared.

Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
Reviewed-by: Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>
Signed-off-by: Bryan O'Donoghue <bod@kernel.org>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
index a24ed2d03a61d3d7a3f9197140f8f6a5c7fea3d6..222bd7d629ce9e1c02e4180e5876347275f8f4af 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_platform_common.h
+++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
@@ -221,6 +221,7 @@ struct iris_platform_data {
        const char * const *opp_pd_tbl;
        unsigned int opp_pd_tbl_size;
        const struct platform_clk_data *clk_tbl;
+       const char * const *opp_clk_tbl;
        unsigned int clk_tbl_size;
        const char * const *clk_rst_tbl;
        unsigned int clk_rst_tbl_size;

diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen1.c b/drivers/media/platform/qcom/iris/iris_platform_gen1.c
index 712515b0f32942a55f3c9f392e695a91bc2f475e..7abd18be3549fe10d96e9caf4dd00c5b22cffa81 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_platform_gen1.c
+++ b/drivers/media/platform/qcom/iris/iris_platform_gen1.c
@@ -289,6 +289,11 @@ static const struct platform_clk_data sm8250_clk_table[] = {
        {IRIS_HW_CLK,   "vcodec0_core" },
 };
 
+static const char * const sm8250_opp_clk_table[] = {
+       "vcodec0_core",
+       NULL,
+};
+
 static struct tz_cp_config tz_cp_config_sm8250 = {
        .cp_start = 0,
        .cp_size = 0x25800000,
@@ -349,6 +354,7 @@ const struct iris_platform_data sm8250_data = {
        .opp_pd_tbl_size = ARRAY_SIZE(sm8250_opp_pd_table),
        .clk_tbl = sm8250_clk_table,
        .clk_tbl_size = ARRAY_SIZE(sm8250_clk_table),
+       .opp_clk_tbl = sm8250_opp_clk_table,
        /* Upper bound of DMA address range */
        .dma_mask = 0xe0000000 - 1,
        .fwname = "qcom/vpu-1.0/venus.mbn",
@@ -400,6 +406,7 @@ const struct iris_platform_data sc7280_data = {
        .opp_pd_tbl_size = ARRAY_SIZE(sc7280_opp_pd_table),
        .clk_tbl = sc7280_clk_table,
        .clk_tbl_size = ARRAY_SIZE(sc7280_clk_table),
+       .opp_clk_tbl = sc7280_opp_clk_table,
        /* Upper bound of DMA address range */
        .dma_mask = 0xe0000000 - 1,
        .fwname = "qcom/vpu/vpu20_p1.mbn",

diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
index 753ebf0a42c59debb2c8e7a0c60cbbae4b79edaa..cc242e56de7f1cfb237b9847bc52a6a1aa5aa819 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c
+++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
@@ -785,6 +785,11 @@ static const struct platform_clk_data sm8550_clk_table[] = {
        {IRIS_HW_CLK,   "vcodec0_core" },
 };
 
+static const char * const sm8550_opp_clk_table[] = {
+       "vcodec0_core",
+       NULL,
+};
+
 static struct ubwc_config_data ubwc_config_sm8550 = {
        .max_channels = 8,
        .mal_length = 32,
@@ -933,6 +938,7 @@ const struct iris_platform_data sm8550_data = {
        .opp_pd_tbl_size = ARRAY_SIZE(sm8550_opp_pd_table),
        .clk_tbl = sm8550_clk_table,
        .clk_tbl_size = ARRAY_SIZE(sm8550_clk_table),
+       .opp_clk_tbl = sm8550_opp_clk_table,
        /* Upper bound of DMA address range */
        .dma_mask = 0xe0000000 - 1,
        .fwname = "qcom/vpu/vpu30_p4.mbn",
@@ -1036,6 +1042,7 @@ const struct iris_platform_data sm8650_data = {
        .opp_pd_tbl_size = ARRAY_SIZE(sm8550_opp_pd_table),
        .clk_tbl = sm8550_clk_table,
        .clk_tbl_size = ARRAY_SIZE(sm8550_clk_table),
+       .opp_clk_tbl = sm8550_opp_clk_table,
        /* Upper bound of DMA address range */
        .dma_mask = 0xe0000000 - 1,
        .fwname = "qcom/vpu/vpu33_p4.mbn",
@@ -1130,6 +1137,7 @@ const struct iris_platform_data sm8750_data = {
        .opp_pd_tbl_size = ARRAY_SIZE(sm8550_opp_pd_table),
        .clk_tbl = sm8750_clk_table,
        .clk_tbl_size = ARRAY_SIZE(sm8750_clk_table),
+       .opp_clk_tbl = sm8550_opp_clk_table,
        /* Upper bound of DMA address range */
        .dma_mask = 0xe0000000 - 1,
        .fwname = "qcom/vpu/vpu35_p4.mbn",
@@ -1228,6 +1236,7 @@ const struct iris_platform_data qcs8300_data = {
        .opp_pd_tbl_size = ARRAY_SIZE(sm8550_opp_pd_table),
        .clk_tbl = sm8550_clk_table,
        .clk_tbl_size = ARRAY_SIZE(sm8550_clk_table),
+       .opp_clk_tbl = sm8550_opp_clk_table,
        /* Upper bound of DMA address range */
        .dma_mask = 0xe0000000 - 1,
        .fwname = "qcom/vpu/vpu30_p4_s6.mbn",

diff --git a/drivers/media/platform/qcom/iris/iris_platform_sc7280.h b/drivers/media/platform/qcom/iris/iris_platform_sc7280.h
index f1bef4d4bcfe8e58e2f18cff23c3c067f25d8bc3..0ec8f334df670c3c1548a5ee3b8907b333e34db3 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_platform_sc7280.h
+++ b/drivers/media/platform/qcom/iris/iris_platform_sc7280.h
@@ -23,4 +23,9 @@ static const struct platform_clk_data sc7280_clk_table[] = {
        {IRIS_HW_AHB_CLK,  "vcodec_bus"   },
 };
 
+static const char * const sc7280_opp_clk_table[] = {
+       "vcodec_core",
+       NULL,
+};
+
 #endif

diff --git a/drivers/media/platform/qcom/iris/iris_power.c b/drivers/media/platform/qcom/iris/iris_power.c
index dbca42df0910fd3c0fb253dbfabf1afa2c3d32ad..91aa21d4070ebcebbe2ed127a03e5e49b9a2bd5c 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_power.c
+++ b/drivers/media/platform/qcom/iris/iris_power.c
@@ -91,7 +91,7 @@ static int iris_set_clocks(struct iris_inst *inst)
        }
 
        core->power.clk_freq = freq;
-       ret = dev_pm_opp_set_rate(core->dev, freq);
+       ret = iris_opp_set_rate(core->dev, freq);
        mutex_unlock(&core->lock);
 
        return ret;

diff --git a/drivers/media/platform/qcom/iris/iris_probe.c b/drivers/media/platform/qcom/iris/iris_probe.c
index 9bc9b34c2576581635fa8d87eed1965657eb3eb3..ddaacda523ecb9990af0dd0640196223fbcc2cab 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_probe.c
+++ b/drivers/media/platform/qcom/iris/iris_probe.c
@@ -40,8 +40,6 @@ static int iris_init_icc(struct iris_core *core)
 
 static int iris_init_power_domains(struct iris_core *core)
 {
-       const struct platform_clk_data *clk_tbl;
-       u32 clk_cnt, i;
        int ret;
 
        struct dev_pm_domain_attach_data iris_pd_data = {
@@ -56,6 +54,11 @@ static int iris_init_power_domains(struct iris_core *core)
                .pd_flags = PD_FLAG_DEV_LINK_ON | PD_FLAG_REQUIRED_OPP,
        };
 
+       struct dev_pm_opp_config iris_opp_clk_data = {
+               .clk_names = core->iris_platform_data->opp_clk_tbl,
+               .config_clks = dev_pm_opp_config_clks_simple,
+       };
+
        ret = devm_pm_domain_attach_list(core->dev, &iris_pd_data, &core->pmdomain_tbl);
        if (ret < 0)
                return ret;
@@ -64,16 +67,9 @@ static int iris_init_power_domains(struct iris_core *core)
        if (ret < 0)
                return ret;
 
-       clk_tbl = core->iris_platform_data->clk_tbl;
-       clk_cnt = core->iris_platform_data->clk_tbl_size;
-
-       for (i = 0; i < clk_cnt; i++) {
-               if (clk_tbl[i].clk_type == IRIS_HW_CLK) {
-                       ret = devm_pm_opp_set_clkname(core->dev, clk_tbl[i].clk_name);
-                       if (ret)
-                               return ret;
-               }
-       }
+       ret = devm_pm_opp_set_config(core->dev, &iris_opp_clk_data);
+       if (ret)
+               return ret;
 
        return devm_pm_opp_of_add_table(core->dev);
 }

diff --git a/drivers/media/platform/qcom/iris/iris_resources.c b/drivers/media/platform/qcom/iris/iris_resources.c
index 164490c49c95ee048670981fdab014d20436ef85..773f6548370a257b8ae7332242544266cbbd61a9 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_resources.c
+++ b/drivers/media/platform/qcom/iris/iris_resources.c
@@ -4,6 +4,7 @@
  */
 
 #include <linux/clk.h>
+#include <linux/devfreq.h>
 #include <linux/interconnect.h>
 #include <linux/pm_domain.h>
 #include <linux/pm_opp.h>
@@ -58,11 +59,22 @@ int iris_unset_icc_bw(struct iris_core *core)
        return icc_bulk_set_bw(core->icc_count, core->icc_tbl);
 }
 
+int iris_opp_set_rate(struct device *dev, unsigned long freq)
+{
+       struct dev_pm_opp *opp __free(put_opp);
+
+       opp = devfreq_recommended_opp(dev, &freq, 0);
+       if (IS_ERR(opp))
+               return PTR_ERR(opp);
+
+       return dev_pm_opp_set_opp(dev, opp);
+}
+
 int iris_enable_power_domains(struct iris_core *core, struct device *pd_dev)
 {
        int ret;
 
-       ret = dev_pm_opp_set_rate(core->dev, ULONG_MAX);
+       ret = iris_opp_set_rate(core->dev, ULONG_MAX);
        if (ret)
                return ret;
 
@@ -77,7 +89,7 @@ int iris_disable_power_domains(struct iris_core *core, struct device *pd_dev)
 {
        int ret;
 
-       ret = dev_pm_opp_set_rate(core->dev, 0);
+       ret = iris_opp_set_rate(core->dev, 0);
        if (ret)
                return ret;
 

diff --git a/drivers/media/platform/qcom/iris/iris_resources.h b/drivers/media/platform/qcom/iris/iris_resources.h
index f723dfe5bd81a9c9db22d53bde4e18743d771210..6bfbd2dc6db095ec05e53c894e048285f82446c6 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_resources.h
+++ b/drivers/media/platform/qcom/iris/iris_resources.h
@@ -8,6 +8,7 @@
 
 struct iris_core;
 
+int iris_opp_set_rate(struct device *dev, unsigned long freq);
 int iris_enable_power_domains(struct iris_core *core, struct device *pd_dev);
 int iris_disable_power_domains(struct iris_core *core, struct device *pd_dev);
 int iris_unset_icc_bw(struct iris_core *core);

diff --git a/drivers/media/platform/qcom/iris/iris_vpu_common.c b/drivers/media/platform/qcom/iris/iris_vpu_common.c
index 515dd55a3377e5d4d131e360f361a44a0a92505b..fef192a2de48fa47af421632829184c5896326cd 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_vpu_common.c
+++ b/drivers/media/platform/qcom/iris/iris_vpu_common.c
@@ -270,7 +270,7 @@ void iris_vpu_power_off_hw(struct iris_core *core)
 
 void iris_vpu_power_off(struct iris_core *core)
 {
-       dev_pm_opp_set_rate(core->dev, 0);
+       iris_opp_set_rate(core->dev, 0);
        core->iris_platform_data->vpu_ops->power_off_hw(core);
        core->iris_platform_data->vpu_ops->power_off_controller(core);
        iris_unset_icc_bw(core);
@@ -368,7 +368,7 @@ int iris_vpu_power_on(struct iris_core *core)
        freq = core->power.clk_freq ? core->power.clk_freq :
                                      (u32)ULONG_MAX;
 
-       dev_pm_opp_set_rate(core->dev, freq);
+       iris_opp_set_rate(core->dev, freq);
 
        core->iris_platform_data->set_preset_registers(core);