All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sean Paul <seanpaul@chromium.org>
To: linux-arm-kernel@lists.infradead.org,
	linux-samsung-soc@vger.kernel.org,
	devicetree-discuss@lists.ozlabs.org,
	dri-devel@lists.freedesktop.org
Cc: linux-kernel@vger.kernel.org, kgene.kim@samsung.com,
	thomas.abraham@linaro.org, inki.dae@samsung.com,
	t.stanislaws@samsung.com, tomasz.figa@gmail.com,
	sylvester.nawrocki@gmail.com, olofj@chromium.org,
	rahul.sharma@samsung.com, Sean Paul <seanpaul@chromium.org>
Subject: [PATCH v3 2/3] ARM: Change exynos5-hdmi references to exynos4-hdmi
Date: Tue,  5 Feb 2013 15:42:57 -0800	[thread overview]
Message-ID: <1360107777-17490-3-git-send-email-seanpaul@chromium.org> (raw)
In-Reply-To: <1360107777-17490-1-git-send-email-seanpaul@chromium.org>

With the change "drm/exynos: Get HDMI version from device tree",
exynos5-hdmi is no longer relevant. Update references to exynos4-hdmi
and update the hdmi compatibility string to accurately reflect the hdmi
driver.

Signed-off-by: Sean Paul <seanpaul@chromium.org>
---
 arch/arm/boot/dts/exynos5250.dtsi      |    3 ++-
 arch/arm/mach-exynos/clock-exynos5.c   |    4 ++--
 arch/arm/mach-exynos/mach-exynos5-dt.c |    4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 3acf594..70464bf 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -573,7 +573,8 @@
 	};
 
 	hdmi {
-		compatible = "samsung,exynos5-hdmi";
+		compatible = "samsung,exynos5250-hdmi",
+			     "samsung,exynos4212-hdmi", "samsung,exynos4-hdmi";
 		reg = <0x14530000 0x70000>;
 		interrupts = <0 95 0>;
 	};
diff --git a/arch/arm/mach-exynos/clock-exynos5.c b/arch/arm/mach-exynos/clock-exynos5.c
index e9d7b80..6eae39d 100644
--- a/arch/arm/mach-exynos/clock-exynos5.c
+++ b/arch/arm/mach-exynos/clock-exynos5.c
@@ -686,12 +686,12 @@ static struct clk exynos5_init_clocks_off[] = {
 		.ctrlbit	= (1 << 0),
 	}, {
 		.name		= "hdmi",
-		.devname	= "exynos5-hdmi",
+		.devname	= "exynos4-hdmi",
 		.enable		= exynos5_clk_ip_disp1_ctrl,
 		.ctrlbit	= (1 << 6),
 	}, {
 		.name		= "hdmiphy",
-		.devname	= "exynos5-hdmi",
+		.devname	= "exynos4-hdmi",
 		.enable		= exynos5_clk_hdmiphy_ctrl,
 		.ctrlbit	= (1 << 0),
 	}, {
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
index e99d3d8..0ccda72 100644
--- a/arch/arm/mach-exynos/mach-exynos5-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
@@ -97,8 +97,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-hdmi", 0x14530000,
-				"exynos5-hdmi", NULL),
+	OF_DEV_AUXDATA("samsung,exynos4-hdmi", 0x14530000,
+				"exynos4-hdmi", NULL),
 	OF_DEV_AUXDATA("samsung,exynos5-mixer", 0x14450000,
 				"exynos5-mixer", NULL),
 	OF_DEV_AUXDATA("samsung,mfc-v6", 0x11000000, "s5p-mfc-v6", NULL),
-- 
1.7.7.3


WARNING: multiple messages have this Message-ID (diff)
From: seanpaul@chromium.org (Sean Paul)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 2/3] ARM: Change exynos5-hdmi references to exynos4-hdmi
Date: Tue,  5 Feb 2013 15:42:57 -0800	[thread overview]
Message-ID: <1360107777-17490-3-git-send-email-seanpaul@chromium.org> (raw)
In-Reply-To: <1360107777-17490-1-git-send-email-seanpaul@chromium.org>

With the change "drm/exynos: Get HDMI version from device tree",
exynos5-hdmi is no longer relevant. Update references to exynos4-hdmi
and update the hdmi compatibility string to accurately reflect the hdmi
driver.

