Vikas Sajjan wrote: > > Moves the properties of FIMD DT node which are common across Exynos5 based > SoCs like Exynos5250 and Exxynos5420 to exynos5.dtsi > %s/Exxynos/Exynos
> Signed-off-by: Vikas Sajjan <[email protected]> > --- > arch/arm/boot/dts/exynos5.dtsi | 10 ++++++++++ > arch/arm/boot/dts/exynos5250-arndale.dts | 1 + > arch/arm/boot/dts/exynos5250.dtsi | 7 +------ > 3 files changed, 12 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/boot/dts/exynos5.dtsi > b/arch/arm/boot/dts/exynos5.dtsi > index f65e124..d464b6c 100644 > --- a/arch/arm/boot/dts/exynos5.dtsi > +++ b/arch/arm/boot/dts/exynos5.dtsi > @@ -108,4 +108,14 @@ > interrupts = <0 42 0>; > status = "disabled"; > }; > + > + fimd@14400000 { > + compatible = "samsung,exynos5250-fimd"; > + interrupt-parent = <&combiner>; > + reg = <0x14400000 0x40000>; > + interrupt-names = "fifo", "vsync", "lcd_sys"; > + interrupts = <18 4>, <18 5>, <18 6>; > + status = "disabled"; > + }; > + No need last empty line. > }; > diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts > b/arch/arm/boot/dts/exynos5250-arndale.dts > index 96d528d..76825ef 100644 > --- a/arch/arm/boot/dts/exynos5250-arndale.dts > +++ b/arch/arm/boot/dts/exynos5250-arndale.dts > @@ -519,6 +519,7 @@ > }; > > fimd: fimd@14400000 { > + status = "okay"; > display-timings { > native-mode = <&timing0>; > timing0: timing@0 { > diff --git a/arch/arm/boot/dts/exynos5250.dtsi > b/arch/arm/boot/dts/exynos5250.dtsi > index ef57277..238bdb2 100644 > --- a/arch/arm/boot/dts/exynos5250.dtsi > +++ b/arch/arm/boot/dts/exynos5250.dtsi > @@ -630,12 +630,7 @@ > }; > }; > > - fimd { > - compatible = "samsung,exynos5250-fimd"; > - interrupt-parent = <&combiner>; > - reg = <0x14400000 0x40000>; > - interrupt-names = "fifo", "vsync", "lcd_sys"; > - interrupts = <18 4>, <18 5>, <18 6>; > + fimd@14400000 { > clocks = <&clock 133>, <&clock 339>; > clock-names = "sclk_fimd", "fimd"; > }; > -- > 1.7.9.5 But you don't need to repost because let me fix when I apply. Thanks, Kukjin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
