diff mbox

[2/3] ARM: EXYNOS: add device tree based discovery support for FIMD

Message ID 1347992531-27279-3-git-send-email-l.krishna@samsung.com (mailing list archive)
State New, archived
Headers show

Commit Message

Leela Krishna Amudala Sept. 18, 2012, 6:22 p.m. UTC
This patch adds support for device tree based discovery for Samsung's
display controller. Adds DRM-Fimd plat data for smdk5250
evt1 to the corresponding dts file

Signed-off-by: Leela Krishna Amudala <l.krishna@samsung.com>
---
 arch/arm/boot/dts/exynos5250-smdk5250.dts |   16 ++++++++++++++++
 arch/arm/mach-exynos/include/mach/map.h   |    1 +
 arch/arm/mach-exynos/mach-exynos5-dt.c    |    2 ++
 3 files changed, 19 insertions(+), 0 deletions(-)

Comments

Jingoo Han Sept. 20, 2012, 5:02 a.m. UTC | #1
On Wednesday, September 19, 2012 3:22 AM Leela Krishna Amudala wrote
> 
> This patch adds support for device tree based discovery for Samsung's
> display controller. Adds DRM-Fimd plat data for smdk5250
> evt1 to the corresponding dts file
> 
> Signed-off-by: Leela Krishna Amudala <l.krishna@samsung.com>
> ---
>  arch/arm/boot/dts/exynos5250-smdk5250.dts |   16 ++++++++++++++++
>  arch/arm/mach-exynos/include/mach/map.h   |    1 +
>  arch/arm/mach-exynos/mach-exynos5-dt.c    |    2 ++
>  3 files changed, 19 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
> index 8a5e348..c8d32f5 100644
> --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
> +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
> @@ -109,4 +109,20 @@
>  	spi_2: spi@12d40000 {
>  		status = "disabled";
>  	};
> +
> +	lcd_fimd0: lcd_panel0 {
> +			lcd-htiming = <4 4 4 1280>;
> +			lcd-vtiming = <4 4 4 800>;
> +			supports-mipi-panel;
> +	};
> +
> +	fimd {
> +		samsung,fimd-display = <&lcd_fimd0>;
> +		samsung,fimd-vidout-rgb;
> +		samsung,fimd-inv-vclk;
> +		samsung,fimd-frame-rate = <60>;
> +		samsung,default-window = <0>;
> +		samsung,fimd-win-bpp = <32>;
> +	};
> +
>  };
> diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h
> index b2021bd..dd9cea3 100644
> --- a/arch/arm/mach-exynos/include/mach/map.h
> +++ b/arch/arm/mach-exynos/include/mach/map.h
> @@ -174,6 +174,7 @@
>  #define EXYNOS4_PA_MIPI_CSIS1		0x11890000
> 
>  #define EXYNOS4_PA_FIMD0		0x11C00000
> +#define EXYNOS5_PA_FIMD			0x14400000

CC'ed Thomas Abraham

Please, replace EXYNOS5_PA_FIMD with EXYNOS5_PA_FIMD1.

As I mentioned before, Other Exynos5 SoCs can have 2 FIMD IPs.
Also, Exynos5250 uses FIMD1.


> 
>  #define EXYNOS4_PA_HSMMC(x)		(0x12510000 + ((x) * 0x10000))
>  #define EXYNOS4_PA_DWMCI		0x12550000
> diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
> index e707eb1..0d35d31 100644
> --- a/arch/arm/mach-exynos/mach-exynos5-dt.c
> +++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
> @@ -64,6 +64,8 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = {
>  				"exynos-gsc.2", NULL),
>  	OF_DEV_AUXDATA("samsung,exynos5-gsc", EXYNOS5_PA_GSC3,
>  				"exynos-gsc.3", NULL),
> +	OF_DEV_AUXDATA("samsung,exynos5-fimd", EXYNOS5_PA_FIMD,
> +				"exynos5-fb.1", NULL),
>  	{},
>  };
> 
> --
> 1.7.0.4
Leela Krishna Amudala Sept. 20, 2012, 5:53 a.m. UTC | #2
Hi Jingoo Han,

