Patch cherry-picked from the following location: https://chromium-review.googlesource.com/#/c/269931/ Disable the i2c device on gsbi4 and mark gsbi4_h and gsbi4_qup clks as unused. If they are enabled, clock framework will turn them off at end of probe. On ipq806x by design gsbi4_qup, gsbi4_h clks and i2c on gsbi4 are meant for RPM usage. So turning them off in kernel is incorrect. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> SVN-Revision: 45728master
John Crispin
9 years ago
parent
1c6d332d8f
commit
f74477de48
@ -0,0 +1,53 @@ |
||||
--- a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
|
||||
+++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
|
||||
@@ -46,15 +46,12 @@
|
||||
serial@16340000 {
|
||||
status = "ok";
|
||||
};
|
||||
-
|
||||
- i2c4: i2c@16380000 {
|
||||
- status = "ok";
|
||||
-
|
||||
- clock-frequency = <200000>;
|
||||
-
|
||||
- pinctrl-0 = <&i2c4_pins>;
|
||||
- pinctrl-names = "default";
|
||||
- };
|
||||
+ /*
|
||||
+ * The i2c device on gsbi4 should not be enabled.
|
||||
+ * On ipq806x designs gsbi4 i2c is meant for exclusive
|
||||
+ * RPM usage. Turning this on in kernel manifests as
|
||||
+ * i2c failure for the RPM.
|
||||
+ */
|
||||
};
|
||||
|
||||
gsbi5: gsbi@1a200000 {
|
||||
--- a/drivers/clk/qcom/gcc-ipq806x.c
|
||||
+++ b/drivers/clk/qcom/gcc-ipq806x.c
|
||||
@@ -794,7 +794,7 @@ static struct clk_rcg gsbi7_qup_src = {
|
||||
.parent_names = gcc_pxo_pll8,
|
||||
.num_parents = 2,
|
||||
.ops = &clk_rcg_ops,
|
||||
- .flags = CLK_SET_PARENT_GATE,
|
||||
+ .flags = CLK_SET_PARENT_GATE | CLK_IGNORE_UNUSED,
|
||||
},
|
||||
},
|
||||
};
|
||||
@@ -810,7 +810,7 @@ static struct clk_branch gsbi7_qup_clk =
|
||||
.parent_names = (const char *[]){ "gsbi7_qup_src" },
|
||||
.num_parents = 1,
|
||||
.ops = &clk_branch_ops,
|
||||
- .flags = CLK_SET_RATE_PARENT,
|
||||
+ .flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED,
|
||||
},
|
||||
},
|
||||
};
|
||||
@@ -858,7 +858,7 @@ static struct clk_branch gsbi4_h_clk = {
|
||||
.hw.init = &(struct clk_init_data){
|
||||
.name = "gsbi4_h_clk",
|
||||
.ops = &clk_branch_ops,
|
||||
- .flags = CLK_IS_ROOT,
|
||||
+ .flags = CLK_IS_ROOT | CLK_IGNORE_UNUSED,
|
||||
},
|
||||
},
|
||||
};
|
||||
@ -0,0 +1,53 @@ |
||||
--- a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
|
||||
+++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
|
||||
@@ -46,15 +46,12 @@
|
||||
serial@16340000 {
|
||||
status = "ok";
|
||||
};
|
||||
-
|
||||
- i2c4: i2c@16380000 {
|
||||
- status = "ok";
|
||||
-
|
||||
- clock-frequency = <200000>;
|
||||
-
|
||||
- pinctrl-0 = <&i2c4_pins>;
|
||||
- pinctrl-names = "default";
|
||||
- };
|
||||
+ /*
|
||||
+ * The i2c device on gsbi4 should not be enabled.
|
||||
+ * On ipq806x designs gsbi4 i2c is meant for exclusive
|
||||
+ * RPM usage. Turning this on in kernel manifests as
|
||||
+ * i2c failure for the RPM.
|
||||
+ */
|
||||
};
|
||||
|
||||
gsbi5: gsbi@1a200000 {
|
||||
--- a/drivers/clk/qcom/gcc-ipq806x.c
|
||||
+++ b/drivers/clk/qcom/gcc-ipq806x.c
|
||||
@@ -805,7 +805,7 @@ static struct clk_rcg gsbi7_qup_src = {
|
||||
.parent_names = gcc_pxo_pll8,
|
||||
.num_parents = 2,
|
||||
.ops = &clk_rcg_ops,
|
||||
- .flags = CLK_SET_PARENT_GATE,
|
||||
+ .flags = CLK_SET_PARENT_GATE | CLK_IGNORE_UNUSED,
|
||||
},
|
||||
},
|
||||
};
|
||||
@@ -821,7 +821,7 @@ static struct clk_branch gsbi7_qup_clk =
|
||||
.parent_names = (const char *[]){ "gsbi7_qup_src" },
|
||||
.num_parents = 1,
|
||||
.ops = &clk_branch_ops,
|
||||
- .flags = CLK_SET_RATE_PARENT,
|
||||
+ .flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED,
|
||||
},
|
||||
},
|
||||
};
|
||||
@@ -869,7 +869,7 @@ static struct clk_branch gsbi4_h_clk = {
|
||||
.hw.init = &(struct clk_init_data){
|
||||
.name = "gsbi4_h_clk",
|
||||
.ops = &clk_branch_ops,
|
||||
- .flags = CLK_IS_ROOT,
|
||||
+ .flags = CLK_IS_ROOT | CLK_IGNORE_UNUSED,
|
||||
},
|
||||
},
|
||||
};
|
||||
Loading…
Reference in new issue