From patchwork Wed May 29 19:30:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Cooper X-Patchwork-Id: 247362 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 93AB72C01D4 for ; Thu, 30 May 2013 05:31:25 +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 1Uhm5Y-0007IC-77; Wed, 29 May 2013 19:31:12 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uhm5V-00064e-GD; Wed, 29 May 2013 19:31:09 +0000 Received: from mho-02-ewr.mailhop.org ([204.13.248.72]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uhm5T-00063p-3g for linux-arm-kernel@lists.infradead.org; Wed, 29 May 2013 19:31:07 +0000 Received: from pool-72-84-113-162.nrflva.fios.verizon.net ([72.84.113.162] helo=titan) by mho-02-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1Uhm56-000F6v-Qa; Wed, 29 May 2013 19:30:45 +0000 Received: from titan.lakedaemon.net (localhost [127.0.0.1]) by titan (Postfix) with ESMTP id 0BA9943A516; Wed, 29 May 2013 15:30:41 -0400 (EDT) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 72.84.113.162 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1/v6hbFgwJOSAclihPHqe0aR3zE5Ezf8nQ= Date: Wed, 29 May 2013 15:30:41 -0400 From: Jason Cooper To: Arnd Bergmann , Olof Johansson Subject: [GIT PULL 5/5 V2] ARM: mvebu: clock SoC reorg for v3.11 Message-ID: <20130529193041.GX31290@titan.lakedaemon.net> References: <20130528202140.GG31290@titan.lakedaemon.net> <20130528202433.GH31290@titan.lakedaemon.net> <20130528203021.GK31290@titan.lakedaemon.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20130528203021.GK31290@titan.lakedaemon.net> User-Agent: Mutt/1.5.20 (2009-06-14) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130529_153107_206452_7CEFBC3F X-CRM114-Status: GOOD ( 11.96 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [204.13.248.72 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Gregory CLEMENT , Andrew Lunn , Linux ARM Kernel 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 Olof, MikeT's Ack came in, so I cut a v2, no other changes (well, one spelling correction in the subject line of the last commit). The following changes since commit 3d9939c92efdd4ced672b94994959ca71b141cb8: pci: mvebu: fix return value check in mvebu_pcie_probe() (2013-05-27 15:51:56 +0000) are available in the git repository at: git://git.infradead.org/users/jcooper/linux.git tags/seb_clk-3.11 for you to fetch changes up to ea7e0bd7e78868bbe6df6834595ef96166dd296a: clk: mvebu: disintegrate obsolete file (2013-05-29 19:28:29 +0000) ---------------------------------------------------------------- mvebu clock restructuring for v3.11 - clk: mvebu - reorganize by SoC to remove built up #ifdefs - add clk flags per clock gate Note: this branch only depends on mvebu/pcie in order to prevent managing a tricky modify/remove file merge conflict. By rebasing on mvebu/pcie, we are able to build the resolution into the patch series. The change is small, and has been tested by the respective authors. depends: - mvebu/pcie - mvebu/of_pci ---------------------------------------------------------------- Sebastian Hesselbarth (10): clk: mvebu: introduce per-clock-gate flags clk: mvebu: add common clock functions for core clk and clk gating clk: mvebu: add Dove SoC-centric clock init clk: mvebu: add Kirkwood SoC-centric clock init clk: mvebu: add Armada 370 SoC-centric clock init clk: mvebu: add Armada XP SoC-centric clock init ARM: dove: move DT boards to SoC-centric clock init ARM: kirkwood: move DT boards to SoC-centric clock init ARM: mvebu: move DT boards to SoC-centric clock init clk: mvebu: disintegrate obsolete file arch/arm/mach-dove/Kconfig | 3 +- arch/arm/mach-dove/board-dt.c | 3 +- arch/arm/mach-dove/common.c | 1 - arch/arm/mach-kirkwood/Kconfig | 3 +- arch/arm/mach-kirkwood/board-dt.c | 3 +- arch/arm/mach-mvebu/Kconfig | 5 +- arch/arm/mach-mvebu/armada-370-xp.c | 4 +- drivers/clk/mvebu/Kconfig | 25 +- drivers/clk/mvebu/Makefile | 8 +- drivers/clk/mvebu/armada-370.c | 176 ++++++++++ drivers/clk/mvebu/armada-xp.c | 210 +++++++++++ drivers/clk/mvebu/clk-core.c | 675 ------------------------------------ drivers/clk/mvebu/clk-core.h | 18 - drivers/clk/mvebu/clk-gating-ctrl.c | 256 -------------- drivers/clk/mvebu/clk-gating-ctrl.h | 22 -- drivers/clk/mvebu/clk.c | 23 -- drivers/clk/mvebu/common.c | 163 +++++++++ drivers/clk/mvebu/common.h | 48 +++ drivers/clk/mvebu/dove.c | 194 +++++++++++ drivers/clk/mvebu/kirkwood.c | 247 +++++++++++++ include/linux/clk/mvebu.h | 22 -- 21 files changed, 1072 insertions(+), 1037 deletions(-) create mode 100644 drivers/clk/mvebu/armada-370.c create mode 100644 drivers/clk/mvebu/armada-xp.c delete mode 100644 drivers/clk/mvebu/clk-core.c delete mode 100644 drivers/clk/mvebu/clk-core.h delete mode 100644 drivers/clk/mvebu/clk-gating-ctrl.c delete mode 100644 drivers/clk/mvebu/clk-gating-ctrl.h delete mode 100644 drivers/clk/mvebu/clk.c create mode 100644 drivers/clk/mvebu/common.c create mode 100644 drivers/clk/mvebu/common.h create mode 100644 drivers/clk/mvebu/dove.c create mode 100644 drivers/clk/mvebu/kirkwood.c delete mode 100644 include/linux/clk/mvebu.h