You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
54 lines
1.4 KiB
54 lines
1.4 KiB
10 years ago
|
--- 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
|
||
|
9 years ago
|
@@ -807,7 +807,7 @@ static struct clk_rcg gsbi7_qup_src = {
|
||
|
10 years ago
|
.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,
|
||
|
|
},
|
||
|
|
},
|
||
|
|
};
|
||
|
9 years ago
|
@@ -823,7 +823,7 @@ static struct clk_branch gsbi7_qup_clk =
|
||
|
10 years ago
|
.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,
|
||
|
|
},
|
||
|
|
},
|
||
|
|
};
|
||
|
9 years ago
|
@@ -871,7 +871,7 @@ static struct clk_branch gsbi4_h_clk = {
|
||
|
10 years ago
|
.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,
|
||
|
|
},
|
||
|
|
},
|
||
|
|
};
|