diff options
-rw-r--r-- | arch/arm64/boot/dts/qcom/msm8939.dtsi | 24 | ||||
-rw-r--r-- | drivers/interconnect/qcom/icc-rpm.c | 3 |
2 files changed, 15 insertions, 12 deletions
diff --git a/arch/arm64/boot/dts/qcom/msm8939.dtsi b/arch/arm64/boot/dts/qcom/msm8939.dtsi index 4ea9ecdf771e7..1022933eef74a 100644 --- a/arch/arm64/boot/dts/qcom/msm8939.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8939.dtsi @@ -469,7 +469,7 @@ clock-names = "bus", "bus_a"; clocks = <&rpmcc RPM_SMD_BIMC_CLK>, <&rpmcc RPM_SMD_BIMC_A_CLK>; - #interconnect-cells = <1>; + #interconnect-cells = <2>; status = "okay"; }; @@ -496,7 +496,7 @@ clock-names = "bus", "bus_a"; clocks = <&rpmcc RPM_SMD_PCNOC_CLK>, <&rpmcc RPM_SMD_PCNOC_A_CLK>; - #interconnect-cells = <1>; + #interconnect-cells = <2>; status = "okay"; }; @@ -506,7 +506,7 @@ clock-names = "bus", "bus_a"; clocks = <&rpmcc RPM_SMD_SNOC_CLK>, <&rpmcc RPM_SMD_SNOC_A_CLK>; - #interconnect-cells = <1>; + #interconnect-cells = <2>; status = "okay"; snoc_mm: interconnect@580000 { @@ -514,7 +514,7 @@ clock-names = "bus", "bus_a"; clocks = <&rpmcc RPM_SMD_SYSMMNOC_CLK>, <&rpmcc RPM_SMD_SYSMMNOC_A_CLK>; - #interconnect-cells = <1>; + #interconnect-cells = <2>; status = "okay"; }; @@ -1139,8 +1139,8 @@ "bus", "vsync"; - interconnects = <&snoc_mm MASTER_MDP_PORT0 &bimc SLAVE_EBI_CH0>, - <&snoc_mm MASTER_MDP_PORT1 &bimc SLAVE_EBI_CH0>; + interconnects = <&snoc_mm MASTER_MDP_PORT0 0 &bimc SLAVE_EBI_CH0 0>, + <&snoc_mm MASTER_MDP_PORT1 0 &bimc SLAVE_EBI_CH0 0>; interconnect-names = "mdp0-mem", "mdp1-mem"; power-domains = <&gcc MDSS_GDSC>; @@ -1621,7 +1621,7 @@ pinctrl-0 = <&i2c1_default>; pinctrl-1 = <&i2c1_sleep>; interconnect-names = "i2c-mem"; - interconnects = <&pcnoc MASTER_BLSP_1 &bimc SLAVE_EBI_CH0>; + interconnects = <&pcnoc MASTER_BLSP_1 2 &bimc SLAVE_EBI_CH0 2>; #address-cells = <1>; #size-cells = <0>; status = "disabled"; @@ -1640,7 +1640,7 @@ pinctrl-0 = <&i2c2_default>; pinctrl-1 = <&i2c2_sleep>; interconnect-names = "i2c-mem"; - interconnects = <&pcnoc MASTER_BLSP_1 &bimc SLAVE_EBI_CH0>; + interconnects = <&pcnoc MASTER_BLSP_1 2 &bimc SLAVE_EBI_CH0 2>; #address-cells = <1>; #size-cells = <0>; status = "disabled"; @@ -1659,7 +1659,7 @@ pinctrl-0 = <&i2c3_default>; pinctrl-1 = <&i2c3_sleep>; interconnect-names = "i2c-mem"; - interconnects = <&pcnoc MASTER_BLSP_1 &bimc SLAVE_EBI_CH0>; + interconnects = <&pcnoc MASTER_BLSP_1 2 &bimc SLAVE_EBI_CH0 2>; #address-cells = <1>; #size-cells = <0>; status = "disabled"; @@ -1678,7 +1678,7 @@ pinctrl-0 = <&i2c4_default>; pinctrl-1 = <&i2c4_sleep>; interconnect-names = "i2c-mem"; - interconnects = <&pcnoc MASTER_BLSP_1 &bimc SLAVE_EBI_CH0>; + interconnects = <&pcnoc MASTER_BLSP_1 2 &bimc SLAVE_EBI_CH0 2>; #address-cells = <1>; #size-cells = <0>; status = "disabled"; @@ -1697,7 +1697,7 @@ pinctrl-0 = <&i2c5_default>; pinctrl-1 = <&i2c5_sleep>; interconnect-names = "i2c-mem"; - interconnects = <&pcnoc MASTER_BLSP_1 &bimc SLAVE_EBI_CH0>; + interconnects = <&pcnoc MASTER_BLSP_1 2 &bimc SLAVE_EBI_CH0 2>; #address-cells = <1>; #size-cells = <0>; status = "disabled"; @@ -1716,7 +1716,7 @@ pinctrl-0 = <&i2c6_default>; pinctrl-1 = <&i2c6_sleep>; interconnect-names = "i2c-mem"; - interconnects = <&pcnoc MASTER_BLSP_1 &bimc SLAVE_EBI_CH0>; + interconnects = <&pcnoc MASTER_BLSP_1 2 &bimc SLAVE_EBI_CH0 2>; #address-cells = <1>; #size-cells = <0>; status = "disabled"; diff --git a/drivers/interconnect/qcom/icc-rpm.c b/drivers/interconnect/qcom/icc-rpm.c index 4b932eb807c75..ebba563600129 100644 --- a/drivers/interconnect/qcom/icc-rpm.c +++ b/drivers/interconnect/qcom/icc-rpm.c @@ -397,6 +397,9 @@ static int qcom_icc_set(struct icc_node *src, struct icc_node *dst) do_div(rate, src_qn->buswidth); rate = min_t(u64, rate, LONG_MAX); + trace_printk("%s: clock=%s bucket=%d rate=%llu\n", __func__, + qp->bus_clks[i].id, bucket, rate); + if (qp->bus_clk_rate[i] == rate) continue; |