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: 2101091 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id B88BC40106 for ; Tue, 5 Feb 2013 23:43:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751333Ab3BEXnS (ORCPT ); Tue, 5 Feb 2013 18:43:18 -0500 Received: from mail-pa0-f51.google.com ([209.85.220.51]:49817 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754407Ab3BEXnQ (ORCPT ); Tue, 5 Feb 2013 18:43:16 -0500 Received: by mail-pa0-f51.google.com with SMTP id hz1so439150pad.10 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=mAZA1R3pdLdV4YXZiezj6uGWiNzWzC2D1JRE/FfKX9Mh34LlWK1x+Xl+JdWxLJF0dN bfc3j1U2qXttTF0l3H7f3vmvBUDBaXnr/903QB86+IeZ6D4JoZkFkF7gurSTwYbuXSCk HLZkGZqSotwBA6QHuagLGk2Ah2QpNmDOMmgd57RQ4G+TAF5mukGQlqHWdTnOn2cwMxC+ ZSUvh1lN+2Ocpn4Fci9wstJQ7d+Os7rBhkdfQS7uVJVA9j4UNO1eGUX8UdbCYA+zqppw SSiNn6jX7Ad/3BeTSKFyFbKjVRrDBX90B3q7sIPEpCQ2KhmZ7IJbJgpAJLwbKKRoLGZu q9rA== 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 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 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: ALoCoQm84LR4SscLdu8Cu3zl2QuGhsILcAvQfQiuHAsrMValY5PBzxFtPxUOm3DxUFrbZyKvMNKP Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.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),