| Message ID | 20171129114234.16132-1-m.szyprowski@samsung.com |
|---|---|
| State | New |
| Headers | show |
| Series | [RESEND] ARM: dts: exynos: Move G2D node to exynos5.dtsi | expand |
On Wed, Nov 29, 2017 at 12:42:34PM +0100, Marek Szyprowski wrote: > From: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> > > Current the node is only defined in the exynos5250 DT, while > the corresponding SYSMMUs are also to be found in the exynos5420 > DT. Move the node to exynos5 and only setup the SYSMMUs in the > corresponding DT. > > Disable the node by default, since exynos5410 also includes > the dtsi, but currently does not define the G2D clock. > > Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> > Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> > [mszyprow: rephrased commit message] > Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> > --- > resend on Krzysztof's request > --- > arch/arm/boot/dts/exynos5.dtsi | 7 +++++++ > arch/arm/boot/dts/exynos5250.dtsi | 16 +++++++--------- > arch/arm/boot/dts/exynos5420.dtsi | 7 +++++++ > 3 files changed, 21 insertions(+), 9 deletions(-) > Thanks, applied. Best regards, Krzysztof -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi index 66d22521c976..f3fec03a7595 100644 --- a/arch/arm/boot/dts/exynos5.dtsi +++ b/arch/arm/boot/dts/exynos5.dtsi @@ -204,5 +204,12 @@ #size-cells = <0>; status = "disabled"; }; + + g2d: g2d@10850000 { + compatible = "samsung,exynos5250-g2d"; + reg = <0x10850000 0x1000>; + interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; }; }; diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 5286084e1032..b6a8a2ef499a 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -245,15 +245,6 @@ samsung,syscon-phandle = <&pmu_system_controller>; }; - g2d@10850000 { - compatible = "samsung,exynos5250-g2d"; - reg = <0x10850000 0x1000>; - interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&clock CLK_G2D>; - clock-names = "fimg2d"; - iommus = <&sysmmu_g2d>; - }; - mfc: codec@11000000 { compatible = "samsung,mfc-v6"; reg = <0x11000000 0x10000>; @@ -1024,6 +1015,13 @@ iommus = <&sysmmu_fimd1>; }; +&g2d { + iommus = <&sysmmu_g2d>; + clocks = <&clock CLK_G2D>; + clock-names = "fimg2d"; + status = "okay"; +}; + &i2c_0 { clocks = <&clock CLK_I2C0>; clock-names = "i2c"; diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index 8aa2cc7aa125..81447fffcc94 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi @@ -1349,6 +1349,13 @@ iommu-names = "m0", "m1"; }; +&g2d { + iommus = <&sysmmu_g2dr>, <&sysmmu_g2dw>; + clocks = <&clock CLK_G2D>; + clock-names = "fimg2d"; + status = "okay"; +}; + &i2c_0 { clocks = <&clock CLK_I2C0>; clock-names = "i2c";