diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-10-21 17:02:13 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-21 17:02:13 +0200 |
| commit | 0690f4f2ef487259e9ce39f575c48c89745058f2 (patch) | |
| tree | 6b9435461cd024e1a49d648fe2487cdfe1c8f1a5 /arch/arm/boot/dts/exynos5800-peach-pi.dts | |
| parent | 6701ef0318f76a9765a3fc762cbac405e024a8c2 (diff) | |
| parent | b28fec1324bf8f5010d2c3c5d57db4115bda66d4 (diff) | |
Merge tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
Merge "Samsung 2nd fixes for v4.3" from Kukjin Kim:
- fix SOC detection of exynos thermal on exynos5260
- fix audio card detection on Peach boards
- fix double of_node_put() when parsing child power domains
* tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
thermal: exynos: Fix register read in TMU
ARM: dts: Fix audio card detection on Peach boards
ARM: EXYNOS: Fix double of_node_put() when parsing child power domains
Diffstat (limited to 'arch/arm/boot/dts/exynos5800-peach-pi.dts')
| -rw-r--r-- | arch/arm/boot/dts/exynos5800-peach-pi.dts | 5 |
1 files changed, 5 insertions, 0 deletions
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 @@ }; }; +&pmu_system_controller { + assigned-clocks = <&pmu_system_controller 0>; + assigned-clock-parents = <&clock CLK_FIN_PLL>; +}; + &rtc { status = "okay"; clocks = <&clock CLK_RTC>, <&max77802 MAX77802_CLK_32K_AP>; |