On 2014ë
11ì 07ì¼ 15:12, YoungJun Cho wrote:
> This patch supports Exynos4415 SoC.
Applied.
Thanks,
Inki Dae
>
> Signed-off-by: YoungJun Cho <yj44.cho at samsung.com>
> Acked-by: Kyungmin Park <kyungmin.park at samsung.com>
> ---
> Documentation/devicetree/bindings/video/samsung-fimd.txt | 1 +
> drivers/gpu/drm/exynos/exynos_drm_fimd.c | 11 +++++++++++
> 2 files changed, 12 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/video/samsung-fimd.txt
> b/Documentation/devicetree/bindings/video/samsung-fimd.txt
> index 4e6c77c..cf1af63 100644
> --- a/Documentation/devicetree/bindings/video/samsung-fimd.txt
> +++ b/Documentation/devicetree/bindings/video/samsung-fimd.txt
> @@ -11,6 +11,7 @@ Required properties:
> "samsung,s5pv210-fimd"; /* for S5PV210 SoC */
> "samsung,exynos3250-fimd"; /* for Exynos3250/3472 SoCs */
> "samsung,exynos4210-fimd"; /* for Exynos4 SoCs */
> + "samsung,exynos4415-fimd"; /* for Exynos4415 SoC */
> "samsung,exynos5250-fimd"; /* for Exynos5 SoCs */
>
> - reg: physical base address and length of the FIMD registers set.
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
> b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
> index 085b066..5dfbbdb 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
> @@ -120,6 +120,15 @@ static struct fimd_driver_data exynos4_fimd_driver_data
> = {
> .has_shadowcon = 1,
> };
>
> +static struct fimd_driver_data exynos4415_fimd_driver_data = {
> + .timing_base = 0x20000,
> + .lcdblk_offset = 0x210,
> + .lcdblk_vt_shift = 10,
> + .lcdblk_bypass_shift = 1,
> + .has_shadowcon = 1,
> + .has_vidoutcon = 1,
> +};
> +
> static struct fimd_driver_data exynos5_fimd_driver_data = {
> .timing_base = 0x20000,
> .lcdblk_offset = 0x214,
> @@ -180,6 +189,8 @@ static const struct of_device_id fimd_driver_dt_match[] =
> {
> .data = &exynos3_fimd_driver_data },
> { .compatible = "samsung,exynos4210-fimd",
> .data = &exynos4_fimd_driver_data },
> + { .compatible = "samsung,exynos4415-fimd",
> + .data = &exynos4415_fimd_driver_data },
> { .compatible = "samsung,exynos5250-fimd",
> .data = &exynos5_fimd_driver_data },
> {},
>
