From patchwork Tue Feb 5 23:42:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 2101141 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id BFC31DF24C for ; Tue, 5 Feb 2013 23:46:40 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U2sAe-0000G7-Rd; Tue, 05 Feb 2013 23:43:24 +0000 Received: from mail-pa0-f49.google.com ([209.85.220.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U2sAX-0000FR-3a for linux-arm-kernel@lists.infradead.org; Tue, 05 Feb 2013 23:43:18 +0000 Received: by mail-pa0-f49.google.com with SMTP id kp6so435616pab.8 for ; Tue, 05 Feb 2013 15:43:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=seU+071pDlmgj7uvq1Ag/7awRjSi8ZhTVNFckoRKebo=; b=OvWUUulhXvaWADG4imIkDn3vQlNVV7lv9oemFVF6fPtX7+fqgE8YbwU+vpyGRwT70A lJDDw2Oxcjr02AbdPSlRJCEZsJuaUfOZ979hzYWDYbPHko0/DRYQo73VxlBTrxN8vpI8 JA1VNsHnpCZVxG4FPtn6fvOGOKscIBxNAMZ9I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=seU+071pDlmgj7uvq1Ag/7awRjSi8ZhTVNFckoRKebo=; b=OcfnpkO+QVlXkjOqRTUCYIerXr1KW72FZrO6sjVvk4rCMHySxxbWkU4vuSrtIi4pHM LtnSHgSYzWOYSQK7z9FdkoroUS8RagMmpeK+PO+Cnt6sjk8zJ47aEOEKSiSrWa86QCYo OT3zIJbCP4IAClrm6KYfDN1dGeY7QaRy2wP4fqNH1F+AT/qWyvWx2prmL5MPdqR09oPm GkJfB1V4e7W/fBhPYD16dkC1Zio8nyrQF8tMikiStAeHdERL2bquOwblFrLpWMONaT1M J7+NLTsTkwKCHRyY8B/IYwP2JHebS/P1gScBnhZIz1zqsZwayQ9twj+Hc7qUoo/q+17M aS2A== X-Received: by 10.66.75.66 with SMTP id a2mr69260414paw.65.1360107795621; Tue, 05 Feb 2013 15:43:15 -0800 (PST) Received: from seanpaul-glaptop.corp.google.com (dhcp-172-19-1-81.mtv.corp.google.com [172.19.1.81]) by mx.google.com with ESMTPS id z6sm6916325pav.3.2013.02.05.15.43.14 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 05 Feb 2013 15:43:15 -0800 (PST) From: Sean Paul To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, dri-devel@lists.freedesktop.org Subject: [PATCH v3 2/3] ARM: Change exynos5-hdmi references to exynos4-hdmi Date: Tue, 5 Feb 2013 15:42:57 -0800 Message-Id: <1360107777-17490-3-git-send-email-seanpaul@chromium.org> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1360107777-17490-1-git-send-email-seanpaul@chromium.org> References: <1360107777-17490-1-git-send-email-seanpaul@chromium.org> X-Gm-Message-State: ALoCoQkOLz1s7SR4yekVvih8yoekuV/DK6QaXB0CaPBwAxkymvpZ3CD+q4fm+VXPxn1wkEZPPrOk X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130205_184317_270154_AF9C896A X-CRM114-Status: GOOD ( 11.36 ) X-Spam-Score: 0.3 (/) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (0.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.220.49 listed in list.dnswl.org] 3.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: t.stanislaws@samsung.com, kgene.kim@samsung.com, linux-kernel@vger.kernel.org, tomasz.figa@gmail.com, inki.dae@samsung.com, thomas.abraham@linaro.org, Sean Paul , sylvester.nawrocki@gmail.com, olofj@chromium.org, rahul.sharma@samsung.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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 --- 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),