From patchwork Thu Apr 18 11:15:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 16233 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f198.google.com (mail-vc0-f198.google.com [209.85.220.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0777023974 for ; Thu, 18 Apr 2013 11:28:26 +0000 (UTC) Received: by mail-vc0-f198.google.com with SMTP id gd11sf4577841vcb.1 for ; Thu, 18 Apr 2013 04:27:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=qElSWZdSsVjbBt5WgjHje/qyQoYcNA/M2sPdXO1RAtY=; b=eKi7rdOc4uqhHpCaN5VVwflYVVA5irzxjislWltrWAzt1tjm5vw0PUNCD1ttwSG98g ELGI5wGMPLqhXdQYJMkM9ev6kKoBKaY0pSXsBjTslMV1Y7+S8V6vNjM5G3LAGeoyuqS+ MEKrghtalQY1189RkSUySyH5n8NfR0hUrI5fhhBEZyGjf/6pfpZawkljja0Url3lh72D B0K+pKCU/ivXM98lTOou5VArAboqUuBhQISAQE4/7aXPY63qACKVdT4qm7wmymH4k5mX u9UIwRNy+ynqXmJ5rpNOOh+6M8misk64kPZUaZyeMuMQkDP2jSNS/QJOfKUIqkeVSDOx ZJPA== X-Received: by 10.224.215.194 with SMTP id hf2mr7456448qab.0.1366284468830; Thu, 18 Apr 2013 04:27:48 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.98.101 with SMTP id eh5ls1388308qeb.95.gmail; Thu, 18 Apr 2013 04:27:48 -0700 (PDT) X-Received: by 10.58.187.42 with SMTP id fp10mr7801214vec.46.1366284468694; Thu, 18 Apr 2013 04:27:48 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id ex4si6368669vdb.40.2013.04.18.04.27.48 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Apr 2013 04:27:48 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.178; Received: by mail-vc0-f178.google.com with SMTP id hv10so2353958vcb.9 for ; Thu, 18 Apr 2013 04:27:48 -0700 (PDT) X-Received: by 10.58.48.166 with SMTP id m6mr7689425ven.59.1366284468501; Thu, 18 Apr 2013 04:27:48 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp118661veb; Thu, 18 Apr 2013 04:27:48 -0700 (PDT) X-Received: by 10.68.163.132 with SMTP id yi4mr13317106pbb.64.1366284467872; Thu, 18 Apr 2013 04:27:47 -0700 (PDT) Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com [209.85.220.42]) by mx.google.com with ESMTPS id ju7si8828994pbc.297.2013.04.18.04.27.47 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Apr 2013 04:27:47 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.42 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.220.42; Received: by mail-pa0-f42.google.com with SMTP id kq13so1529679pab.29 for ; Thu, 18 Apr 2013 04:27:47 -0700 (PDT) X-Received: by 10.66.255.99 with SMTP id ap3mr31083pad.102.1366284467499; Thu, 18 Apr 2013 04:27:47 -0700 (PDT) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPS id b3sm9626922pbw.4.2013.04.18.04.27.45 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Apr 2013 04:27:47 -0700 (PDT) From: Sachin Kamat To: linux-samsung-soc@vger.kernel.org Cc: kgene.kim@samsung.com, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH 2/5] ARM: dts: Remove duplicate and add missing G2D nodes Date: Thu, 18 Apr 2013 16:45:16 +0530 Message-Id: <1366283719-9615-2-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1366283719-9615-1-git-send-email-sachin.kamat@linaro.org> References: <1366283719-9615-1-git-send-email-sachin.kamat@linaro.org> X-Gm-Message-State: ALoCoQlk+kH/jLkjVq5qRChOHAPFW/yN2fWPB7eHN8BQtW6khJZVVU/dS5HSwhO2C/MO4a0exFp0 X-Original-Sender: sachin.kamat@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , G2D node got added twice in exynos4412-smdk4412.dts instead of getting added to exynos4412-origen.dts. Remove the duplicate entry and add it to exynos4412-origen.dts. Signed-off-by: Sachin Kamat --- arch/arm/boot/dts/exynos4412-origen.dts | 4 ++++ arch/arm/boot/dts/exynos4412-smdk4412.dts | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts index 790a999..ca73c42 100644 --- a/arch/arm/boot/dts/exynos4412-origen.dts +++ b/arch/arm/boot/dts/exynos4412-origen.dts @@ -98,6 +98,10 @@ }; }; + g2d@10800000 { + status = "okay"; + }; + sdhci@12530000 { bus-width = <4>; pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4 &sd2_cd>; diff --git a/arch/arm/boot/dts/exynos4412-smdk4412.dts b/arch/arm/boot/dts/exynos4412-smdk4412.dts index c52b01f..a8ba195 100644 --- a/arch/arm/boot/dts/exynos4412-smdk4412.dts +++ b/arch/arm/boot/dts/exynos4412-smdk4412.dts @@ -31,10 +31,6 @@ status = "okay"; }; - g2d@10800000 { - status = "okay"; - }; - pinctrl@11000000 { keypad_rows: keypad-rows { samsung,pins = "gpx2-0", "gpx2-1", "gpx2-2";