diff options
author | Alim Akhtar <alim.akhtar@samsung.com> | 2015-10-12 15:32:53 -0400 |
---|---|---|
committer | Kukjin Kim <kgene@kernel.org> | 2015-10-12 15:40:27 -0400 |
commit | b8bb9baad27e455c467e8fac47eebadbe765c18f (patch) | |
tree | 2baa2f188c7dda37189541bc508257305e117efb | |
parent | 51a6256b00008a3c520f6f31bcd62cd15cb05960 (diff) |
ARM: dts: Fix audio card detection on Peach boards
Since commit 2fad972d45c4 ("ARM: dts: Add mclk entry for Peach boards"),
sound card detection is broken on peach boards and gives below errors:
[ 3.630457] max98090 7-0010: MAX98091 REVID=0x51
[ 3.634233] max98090 7-0010: use default 2.8v micbias
[ 3.640985] snow-audio sound: HiFi <-> 3830000.i2s mapping ok
[ 3.645307] max98090 7-0010: Invalid master clock frequency
[ 3.650824] snow-audio sound: ASoC: Peach-Pi-I2S-MAX98091 late_probe() failed: -22
[ 3.658914] snow-audio sound: snd_soc_register_card failed (-22)
[ 3.664366] snow-audio: probe of sound failed with error -22
This patch adds missing assigned-clocks and assigned-clock-parents for
pmu_system_controller node which is used as "mclk" for audio codec.
Fixes: 2fad972d45c4 ("ARM: dts: Add mclk entry for Peach boards")
Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
-rw-r--r-- | arch/arm/boot/dts/exynos5420-peach-pit.dts | 5 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos5800-peach-pi.dts | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts index 8f4d76c5e11c..1b95da79293c 100644 --- a/arch/arm/boot/dts/exynos5420-peach-pit.dts +++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts | |||
@@ -915,6 +915,11 @@ | |||
915 | }; | 915 | }; |
916 | }; | 916 | }; |
917 | 917 | ||
918 | &pmu_system_controller { | ||
919 | assigned-clocks = <&pmu_system_controller 0>; | ||
920 | assigned-clock-parents = <&clock CLK_FIN_PLL>; | ||
921 | }; | ||
922 | |||
918 | &rtc { | 923 | &rtc { |
919 | status = "okay"; | 924 | status = "okay"; |
920 | clocks = <&clock CLK_RTC>, <&max77802 MAX77802_CLK_32K_AP>; | 925 | clocks = <&clock CLK_RTC>, <&max77802 MAX77802_CLK_32K_AP>; |
diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts index 7d5b386b5ae6..8f40c7e549bd 100644 --- a/arch/arm/boot/dts/exynos5800-peach-pi.dts +++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts | |||
@@ -878,6 +878,11 @@ | |||
878 | }; | 878 | }; |
879 | }; | 879 | }; |
880 | 880 | ||
881 | &pmu_system_controller { | ||
882 | assigned-clocks = <&pmu_system_controller 0>; | ||
883 | assigned-clock-parents = <&clock CLK_FIN_PLL>; | ||
884 | }; | ||
885 | |||
881 | &rtc { | 886 | &rtc { |
882 | status = "okay"; | 887 | status = "okay"; |
883 | clocks = <&clock CLK_RTC>, <&max77802 MAX77802_CLK_32K_AP>; | 888 | clocks = <&clock CLK_RTC>, <&max77802 MAX77802_CLK_32K_AP>; |