media: qcom: iris: use common set_preset_registers function

The set_preset_registers is (currently) common to all supported devices.
Extract it to a iris_vpu_common.c and call it directly from
iris_vpu_power_on(). Later, if any of the devices requires special
handling, it can be sorted out separately.

Reviewed-by: Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>
Reviewed-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Bryan O'Donoghue <bod@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 e4eefc646c7fc1d8a1e14a73272992e21a37decb..d7106902698cb0e4958af8fec3cc92995f5a98ec 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_platform_common.h
+++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
@@ -207,7 +207,6 @@ struct iris_platform_data {
        struct iris_inst *(*get_instance)(void);
        u32 (*get_vpu_buffer_size)(struct iris_inst *inst, enum iris_buffer_type buffer_type);
        const struct vpu_ops *vpu_ops;
-       void (*set_preset_registers)(struct iris_core *core);
        const struct icc_info *icc_tbl;
        unsigned int icc_tbl_size;
        const struct bw_info *bw_tbl_dec;

diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen1.c b/drivers/media/platform/qcom/iris/iris_platform_gen1.c
index 07ed572e895bb2c81edc9ee1228146fc016b06ad..ed07d1b00e43fd749727323f83cb957b94007a57 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_platform_gen1.c
+++ b/drivers/media/platform/qcom/iris/iris_platform_gen1.c
@@ -260,11 +260,6 @@ static struct platform_inst_caps platform_inst_cap_sm8250 = {
        .max_operating_rate = MAXIMUM_FPS,
 };
 
-static void iris_set_sm8250_preset_registers(struct iris_core *core)
-{
-       writel(0x0, core->reg_base + 0xB0088);
-}
-
 static const struct icc_info sm8250_icc_table[] = {
        { "cpu-cfg",    1000, 1000     },
        { "video-mem",  1000, 15000000 },
@@ -343,7 +338,6 @@ const struct iris_platform_data sm8250_data = {
        .init_hfi_response_ops = iris_hfi_gen1_response_ops_init,
        .get_vpu_buffer_size = iris_vpu_buf_size,
        .vpu_ops = &iris_vpu2_ops,
-       .set_preset_registers = iris_set_sm8250_preset_registers,
        .icc_tbl = sm8250_icc_table,
        .icc_tbl_size = ARRAY_SIZE(sm8250_icc_table),
        .clk_rst_tbl = sm8250_clk_reset_table,
@@ -397,7 +391,6 @@ const struct iris_platform_data sc7280_data = {
        .init_hfi_response_ops = iris_hfi_gen1_response_ops_init,
        .get_vpu_buffer_size = iris_vpu_buf_size,
        .vpu_ops = &iris_vpu2_ops,
-       .set_preset_registers = iris_set_sm8250_preset_registers,
        .icc_tbl = sm8250_icc_table,
        .icc_tbl_size = ARRAY_SIZE(sm8250_icc_table),
        .bw_tbl_dec = sc7280_bw_table_dec,

diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
index 1f23ddb972f0fd1d2f4b2e476607aad6a9f2f76a..c84d4399f84d97a40cbaafaa1d3123602064b4ee 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c
+++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
@@ -756,11 +756,6 @@ static struct platform_inst_caps platform_inst_cap_sm8550 = {
        .max_operating_rate = MAXIMUM_FPS,
 };
 
-static void iris_set_sm8550_preset_registers(struct iris_core *core)
-{
-       writel(0x0, core->reg_base + 0xB0088);
-}
-
 static const struct icc_info sm8550_icc_table[] = {
        { "cpu-cfg",    1000, 1000     },
        { "video-mem",  1000, 15000000 },
@@ -917,7 +912,6 @@ const struct iris_platform_data sm8550_data = {
        .init_hfi_response_ops = iris_hfi_gen2_response_ops_init,
        .get_vpu_buffer_size = iris_vpu_buf_size,
        .vpu_ops = &iris_vpu3_ops,
-       .set_preset_registers = iris_set_sm8550_preset_registers,
        .icc_tbl = sm8550_icc_table,
        .icc_tbl_size = ARRAY_SIZE(sm8550_icc_table),
        .clk_rst_tbl = sm8550_clk_reset_table,
@@ -1018,7 +1012,6 @@ const struct iris_platform_data sm8650_data = {
        .init_hfi_response_ops = iris_hfi_gen2_response_ops_init,
        .get_vpu_buffer_size = iris_vpu33_buf_size,
        .vpu_ops = &iris_vpu33_ops,
-       .set_preset_registers = iris_set_sm8550_preset_registers,
        .icc_tbl = sm8550_icc_table,
        .icc_tbl_size = ARRAY_SIZE(sm8550_icc_table),
        .clk_rst_tbl = sm8650_clk_reset_table,
@@ -1114,7 +1107,6 @@ const struct iris_platform_data sm8750_data = {
        .init_hfi_response_ops = iris_hfi_gen2_response_ops_init,
        .get_vpu_buffer_size = iris_vpu33_buf_size,
        .vpu_ops = &iris_vpu35_ops,
-       .set_preset_registers = iris_set_sm8550_preset_registers,
        .icc_tbl = sm8550_icc_table,
        .icc_tbl_size = ARRAY_SIZE(sm8550_icc_table),
        .clk_rst_tbl = sm8750_clk_reset_table,
@@ -1212,7 +1204,6 @@ const struct iris_platform_data qcs8300_data = {
        .init_hfi_response_ops = iris_hfi_gen2_response_ops_init,
        .get_vpu_buffer_size = iris_vpu_buf_size,
        .vpu_ops = &iris_vpu3_ops,
-       .set_preset_registers = iris_set_sm8550_preset_registers,
        .icc_tbl = sm8550_icc_table,
        .icc_tbl_size = ARRAY_SIZE(sm8550_icc_table),
        .clk_rst_tbl = sm8550_clk_reset_table,

diff --git a/drivers/media/platform/qcom/iris/iris_vpu_common.c b/drivers/media/platform/qcom/iris/iris_vpu_common.c
index 548e5f1727fdb7543f76a1871f17257fa2360733..faabf53126f301ab3ac96510d383318b07e4b420 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_vpu_common.c
+++ b/drivers/media/platform/qcom/iris/iris_vpu_common.c
@@ -468,7 +468,7 @@ int iris_vpu_power_on(struct iris_core *core)
 
        iris_opp_set_rate(core->dev, freq);
 
-       core->iris_platform_data->set_preset_registers(core);
+       iris_vpu_set_preset_registers(core);
 
        iris_vpu_interrupt_init(core);
        core->intr_status = 0;
@@ -485,3 +485,8 @@ err:
 
        return ret;
 }
+
+void iris_vpu_set_preset_registers(struct iris_core *core)
+{
+       writel(0x0, core->reg_base + 0xb0088);
+}

diff --git a/drivers/media/platform/qcom/iris/iris_vpu_common.h b/drivers/media/platform/qcom/iris/iris_vpu_common.h
index f6dffc613b822341fb21e12de6b1395202f62cde..07728c4c72b64bd15f4e4fdfdce90a5d4d6e9d3e 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_vpu_common.h
+++ b/drivers/media/platform/qcom/iris/iris_vpu_common.h
@@ -39,4 +39,6 @@ int iris_vpu35_vpu4x_power_on_controller(struct iris_core *core);
 void iris_vpu35_vpu4x_program_bootup_registers(struct iris_core *core);
 u64 iris_vpu3x_vpu4x_calculate_frequency(struct iris_inst *inst, size_t data_size);
 
+void iris_vpu_set_preset_registers(struct iris_core *core);
+
 #endif