ARM: dts: add the AB8500 clocks to the device tree
PATCH 1/1 ARM: dts: add the AB8500 clocks to the device tree
This adds the AB8500 clocks to the device tree using the new bindings from the clk subsystem, making audio work again.
---
ARM SoC guys: please consider this for late merge/early fix.
Lee had audio working at some point in the past, but there is no way of fixing it backward or for stable. However: applying this fixes it for v4.11.
ChangeLog v1->v2:
- Rename DT node to clock-controller.
--- arch/arm/boot/dts/ste-dbx5x0.dtsi | 19 +++++++++++++++++++ arch/arm/boot/dts/ste-href.dtsi | 9 --------- arch/arm/boot/dts/ste-snowball.dts | 9 --------- 3 files changed, 19 insertions(+), 18 deletions(-)
arch/arm/boot/dts/ste-dbx5x0.dtsi +19 -0
@@ -14,6 +14,7 @@ #include <dt-bindings/mfd/dbx500-prcmu.h> #include <dt-bindings/arm/ux500_pm_domains.h> #include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/clock/ste-ab8500.h> #include "skeleton.dtsi" / {
@@ -603,6 +604,11 @@ interrupt-controller; #interrupt-cells = <2>; + ab8500_clock: clock-controller { + compatible = "stericsson,ab8500-clk"; + #clock-cells = <1>; + }; + ab8500_gpio: ab8500-gpio { compatible = "stericsson,ab8500-gpio"; gpio-controller;
@@ -686,6 +692,8 @@ ab8500-pwm { compatible = "stericsson,ab8500-pwm"; + clocks = <&ab8500_clock AB8500_SYSCLK_INT>; + clock-names = "intclk"; }; ab8500-debugfs {
@@ -700,6 +708,9 @@ V-AMIC2-supply = <&ab8500_ldo_anamic2_reg>; V-DMIC-supply = <&ab8500_ldo_dmic_reg>; + clocks = <&ab8500_clock AB8500_SYSCLK_AUDIO>; + clock-names = "audioclk"; + stericsson,earpeice-cmv = <950>; /* Units in mV. */ };
@@ -1095,6 +1106,14 @@ status = "disabled"; }; + sound { + compatible = "stericsson,snd-soc-mop500"; + stericsson,cpu-dai = <&msp1 &msp3>; + stericsson,audio-codec = <&codec>; + clocks = <&prcmu_clk PRCMU_SYSCLK>, <&ab8500_clock AB8500_SYSCLK_ULP>, <&ab8500_clock AB8500_SYSCLK_INT>; + clock-names = "sysclk", "ulpclk", "intclk"; + }; + msp0: msp at 80123000 { compatible = "stericsson,ux500-msp-i2s"; reg = <0x80123000 0x1000>;
arch/arm/boot/dts/ste-href.dtsi +0 -9
@@ -186,15 +186,6 @@ status = "okay"; }; - sound { - compatible = "stericsson,snd-soc-mop500"; - - stericsson,cpu-dai = <&msp1 &msp3>; - stericsson,audio-codec = <&codec>; - clocks = <&prcmu_clk PRCMU_SYSCLK>; - clock-names = "sysclk"; - }; - msp0: msp at 80123000 { pinctrl-names = "default"; pinctrl-0 = <&msp0_default_mode>;
arch/arm/boot/dts/ste-snowball.dts +0 -9
@@ -159,15 +159,6 @@ "", "", "", "", "", "", "", ""; }; - sound { - compatible = "stericsson,snd-soc-mop500"; - - stericsson,cpu-dai = <&msp1 &msp3>; - stericsson,audio-codec = <&codec>; - clocks = <&prcmu_clk PRCMU_SYSCLK>; - clock-names = "sysclk"; - }; - msp0: msp at 80123000 { pinctrl-names = "default"; pinctrl-0 = <&msp0_default_mode>;
Signature · 1 line
2.9.3
PATCH 1/1 ARM: dts: add the AB8500 clocks to the device tree
Quoted 9 lines · Linus Walleij
This adds the AB8500 clocks to the device tree using the new bindings from the clk subsystem, making audio work again.
Cc Lee Jones <[email protected]>Cc Ulf Hansson <[email protected]>Signed-off-by Linus Walleij <[email protected]>---
ARM SoC guys: please consider this for late merge/early fix.
Quoted 6 lines
Lee had audio working at some point in the past, but there is no way of fixing it backward or for stable. However: applying this fixes it for v4.11.
ChangeLog
v1->v2:
- Rename DT node to clock-controller.
Thanks, I'm interpreting this as a fix (at least this early in the release cycle, and merging it for 4.11 fixes).
-Olof
PATCH 1/1 ARM: dts: add the AB8500 clocks to the device tree
Quoted 14 lines · Olof Johansson
Quoted 13 lines · Linus Walleij
This adds the AB8500 clocks to the device tree using the new bindings from the clk subsystem, making audio work again.
Cc Lee Jones <[email protected]>Cc Ulf Hansson <[email protected]>Signed-off-by Linus Walleij <[email protected]>---
ARM SoC guys: please consider this for late merge/early fix.Lee had audio working at some point in the past, but there is no way of fixing it backward or for stable. However: applying this fixes it for v4.11.
Quoted 5 lines
Quoted 2 lines
ChangeLog
v1->v2:
- Rename DT node to clock-controller.Thanks, I'm interpreting this as a fix (at least this early in the release cycle, and merging it for 4.11 fixes).
Yes, thanks a lot. It's a fix indeed, the sound card comes up after this.
Yours,
Linus Walleij