From patchwork Tue Feb 21 11:37:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kukjin Kim X-Patchwork-Id: 142290 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (unknown [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9DCC3B6F9F for ; Tue, 21 Feb 2012 22:40:13 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Rzo2L-0000k4-Qf; Tue, 21 Feb 2012 11:37:37 +0000 Received: from mailout4.samsung.com ([203.254.224.34]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Rzo2D-0000iD-Lz for linux-arm-kernel@lists.infradead.org; Tue, 21 Feb 2012 11:37:33 +0000 Received: from epcpsbgm2.samsung.com (mailout4.samsung.com [203.254.224.34]) by mailout4.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTP id <0LZQ00GDMQY6I3Q0@mailout4.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 21 Feb 2012 20:37:27 +0900 (KST) X-AuditID: cbfee61b-b7c62ae000000989-6e-4f4381f75296 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (MMPCPMTA) with SMTP id 58.1B.02441.7F1834F4; Tue, 21 Feb 2012 20:37:27 +0900 (KST) Received: from DOKGENEKIM03 ([12.23.119.152]) by mmp1.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTPA id <0LZQ00382QYEKD00@mmp1.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 21 Feb 2012 20:37:26 +0900 (KST) From: Kukjin Kim To: 'Chris Ball' References: <1328032576-9269-1-git-send-email-thomas.abraham@linaro.org> <003401cce730$baf979a0$30ec6ce0$%kim@samsung.com> <4F3CFEED.6060206@samsung.com> In-reply-to: Subject: RE: [PATCH v3 0/6] mmc: sdhci-s3c: Rework platform data and add device tree support Date: Tue, 21 Feb 2012 20:37:26 +0900 Message-id: <00b901ccf08d$2fc18b50$8f44a1f0$%kim@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Thread-index: AczsrDOI4+pOvI9YT3KvyZTkXCzPmwD4J2pQ Content-language: ko X-Brightmail-Tracker: AAAAAA== X-Spam-Note: CRM114 invocation failed X-Spam-Score: -6.9 (------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-6.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.34 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-samsung-soc@vger.kernel.org, patches@linaro.org, devicetree-discuss@lists.ozlabs.org, linux-mmc@vger.kernel.org, rob.herring@calxeda.com, grant.likely@secretlab.ca, 'Thomas Abraham' , ben-linux@fluff.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Chris Ball wrote: > > Hi, > Hi, > On Thu, Feb 16 2012, Kukjin Kim wrote: > > I mean if I or you create topic branch for this whole series, can be > > merged into both tree for avoiding conflicts with further working. Of > > course, the topic branch don't have to rebase after merging into each > > tree. > > > > If you're ok on this and my opinion, let me create the topic branch. > > Okay, sure. Thanks, > I created topic branch for this we talked. You can pull that following: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git v3.4-for-cjb If any problems, please kindly let me know. Thanks. Best regards, Kgene. Acked-by: Jaehoon Chung Acked-by: Jaehoon Chung --- Kukjin Kim , Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. The following changes since commit d65b4e98d7ea3038b767b70fe8be959b2913f16d: Linux 3.3-rc3 (2012-02-08 19:21:53 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git v3.4-for-cjb Thomas Abraham (6): mmc: sdhci-s3c: Remove usage of clk_type member in platform data ARM: EXYNOS: use 'exynos4-sdhci' as device name for sdhci controllers ARM: SAMSUNG: remove all uses of clk_type member in sdhci platform data mmc: sdhci-s3c: derive transfer width host capability from max_width in platform data mmc: sdhci-s3c: Keep a copy of platform data and use it mmc: sdhci-s3c: Add device tree support .../devicetree/bindings/mmc/samsung-sdhci.txt | 70 ++++++ arch/arm/mach-exynos/clock.c | 24 +- arch/arm/mach-exynos/common.c | 5 + arch/arm/mach-exynos/mach-armlex4210.c | 3 - arch/arm/mach-exynos/mach-nuri.c | 3 - arch/arm/mach-exynos/mach-origen.c | 2 - arch/arm/mach-exynos/mach-smdk4x12.c | 2 - arch/arm/mach-exynos/mach-smdkv310.c | 4 - arch/arm/mach-exynos/mach-universal_c210.c | 2 - arch/arm/plat-samsung/devs.c | 4 - arch/arm/plat-samsung/include/plat/sdhci.h | 35 +++- arch/arm/plat-samsung/platformdata.c | 2 - drivers/mmc/host/sdhci-s3c.c | 235 +++++++++++++++++++- 13 files changed, 341 insertions(+), 50 deletions(-) create mode 100644 Documentation/devicetree/bindings/mmc/samsung-sdhci.txt