From patchwork Tue May 15 09:06:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kukjin Kim X-Patchwork-Id: 159263 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [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 4FE15B6FB4 for ; Tue, 15 May 2012 19:09:30 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SUDip-0000Xl-B3; Tue, 15 May 2012 09:07:12 +0000 Received: from mailout4.samsung.com ([203.254.224.34]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SUDiU-0000KY-NN for linux-arm-kernel@lists.infradead.org; Tue, 15 May 2012 09:06:53 +0000 Received: from epcpsbgm2.samsung.com (mailout4.samsung.com [203.254.224.34]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0M4200CU43YHRS70@mailout4.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 15 May 2012 18:06:47 +0900 (KST) X-AuditID: cbfee61b-b7b94ae000002e44-94-4fb21ca7a0d2 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (MMPCPMTA) with SMTP id F5.E4.11844.7AC12BF4; Tue, 15 May 2012 18:06:47 +0900 (KST) Received: from DOKGENEKIM03 ([12.23.119.152]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0M42008DH3ZABG30@mmp2.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 15 May 2012 18:06:47 +0900 (KST) From: Kukjin Kim To: 'Kukjin Kim' , 'Olof Johansson' References: <4FAF0156.5080306@samsung.com> <064f01cd31a5$d2300660$76901320$%kim@samsung.com> In-reply-to: <064f01cd31a5$d2300660$76901320$%kim@samsung.com> Subject: RE: [GIT PULL] Samsung devel-1 for v3.5 Date: Tue, 15 May 2012 18:06:49 +0900 Message-id: <07fe01cd327a$0fde53c0$2f9afb40$%kim@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac0wyRCtpkIPj3TqRPSLyMiiCSkRggA29M4QADUXOXA= Content-language: ko X-Brightmail-Tracker: AAAAAA== X-TM-AS-MML: No 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, linux-arm-kernel@lists.infradead.org, 'Arnd Bergmann' 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 Kukjin Kim wrote: > > Olof Johansson wrote: > > > > On Sat, May 12, 2012 at 5:33 PM, Kukjin Kim > wrote: > > > Hi Arnd, Olof > > > > > > Please pull Samsung devel for v3.5 > > > > > > This is including exynos/iommu, platform of drm and fimc-lite, dma for > > > exynos5250 and s3c24xx-hsspi. > > > > > > Note, the exynos/iommu patch got the ack from Joerg and this should be > > sent > > > to upstream via arm tree and since it depends on cleanup-samsung-iommu, > > the > > > cleanup branch is included(merged) in here. > > > > > > If any problems, please let me know. > > > > Same here, I'll hold off pulling this until we've sorted out the > > cleanup-samsung-iommu request. > > > Please hold this off for a moment because I need to sort out regarding > s3c-hsotg patches which cause build error because some patches have been > already in usb tree for it. > > If required, I will send separate branch to you. > Hi Arnd and Olof, I updated the next/devel-samsung branch. As I said, I separate out the regarding s3c-hsotg patches from here and it will be sent to usb tree. And added support suspend/resume for EXYNOS4412, others same as before. Please pull Samsung devel-1 for v3.5 from: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/devel-samsung If any problems, please kindly let me know. Thanks. Best regards, Kgene. --- Kukjin Kim , Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. The following changes since commit d48b97b403d23f6df0b990cee652bdf9a52337a3: Linux 3.4-rc6 (2012-05-06 15:07:32 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/devel-samsung Boojin Kim (1): ARM: EXYNOS: Support DMA for EXYNOS5250 SoC Heiko Stuebner (6): ARM: S3C24XX: Add forgotten clock lookup table to S3C2443 ARM: S3C24XX: claim spi channels for hsspi in dma-s3c2443 ARM: S3C24XX: Add map entries needed by the s3c64xx-spi devices ARM: S3C24XX: Add clock-lookup entries required by s3c64xx-spi ARM: S3C24XX: Add HSSPI setup callback for s3c64xx-spi driver spi/s3c64xx: Allow usage for ARCH_S3C24XX Inderpal Singh (1): ARM: EXYNOS: Support Suspend/Resume for EXYNOS4412 Kukjin Kim (2): Merge branch 'next/devel-samsung-iommu' into next/devel-samsung Merge branch 'next/devel-s3c24xx-hsspi' into next/devel-samsung KyongHo Cho (3): S5P: SYSMMU: Remove System MMU device driver ARM: EXYNOS: Change System MMU platform device definitions iommu/exynos: Add iommu driver for EXYNOS Platforms Kyoungil Kim (1): ARM: EXYNOS: To use common config for EXYNOS4 and EXYNOS5 SPI Marek Szyprowski (1): ARM: EXYNOS: add platform device for core DRM subsystem Olof Johansson (1): ARM: EXYNOS: add dts files to dtbs target Sylwester Nawrocki (1): ARM: EXYNOS: Add platform resource definitions for FIMC-LITE arch/arm/mach-exynos/Kconfig | 24 +- arch/arm/mach-exynos/Makefile | 7 +- arch/arm/mach-exynos/Makefile.boot | 3 + arch/arm/mach-exynos/clock-exynos4.c | 79 +- arch/arm/mach-exynos/clock-exynos4.h | 2 + arch/arm/mach-exynos/clock-exynos4210.c | 11 + arch/arm/mach-exynos/clock-exynos4212.c | 38 +- arch/arm/mach-exynos/clock-exynos5.c | 90 ++ arch/arm/mach-exynos/dev-drm.c | 29 + arch/arm/mach-exynos/dev-sysmmu.c | 457 ++++++----- arch/arm/mach-exynos/dma.c | 141 +++- arch/arm/mach-exynos/include/mach/irqs.h | 25 +- arch/arm/mach-exynos/include/mach/map.h | 41 + arch/arm/mach-exynos/include/mach/regs-clock.h | 5 + arch/arm/mach-exynos/include/mach/regs-pmu.h | 10 +- arch/arm/mach-exynos/include/mach/regs-sysmmu.h | 28 - arch/arm/mach-exynos/include/mach/spi-clocks.h | 2 +- arch/arm/mach-exynos/include/mach/sysmmu.h | 88 ++- arch/arm/mach-exynos/mach-armlex4210.c | 1 - arch/arm/mach-exynos/mach-smdkv310.c | 1 - arch/arm/mach-exynos/pm.c | 2 +- arch/arm/mach-exynos/pmu.c | 24 +- arch/arm/mach-s3c24xx/Kconfig | 5 + arch/arm/mach-s3c24xx/Makefile | 1 + arch/arm/mach-s3c24xx/clock-s3c2416.c | 1 + arch/arm/mach-s3c24xx/clock-s3c2443.c | 6 + arch/arm/mach-s3c24xx/common-s3c2443.c | 15 +- arch/arm/mach-s3c24xx/dma-s3c2443.c | 16 +- arch/arm/mach-s3c24xx/include/mach/dma.h | 4 + arch/arm/mach-s3c24xx/include/mach/map.h | 5 + arch/arm/mach-s3c24xx/setup-spi.c | 39 + arch/arm/plat-s5p/Kconfig | 8 - arch/arm/plat-s5p/Makefile | 1 - arch/arm/plat-s5p/sysmmu.c | 313 ------- arch/arm/plat-samsung/Kconfig | 2 +- arch/arm/plat-samsung/include/plat/devs.h | 3 +- arch/arm/plat-samsung/include/plat/dma-pl330.h | 1 + arch/arm/plat-samsung/include/plat/sysmmu.h | 95 -- drivers/iommu/Kconfig | 21 + drivers/iommu/Makefile | 1 + drivers/iommu/exynos-iommu.c | 1076 +++++++++++++++++++++++ drivers/spi/Kconfig | 2 +- 42 files changed, 1918 insertions(+), 805 deletions(-) create mode 100644 arch/arm/mach-exynos/dev-drm.c delete mode 100644 arch/arm/mach-exynos/include/mach/regs-sysmmu.h create mode 100644 arch/arm/mach-s3c24xx/setup-spi.c delete mode 100644 arch/arm/plat-s5p/sysmmu.c delete mode 100644 arch/arm/plat-samsung/include/plat/sysmmu.h create mode 100644 drivers/iommu/exynos-iommu.c