| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152 |
- --- a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
- +++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
- @@ -47,14 +47,12 @@
- 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
- @@ -294,7 +294,7 @@ static struct clk_rcg gsbi1_uart_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,
- },
- },
- };
- @@ -312,7 +312,7 @@ static struct clk_branch gsbi1_uart_clk
- },
- .num_parents = 1,
- .ops = &clk_branch_ops,
- - .flags = CLK_SET_RATE_PARENT,
- + .flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED,
- },
- },
- };
- @@ -890,7 +890,7 @@ static struct clk_branch gsbi1_h_clk = {
- .hw.init = &(struct clk_init_data){
- .name = "gsbi1_h_clk",
- .ops = &clk_branch_ops,
- - .flags = CLK_IS_ROOT,
- + .flags = CLK_IS_ROOT | CLK_IGNORE_UNUSED,
- },
- },
- };
|
