* [PATCH v3 1/3] drm/exynos: add new compatible strings for hdmi subsystem
2013-06-19 12:51 [PATCH v3 0/3] exynos5420/hdmi: add support for hdmi subsystem Rahul Sharma
@ 2013-06-19 12:51 ` Rahul Sharma
2013-06-20 2:11 ` Rahul Sharma
2013-06-19 12:51 ` [PATCH v3 2/3] drm/exynos: add support for exynos5420 mixer Rahul Sharma
2013-06-19 12:51 ` [PATCH v3 3/3] ARM/dts: change compatible strings for hdmi subsystem Rahul Sharma
2 siblings, 1 reply; 12+ messages in thread
From: Rahul Sharma @ 2013-06-19 12:51 UTC (permalink / raw)
To: linux-samsung-soc, devicetree-discuss, dri-devel
Cc: kgene.kim, sw0312.kim, inki.dae, seanpaul, l.stach, tomasz.figa,
rob.herring, s.nawrocki, grant.likely, joshi, r.sh.open,
Rahul Sharma
This patch adds new combatible strings for hdmi, mixer, ddc
and hdmiphy. It follows the convention of using compatible string
which represent the SoC in which the IP was added for the first
time.
Drivers continue to support the previous compatible strings
but further addition of these compatible strings in device tree
is deprecated.
Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
---
Documentation/devicetree/bindings/video/exynos_hdmi.txt | 7 +++++--
.../devicetree/bindings/video/exynos_hdmiddc.txt | 7 +++++--
.../devicetree/bindings/video/exynos_hdmiphy.txt | 7 +++++--
Documentation/devicetree/bindings/video/exynos_mixer.txt | 8 ++++++--
drivers/gpu/drm/exynos/exynos_ddc.c | 2 ++
drivers/gpu/drm/exynos/exynos_hdmi.c | 3 +++
drivers/gpu/drm/exynos/exynos_hdmiphy.c | 4 ++++
drivers/gpu/drm/exynos/exynos_mixer.c | 13 ++++++++-----
8 files changed, 38 insertions(+), 13 deletions(-)
diff --git a/Documentation/devicetree/bindings/video/exynos_hdmi.txt b/Documentation/devicetree/bindings/video/exynos_hdmi.txt
index 589edee..c71d0f0 100644
--- a/Documentation/devicetree/bindings/video/exynos_hdmi.txt
+++ b/Documentation/devicetree/bindings/video/exynos_hdmi.txt
@@ -1,7 +1,10 @@
Device-Tree bindings for drm hdmi driver
Required properties:
-- compatible: value should be "samsung,exynos5-hdmi".
+- compatible: value should be one among the following:
+ 1) "samsung,exynos5-hdmi" <DEPRECATED>
+ 2) "samsung,exynos4210-hdmi"
+ 3) "samsung,exynos4212-hdmi"
- reg: physical base address of the hdmi and length of memory mapped
region.
- interrupts: interrupt number to the cpu.
@@ -15,7 +18,7 @@ Required properties:
Example:
hdmi {
- compatible = "samsung,exynos5-hdmi";
+ compatible = "samsung,exynos4212-hdmi";
reg = <0x14530000 0x100000>;
interrupts = <0 95 0>;
hpd-gpio = <&gpx3 7 0xf 1 3>;
diff --git a/Documentation/devicetree/bindings/video/exynos_hdmiddc.txt b/Documentation/devicetree/bindings/video/exynos_hdmiddc.txt
index fa166d9..41eee97 100644
--- a/Documentation/devicetree/bindings/video/exynos_hdmiddc.txt
+++ b/Documentation/devicetree/bindings/video/exynos_hdmiddc.txt
@@ -1,12 +1,15 @@
Device-Tree bindings for hdmiddc driver
Required properties:
-- compatible: value should be "samsung,exynos5-hdmiddc".
+- compatible: value should be one of the following
+ 1) "samsung,exynos5-hdmiddc" <DEPRECATED>
+ 2) "samsung,exynos4210-hdmiddc"
+
- reg: I2C address of the hdmiddc device.
Example:
hdmiddc {
- compatible = "samsung,exynos5-hdmiddc";
+ compatible = "samsung,exynos4210-hdmiddc";
reg = <0x50>;
};
diff --git a/Documentation/devicetree/bindings/video/exynos_hdmiphy.txt b/Documentation/devicetree/bindings/video/exynos_hdmiphy.txt
index 858f4f9..162f641 100644
--- a/Documentation/devicetree/bindings/video/exynos_hdmiphy.txt
+++ b/Documentation/devicetree/bindings/video/exynos_hdmiphy.txt
@@ -1,12 +1,15 @@
Device-Tree bindings for hdmiphy driver
Required properties:
-- compatible: value should be "samsung,exynos5-hdmiphy".
+- compatible: value should be one of the following:
+ 1) "samsung,exynos5-hdmiphy" <DEPRECATED>
+ 2) "samsung,exynos4210-hdmiphy".
+ 3) "samsung,exynos4212-hdmiphy".
- reg: I2C address of the hdmiphy device.
Example:
hdmiphy {
- compatible = "samsung,exynos5-hdmiphy";
+ compatible = "samsung,exynos4210-hdmiphy";
reg = <0x38>;
};
diff --git a/Documentation/devicetree/bindings/video/exynos_mixer.txt b/Documentation/devicetree/bindings/video/exynos_mixer.txt
index 9b2ea03..9131b99 100644
--- a/Documentation/devicetree/bindings/video/exynos_mixer.txt
+++ b/Documentation/devicetree/bindings/video/exynos_mixer.txt
@@ -1,7 +1,11 @@
Device-Tree bindings for mixer driver
Required properties:
-- compatible: value should be "samsung,exynos5-mixer".
+- compatible: value should be one of the following:
+ 1) "samsung,exynos5-mixer" <DEPRECATED>
+ 2) "samsung,exynos4210-mixer"
+ 3) "samsung,exynos5250-mixer"
+
- reg: physical base address of the mixer and length of memory mapped
region.
- interrupts: interrupt number to the cpu.
@@ -9,7 +13,7 @@ Required properties:
Example:
mixer {
- compatible = "samsung,exynos5-mixer";
+ compatible = "samsung,exynos5250-mixer";
reg = <0x14450000 0x10000>;
interrupts = <0 94 0>;
};
diff --git a/drivers/gpu/drm/exynos/exynos_ddc.c b/drivers/gpu/drm/exynos/exynos_ddc.c
index 4e9b5ba..95c75ed 100644
--- a/drivers/gpu/drm/exynos/exynos_ddc.c
+++ b/drivers/gpu/drm/exynos/exynos_ddc.c
@@ -53,6 +53,8 @@ static struct of_device_id hdmiddc_match_types[] = {
{
.compatible = "samsung,exynos5-hdmiddc",
}, {
+ .compatible = "samsung,exynos4210-hdmiddc",
+ }, {
/* end node */
}
};
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index 743059f..de39530 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -1916,6 +1916,9 @@ static struct of_device_id hdmi_match_types[] = {
.compatible = "samsung,exynos5-hdmi",
.data = (void *)HDMI_TYPE14,
}, {
+ .compatible = "samsung,exynos4212-hdmi",
+ .data = (void *)HDMI_TYPE14,
+ }, {
/* end node */
}
};
diff --git a/drivers/gpu/drm/exynos/exynos_hdmiphy.c b/drivers/gpu/drm/exynos/exynos_hdmiphy.c
index ea49d13..ef04255 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmiphy.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmiphy.c
@@ -51,6 +51,10 @@ static struct of_device_id hdmiphy_match_types[] = {
{
.compatible = "samsung,exynos5-hdmiphy",
}, {
+ .compatible = "samsung,exynos4210-hdmiphy",
+ }, {
+ .compatible = "samsung,exynos4212-hdmiphy",
+ }, {
/* end node */
}
};
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index f36f878..6225501 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -1115,12 +1115,12 @@ static int vp_resources_init(struct exynos_drm_hdmi_context *ctx,
return 0;
}
-static struct mixer_drv_data exynos5_mxr_drv_data = {
+static struct mixer_drv_data exynos5250_mxr_drv_data = {
.version = MXR_VER_16_0_33_0,
.is_vp_enabled = 0,
};
-static struct mixer_drv_data exynos4_mxr_drv_data = {
+static struct mixer_drv_data exynos4210_mxr_drv_data = {
.version = MXR_VER_0_0_0_16,
.is_vp_enabled = 1,
};
@@ -1128,10 +1128,10 @@ static struct mixer_drv_data exynos4_mxr_drv_data = {
static struct platform_device_id mixer_driver_types[] = {
{
.name = "s5p-mixer",
- .driver_data = (unsigned long)&exynos4_mxr_drv_data,
+ .driver_data = (unsigned long)&exynos4210_mxr_drv_data,
}, {
.name = "exynos5-mixer",
- .driver_data = (unsigned long)&exynos5_mxr_drv_data,
+ .driver_data = (unsigned long)&exynos5250_mxr_drv_data,
}, {
/* end node */
}
@@ -1140,7 +1140,10 @@ static struct platform_device_id mixer_driver_types[] = {
static struct of_device_id mixer_match_types[] = {
{
.compatible = "samsung,exynos5-mixer",
- .data = &exynos5_mxr_drv_data,
+ .data = &exynos5250_mxr_drv_data,
+ }, {
+ .compatible = "samsung,exynos5250-mixer",
+ .data = &exynos5250_mxr_drv_data,
}, {
/* end node */
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH v3 1/3] drm/exynos: add new compatible strings for hdmi subsystem
2013-06-19 12:51 ` [PATCH v3 1/3] drm/exynos: add new compatible strings " Rahul Sharma
@ 2013-06-20 2:11 ` Rahul Sharma
2013-06-20 7:22 ` Tomasz Figa
0 siblings, 1 reply; 12+ messages in thread
From: Rahul Sharma @ 2013-06-20 2:11 UTC (permalink / raw)
To: Rahul Sharma
Cc: linux-samsung-soc, devicetree-discuss, dri-devel, kgene.kim,
sw0312.kim, inki.dae, seanpaul, l.stach, tomasz.figa, rob.herring,
s.nawrocki, grant.likely, joshi
Hi Tomasz, Lucas,
How does this patch look to you ? Please share your views.
regards,
Rahul Sharma.
On Wed, Jun 19, 2013 at 6:21 PM, Rahul Sharma <rahul.sharma@samsung.com> wrote:
> This patch adds new combatible strings for hdmi, mixer, ddc
> and hdmiphy. It follows the convention of using compatible string
> which represent the SoC in which the IP was added for the first
> time.
>
> Drivers continue to support the previous compatible strings
> but further addition of these compatible strings in device tree
> is deprecated.
>
> Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
> ---
> Documentation/devicetree/bindings/video/exynos_hdmi.txt | 7 +++++--
> .../devicetree/bindings/video/exynos_hdmiddc.txt | 7 +++++--
> .../devicetree/bindings/video/exynos_hdmiphy.txt | 7 +++++--
> Documentation/devicetree/bindings/video/exynos_mixer.txt | 8 ++++++--
> drivers/gpu/drm/exynos/exynos_ddc.c | 2 ++
> drivers/gpu/drm/exynos/exynos_hdmi.c | 3 +++
> drivers/gpu/drm/exynos/exynos_hdmiphy.c | 4 ++++
> drivers/gpu/drm/exynos/exynos_mixer.c | 13 ++++++++-----
> 8 files changed, 38 insertions(+), 13 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/video/exynos_hdmi.txt b/Documentation/devicetree/bindings/video/exynos_hdmi.txt
> index 589edee..c71d0f0 100644
> --- a/Documentation/devicetree/bindings/video/exynos_hdmi.txt
> +++ b/Documentation/devicetree/bindings/video/exynos_hdmi.txt
> @@ -1,7 +1,10 @@
> Device-Tree bindings for drm hdmi driver
>
> Required properties:
> -- compatible: value should be "samsung,exynos5-hdmi".
> +- compatible: value should be one among the following:
> + 1) "samsung,exynos5-hdmi" <DEPRECATED>
> + 2) "samsung,exynos4210-hdmi"
> + 3) "samsung,exynos4212-hdmi"
> - reg: physical base address of the hdmi and length of memory mapped
> region.
> - interrupts: interrupt number to the cpu.
> @@ -15,7 +18,7 @@ Required properties:
> Example:
>
> hdmi {
> - compatible = "samsung,exynos5-hdmi";
> + compatible = "samsung,exynos4212-hdmi";
> reg = <0x14530000 0x100000>;
> interrupts = <0 95 0>;
> hpd-gpio = <&gpx3 7 0xf 1 3>;
> diff --git a/Documentation/devicetree/bindings/video/exynos_hdmiddc.txt b/Documentation/devicetree/bindings/video/exynos_hdmiddc.txt
> index fa166d9..41eee97 100644
> --- a/Documentation/devicetree/bindings/video/exynos_hdmiddc.txt
> +++ b/Documentation/devicetree/bindings/video/exynos_hdmiddc.txt
> @@ -1,12 +1,15 @@
> Device-Tree bindings for hdmiddc driver
>
> Required properties:
> -- compatible: value should be "samsung,exynos5-hdmiddc".
> +- compatible: value should be one of the following
> + 1) "samsung,exynos5-hdmiddc" <DEPRECATED>
> + 2) "samsung,exynos4210-hdmiddc"
> +
> - reg: I2C address of the hdmiddc device.
>
> Example:
>
> hdmiddc {
> - compatible = "samsung,exynos5-hdmiddc";
> + compatible = "samsung,exynos4210-hdmiddc";
> reg = <0x50>;
> };
> diff --git a/Documentation/devicetree/bindings/video/exynos_hdmiphy.txt b/Documentation/devicetree/bindings/video/exynos_hdmiphy.txt
> index 858f4f9..162f641 100644
> --- a/Documentation/devicetree/bindings/video/exynos_hdmiphy.txt
> +++ b/Documentation/devicetree/bindings/video/exynos_hdmiphy.txt
> @@ -1,12 +1,15 @@
> Device-Tree bindings for hdmiphy driver
>
> Required properties:
> -- compatible: value should be "samsung,exynos5-hdmiphy".
> +- compatible: value should be one of the following:
> + 1) "samsung,exynos5-hdmiphy" <DEPRECATED>
> + 2) "samsung,exynos4210-hdmiphy".
> + 3) "samsung,exynos4212-hdmiphy".
> - reg: I2C address of the hdmiphy device.
>
> Example:
>
> hdmiphy {
> - compatible = "samsung,exynos5-hdmiphy";
> + compatible = "samsung,exynos4210-hdmiphy";
> reg = <0x38>;
> };
> diff --git a/Documentation/devicetree/bindings/video/exynos_mixer.txt b/Documentation/devicetree/bindings/video/exynos_mixer.txt
> index 9b2ea03..9131b99 100644
> --- a/Documentation/devicetree/bindings/video/exynos_mixer.txt
> +++ b/Documentation/devicetree/bindings/video/exynos_mixer.txt
> @@ -1,7 +1,11 @@
> Device-Tree bindings for mixer driver
>
> Required properties:
> -- compatible: value should be "samsung,exynos5-mixer".
> +- compatible: value should be one of the following:
> + 1) "samsung,exynos5-mixer" <DEPRECATED>
> + 2) "samsung,exynos4210-mixer"
> + 3) "samsung,exynos5250-mixer"
> +
> - reg: physical base address of the mixer and length of memory mapped
> region.
> - interrupts: interrupt number to the cpu.
> @@ -9,7 +13,7 @@ Required properties:
> Example:
>
> mixer {
> - compatible = "samsung,exynos5-mixer";
> + compatible = "samsung,exynos5250-mixer";
> reg = <0x14450000 0x10000>;
> interrupts = <0 94 0>;
> };
> diff --git a/drivers/gpu/drm/exynos/exynos_ddc.c b/drivers/gpu/drm/exynos/exynos_ddc.c
> index 4e9b5ba..95c75ed 100644
> --- a/drivers/gpu/drm/exynos/exynos_ddc.c
> +++ b/drivers/gpu/drm/exynos/exynos_ddc.c
> @@ -53,6 +53,8 @@ static struct of_device_id hdmiddc_match_types[] = {
> {
> .compatible = "samsung,exynos5-hdmiddc",
> }, {
> + .compatible = "samsung,exynos4210-hdmiddc",
> + }, {
> /* end node */
> }
> };
> diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
> index 743059f..de39530 100644
> --- a/drivers/gpu/drm/exynos/exynos_hdmi.c
> +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
> @@ -1916,6 +1916,9 @@ static struct of_device_id hdmi_match_types[] = {
> .compatible = "samsung,exynos5-hdmi",
> .data = (void *)HDMI_TYPE14,
> }, {
> + .compatible = "samsung,exynos4212-hdmi",
> + .data = (void *)HDMI_TYPE14,
> + }, {
> /* end node */
> }
> };
> diff --git a/drivers/gpu/drm/exynos/exynos_hdmiphy.c b/drivers/gpu/drm/exynos/exynos_hdmiphy.c
> index ea49d13..ef04255 100644
> --- a/drivers/gpu/drm/exynos/exynos_hdmiphy.c
> +++ b/drivers/gpu/drm/exynos/exynos_hdmiphy.c
> @@ -51,6 +51,10 @@ static struct of_device_id hdmiphy_match_types[] = {
> {
> .compatible = "samsung,exynos5-hdmiphy",
> }, {
> + .compatible = "samsung,exynos4210-hdmiphy",
> + }, {
> + .compatible = "samsung,exynos4212-hdmiphy",
> + }, {
> /* end node */
> }
> };
> diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
> index f36f878..6225501 100644
> --- a/drivers/gpu/drm/exynos/exynos_mixer.c
> +++ b/drivers/gpu/drm/exynos/exynos_mixer.c
> @@ -1115,12 +1115,12 @@ static int vp_resources_init(struct exynos_drm_hdmi_context *ctx,
> return 0;
> }
>
> -static struct mixer_drv_data exynos5_mxr_drv_data = {
> +static struct mixer_drv_data exynos5250_mxr_drv_data = {
> .version = MXR_VER_16_0_33_0,
> .is_vp_enabled = 0,
> };
>
> -static struct mixer_drv_data exynos4_mxr_drv_data = {
> +static struct mixer_drv_data exynos4210_mxr_drv_data = {
> .version = MXR_VER_0_0_0_16,
> .is_vp_enabled = 1,
> };
> @@ -1128,10 +1128,10 @@ static struct mixer_drv_data exynos4_mxr_drv_data = {
> static struct platform_device_id mixer_driver_types[] = {
> {
> .name = "s5p-mixer",
> - .driver_data = (unsigned long)&exynos4_mxr_drv_data,
> + .driver_data = (unsigned long)&exynos4210_mxr_drv_data,
> }, {
> .name = "exynos5-mixer",
> - .driver_data = (unsigned long)&exynos5_mxr_drv_data,
> + .driver_data = (unsigned long)&exynos5250_mxr_drv_data,
> }, {
> /* end node */
> }
> @@ -1140,7 +1140,10 @@ static struct platform_device_id mixer_driver_types[] = {
> static struct of_device_id mixer_match_types[] = {
> {
> .compatible = "samsung,exynos5-mixer",
> - .data = &exynos5_mxr_drv_data,
> + .data = &exynos5250_mxr_drv_data,
> + }, {
> + .compatible = "samsung,exynos5250-mixer",
> + .data = &exynos5250_mxr_drv_data,
> }, {
> /* end node */
> }
> --
> 1.7.10.4
>
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH v3 1/3] drm/exynos: add new compatible strings for hdmi subsystem
2013-06-20 2:11 ` Rahul Sharma
@ 2013-06-20 7:22 ` Tomasz Figa
0 siblings, 0 replies; 12+ messages in thread
From: Tomasz Figa @ 2013-06-20 7:22 UTC (permalink / raw)
To: Rahul Sharma
Cc: Rahul Sharma, linux-samsung-soc, devicetree-discuss, dri-devel,
kgene.kim, sw0312.kim, inki.dae, seanpaul, l.stach, rob.herring,
s.nawrocki, grant.likely, joshi
Hi Rahul,
On Thursday 20 of June 2013 07:41:53 Rahul Sharma wrote:
> Hi Tomasz, Lucas,
>
> How does this patch look to you ? Please share your views.
Looks fine now. Have my
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
for the whole series.
Best regards,
Tomasz
> regards,
> Rahul Sharma.
>
> On Wed, Jun 19, 2013 at 6:21 PM, Rahul Sharma <rahul.sharma@samsung.com>
wrote:
> > This patch adds new combatible strings for hdmi, mixer, ddc
> > and hdmiphy. It follows the convention of using compatible string
> > which represent the SoC in which the IP was added for the first
> > time.
> >
> > Drivers continue to support the previous compatible strings
> > but further addition of these compatible strings in device tree
> > is deprecated.
> >
> > Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
> > ---
> >
> > Documentation/devicetree/bindings/video/exynos_hdmi.txt | 7
> > +++++-- .../devicetree/bindings/video/exynos_hdmiddc.txt |
> > 7 +++++-- .../devicetree/bindings/video/exynos_hdmiphy.txt
> > | 7 +++++--
> > Documentation/devicetree/bindings/video/exynos_mixer.txt | 8
> > ++++++-- drivers/gpu/drm/exynos/exynos_ddc.c |
> > 2 ++ drivers/gpu/drm/exynos/exynos_hdmi.c |
> > 3 +++ drivers/gpu/drm/exynos/exynos_hdmiphy.c |
> > 4 ++++ drivers/gpu/drm/exynos/exynos_mixer.c |
> > 13 ++++++++----- 8 files changed, 38 insertions(+), 13
> > deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/video/exynos_hdmi.txt
> > b/Documentation/devicetree/bindings/video/exynos_hdmi.txt index
> > 589edee..c71d0f0 100644
> > --- a/Documentation/devicetree/bindings/video/exynos_hdmi.txt
> > +++ b/Documentation/devicetree/bindings/video/exynos_hdmi.txt
> > @@ -1,7 +1,10 @@
> >
> > Device-Tree bindings for drm hdmi driver
> >
> > Required properties:
> > -- compatible: value should be "samsung,exynos5-hdmi".
> > +- compatible: value should be one among the following:
> > + 1) "samsung,exynos5-hdmi" <DEPRECATED>
> > + 2) "samsung,exynos4210-hdmi"
> > + 3) "samsung,exynos4212-hdmi"
> >
> > - reg: physical base address of the hdmi and length of memory mapped
> >
> > region.
> >
> > - interrupts: interrupt number to the cpu.
> >
> > @@ -15,7 +18,7 @@ Required properties:
> > Example:
> > hdmi {
> >
> > - compatible = "samsung,exynos5-hdmi";
> > + compatible = "samsung,exynos4212-hdmi";
> >
> > reg = <0x14530000 0x100000>;
> > interrupts = <0 95 0>;
> > hpd-gpio = <&gpx3 7 0xf 1 3>;
> >
> > diff --git
> > a/Documentation/devicetree/bindings/video/exynos_hdmiddc.txt
> > b/Documentation/devicetree/bindings/video/exynos_hdmiddc.txt index
> > fa166d9..41eee97 100644
> > --- a/Documentation/devicetree/bindings/video/exynos_hdmiddc.txt
> > +++ b/Documentation/devicetree/bindings/video/exynos_hdmiddc.txt
> > @@ -1,12 +1,15 @@
> >
> > Device-Tree bindings for hdmiddc driver
> >
> > Required properties:
> > -- compatible: value should be "samsung,exynos5-hdmiddc".
> > +- compatible: value should be one of the following
> > + 1) "samsung,exynos5-hdmiddc" <DEPRECATED>
> > + 2) "samsung,exynos4210-hdmiddc"
> > +
> >
> > - reg: I2C address of the hdmiddc device.
> >
> > Example:
> > hdmiddc {
> >
> > - compatible = "samsung,exynos5-hdmiddc";
> > + compatible = "samsung,exynos4210-hdmiddc";
> >
> > reg = <0x50>;
> >
> > };
> >
> > diff --git
> > a/Documentation/devicetree/bindings/video/exynos_hdmiphy.txt
> > b/Documentation/devicetree/bindings/video/exynos_hdmiphy.txt index
> > 858f4f9..162f641 100644
> > --- a/Documentation/devicetree/bindings/video/exynos_hdmiphy.txt
> > +++ b/Documentation/devicetree/bindings/video/exynos_hdmiphy.txt
> > @@ -1,12 +1,15 @@
> >
> > Device-Tree bindings for hdmiphy driver
> >
> > Required properties:
> > -- compatible: value should be "samsung,exynos5-hdmiphy".
> > +- compatible: value should be one of the following:
> > + 1) "samsung,exynos5-hdmiphy" <DEPRECATED>
> > + 2) "samsung,exynos4210-hdmiphy".
> > + 3) "samsung,exynos4212-hdmiphy".
> >
> > - reg: I2C address of the hdmiphy device.
> >
> > Example:
> > hdmiphy {
> >
> > - compatible = "samsung,exynos5-hdmiphy";
> > + compatible = "samsung,exynos4210-hdmiphy";
> >
> > reg = <0x38>;
> >
> > };
> >
> > diff --git a/Documentation/devicetree/bindings/video/exynos_mixer.txt
> > b/Documentation/devicetree/bindings/video/exynos_mixer.txt index
> > 9b2ea03..9131b99 100644
> > --- a/Documentation/devicetree/bindings/video/exynos_mixer.txt
> > +++ b/Documentation/devicetree/bindings/video/exynos_mixer.txt
> > @@ -1,7 +1,11 @@
> >
> > Device-Tree bindings for mixer driver
> >
> > Required properties:
> > -- compatible: value should be "samsung,exynos5-mixer".
> > +- compatible: value should be one of the following:
> > + 1) "samsung,exynos5-mixer" <DEPRECATED>
> > + 2) "samsung,exynos4210-mixer"
> > + 3) "samsung,exynos5250-mixer"
> > +
> >
> > - reg: physical base address of the mixer and length of memory mapped
> >
> > region.
> >
> > - interrupts: interrupt number to the cpu.
> >
> > @@ -9,7 +13,7 @@ Required properties:
> > Example:
> > mixer {
> >
> > - compatible = "samsung,exynos5-mixer";
> > + compatible = "samsung,exynos5250-mixer";
> >
> > reg = <0x14450000 0x10000>;
> > interrupts = <0 94 0>;
> >
> > };
> >
> > diff --git a/drivers/gpu/drm/exynos/exynos_ddc.c
> > b/drivers/gpu/drm/exynos/exynos_ddc.c index 4e9b5ba..95c75ed 100644
> > --- a/drivers/gpu/drm/exynos/exynos_ddc.c
> > +++ b/drivers/gpu/drm/exynos/exynos_ddc.c
> > @@ -53,6 +53,8 @@ static struct of_device_id hdmiddc_match_types[] = {
> >
> > {
> >
> > .compatible = "samsung,exynos5-hdmiddc",
> >
> > }, {
> >
> > + .compatible = "samsung,exynos4210-hdmiddc",
> > + }, {
> >
> > /* end node */
> >
> > }
> >
> > };
> >
> > diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c
> > b/drivers/gpu/drm/exynos/exynos_hdmi.c index 743059f..de39530 100644
> > --- a/drivers/gpu/drm/exynos/exynos_hdmi.c
> > +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
> > @@ -1916,6 +1916,9 @@ static struct of_device_id hdmi_match_types[] =
> > {
> >
> > .compatible = "samsung,exynos5-hdmi",
> > .data = (void *)HDMI_TYPE14,
> >
> > }, {
> >
> > + .compatible = "samsung,exynos4212-hdmi",
> > + .data = (void *)HDMI_TYPE14,
> > + }, {
> >
> > /* end node */
> >
> > }
> >
> > };
> >
> > diff --git a/drivers/gpu/drm/exynos/exynos_hdmiphy.c
> > b/drivers/gpu/drm/exynos/exynos_hdmiphy.c index ea49d13..ef04255
> > 100644
> > --- a/drivers/gpu/drm/exynos/exynos_hdmiphy.c
> > +++ b/drivers/gpu/drm/exynos/exynos_hdmiphy.c
> > @@ -51,6 +51,10 @@ static struct of_device_id hdmiphy_match_types[] =
> > {
> >
> > {
> >
> > .compatible = "samsung,exynos5-hdmiphy",
> >
> > }, {
> >
> > + .compatible = "samsung,exynos4210-hdmiphy",
> > + }, {
> > + .compatible = "samsung,exynos4212-hdmiphy",
> > + }, {
> >
> > /* end node */
> >
> > }
> >
> > };
> >
> > diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c
> > b/drivers/gpu/drm/exynos/exynos_mixer.c index f36f878..6225501 100644
> > --- a/drivers/gpu/drm/exynos/exynos_mixer.c
> > +++ b/drivers/gpu/drm/exynos/exynos_mixer.c
> > @@ -1115,12 +1115,12 @@ static int vp_resources_init(struct
> > exynos_drm_hdmi_context *ctx,>
> > return 0;
> >
> > }
> >
> > -static struct mixer_drv_data exynos5_mxr_drv_data = {
> > +static struct mixer_drv_data exynos5250_mxr_drv_data = {
> >
> > .version = MXR_VER_16_0_33_0,
> > .is_vp_enabled = 0,
> >
> > };
> >
> > -static struct mixer_drv_data exynos4_mxr_drv_data = {
> > +static struct mixer_drv_data exynos4210_mxr_drv_data = {
> >
> > .version = MXR_VER_0_0_0_16,
> > .is_vp_enabled = 1,
> >
> > };
> >
> > @@ -1128,10 +1128,10 @@ static struct mixer_drv_data
> > exynos4_mxr_drv_data = {>
> > static struct platform_device_id mixer_driver_types[] = {
> >
> > {
> >
> > .name = "s5p-mixer",
> >
> > - .driver_data = (unsigned
> > long)&exynos4_mxr_drv_data,
> > + .driver_data = (unsigned
> > long)&exynos4210_mxr_drv_data,>
> > }, {
> >
> > .name = "exynos5-mixer",
> >
> > - .driver_data = (unsigned
> > long)&exynos5_mxr_drv_data,
> > + .driver_data = (unsigned
> > long)&exynos5250_mxr_drv_data,>
> > }, {
> >
> > /* end node */
> >
> > }
> >
> > @@ -1140,7 +1140,10 @@ static struct platform_device_id
> > mixer_driver_types[] = {>
> > static struct of_device_id mixer_match_types[] = {
> >
> > {
> >
> > .compatible = "samsung,exynos5-mixer",
> >
> > - .data = &exynos5_mxr_drv_data,
> > + .data = &exynos5250_mxr_drv_data,
> > + }, {
> > + .compatible = "samsung,exynos5250-mixer",
> > + .data = &exynos5250_mxr_drv_data,
> >
> > }, {
> >
> > /* end node */
> >
> > }
> >
> > --
> > 1.7.10.4
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v3 2/3] drm/exynos: add support for exynos5420 mixer
2013-06-19 12:51 [PATCH v3 0/3] exynos5420/hdmi: add support for hdmi subsystem Rahul Sharma
2013-06-19 12:51 ` [PATCH v3 1/3] drm/exynos: add new compatible strings " Rahul Sharma
@ 2013-06-19 12:51 ` Rahul Sharma
2013-06-20 2:03 ` 김승우
2013-06-19 12:51 ` [PATCH v3 3/3] ARM/dts: change compatible strings for hdmi subsystem Rahul Sharma
2 siblings, 1 reply; 12+ messages in thread
From: Rahul Sharma @ 2013-06-19 12:51 UTC (permalink / raw)
To: linux-samsung-soc, devicetree-discuss, dri-devel
Cc: kgene.kim, sw0312.kim, inki.dae, seanpaul, l.stach, tomasz.figa,
rob.herring, s.nawrocki, grant.likely, joshi, r.sh.open,
Rahul Sharma
Add support for exynos5420 mixer IP in the drm mixer driver.
Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
---
.../devicetree/bindings/video/exynos_mixer.txt | 1 +
drivers/gpu/drm/exynos/exynos_mixer.c | 49 +++++++++++++++-----
drivers/gpu/drm/exynos/regs-mixer.h | 7 +++
3 files changed, 45 insertions(+), 12 deletions(-)
diff --git a/Documentation/devicetree/bindings/video/exynos_mixer.txt b/Documentation/devicetree/bindings/video/exynos_mixer.txt
index 9131b99..3334b0a 100644
--- a/Documentation/devicetree/bindings/video/exynos_mixer.txt
+++ b/Documentation/devicetree/bindings/video/exynos_mixer.txt
@@ -5,6 +5,7 @@ Required properties:
1) "samsung,exynos5-mixer" <DEPRECATED>
2) "samsung,exynos4210-mixer"
3) "samsung,exynos5250-mixer"
+ 4) "samsung,exynos5420-mixer"
- reg: physical base address of the mixer and length of memory mapped
region.
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index 6225501..b1280b4 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -78,6 +78,7 @@ struct mixer_resources {
enum mixer_version_id {
MXR_VER_0_0_0_16,
MXR_VER_16_0_33_0,
+ MXR_VER_128_0_0_184,
};
struct mixer_context {
@@ -283,17 +284,19 @@ static void mixer_cfg_scan(struct mixer_context *ctx, unsigned int height)
val = (ctx->interlace ? MXR_CFG_SCAN_INTERLACE :
MXR_CFG_SCAN_PROGRASSIVE);
- /* choosing between porper HD and SD mode */
- if (height <= 480)
- val |= MXR_CFG_SCAN_NTSC | MXR_CFG_SCAN_SD;
- else if (height <= 576)
- val |= MXR_CFG_SCAN_PAL | MXR_CFG_SCAN_SD;
- else if (height <= 720)
- val |= MXR_CFG_SCAN_HD_720 | MXR_CFG_SCAN_HD;
- else if (height <= 1080)
- val |= MXR_CFG_SCAN_HD_1080 | MXR_CFG_SCAN_HD;
- else
- val |= MXR_CFG_SCAN_HD_720 | MXR_CFG_SCAN_HD;
+ if (ctx->mxr_ver != MXR_VER_128_0_0_184) {
+ /* choosing between proper HD and SD mode */
+ if (height <= 480)
+ val |= MXR_CFG_SCAN_NTSC | MXR_CFG_SCAN_SD;
+ else if (height <= 576)
+ val |= MXR_CFG_SCAN_PAL | MXR_CFG_SCAN_SD;
+ else if (height <= 720)
+ val |= MXR_CFG_SCAN_HD_720 | MXR_CFG_SCAN_HD;
+ else if (height <= 1080)
+ val |= MXR_CFG_SCAN_HD_1080 | MXR_CFG_SCAN_HD;
+ else
+ val |= MXR_CFG_SCAN_HD_720 | MXR_CFG_SCAN_HD;
+ }
mixer_reg_writemask(res, MXR_CFG, val, MXR_CFG_SCAN_MASK);
}
@@ -557,6 +560,14 @@ static void mixer_graph_buffer(struct mixer_context *ctx, int win)
/* setup geometry */
mixer_reg_write(res, MXR_GRAPHIC_SPAN(win), win_data->fb_width);
+ /* setup display size */
+ if (ctx->mxr_ver == MXR_VER_128_0_0_184 &&
+ win == MIXER_DEFAULT_WIN) {
+ val = MXR_MXR_RES_HEIGHT(win_data->fb_height);
+ val |= MXR_MXR_RES_WIDTH(win_data->fb_width);
+ mixer_reg_write(res, MXR_RESOLUTION, val);
+ }
+
val = MXR_GRP_WH_WIDTH(win_data->crtc_width);
val |= MXR_GRP_WH_HEIGHT(win_data->crtc_height);
val |= MXR_GRP_WH_H_SCALE(x_ratio);
@@ -581,7 +592,8 @@ static void mixer_graph_buffer(struct mixer_context *ctx, int win)
mixer_cfg_layer(ctx, win, true);
/* layer update mandatory for mixer 16.0.33.0 */
- if (ctx->mxr_ver == MXR_VER_16_0_33_0)
+ if (ctx->mxr_ver == MXR_VER_16_0_33_0 ||
+ ctx->mxr_ver == MXR_VER_128_0_0_184)
mixer_layer_update(ctx);
mixer_run(ctx);
@@ -816,6 +828,7 @@ static void mixer_win_disable(void *ctx, int win)
static int mixer_check_mode(void *ctx, struct drm_display_mode *mode)
{
+ struct mixer_context *mixer_ctx = ctx;
u32 w, h;
w = mode->hdisplay;
@@ -825,6 +838,10 @@ static int mixer_check_mode(void *ctx, struct drm_display_mode *mode)
mode->hdisplay, mode->vdisplay, mode->vrefresh,
(mode->flags & DRM_MODE_FLAG_INTERLACE) ? 1 : 0);
+ if (mixer_ctx->mxr_ver == MXR_VER_0_0_0_16 ||
+ mixer_ctx->mxr_ver == MXR_VER_128_0_0_184)
+ return 0;
+
if ((w >= 464 && w <= 720 && h >= 261 && h <= 576) ||
(w >= 1024 && w <= 1280 && h >= 576 && h <= 720) ||
(w >= 1664 && w <= 1920 && h >= 936 && h <= 1080))
@@ -1115,6 +1132,11 @@ static int vp_resources_init(struct exynos_drm_hdmi_context *ctx,
return 0;
}
+static struct mixer_drv_data exynos5420_mxr_drv_data = {
+ .version = MXR_VER_128_0_0_184,
+ .is_vp_enabled = 0,
+};
+
static struct mixer_drv_data exynos5250_mxr_drv_data = {
.version = MXR_VER_16_0_33_0,
.is_vp_enabled = 0,
@@ -1145,6 +1167,9 @@ static struct of_device_id mixer_match_types[] = {
.compatible = "samsung,exynos5250-mixer",
.data = &exynos5250_mxr_drv_data,
}, {
+ .compatible = "samsung,exynos5420-mixer",
+ .data = &exynos5420_mxr_drv_data,
+ }, {
/* end node */
}
};
diff --git a/drivers/gpu/drm/exynos/regs-mixer.h b/drivers/gpu/drm/exynos/regs-mixer.h
index 5d8dbc0..4537026 100644
--- a/drivers/gpu/drm/exynos/regs-mixer.h
+++ b/drivers/gpu/drm/exynos/regs-mixer.h
@@ -44,6 +44,9 @@
#define MXR_CM_COEFF_Y 0x0080
#define MXR_CM_COEFF_CB 0x0084
#define MXR_CM_COEFF_CR 0x0088
+#define MXR_MO 0x0304
+#define MXR_RESOLUTION 0x0310
+
#define MXR_GRAPHIC0_BASE_S 0x2024
#define MXR_GRAPHIC1_BASE_S 0x2044
@@ -119,6 +122,10 @@
#define MXR_GRP_WH_WIDTH(x) MXR_MASK_VAL(x, 26, 16)
#define MXR_GRP_WH_HEIGHT(x) MXR_MASK_VAL(x, 10, 0)
+/* bits for MXR_RESOLUTION */
+#define MXR_MXR_RES_HEIGHT(x) MXR_MASK_VAL(x, 26, 16)
+#define MXR_MXR_RES_WIDTH(x) MXR_MASK_VAL(x, 10, 0)
+
/* bits for MXR_GRAPHICn_SXY */
#define MXR_GRP_SXY_SX(x) MXR_MASK_VAL(x, 26, 16)
#define MXR_GRP_SXY_SY(x) MXR_MASK_VAL(x, 10, 0)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH v3 2/3] drm/exynos: add support for exynos5420 mixer
2013-06-19 12:51 ` [PATCH v3 2/3] drm/exynos: add support for exynos5420 mixer Rahul Sharma
@ 2013-06-20 2:03 ` 김승우
0 siblings, 0 replies; 12+ messages in thread
From: 김승우 @ 2013-06-20 2:03 UTC (permalink / raw)
To: Rahul Sharma
Cc: linux-samsung-soc, devicetree-discuss, dri-devel, kgene.kim,
inki.dae, seanpaul, l.stach, tomasz.figa, rob.herring, s.nawrocki,
grant.likely, joshi, r.sh.open, Seung-Woo Kim
Hello Rahul,
This patch is exactly same with v2 2/4 and only rebased on v3 1/3, so my
ack is valid for this patch.
On 2013년 06월 19일 21:51, Rahul Sharma wrote:
> Add support for exynos5420 mixer IP in the drm mixer driver.
>
> Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
Acked-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Anyway, this patch can be merged after merging [Patch v3 1/3] as like v2.
Best Regards,
- Seung-Woo Kim
> ---
> .../devicetree/bindings/video/exynos_mixer.txt | 1 +
> drivers/gpu/drm/exynos/exynos_mixer.c | 49 +++++++++++++++-----
> drivers/gpu/drm/exynos/regs-mixer.h | 7 +++
> 3 files changed, 45 insertions(+), 12 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/video/exynos_mixer.txt b/Documentation/devicetree/bindings/video/exynos_mixer.txt
> index 9131b99..3334b0a 100644
> --- a/Documentation/devicetree/bindings/video/exynos_mixer.txt
> +++ b/Documentation/devicetree/bindings/video/exynos_mixer.txt
> @@ -5,6 +5,7 @@ Required properties:
> 1) "samsung,exynos5-mixer" <DEPRECATED>
> 2) "samsung,exynos4210-mixer"
> 3) "samsung,exynos5250-mixer"
> + 4) "samsung,exynos5420-mixer"
>
> - reg: physical base address of the mixer and length of memory mapped
> region.
> diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
> index 6225501..b1280b4 100644
> --- a/drivers/gpu/drm/exynos/exynos_mixer.c
> +++ b/drivers/gpu/drm/exynos/exynos_mixer.c
> @@ -78,6 +78,7 @@ struct mixer_resources {
> enum mixer_version_id {
> MXR_VER_0_0_0_16,
> MXR_VER_16_0_33_0,
> + MXR_VER_128_0_0_184,
> };
>
> struct mixer_context {
> @@ -283,17 +284,19 @@ static void mixer_cfg_scan(struct mixer_context *ctx, unsigned int height)
> val = (ctx->interlace ? MXR_CFG_SCAN_INTERLACE :
> MXR_CFG_SCAN_PROGRASSIVE);
>
> - /* choosing between porper HD and SD mode */
> - if (height <= 480)
> - val |= MXR_CFG_SCAN_NTSC | MXR_CFG_SCAN_SD;
> - else if (height <= 576)
> - val |= MXR_CFG_SCAN_PAL | MXR_CFG_SCAN_SD;
> - else if (height <= 720)
> - val |= MXR_CFG_SCAN_HD_720 | MXR_CFG_SCAN_HD;
> - else if (height <= 1080)
> - val |= MXR_CFG_SCAN_HD_1080 | MXR_CFG_SCAN_HD;
> - else
> - val |= MXR_CFG_SCAN_HD_720 | MXR_CFG_SCAN_HD;
> + if (ctx->mxr_ver != MXR_VER_128_0_0_184) {
> + /* choosing between proper HD and SD mode */
> + if (height <= 480)
> + val |= MXR_CFG_SCAN_NTSC | MXR_CFG_SCAN_SD;
> + else if (height <= 576)
> + val |= MXR_CFG_SCAN_PAL | MXR_CFG_SCAN_SD;
> + else if (height <= 720)
> + val |= MXR_CFG_SCAN_HD_720 | MXR_CFG_SCAN_HD;
> + else if (height <= 1080)
> + val |= MXR_CFG_SCAN_HD_1080 | MXR_CFG_SCAN_HD;
> + else
> + val |= MXR_CFG_SCAN_HD_720 | MXR_CFG_SCAN_HD;
> + }
>
> mixer_reg_writemask(res, MXR_CFG, val, MXR_CFG_SCAN_MASK);
> }
> @@ -557,6 +560,14 @@ static void mixer_graph_buffer(struct mixer_context *ctx, int win)
> /* setup geometry */
> mixer_reg_write(res, MXR_GRAPHIC_SPAN(win), win_data->fb_width);
>
> + /* setup display size */
> + if (ctx->mxr_ver == MXR_VER_128_0_0_184 &&
> + win == MIXER_DEFAULT_WIN) {
> + val = MXR_MXR_RES_HEIGHT(win_data->fb_height);
> + val |= MXR_MXR_RES_WIDTH(win_data->fb_width);
> + mixer_reg_write(res, MXR_RESOLUTION, val);
> + }
> +
> val = MXR_GRP_WH_WIDTH(win_data->crtc_width);
> val |= MXR_GRP_WH_HEIGHT(win_data->crtc_height);
> val |= MXR_GRP_WH_H_SCALE(x_ratio);
> @@ -581,7 +592,8 @@ static void mixer_graph_buffer(struct mixer_context *ctx, int win)
> mixer_cfg_layer(ctx, win, true);
>
> /* layer update mandatory for mixer 16.0.33.0 */
> - if (ctx->mxr_ver == MXR_VER_16_0_33_0)
> + if (ctx->mxr_ver == MXR_VER_16_0_33_0 ||
> + ctx->mxr_ver == MXR_VER_128_0_0_184)
> mixer_layer_update(ctx);
>
> mixer_run(ctx);
> @@ -816,6 +828,7 @@ static void mixer_win_disable(void *ctx, int win)
>
> static int mixer_check_mode(void *ctx, struct drm_display_mode *mode)
> {
> + struct mixer_context *mixer_ctx = ctx;
> u32 w, h;
>
> w = mode->hdisplay;
> @@ -825,6 +838,10 @@ static int mixer_check_mode(void *ctx, struct drm_display_mode *mode)
> mode->hdisplay, mode->vdisplay, mode->vrefresh,
> (mode->flags & DRM_MODE_FLAG_INTERLACE) ? 1 : 0);
>
> + if (mixer_ctx->mxr_ver == MXR_VER_0_0_0_16 ||
> + mixer_ctx->mxr_ver == MXR_VER_128_0_0_184)
> + return 0;
> +
> if ((w >= 464 && w <= 720 && h >= 261 && h <= 576) ||
> (w >= 1024 && w <= 1280 && h >= 576 && h <= 720) ||
> (w >= 1664 && w <= 1920 && h >= 936 && h <= 1080))
> @@ -1115,6 +1132,11 @@ static int vp_resources_init(struct exynos_drm_hdmi_context *ctx,
> return 0;
> }
>
> +static struct mixer_drv_data exynos5420_mxr_drv_data = {
> + .version = MXR_VER_128_0_0_184,
> + .is_vp_enabled = 0,
> +};
> +
> static struct mixer_drv_data exynos5250_mxr_drv_data = {
> .version = MXR_VER_16_0_33_0,
> .is_vp_enabled = 0,
> @@ -1145,6 +1167,9 @@ static struct of_device_id mixer_match_types[] = {
> .compatible = "samsung,exynos5250-mixer",
> .data = &exynos5250_mxr_drv_data,
> }, {
> + .compatible = "samsung,exynos5420-mixer",
> + .data = &exynos5420_mxr_drv_data,
> + }, {
> /* end node */
> }
> };
> diff --git a/drivers/gpu/drm/exynos/regs-mixer.h b/drivers/gpu/drm/exynos/regs-mixer.h
> index 5d8dbc0..4537026 100644
> --- a/drivers/gpu/drm/exynos/regs-mixer.h
> +++ b/drivers/gpu/drm/exynos/regs-mixer.h
> @@ -44,6 +44,9 @@
> #define MXR_CM_COEFF_Y 0x0080
> #define MXR_CM_COEFF_CB 0x0084
> #define MXR_CM_COEFF_CR 0x0088
> +#define MXR_MO 0x0304
> +#define MXR_RESOLUTION 0x0310
> +
> #define MXR_GRAPHIC0_BASE_S 0x2024
> #define MXR_GRAPHIC1_BASE_S 0x2044
>
> @@ -119,6 +122,10 @@
> #define MXR_GRP_WH_WIDTH(x) MXR_MASK_VAL(x, 26, 16)
> #define MXR_GRP_WH_HEIGHT(x) MXR_MASK_VAL(x, 10, 0)
>
> +/* bits for MXR_RESOLUTION */
> +#define MXR_MXR_RES_HEIGHT(x) MXR_MASK_VAL(x, 26, 16)
> +#define MXR_MXR_RES_WIDTH(x) MXR_MASK_VAL(x, 10, 0)
> +
> /* bits for MXR_GRAPHICn_SXY */
> #define MXR_GRP_SXY_SX(x) MXR_MASK_VAL(x, 26, 16)
> #define MXR_GRP_SXY_SY(x) MXR_MASK_VAL(x, 10, 0)
>
--
Seung-Woo Kim
Samsung Software R&D Center
--
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v3 3/3] ARM/dts: change compatible strings for hdmi subsystem
2013-06-19 12:51 [PATCH v3 0/3] exynos5420/hdmi: add support for hdmi subsystem Rahul Sharma
2013-06-19 12:51 ` [PATCH v3 1/3] drm/exynos: add new compatible strings " Rahul Sharma
2013-06-19 12:51 ` [PATCH v3 2/3] drm/exynos: add support for exynos5420 mixer Rahul Sharma
@ 2013-06-19 12:51 ` Rahul Sharma
2013-06-19 13:50 ` Kukjin Kim
2 siblings, 1 reply; 12+ messages in thread
From: Rahul Sharma @ 2013-06-19 12:51 UTC (permalink / raw)
To: linux-samsung-soc, devicetree-discuss, dri-devel
Cc: kgene.kim, sw0312.kim, inki.dae, seanpaul, l.stach, tomasz.figa,
rob.herring, s.nawrocki, grant.likely, joshi, r.sh.open,
Rahul Sharma
This patch renames the combatible strings for hdmi, mixer, ddc
and hdmiphy. It follows the convention of using compatible string
which represent the SoC in which the IP was added for the first
time.
Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
---
arch/arm/boot/dts/cros5250-common.dtsi | 4 ++--
arch/arm/boot/dts/exynos5250-smdk5250.dts | 4 ++--
arch/arm/boot/dts/exynos5250.dtsi | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi
index 3f0239e..dc259e8b 100644
--- a/arch/arm/boot/dts/cros5250-common.dtsi
+++ b/arch/arm/boot/dts/cros5250-common.dtsi
@@ -190,7 +190,7 @@
samsung,i2c-max-bus-freq = <66000>;
hdmiddc@50 {
- compatible = "samsung,exynos5-hdmiddc";
+ compatible = "samsung,exynos4210-hdmiddc";
reg = <0x50>;
};
};
@@ -224,7 +224,7 @@
samsung,i2c-max-bus-freq = <378000>;
hdmiphy@38 {
- compatible = "samsung,exynos5-hdmiphy";
+ compatible = "samsung,exynos4212-hdmiphy";
reg = <0x38>;
};
};
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 3e0c792..f320d7c 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -72,7 +72,7 @@
samsung,i2c-max-bus-freq = <66000>;
hdmiddc@50 {
- compatible = "samsung,exynos5-hdmiddc";
+ compatible = "samsung,exynos4210-hdmiddc";
reg = <0x50>;
};
};
@@ -102,7 +102,7 @@
samsung,i2c-max-bus-freq = <66000>;
hdmiphy@38 {
- compatible = "samsung,exynos5-hdmiphy";
+ compatible = "samsung,exynos4212-hdmiphy";
reg = <0x38>;
};
};
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 0673524..2f7763b 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -601,7 +601,7 @@
};
hdmi {
- compatible = "samsung,exynos5-hdmi";
+ compatible = "samsung,exynos4212-hdmi";
reg = <0x14530000 0x70000>;
interrupts = <0 95 0>;
clocks = <&clock 333>, <&clock 136>, <&clock 137>,
@@ -611,7 +611,7 @@
};
mixer {
- compatible = "samsung,exynos5-mixer";
+ compatible = "samsung,exynos5250-mixer";
reg = <0x14450000 0x10000>;
interrupts = <0 94 0>;
};
--
1.7.10.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH v3 3/3] ARM/dts: change compatible strings for hdmi subsystem
2013-06-19 12:51 ` [PATCH v3 3/3] ARM/dts: change compatible strings for hdmi subsystem Rahul Sharma
@ 2013-06-19 13:50 ` Kukjin Kim
2013-06-19 13:52 ` Kukjin Kim
0 siblings, 1 reply; 12+ messages in thread
From: Kukjin Kim @ 2013-06-19 13:50 UTC (permalink / raw)
To: Rahul Sharma
Cc: linux-samsung-soc, devicetree-discuss, dri-devel, kgene.kim,
sw0312.kim, inki.dae, seanpaul, l.stach, tomasz.figa, rob.herring,
s.nawrocki, grant.likely, joshi, r.sh.open
On 06/19/13 21:51, Rahul Sharma wrote:
> This patch renames the combatible strings for hdmi, mixer, ddc
> and hdmiphy. It follows the convention of using compatible string
> which represent the SoC in which the IP was added for the first
> time.
>
> Signed-off-by: Rahul Sharma<rahul.sharma@samsung.com>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
- Kukjin
> ---
> arch/arm/boot/dts/cros5250-common.dtsi | 4 ++--
> arch/arm/boot/dts/exynos5250-smdk5250.dts | 4 ++--
> arch/arm/boot/dts/exynos5250.dtsi | 4 ++--
> 3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi
> index 3f0239e..dc259e8b 100644
> --- a/arch/arm/boot/dts/cros5250-common.dtsi
> +++ b/arch/arm/boot/dts/cros5250-common.dtsi
> @@ -190,7 +190,7 @@
> samsung,i2c-max-bus-freq =<66000>;
>
> hdmiddc@50 {
> - compatible = "samsung,exynos5-hdmiddc";
> + compatible = "samsung,exynos4210-hdmiddc";
> reg =<0x50>;
> };
> };
> @@ -224,7 +224,7 @@
> samsung,i2c-max-bus-freq =<378000>;
>
> hdmiphy@38 {
> - compatible = "samsung,exynos5-hdmiphy";
> + compatible = "samsung,exynos4212-hdmiphy";
> reg =<0x38>;
> };
> };
> diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
> index 3e0c792..f320d7c 100644
> --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
> +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
> @@ -72,7 +72,7 @@
> samsung,i2c-max-bus-freq =<66000>;
>
> hdmiddc@50 {
> - compatible = "samsung,exynos5-hdmiddc";
> + compatible = "samsung,exynos4210-hdmiddc";
> reg =<0x50>;
> };
> };
> @@ -102,7 +102,7 @@
> samsung,i2c-max-bus-freq =<66000>;
>
> hdmiphy@38 {
> - compatible = "samsung,exynos5-hdmiphy";
> + compatible = "samsung,exynos4212-hdmiphy";
> reg =<0x38>;
> };
> };
> diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
> index 0673524..2f7763b 100644
> --- a/arch/arm/boot/dts/exynos5250.dtsi
> +++ b/arch/arm/boot/dts/exynos5250.dtsi
> @@ -601,7 +601,7 @@
> };
>
> hdmi {
> - compatible = "samsung,exynos5-hdmi";
> + compatible = "samsung,exynos4212-hdmi";
> reg =<0x14530000 0x70000>;
> interrupts =<0 95 0>;
> clocks =<&clock 333>,<&clock 136>,<&clock 137>,
> @@ -611,7 +611,7 @@
> };
>
> mixer {
> - compatible = "samsung,exynos5-mixer";
> + compatible = "samsung,exynos5250-mixer";
> reg =<0x14450000 0x10000>;
> interrupts =<0 94 0>;
> };
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH v3 3/3] ARM/dts: change compatible strings for hdmi subsystem
2013-06-19 13:50 ` Kukjin Kim
@ 2013-06-19 13:52 ` Kukjin Kim
2013-06-19 15:55 ` Rahul Sharma
0 siblings, 1 reply; 12+ messages in thread
From: Kukjin Kim @ 2013-06-19 13:52 UTC (permalink / raw)
To: Kukjin Kim
Cc: Rahul Sharma, linux-samsung-soc, devicetree-discuss, dri-devel,
sw0312.kim, inki.dae, seanpaul, l.stach, tomasz.figa, rob.herring,
s.nawrocki, grant.likely, joshi, r.sh.open
On 06/19/13 22:50, Kukjin Kim wrote:
> On 06/19/13 21:51, Rahul Sharma wrote:
>> This patch renames the combatible strings for hdmi, mixer, ddc
>> and hdmiphy. It follows the convention of using compatible string
>> which represent the SoC in which the IP was added for the first
>> time.
>>
>> Signed-off-by: Rahul Sharma<rahul.sharma@samsung.com>
>
> Acked-by: Kukjin Kim <kgene.kim@samsung.com>
>
Just one nit in subject:
[PATCH] ARM: dts: ..... for exynos5250
Thanks,
- Kukjin
>> ---
>> arch/arm/boot/dts/cros5250-common.dtsi | 4 ++--
>> arch/arm/boot/dts/exynos5250-smdk5250.dts | 4 ++--
>> arch/arm/boot/dts/exynos5250.dtsi | 4 ++--
>> 3 files changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/cros5250-common.dtsi
>> b/arch/arm/boot/dts/cros5250-common.dtsi
>> index 3f0239e..dc259e8b 100644
>> --- a/arch/arm/boot/dts/cros5250-common.dtsi
>> +++ b/arch/arm/boot/dts/cros5250-common.dtsi
>> @@ -190,7 +190,7 @@
>> samsung,i2c-max-bus-freq =<66000>;
>>
>> hdmiddc@50 {
>> - compatible = "samsung,exynos5-hdmiddc";
>> + compatible = "samsung,exynos4210-hdmiddc";
>> reg =<0x50>;
>> };
>> };
>> @@ -224,7 +224,7 @@
>> samsung,i2c-max-bus-freq =<378000>;
>>
>> hdmiphy@38 {
>> - compatible = "samsung,exynos5-hdmiphy";
>> + compatible = "samsung,exynos4212-hdmiphy";
>> reg =<0x38>;
>> };
>> };
>> diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts
>> b/arch/arm/boot/dts/exynos5250-smdk5250.dts
>> index 3e0c792..f320d7c 100644
>> --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
>> +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
>> @@ -72,7 +72,7 @@
>> samsung,i2c-max-bus-freq =<66000>;
>>
>> hdmiddc@50 {
>> - compatible = "samsung,exynos5-hdmiddc";
>> + compatible = "samsung,exynos4210-hdmiddc";
>> reg =<0x50>;
>> };
>> };
>> @@ -102,7 +102,7 @@
>> samsung,i2c-max-bus-freq =<66000>;
>>
>> hdmiphy@38 {
>> - compatible = "samsung,exynos5-hdmiphy";
>> + compatible = "samsung,exynos4212-hdmiphy";
>> reg =<0x38>;
>> };
>> };
>> diff --git a/arch/arm/boot/dts/exynos5250.dtsi
>> b/arch/arm/boot/dts/exynos5250.dtsi
>> index 0673524..2f7763b 100644
>> --- a/arch/arm/boot/dts/exynos5250.dtsi
>> +++ b/arch/arm/boot/dts/exynos5250.dtsi
>> @@ -601,7 +601,7 @@
>> };
>>
>> hdmi {
>> - compatible = "samsung,exynos5-hdmi";
>> + compatible = "samsung,exynos4212-hdmi";
>> reg =<0x14530000 0x70000>;
>> interrupts =<0 95 0>;
>> clocks =<&clock 333>,<&clock 136>,<&clock 137>,
>> @@ -611,7 +611,7 @@
>> };
>>
>> mixer {
>> - compatible = "samsung,exynos5-mixer";
>> + compatible = "samsung,exynos5250-mixer";
>> reg =<0x14450000 0x10000>;
>> interrupts =<0 94 0>;
>> };
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH v3 3/3] ARM/dts: change compatible strings for hdmi subsystem
2013-06-19 13:52 ` Kukjin Kim
@ 2013-06-19 15:55 ` Rahul Sharma
[not found] ` <CAPdUM4Pg7wG4EaPw_7R=N=Lx1qWrNt4=LxhzH2+V5YGx0USfNg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
0 siblings, 1 reply; 12+ messages in thread
From: Rahul Sharma @ 2013-06-19 15:55 UTC (permalink / raw)
To: Kukjin Kim
Cc: Rahul Sharma, linux-samsung-soc, devicetree-discuss, dri-devel,
sw0312.kim, inki.dae, seanpaul, l.stach, tomasz.figa, rob.herring,
s.nawrocki, grant.likely, joshi
Thanks Mr. Kim,
I will post v4 with aforesaid change.
regards,
Rahul Sharma.
On Wed, Jun 19, 2013 at 7:22 PM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> On 06/19/13 22:50, Kukjin Kim wrote:
>>
>> On 06/19/13 21:51, Rahul Sharma wrote:
>>>
>>> This patch renames the combatible strings for hdmi, mixer, ddc
>>> and hdmiphy. It follows the convention of using compatible string
>>> which represent the SoC in which the IP was added for the first
>>> time.
>>>
>>> Signed-off-by: Rahul Sharma<rahul.sharma@samsung.com>
>>
>>
>> Acked-by: Kukjin Kim <kgene.kim@samsung.com>
>>
>
> Just one nit in subject:
>
> [PATCH] ARM: dts: ..... for exynos5250
>
> Thanks,
>
> - Kukjin
>
>>> ---
>>> arch/arm/boot/dts/cros5250-common.dtsi | 4 ++--
>>> arch/arm/boot/dts/exynos5250-smdk5250.dts | 4 ++--
>>> arch/arm/boot/dts/exynos5250.dtsi | 4 ++--
>>> 3 files changed, 6 insertions(+), 6 deletions(-)
>>>
>>> diff --git a/arch/arm/boot/dts/cros5250-common.dtsi
>>> b/arch/arm/boot/dts/cros5250-common.dtsi
>>> index 3f0239e..dc259e8b 100644
>>> --- a/arch/arm/boot/dts/cros5250-common.dtsi
>>> +++ b/arch/arm/boot/dts/cros5250-common.dtsi
>>> @@ -190,7 +190,7 @@
>>> samsung,i2c-max-bus-freq =<66000>;
>>>
>>> hdmiddc@50 {
>>> - compatible = "samsung,exynos5-hdmiddc";
>>> + compatible = "samsung,exynos4210-hdmiddc";
>>> reg =<0x50>;
>>> };
>>> };
>>> @@ -224,7 +224,7 @@
>>> samsung,i2c-max-bus-freq =<378000>;
>>>
>>> hdmiphy@38 {
>>> - compatible = "samsung,exynos5-hdmiphy";
>>> + compatible = "samsung,exynos4212-hdmiphy";
>>> reg =<0x38>;
>>> };
>>> };
>>> diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts
>>> b/arch/arm/boot/dts/exynos5250-smdk5250.dts
>>> index 3e0c792..f320d7c 100644
>>> --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
>>> +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
>>> @@ -72,7 +72,7 @@
>>> samsung,i2c-max-bus-freq =<66000>;
>>>
>>> hdmiddc@50 {
>>> - compatible = "samsung,exynos5-hdmiddc";
>>> + compatible = "samsung,exynos4210-hdmiddc";
>>> reg =<0x50>;
>>> };
>>> };
>>> @@ -102,7 +102,7 @@
>>> samsung,i2c-max-bus-freq =<66000>;
>>>
>>> hdmiphy@38 {
>>> - compatible = "samsung,exynos5-hdmiphy";
>>> + compatible = "samsung,exynos4212-hdmiphy";
>>> reg =<0x38>;
>>> };
>>> };
>>> diff --git a/arch/arm/boot/dts/exynos5250.dtsi
>>> b/arch/arm/boot/dts/exynos5250.dtsi
>>> index 0673524..2f7763b 100644
>>> --- a/arch/arm/boot/dts/exynos5250.dtsi
>>> +++ b/arch/arm/boot/dts/exynos5250.dtsi
>>> @@ -601,7 +601,7 @@
>>> };
>>>
>>> hdmi {
>>> - compatible = "samsung,exynos5-hdmi";
>>> + compatible = "samsung,exynos4212-hdmi";
>>> reg =<0x14530000 0x70000>;
>>> interrupts =<0 95 0>;
>>> clocks =<&clock 333>,<&clock 136>,<&clock 137>,
>>> @@ -611,7 +611,7 @@
>>> };
>>>
>>> mixer {
>>> - compatible = "samsung,exynos5-mixer";
>>> + compatible = "samsung,exynos5250-mixer";
>>> reg =<0x14450000 0x10000>;
>>> interrupts =<0 94 0>;
>>> };
^ permalink raw reply [flat|nested] 12+ messages in thread