From patchwork Sun Nov 6 15:37:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 123933 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 6FE65B6F67 for ; Mon, 7 Nov 2011 02:40:25 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RN4n6-0003TP-0X; Sun, 06 Nov 2011 15:37:48 +0000 Received: from moutng.kundenserver.de ([212.227.126.187]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RN4n2-0003TK-DJ for linux-arm-kernel@lists.infradead.org; Sun, 06 Nov 2011 15:37:45 +0000 Received: from klappe2.localnet (24-196-174-139.dhcp.ahvl.nc.charter.com [24.196.174.139]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0MKbbD-1RLhsC03KZ-001U4x; Sun, 06 Nov 2011 16:37:23 +0100 From: Arnd Bergmann To: Linus Torvalds Subject: [GIT PULL] arm-soc: mach-exynos code reorganization Date: Sun, 6 Nov 2011 16:37:14 +0100 User-Agent: KMail/1.12.2 (Linux/2.6.35-22-generic; KDE/4.3.2; x86_64; ; ) MIME-Version: 1.0 Message-Id: <201111061637.15412.arnd@arndb.de> X-Provags-ID: V02:K0:Oo0o8Kj8QlQhnVL/I/xvaVxh6JPSwpG8hf7HSg2YnDL r1NUSUe+rPN3My4b49YalSMfM5ynx2+Fy9d+PrNKRf8gB3H4ZW SwKPXenbh5nDcY8Cv0GkIkoPADIkZ8AlYZbuoTvJ9HSyM2skG9 hnml8DaIJBTGfscSkMflUMznocbSfbiz0fx96+3NQV2YN6/6YO 7yKguWuc+ki/tSLyyjLHnUYnBx4nvTlsbgwaKWgNo1TLSWgbgo dX9soJ8pSQ2XJessrWwdHOSY9FsSBYMk6Prenk1EH1o3zWGbK/ xqBTctMkxP8g/SEzToC0G9sz2DG2vH1LwI3goFQjK4wQADaB9r 51KW+qCITr7w66La/oHU= X-Spam-Note: CRM114 invocation failed X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.187 listed in list.dnswl.org] Cc: linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Kukjin Kim , ben-linux@fluff.org, 'Russell King' , 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 Hi Linus, Thanks for pulling the two previous sets of samsung patches, I've just seen them show up and Kukjin Kim has already provided a patch on top of that to do the move I mentioned in the previous pull request. This moves all files from mach-exynos4 to mach-exynos in preparation for future exynos socs. The branch also contains three bug fixes that have shown up during the merge window. Arnd The following changes since commit c861cd3e92d92ae946e19099f198018fcb4fd887: Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc (2011-11-05 18:21:21 -0700) are available in the git repository at: git://git.linaro.org/people/arnd/arm-soc.git next/move Jonghwan Choi (1): ARM: SAMSUNG: Fix compile error due to kfree Joonyoung Shim (1): ARM: SAMSUNG: Add clk enable/disable of pwm Kukjin Kim (1): ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos Marc Zyngier (1): ARM: EXYNOS4: convert MCT to percpu interrupt API arch/arm/Kconfig | 8 +- arch/arm/Makefile | 2 +- arch/arm/configs/exynos4_defconfig | 9 +-- arch/arm/{mach-exynos4 => mach-exynos}/Kconfig | 42 +++++++++--- arch/arm/{mach-exynos4 => mach-exynos}/Makefile | 11 ++-- .../{mach-exynos4 => mach-exynos}/Makefile.boot | 0 .../clock-exynos4210.c | 0 .../clock-exynos4212.c | 0 arch/arm/{mach-exynos4 => mach-exynos}/clock.c | 0 arch/arm/{mach-exynos4 => mach-exynos}/cpu.c | 69 +++++++++++--------- arch/arm/{mach-exynos4 => mach-exynos}/cpuidle.c | 0 arch/arm/{mach-exynos4 => mach-exynos}/dev-ahci.c | 0 arch/arm/{mach-exynos4 => mach-exynos}/dev-audio.c | 0 arch/arm/{mach-exynos4 => mach-exynos}/dev-dwmci.c | 0 arch/arm/{mach-exynos4 => mach-exynos}/dev-pd.c | 0 .../arm/{mach-exynos4 => mach-exynos}/dev-sysmmu.c | 0 arch/arm/{mach-exynos4 => mach-exynos}/dma.c | 0 arch/arm/{mach-exynos4 => mach-exynos}/headsmp.S | 0 arch/arm/{mach-exynos4 => mach-exynos}/hotplug.c | 0 .../include/mach/debug-macro.S | 0 .../include/mach/dma.h | 0 .../include/mach/dwmci.h | 0 .../include/mach/entry-macro.S | 0 .../include/mach/exynos4-clock.h | 0 .../include/mach/gpio.h | 0 .../include/mach/hardware.h | 0 .../include/mach/io.h | 0 .../include/mach/irqs.h | 0 .../include/mach/map.h | 32 ++++++---- .../include/mach/memory.h | 0 .../include/mach/pm-core.h | 0 .../include/mach/pmu.h | 0 .../include/mach/regs-audss.h | 0 .../include/mach/regs-clock.h | 0 .../include/mach/regs-gpio.h | 0 .../include/mach/regs-irq.h | 0 .../include/mach/regs-mct.h | 0 .../include/mach/regs-mem.h | 0 .../include/mach/regs-pmu.h | 0 .../include/mach/regs-sysmmu.h | 0 .../include/mach/regs-usb-phy.h | 0 .../include/mach/sysmmu.h | 0 .../include/mach/system.h | 0 .../include/mach/timex.h | 0 .../include/mach/uncompress.h | 0 .../include/mach/vmalloc.h | 0 arch/arm/{mach-exynos4 => mach-exynos}/init.c | 0 .../{mach-exynos4 => mach-exynos}/irq-combiner.c | 0 arch/arm/{mach-exynos4 => mach-exynos}/irq-eint.c | 0 .../mach-armlex4210.c | 0 arch/arm/{mach-exynos4 => mach-exynos}/mach-nuri.c | 0 .../{mach-exynos4 => mach-exynos}/mach-origen.c | 0 .../{mach-exynos4 => mach-exynos}/mach-smdk4x12.c | 0 .../{mach-exynos4 => mach-exynos}/mach-smdkv310.c | 0 .../mach-universal_c210.c | 0 arch/arm/{mach-exynos4 => mach-exynos}/mct.c | 40 ++++++++---- arch/arm/{mach-exynos4 => mach-exynos}/platsmp.c | 0 arch/arm/{mach-exynos4 => mach-exynos}/pm.c | 0 arch/arm/{mach-exynos4 => mach-exynos}/pmu.c | 0 .../arm/{mach-exynos4 => mach-exynos}/setup-fimc.c | 0 .../{mach-exynos4 => mach-exynos}/setup-fimd0.c | 0 .../arm/{mach-exynos4 => mach-exynos}/setup-i2c0.c | 0 .../arm/{mach-exynos4 => mach-exynos}/setup-i2c1.c | 0 .../arm/{mach-exynos4 => mach-exynos}/setup-i2c2.c | 0 .../arm/{mach-exynos4 => mach-exynos}/setup-i2c3.c | 0 .../arm/{mach-exynos4 => mach-exynos}/setup-i2c4.c | 0 .../arm/{mach-exynos4 => mach-exynos}/setup-i2c5.c | 0 .../arm/{mach-exynos4 => mach-exynos}/setup-i2c6.c | 0 .../arm/{mach-exynos4 => mach-exynos}/setup-i2c7.c | 0 .../{mach-exynos4 => mach-exynos}/setup-keypad.c | 0 .../setup-sdhci-gpio.c | 0 .../{mach-exynos4 => mach-exynos}/setup-sdhci.c | 0 .../{mach-exynos4 => mach-exynos}/setup-usb-phy.c | 0 arch/arm/plat-s5p/Kconfig | 2 +- arch/arm/plat-s5p/cpu.c | 6 +- arch/arm/plat-samsung/dev-backlight.c | 1 + arch/arm/plat-samsung/include/plat/exynos4.h | 6 +- arch/arm/plat-samsung/pwm.c | 7 ++ 78 files changed, 141 insertions(+), 94 deletions(-) rename arch/arm/{mach-exynos4 => mach-exynos}/Kconfig (92%) rename arch/arm/{mach-exynos4 => mach-exynos}/Makefile (90%) rename arch/arm/{mach-exynos4 => mach-exynos}/Makefile.boot (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/clock-exynos4210.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/clock-exynos4212.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/clock.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/cpu.c (91%) rename arch/arm/{mach-exynos4 => mach-exynos}/cpuidle.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/dev-ahci.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/dev-audio.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/dev-dwmci.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/dev-pd.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/dev-sysmmu.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/dma.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/headsmp.S (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/hotplug.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/include/mach/debug-macro.S (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/include/mach/dma.h (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/include/mach/dwmci.h (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/include/mach/entry-macro.S (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/include/mach/exynos4-clock.h (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/include/mach/gpio.h (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/include/mach/hardware.h (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/include/mach/io.h (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/include/mach/irqs.h (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/include/mach/map.h (93%) rename arch/arm/{mach-exynos4 => mach-exynos}/include/mach/memory.h (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/include/mach/pm-core.h (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/include/mach/pmu.h (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/include/mach/regs-audss.h (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/include/mach/regs-clock.h (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/include/mach/regs-gpio.h (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/include/mach/regs-irq.h (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/include/mach/regs-mct.h (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/include/mach/regs-mem.h (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/include/mach/regs-pmu.h (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/include/mach/regs-sysmmu.h (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/include/mach/regs-usb-phy.h (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/include/mach/sysmmu.h (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/include/mach/system.h (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/include/mach/timex.h (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/include/mach/uncompress.h (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/include/mach/vmalloc.h (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/init.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/irq-combiner.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/irq-eint.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/mach-armlex4210.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/mach-nuri.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/mach-origen.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/mach-smdk4x12.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/mach-smdkv310.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/mach-universal_c210.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/mct.c (91%) rename arch/arm/{mach-exynos4 => mach-exynos}/platsmp.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/pm.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/pmu.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/setup-fimc.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/setup-fimd0.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/setup-i2c0.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/setup-i2c1.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/setup-i2c2.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/setup-i2c3.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/setup-i2c4.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/setup-i2c5.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/setup-i2c6.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/setup-i2c7.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/setup-keypad.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/setup-sdhci-gpio.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/setup-sdhci.c (100%) rename arch/arm/{mach-exynos4 => mach-exynos}/setup-usb-phy.c (100%)