On Thu, Sep 20, 2012 at 10:32 AM, Jingoo Han <jg1.han@samsung.com> wrote:
> On Wednesday, September 19, 2012 3:22 AM Leela Krishna Amudala wrote
>>
>> This patch adds support for device tree based discovery for Samsung's
>> display controller. Adds DRM-Fimd plat data for smdk5250
>> evt1 to the corresponding dts file
>>
>> Signed-off-by: Leela Krishna Amudala <l.krishna@samsung.com>
>> ---
>>  arch/arm/boot/dts/exynos5250-smdk5250.dts |   16 ++++++++++++++++
>>  arch/arm/mach-exynos/include/mach/map.h   |    1 +
>>  arch/arm/mach-exynos/mach-exynos5-dt.c    |    2 ++
>>  3 files changed, 19 insertions(+), 0 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
>> index 8a5e348..c8d32f5 100644
>> --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
>> +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
>> @@ -109,4 +109,20 @@
>>       spi_2: spi@12d40000 {
>>               status = "disabled";
>>       };
>> +
>> +     lcd_fimd0: lcd_panel0 {
>> +                     lcd-htiming = <4 4 4 1280>;
>> +                     lcd-vtiming = <4 4 4 800>;
>> +                     supports-mipi-panel;
>> +     };
>> +
>> +     fimd {
>> +             samsung,fimd-display = <&lcd_fimd0>;
>> +             samsung,fimd-vidout-rgb;
>> +             samsung,fimd-inv-vclk;
>> +             samsung,fimd-frame-rate = <60>;
>> +             samsung,default-window = <0>;
>> +             samsung,fimd-win-bpp = <32>;
>> +     };
>> +
>>  };
>> diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h
>> index b2021bd..dd9cea3 100644
>> --- a/arch/arm/mach-exynos/include/mach/map.h
>> +++ b/arch/arm/mach-exynos/include/mach/map.h
>> @@ -174,6 +174,7 @@
>>  #define EXYNOS4_PA_MIPI_CSIS1                0x11890000
>>
>>  #define EXYNOS4_PA_FIMD0             0x11C00000
>> +#define EXYNOS5_PA_FIMD                      0x14400000
>
> CC'ed Thomas Abraham
>
> Please, replace EXYNOS5_PA_FIMD with EXYNOS5_PA_FIMD1.
>
> As I mentioned before, Other Exynos5 SoCs can have 2 FIMD IPs.
> Also, Exynos5250 uses FIMD1.
>
>

As per Joonyoung Shim's comment on my previous patches I renamed it
from EXYNOS5_PA_FIMD1 to EXYNOS5_PA_FIMD. Will change it in next
version.
Thanks for reviewing the patch set.

Best Wishes,
Leela Krishna Amudala.

>>
>>  #define EXYNOS4_PA_HSMMC(x)          (0x12510000 + ((x) * 0x10000))
>>  #define EXYNOS4_PA_DWMCI             0x12550000
>> diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
>> index e707eb1..0d35d31 100644
>> --- a/arch/arm/mach-exynos/mach-exynos5-dt.c
>> +++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
>> @@ -64,6 +64,8 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = {
>>                               "exynos-gsc.2", NULL),
>>       OF_DEV_AUXDATA("samsung,exynos5-gsc", EXYNOS5_PA_GSC3,
>>                               "exynos-gsc.3", NULL),
>> +     OF_DEV_AUXDATA("samsung,exynos5-fimd", EXYNOS5_PA_FIMD,
>> +                             "exynos5-fb.1", NULL),
>>       {},
>>  };
>>
>> --
>> 1.7.0.4
>
> --
> 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
Jingoo Han Sept. 20, 2012, 8:23 a.m. UTC | #3
On Thursday, September 20, 2012 2:54 PM Leela Krishna Amudala wrote
> 
> Hi Jingoo Han,
> 
> On Thu, Sep 20, 2012 at 10:32 AM, Jingoo Han <jg1.han@samsung.com> wrote:
> > On Wednesday, September 19, 2012 3:22 AM Leela Krishna Amudala wrote
> >>
> >> This patch adds support for device tree based discovery for Samsung's
> >> display controller. Adds DRM-Fimd plat data for smdk5250
> >> evt1 to the corresponding dts file
> >>
> >> Signed-off-by: Leela Krishna Amudala <l.krishna@samsung.com>
> >> ---
> >>  arch/arm/boot/dts/exynos5250-smdk5250.dts |   16 ++++++++++++++++
> >>  arch/arm/mach-exynos/include/mach/map.h   |    1 +
> >>  arch/arm/mach-exynos/mach-exynos5-dt.c    |    2 ++
> >>  3 files changed, 19 insertions(+), 0 deletions(-)
> >>
> >> diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
> >> index 8a5e348..c8d32f5 100644
> >> --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
> >> +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
> >> @@ -109,4 +109,20 @@
> >>       spi_2: spi@12d40000 {
> >>               status = "disabled";
> >>       };
> >> +
> >> +     lcd_fimd0: lcd_panel0 {
> >> +                     lcd-htiming = <4 4 4 1280>;
> >> +                     lcd-vtiming = <4 4 4 800>;
> >> +                     supports-mipi-panel;
> >> +     };
> >> +
> >> +     fimd {
> >> +             samsung,fimd-display = <&lcd_fimd0>;
> >> +             samsung,fimd-vidout-rgb;
> >> +             samsung,fimd-inv-vclk;
> >> +             samsung,fimd-frame-rate = <60>;
> >> +             samsung,default-window = <0>;
> >> +             samsung,fimd-win-bpp = <32>;
> >> +     };
> >> +
> >>  };
> >> diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h
> >> index b2021bd..dd9cea3 100644
> >> --- a/arch/arm/mach-exynos/include/mach/map.h
> >> +++ b/arch/arm/mach-exynos/include/mach/map.h
> >> @@ -174,6 +174,7 @@
> >>  #define EXYNOS4_PA_MIPI_CSIS1                0x11890000
> >>
> >>  #define EXYNOS4_PA_FIMD0             0x11C00000
> >> +#define EXYNOS5_PA_FIMD                      0x14400000
> >
> > CC'ed Thomas Abraham
> >
> > Please, replace EXYNOS5_PA_FIMD with EXYNOS5_PA_FIMD1.
> >
> > As I mentioned before, Other Exynos5 SoCs can have 2 FIMD IPs.
> > Also, Exynos5250 uses FIMD1.
> >
> >
> 
> As per Joonyoung Shim's comment on my previous patches I renamed it
> from EXYNOS5_PA_FIMD1 to EXYNOS5_PA_FIMD. Will change it in next
> version.
> Thanks for reviewing the patch set.

