diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-17 08:57:31 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-17 08:57:31 +0300 |
| commit | 75d95d84888cbd0024eb62ca7e72b3f7fe67dbdd (patch) | |
| tree | 7167fa30a5c46766c10c4b9a37d7bf9373c26c6d /arch/arm/boot/dts/exynos5420.dtsi | |
| parent | 52648e83c9a6b9f7fc3dd272d4d10175e93aa62a (diff) | |
| parent | c0655fe9b0901a968800f56687be3c62b4cce5d2 (diff) | |
| download | linux-75d95d84888cbd0024eb62ca7e72b3f7fe67dbdd.tar.xz | |
Merge branch 'linus' into x86/asm, to resolve conflicts
Conflicts:
tools/testing/selftests/x86/Makefile
tools/testing/selftests/x86/run_x86_tests.sh
Diffstat (limited to 'arch/arm/boot/dts/exynos5420.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/exynos5420.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index f67b23f303c3..45317538bbae 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi @@ -536,6 +536,7 @@ clock-names = "dp"; phys = <&dp_phy>; phy-names = "dp"; + power-domains = <&disp_pd>; }; mipi_phy: video-phy@10040714 { |