2015-02-06 17:53:08

by Javier Martinez Canillas

Subject: [PATCH v2 1/1] ARM: dts: Add mclk entry for Snow and Peach Pit/Pi boards

From: Tushar Behera <[email protected]>

On Snow, Peach Pit and Peach Pi boards, the Exynos SoC XCLKOUT output pin
provides the master clock (mclk) to codecs. So make them a clock consumer.

Signed-off-by: Tushar Behera <[email protected]>
Signed-off-by: Javier Martinez Canillas <[email protected]>
---

Changes since v1:
- Rebased on top of Kukjin's for-next branch since v1 made on top of
3.19-rc7 doesn't apply cleanly on that branch. Sorry for the noise.

arch/arm/boot/dts/exynos5250-snow.dts | 2 ++
arch/arm/boot/dts/exynos5420-peach-pit.dts | 2 ++
arch/arm/boot/dts/exynos5800-peach-pi.dts | 2 ++
3 files changed, 6 insertions(+)

diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts
index 5be966df7603..6096d6b02dd8 100644
--- a/arch/arm/boot/dts/exynos5250-snow.dts
+++ b/arch/arm/boot/dts/exynos5250-snow.dts
@@ -206,6 +206,8 @@
samsung,model = "Snow-I2S-MAX98095";
samsung,i2s-controller = <&i2s0>;
samsung,audio-codec = <&max98095>;
+ clocks = <&pmu_system_controller 0>;
+ clock-names = "mclk";
};

usb3_vbus_reg: regulator-usb3 {
diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
index ec86d9523935..1d4db3b0676e 100644
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -594,6 +594,8 @@
interrupt-parent = <&gpx0>;
pinctrl-names = "default";
pinctrl-0 = <&max98090_irq>;
+ clocks = <&pmu_system_controller 0>;
+ clock-names = "mclk";
};

light-sensor@44 {
diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index 06737c60d333..6f2fc3445bd5 100644
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -581,6 +581,8 @@
interrupt-parent = <&gpx0>;
pinctrl-names = "default";
pinctrl-0 = <&max98091_irq>;
+ clocks = <&pmu_system_controller 0>;
+ clock-names = "mclk";
};

light-sensor@44 {
--
2.1.3

2015-02-19 13:31:33

by Javier Martinez Canillas

Subject: Re: [PATCH v2 1/1] ARM: dts: Add mclk entry for Snow and Peach Pit/Pi boards

Hello Kukjin,

On 02/06/2015 06:52 PM, Javier Martinez Canillas wrote:
> From: Tushar Behera <[email protected]>
>
> On Snow, Peach Pit and Peach Pi boards, the Exynos SoC XCLKOUT output pin
> provides the master clock (mclk) to codecs. So make them a clock consumer.
>
> Signed-off-by: Tushar Behera <[email protected]>
> Signed-off-by: Javier Martinez Canillas <[email protected]>
> ---
>

Please drop this patch since I took it from [0] but that patch was when
the master clock was grabbed in the ASoC machine driver but the final
version that got merged grabs the master clock in the codec driver so
it has to be in the codec device node too.

I'll send the correct version soon.

Best regards,
Javier

[0]: https://lkml.org/lkml/2014/5/20/4