> -----Original Message-----
> From: Inki Dae [mailto:inki....@samsung.com]
> Sent: Wednesday, June 19, 2013 4:06 PM
> To: 'Rahul Sharma'; 'linux-samsung-soc@vger.kernel.org'; 'devicetree-
> disc...@lists.ozlabs.org'; 'dri-de...@lists.freedesktop.org'
> Cc: 'kgene....@samsung.com'; 'sw0312....@samsung.com';
'jo...@samsung.com';
> 'r.sh.o...@gmail.com'
> Subject: RE: [PATCH 1/4] drm/exynos: rename compatible strings for hdmi
> subsystem
>
>
>
> > -----Original Message-----
> > From: Rahul Sharma [mailto:rahul.sha...@samsung.com]
> > Sent: Tuesday, June 18, 2013 9:50 PM
> > To: linux-samsung-soc@vger.kernel.org; devicetree-
> disc...@lists.ozlabs.org;
> > dri-de...@lists.freedesktop.org
> > Cc: kgene....@samsung.com; sw0312....@samsung.com; inki....@samsung.com;
> > jo...@samsung.com; r.sh.o...@gmail.com; Rahul Sharma
> > Subject: [PATCH 1/4] drm/exynos: rename compatible strings for hdmi
> > subsystem
> >
> > 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.
> >
>
> Hi Rahul,
>
> Could you separate this patch into two patches, driver side and document
> side, and the below patch also?
> [PATCH v2 2/4] drm/exynos: add support for exynos5420 mixer
>
Sorry, just will merge them.
To devicetree maintainers, please give me ACK.
Thanks,
Inki Dae
> Thanks,
> Inki Dae
>
> > Signed-off-by: Rahul Sharma <rahul.sha...@samsung.com>
> > ---
> > Documentation/devicetree/bindings/video/exynos_hdmi.txt | 6
++++--
> > Documentation/devicetree/bindings/video/exynos_hdmiddc.txt | 4 ++--
> > Documentation/devicetree/bindings/video/exynos_hdmiphy.txt | 6
++++--
> > Documentation/devicetree/bindings/video/exynos_mixer.txt | 7
+++++--
> > drivers/gpu/drm/exynos/exynos_ddc.c | 2 +-
> > drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +-
> > drivers/gpu/drm/exynos/exynos_hdmiphy.c | 4 +++-
> > drivers/gpu/drm/exynos/exynos_mixer.c | 12
++++++-----
> -
> > 8 files changed, 26 insertions(+), 17 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/video/exynos_hdmi.txt
> > b/Documentation/devicetree/bindings/video/exynos_hdmi.txt
> > index 589edee..2ac01ca 100644
> > --- a/Documentation/devicetree/bindings/video/exynos_hdmi.txt
> > +++ b/Documentation/devicetree/bindings/video/exynos_hdmi.txt
> > @@ -1,7 +1,9 @@
> > 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,exynos4210-hdmi"
> > + 2) "samsung,exynos4212-hdmi"
> > - reg: physical base address of the hdmi and length of memory mapped
> > region.
> > - interrupts: interrupt number to the cpu.
> > @@ -15,7 +17,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..c1bd2ea 100644
> > --- a/Documentation/devicetree/bindings/video/exynos_hdmiddc.txt
> > +++ b/Documentation/devicetree/bindings/video/exynos_hdmiddc.txt
> > @@ -1,12 +1,12 @@
> > Device-Tree bindings for hdmiddc driver
> >
> > Required properties:
> > -- compatible: value should be "samsung,exynos5-hdmiddc".
> > +- compatible: value should be "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..e59d793 100644
> > --- a/Documentation/devicetree/bindings/video/exynos_hdmiphy.txt
> > +++ b/Documentation/devicetree/bindings/video/exynos_hdmiphy.txt
> > @@ -1,12 +1,14 @@
> > Device-Tree bindings for hdmiphy driver
> >
> > Required properties:
> > -- compatible: value should be "samsung,exynos5-hdmiphy".
> > +- compatible: value should be
> > + 1) "samsung,exynos4210-hdmiphy".
> > + 2) "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..a8b063f 100644
> > --- a/Documentation/devicetree/bindings/video/exynos_mixer.txt
> > +++ b/Documentation/devicetree/bindings/video/exynos_mixer.txt
> > @@ -1,7 +1,10 @@
> > Device-Tree bindings for mixer driver
> >
> > Required properties:
> > -- compatible: value should be "samsung,exynos5-mixer".
> > +- compatible: value should be:
> > + 1) "samsung,exynos4210-mixer"
> > + 2) "samsung,exynos5250-mixer"
> > +
> > - reg: physical base address of the mixer and length of memory mapped
> > region.
> > - interrupts: interrupt number to the cpu.
> > @@ -9,7 +12,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..1a0cca1 100644
> > --- a/drivers/gpu/drm/exynos/exynos_ddc.c
> > +++ b/drivers/gpu/drm/exynos/exynos_ddc.c
> > @@ -51,7 +51,7 @@ static struct i2c_device_id ddc_idtable[] = {
> > #ifdef CONFIG_OF
> > 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..8752171 100644
> > --- a/drivers/gpu/drm/exynos/exynos_hdmi.c
> > +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
> > @@ -1913,7 +1913,7 @@ static struct platform_device_id
> hdmi_driver_types[]
> > = {
> > #ifdef CONFIG_OF
> > static struct of_device_id hdmi_match_types[] = {
> > {
> > - .compatible = "samsung,exynos5-hdmi",
> > + .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..bf1718a 100644
> > --- a/drivers/gpu/drm/exynos/exynos_hdmiphy.c
> > +++ b/drivers/gpu/drm/exynos/exynos_hdmiphy.c
> > @@ -49,7 +49,9 @@ static const struct i2c_device_id hdmiphy_id[] = {
> > #ifdef CONFIG_OF
> > 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..2fe6d33 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 */
> > }
> > @@ -1139,8 +1139,8 @@ 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,
> > + .compatible = "samsung,exynos5250-mixer",
> > + .data = &exynos5250_mxr_drv_data,
> > }, {
> > /* end node */
> > }
> > --
> > 1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