Signed-off-by: Sean Paul <seanpaul@chromium.org>
---
 arch/arm/boot/dts/exynos5250.dtsi      |    3 ++-
 arch/arm/mach-exynos/clock-exynos5.c   |    4 ++--
 arch/arm/mach-exynos/mach-exynos5-dt.c |    4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 3acf594..70464bf 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -573,7 +573,8 @@
 	};
 
 	hdmi {
-		compatible = "samsung,exynos5-hdmi";
+		compatible = "samsung,exynos5250-hdmi",
+			     "samsung,exynos4212-hdmi", "samsung,exynos4-hdmi";
 		reg = <0x14530000 0x70000>;
 		interrupts = <0 95 0>;
 	};
diff --git a/arch/arm/mach-exynos/clock-exynos5.c b/arch/arm/mach-exynos/clock-exynos5.c
index e9d7b80..6eae39d 100644
--- a/arch/arm/mach-exynos/clock-exynos5.c
+++ b/arch/arm/mach-exynos/clock-exynos5.c
@@ -686,12 +686,12 @@ static struct clk exynos5_init_clocks_off[] = {
 		.ctrlbit	= (1 << 0),
 	}, {
 		.name		= "hdmi",
-		.devname	= "exynos5-hdmi",
+		.devname	= "exynos4-hdmi",
 		.enable		= exynos5_clk_ip_disp1_ctrl,
 		.ctrlbit	= (1 << 6),
 	}, {
 		.name		= "hdmiphy",
-		.devname	= "exynos5-hdmi",
+		.devname	= "exynos4-hdmi",
 		.enable		= exynos5_clk_hdmiphy_ctrl,
 		.ctrlbit	= (1 << 0),
 	}, {
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
index e99d3d8..0ccda72 100644
--- a/arch/arm/mach-exynos/mach-exynos5-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
@@ -97,8 +97,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-hdmi", 0x14530000,
-				"exynos5-hdmi", NULL),
+	OF_DEV_AUXDATA("samsung,exynos4-hdmi", 0x14530000,
+				"exynos4-hdmi", NULL),
 	OF_DEV_AUXDATA("samsung,exynos5-mixer", 0x14450000,
 				"exynos5-mixer", NULL),
 	OF_DEV_AUXDATA("samsung,mfc-v6", 0x11000000, "s5p-mfc-v6", NULL),
-- 
1.7.7.3

  parent reply	other threads:[~2013-02-05 23:43 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-05 23:42 [PATCH v3 0/2] Get the HDMI IP block version from device tree Sean Paul
2013-02-05 23:42 ` Sean Paul
2013-02-05 23:42 ` [PATCH v3 1/3] drm/exynos: Get HDMI " Sean Paul
2013-02-05 23:42   ` Sean Paul
2013-02-06  0:22   ` Stephen Warren
2013-02-06  0:22     ` Stephen Warren
2013-02-06  0:37     ` Sean Paul
2013-02-06  0:37       ` Sean Paul
2013-02-06  0:37       ` Sean Paul
2013-02-06  0:42       ` Stephen Warren
2013-02-06  0:42         ` Stephen Warren
2013-02-06  0:47         ` Kyungmin Park
2013-02-06  0:47           ` Kyungmin Park
2013-02-06  0:56         ` Sean Paul
2013-02-06  0:56           ` Sean Paul
2013-02-06  1:48           ` Joonyoung Shim
2013-02-06  1:48             ` Joonyoung Shim
2013-02-06  2:49           ` Stephen Warren
2013-02-06  2:49             ` Stephen Warren
2013-02-06  2:56           ` 김승우
2013-02-06  2:56             ` 김승우
2013-02-06 19:01             ` Olof Johansson
2013-02-06 19:01               ` Olof Johansson
2013-02-05 23:42 ` Sean Paul [this message]
2013-02-05 23:42   ` [PATCH v3 2/3] ARM: Change exynos5-hdmi references to exynos4-hdmi Sean Paul

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1360107777-17490-3-git-send-email-seanpaul@chromium.org \
    --to=seanpaul@chromium.org \
    --cc=devicetree-discuss@lists.ozlabs.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=inki.dae@samsung.com \
    --cc=kgene.kim@samsung.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=olofj@chromium.org \
    --cc=rahul.sharma@samsung.com \
    --cc=sylvester.nawrocki@gmail.com \
    --cc=t.stanislaws@samsung.com \
    --cc=thomas.abraham@linaro.org \
    --cc=tomasz.figa@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.