From patchwork Mon Jan 28 22:36:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 216389 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@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 C6A362C0089 for ; Tue, 29 Jan 2013 09:38:04 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TzxK4-0006j6-TI; Mon, 28 Jan 2013 22:37:04 +0000 Received: from ia-in-x0233.1e100.net ([2607:f8b0:4001:c02::233] helo=mail-ia0-x233.google.com) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TzxK1-0006iD-5F for linux-mtd@lists.infradead.org; Mon, 28 Jan 2013 22:37:02 +0000 Received: by mail-ia0-f179.google.com with SMTP id x24so5052619iak.10 for ; Mon, 28 Jan 2013 14:37:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:cc:content-type:x-gm-message-state; bh=viEu7fEfC/BEVF0+w6kfICalRmF1Z4rA5p3pgMAGWKw=; b=VMsSFAW+DLIoxjIOZVYzEAhvpzZmizaNJ8Y7EoELXwVc3wL1/Ex9lSFIHi5WUn3Yvb 6DAk+CU499NkSXeByS05rGGQpYPf/aVd0g5p2b/NXVCirm8jJXNMcFpDZ2LVfdAmywYv OxJ4xP8UmerkuM/uDzNsRjP8aoZtG8/VEr0hDYtMRTJUe1c+7QcFujPKUMeMIjlhvnmA 57rXaxuWadM+44MlgGWKxDZd7vKSzMJMwDLopDL+8R0sYdsUxCde2SImdxJd9dMQX+5d 0pa6obKoLb8LiZSCb2mC3UySK9Ssz3wpvDRKFpgUKkBgJZcCorxDupiIdJ3wtfLtF4xh C5PQ== MIME-Version: 1.0 X-Received: by 10.50.189.163 with SMTP id gj3mr6159425igc.14.1359412619811; Mon, 28 Jan 2013 14:36:59 -0800 (PST) Received: by 10.43.12.9 with HTTP; Mon, 28 Jan 2013 14:36:59 -0800 (PST) In-Reply-To: <20130128213135.GA3047@quad.lixom.net> References: <20130128213135.GA3047@quad.lixom.net> Date: Mon, 28 Jan 2013 23:36:59 +0100 Message-ID: Subject: Re: [GIT PULL] Nomadik devicetree and cleanups From: Linus Walleij To: Olof Johansson X-Gm-Message-State: ALoCoQlUKQZzUY0zfc6NWai4Ca0HS2biosCZfXbdtoAcoSS0hNCJAOo13YYDHMmzJ4FKm6Ws/qAb X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130128_173701_270827_E9AEE4D9 X-CRM114-Status: GOOD ( 15.66 ) 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 ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: David Woodhouse , arm@kernel.org, linux-mtd@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Artem Bityutskiy X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org On Mon, Jan 28, 2013 at 10:31 PM, Olof Johansson wrote: > Would you mind rebasing on top of the depends/cleanup branch in arm-soc, sort > out the breakage (and test it) and resubmit? So Olof, please try this instead, based on the ARM depends/cleanup HEAD when I fetched it: The following changes since commit f8060f5446b1f2782f0a8ca9be2d870ea4198aee: Merge tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux into next/cleanup (2013-01-14 19:55:03 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git tags/nmk-dt-on-cleanups for you to fetch changes up to dea3eacd087cfa692ea20aafbfaf4827607afe45: ARM: nomadik: get rid of (2013-01-28 23:25:40 +0100) ---------------------------------------------------------------- Nomadik Device Tree conversion rebased on ARM SoC cleanup branch This patch set converts the Nomadik (mach-nomadik) to Device Tree and delete the old board files, paving the road for single zImage. ---------------------------------------------------------------- Linus Walleij (11): ARM: nomadik: move last custom calls to pinctrl ARM: nomadik: initial devicetree support ARM: nomadik: move pin maps to cpu file ARM: nomadik: move remaining PrimeCells to device tree ARM: nomadik: add FSMC NAND ARM: nomadik: move GPIO and pinctrl to device tree ARM: nomadik: convert SMSC91x ethernet to device tree ARM: nomadik: migrate MMC/SD card support to device tree ARM: nomadik: add I2C devices to the device tree ARM: nomadik: delete old board files ARM: nomadik: get rid of .../devicetree/bindings/arm/ste-nomadik.txt | 27 ++ .../devicetree/bindings/mtd/fsmc-nand.txt | 2 +- arch/arm/Kconfig | 2 + arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/ste-nomadik-s8815.dts | 30 ++ arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 256 +++++++++++++++ arch/arm/mach-nomadik/Kconfig | 10 +- arch/arm/mach-nomadik/Makefile | 6 - arch/arm/mach-nomadik/board-nhk8815.c | 353 -------------------- arch/arm/mach-nomadik/cpu-8815.c | 358 +++++++++++++++------ arch/arm/mach-nomadik/cpu-8815.h | 4 - arch/arm/mach-nomadik/i2c-8815nhk.c | 88 ----- arch/arm/mach-nomadik/include/mach/hardware.h | 90 ------ arch/arm/mach-nomadik/include/mach/irqs.h | 2 - arch/arm/mach-nomadik/include/mach/uncompress.h | 1 - drivers/mtd/nand/fsmc_nand.c | 1 + drivers/pinctrl/pinctrl-nomadik.c | 4 + 17 files changed, 588 insertions(+), 647 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/ste-nomadik.txt create mode 100644 arch/arm/boot/dts/ste-nomadik-s8815.dts create mode 100644 arch/arm/boot/dts/ste-nomadik-stn8815.dtsi delete mode 100644 arch/arm/mach-nomadik/board-nhk8815.c delete mode 100644 arch/arm/mach-nomadik/cpu-8815.h delete mode 100644 arch/arm/mach-nomadik/i2c-8815nhk.c delete mode 100644 arch/arm/mach-nomadik/include/mach/hardware.h