Let me explain why FIMD1 is right.

Exynos5 SoCs have 2 FIMD IPs, and its address are 0x13800000
And 0x14400000, respectively. Therefore, if address of FIMD IP
Is 0x14400000, it means FIMD1.

Best regards,
Jingoo Han

> 
> Best Wishes,
> Leela Krishna Amudala.
> 
> >>
> >>  #define EXYNOS4_PA_HSMMC(x)          (0x12510000 + ((x) * 0x10000))
> >>  #define EXYNOS4_PA_DWMCI             0x12550000
> >> diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
> >> index e707eb1..0d35d31 100644
> >> --- a/arch/arm/mach-exynos/mach-exynos5-dt.c
> >> +++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
> >> @@ -64,6 +64,8 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = {
> >>                               "exynos-gsc.2", NULL),
> >>       OF_DEV_AUXDATA("samsung,exynos5-gsc", EXYNOS5_PA_GSC3,
> >>                               "exynos-gsc.3", NULL),
> >> +     OF_DEV_AUXDATA("samsung,exynos5-fimd", EXYNOS5_PA_FIMD,
> >> +                             "exynos5-fb.1", NULL),
> >>       {},
> >>  };
> >>
> >> --
> >> 1.7.0.4
> >
> > --
> > 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 mbox

Patch

diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 8a5e348..c8d32f5 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -109,4 +109,20 @@ 
 	spi_2: spi@12d40000 {
 		status = "disabled";
 	};
+
+	lcd_fimd0: lcd_panel0 {
+			lcd-htiming = <4 4 4 1280>;
+			lcd-vtiming = <4 4 4 800>;
+			supports-mipi-panel;
+	};
+
+	fimd {
+		samsung,fimd-display = <&lcd_fimd0>;
+		samsung,fimd-vidout-rgb;
+		samsung,fimd-inv-vclk;
+		samsung,fimd-frame-rate = <60>;
+		samsung,default-window = <0>;
+		samsung,fimd-win-bpp = <32>;
+	};
+
 };
diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h
index b2021bd..dd9cea3 100644
--- a/arch/arm/mach-exynos/include/mach/map.h
+++ b/arch/arm/mach-exynos/include/mach/map.h
@@ -174,6 +174,7 @@ 
 #define EXYNOS4_PA_MIPI_CSIS1		0x11890000
 
 #define EXYNOS4_PA_FIMD0		0x11C00000
+#define EXYNOS5_PA_FIMD			0x14400000
 
 #define EXYNOS4_PA_HSMMC(x)		(0x12510000 + ((x) * 0x10000))
 #define EXYNOS4_PA_DWMCI		0x12550000
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
index e707eb1..0d35d31 100644
--- a/arch/arm/mach-exynos/mach-exynos5-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
@@ -64,6 +64,8 @@  static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = {
 				"exynos-gsc.2", NULL),
 	OF_DEV_AUXDATA("samsung,exynos5-gsc", EXYNOS5_PA_GSC3,
 				"exynos-gsc.3", NULL),
+	OF_DEV_AUXDATA("samsung,exynos5-fimd", EXYNOS5_PA_FIMD,
+				"exynos5-fb.1", NULL),
 	{},
 };