Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9aea151f authored by Linus Walleij's avatar Linus Walleij Committed by Olof Johansson
Browse files

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.

Cc: Lee Jones <lee.jones@linaro.org>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 4495c08e

arch/arm/boot/dts/ste-dbx5x0.dtsi

+19 −0
Original line number Diff line number Diff line
@@ -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@80123000 {

			compatible = "stericsson,ux500-msp-i2s";

			reg = <0x80123000 0x1000>;

arch/arm/boot/dts/ste-href.dtsi

+0 −9
Original line number Diff line number Diff line
@@ -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@80123000 {

			pinctrl-names = "default";

			pinctrl-0 = <&msp0_default_mode>;

arch/arm/boot/dts/ste-snowball.dts

+0 −9
Original line number Diff line number Diff line
@@ -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@80123000 {

			pinctrl-names = "default";

			pinctrl-0 = <&msp0_default_mode>;