diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-01-16 13:13:46 -0800 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-01-16 13:13:46 -0800 |
| commit | 0099d8851681a550065e36fe89719616ab5f63d4 (patch) | |
| tree | 8881a7064ff68cc97c71abd4b5bd1a67de314871 /arch/arm/boot/dts/exynos5420.dtsi | |
| parent | d6e0a2dd12f4067a5bcefb8bbd8ddbeff800afbc (diff) | |
| parent | 2e84d75116c17c2034e917b411250d2d11755435 (diff) | |
Merge remote-tracking branch 'linaro/clk-next' into clk-next
Diffstat (limited to 'arch/arm/boot/dts/exynos5420.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/exynos5420.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index 09aa06cb3d3a..25a1120d88a5 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi @@ -76,8 +76,8 @@ compatible = "samsung,exynos5420-audss-clock"; reg = <0x03810000 0x0C>; #clock-cells = <1>; - clocks = <&clock 148>; - clock-names = "sclk_audio"; + clocks = <&clock 1>, <&clock 5>, <&clock 148>, <&clock 149>; + clock-names = "pll_ref", "pll_in", "sclk_audio", "sclk_pcm_in"; }; codec@11000000 { |