Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b187db02 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-dt64-4.18-2' of...

Merge tag 'samsung-dt64-4.18-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt

Samsung DTS ARM64 changes for v4.18, part 2

1. Add clocks necessary for DECON hardware windows no 4 and 5 on
   Exynos5433.

* tag 'samsung-dt64-4.18-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  arm64: dts: exynos: Add more clocks to Exynos5433 Decon/DeconTV

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents da91a61d f0b5e8a2
Loading
Loading
Loading
Loading
+12 −2
Original line number Diff line number Diff line
@@ -829,11 +829,16 @@
				<&cmu_disp CLK_ACLK_SMMU_DECON0X>,
				<&cmu_disp CLK_ACLK_XIU_DECON0X>,
				<&cmu_disp CLK_PCLK_SMMU_DECON0X>,
				<&cmu_disp CLK_ACLK_SMMU_DECON1X>,
				<&cmu_disp CLK_ACLK_XIU_DECON1X>,
				<&cmu_disp CLK_PCLK_SMMU_DECON1X>,
				<&cmu_disp CLK_SCLK_DECON_VCLK>,
				<&cmu_disp CLK_SCLK_DECON_ECLK>;
			clock-names = "pclk", "aclk_decon", "aclk_smmu_decon0x",
				"aclk_xiu_decon0x", "pclk_smmu_decon0x",
				"sclk_decon_vclk", "sclk_decon_eclk";
				"aclk_smmu_decon1x", "aclk_xiu_decon1x",
				"pclk_smmu_decon1x", "sclk_decon_vclk",
				"sclk_decon_eclk";
			power-domains = <&pd_disp>;
			interrupt-names = "fifo", "vsync", "lcd_sys";
			interrupts = <GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH>,
@@ -866,11 +871,16 @@
				 <&cmu_disp CLK_ACLK_SMMU_TV0X>,
				 <&cmu_disp CLK_ACLK_XIU_TV0X>,
				 <&cmu_disp CLK_PCLK_SMMU_TV0X>,
				 <&cmu_disp CLK_ACLK_SMMU_TV1X>,
				 <&cmu_disp CLK_ACLK_XIU_TV1X>,
				 <&cmu_disp CLK_PCLK_SMMU_TV1X>,
				 <&cmu_disp CLK_SCLK_DECON_TV_VCLK>,
				 <&cmu_disp CLK_SCLK_DECON_TV_ECLK>;
			clock-names = "pclk", "aclk_decon", "aclk_smmu_decon0x",
				      "aclk_xiu_decon0x", "pclk_smmu_decon0x",
				      "sclk_decon_vclk", "sclk_decon_eclk";
				      "aclk_smmu_decon1x", "aclk_xiu_decon1x",
				      "pclk_smmu_decon1x", "sclk_decon_vclk",
				      "sclk_decon_eclk";
			samsung,disp-sysreg = <&syscon_disp>;
			power-domains = <&pd_disp>;
			interrupt-names = "fifo", "vsync", "lcd_sys";