From patchwork Mon Apr 8 09:00:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 234605 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 608DE2C00C3 for ; Mon, 8 Apr 2013 19:02:20 +1000 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UP7x1-0002tb-L6; Mon, 08 Apr 2013 09:01:19 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UP7wy-0004VG-Tv; Mon, 08 Apr 2013 09:01:16 +0000 Received: from co9ehsobe005.messaging.microsoft.com ([207.46.163.28] helo=co9outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UP7wv-0004Ue-Tp for linux-arm-kernel@lists.infradead.org; Mon, 08 Apr 2013 09:01:15 +0000 Received: from mail167-co9-R.bigfish.com (10.236.132.245) by CO9EHSOBE033.bigfish.com (10.236.130.96) with Microsoft SMTP Server id 14.1.225.23; Mon, 8 Apr 2013 09:01:11 +0000 Received: from mail167-co9 (localhost [127.0.0.1]) by mail167-co9-R.bigfish.com (Postfix) with ESMTP id EE6934C019E; Mon, 8 Apr 2013 09:01:10 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(z551biz936eIzz1f42h1fc6h1ee6h1de0h1fdah1202h1e76h1d1ah1d2ahzz8275dhz2dh87h2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1155h) X-FB-DOMAIN-IP-MATCH: fail Received: from mail167-co9 (localhost.localdomain [127.0.0.1]) by mail167-co9 (MessageSwitch) id 1365411669774703_4471; Mon, 8 Apr 2013 09:01:09 +0000 (UTC) Received: from CO9EHSMHS026.bigfish.com (unknown [10.236.132.246]) by mail167-co9.bigfish.com (Postfix) with ESMTP id BAF89480057; Mon, 8 Apr 2013 09:01:09 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO9EHSMHS026.bigfish.com (10.236.130.36) with Microsoft SMTP Server (TLS) id 14.1.225.23; Mon, 8 Apr 2013 09:01:09 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server (TLS) id 14.2.328.11; Mon, 8 Apr 2013 09:01:06 +0000 Received: from S2101-09.ap.freescale.net ([10.192.185.95]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id r389138o019186; Mon, 8 Apr 2013 02:01:04 -0700 From: Shawn Guo To: Subject: [GIT PULL 1/4] ARM: mxs: cleanup for 3.10 Date: Mon, 8 Apr 2013 17:00:18 +0800 Message-ID: <1365411621-18422-1-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130408_050114_123670_24AB36BE X-CRM114-Status: GOOD ( 11.13 ) X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [207.46.163.28 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Shawn Guo , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Hi Arnd, Olof, This is the mxs cleanup material for 3.10. It's based on clksrc/cleanup branch in arm-soc tree. Please pull, thanks. Shawn The following changes since commit 3ed628a8122112ee796cd643e2478c4a6def234c: Merge remote-tracking branch 'arm-soc/clksrc/cleanup' into mxs/cleanup (2013-04-01 16:29:56 +0800) are available in the git repository at: git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-cleanup-3.10 for you to fetch changes up to e933a1a12a02f42e0013cda87bba37ccb59efc47: clocksource: mxs_timer: Add semicolon at end of line (2013-04-03 10:30:08 +0800) ---------------------------------------------------------------- The mxs cleanup for 3.10: * Clean up timer code and move it into drivers/clocksource * Clean up icoll code and move it into drivers/irqchip * Clean up clock code to not include headers * Clean up rtc-stmp3xxx, mxs-lradc and mxs-saif to not include headers * Clean up mach-mxs code to get it prepared for multiplatform support ---------------------------------------------------------------- Fabio Estevam (1): clocksource: mxs_timer: Add semicolon at end of line Shawn Guo (25): ARM: mxs: use CLKSRC_OF helper to initialize timer ARM: mxs: look up timrot clock from device tree ARM: mxs: get timrot base address from device tree ARM: mxs: remove cpu_is_mx23() call from timer code ARM: mxs: select STMP_DEVICE and use it for timer code ARM: mxs: move timer driver into drivers/clocksource ARM: mxs: get icoll base address from device tree ARM: mxs: call stmp_reset_block() in icoll ARM: mxs: move icoll driver into drivers/irqchip ARM: mxs: remove unneeded mach-types.h inclusion clk: mxs: get base address from device tree clk: mxs: remove the use of mach level IO accessor rtc: stmp3xxx: use stmp_reset_block() instead iio: mxs-lradc: remove unneeded mach header inclusion ASoC: mxs-saif: remove mach header inclusion ARM: mxs: remove empty hardware.h ARM: mxs: get reset address from device tree ARM: mxs: remove system.c ARM: mxs: get ocotp base address from device tree ARM: mxs: use debug_ll_io_init for low-level debug ARM: mxs: remove mm.c ARM: mxs: move mxs_get_ocotp() into mach-mxs.c ARM: mxs: remove common.h ARM: mxs: merge imx23 and imx28 into one machine_desc ARM: mxs: remove unused headers arch/arm/Kconfig | 2 + arch/arm/boot/dts/imx23.dtsi | 5 +- arch/arm/boot/dts/imx28.dtsi | 5 +- arch/arm/mach-mxs/Makefile | 4 - arch/arm/mach-mxs/include/mach/common.h | 29 --- arch/arm/mach-mxs/include/mach/debug-macro.S | 9 +- arch/arm/mach-mxs/include/mach/digctl.h | 22 -- arch/arm/mach-mxs/include/mach/hardware.h | 23 -- arch/arm/mach-mxs/include/mach/mx23.h | 169 --------------- arch/arm/mach-mxs/include/mach/mx28.h | 225 -------------------- arch/arm/mach-mxs/include/mach/mxs.h | 117 ---------- arch/arm/mach-mxs/mach-mxs.c | 185 +++++++++++++--- arch/arm/mach-mxs/mm.c | 52 ----- arch/arm/mach-mxs/ocotp.c | 93 -------- arch/arm/mach-mxs/system.c | 139 ------------ drivers/clk/mxs/clk-imx23.c | 42 ++-- drivers/clk/mxs/clk-imx28.c | 42 ++-- drivers/clocksource/Makefile | 1 + .../timer.c => drivers/clocksource/mxs_timer.c | 36 ++-- drivers/irqchip/Makefile | 1 + .../mach-mxs/icoll.c => drivers/irqchip/irq-mxs.c | 24 +-- drivers/rtc/rtc-stmp3xxx.c | 6 +- drivers/staging/iio/adc/mxs-lradc.c | 3 - include/linux/clk/mxs.h | 16 ++ include/linux/irqchip/mxs.h | 14 ++ sound/soc/mxs/mxs-saif.c | 5 +- 26 files changed, 279 insertions(+), 990 deletions(-) delete mode 100644 arch/arm/mach-mxs/include/mach/common.h delete mode 100644 arch/arm/mach-mxs/include/mach/digctl.h delete mode 100644 arch/arm/mach-mxs/include/mach/hardware.h delete mode 100644 arch/arm/mach-mxs/include/mach/mx23.h delete mode 100644 arch/arm/mach-mxs/include/mach/mx28.h delete mode 100644 arch/arm/mach-mxs/include/mach/mxs.h delete mode 100644 arch/arm/mach-mxs/mm.c delete mode 100644 arch/arm/mach-mxs/ocotp.c delete mode 100644 arch/arm/mach-mxs/system.c rename arch/arm/mach-mxs/timer.c => drivers/clocksource/mxs_timer.c (91%) rename arch/arm/mach-mxs/icoll.c => drivers/irqchip/irq-mxs.c (89%) create mode 100644 include/linux/clk/mxs.h create mode 100644 include/linux/irqchip/mxs.h