From patchwork Wed Jan 30 22:21:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 217000 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 C004D2C007C for ; Thu, 31 Jan 2013 09:22:13 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U0g1m-0001vZ-V7; Wed, 30 Jan 2013 22:21:10 +0000 Received: from mail-ob0-f177.google.com ([209.85.214.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U0g1k-0001ug-7V for linux-mtd@lists.infradead.org; Wed, 30 Jan 2013 22:21:09 +0000 Received: by mail-ob0-f177.google.com with SMTP id wc18so2161557obb.22 for ; Wed, 30 Jan 2013 14:21:06 -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=zf2cUQfLo7M3IUZvXYZ392Fra3UIt1GC7ts1s1zWqwk=; b=lUbHJDkSqzzDP5pnTJL7LjhMB5DmNJcSbc3MyarbEMVFtgkaibX0JF5O0V1kCJD2XP WhWrvZ46oEoV+pXWgLIjN+Y62yj0Mmeuld/ocYFfZWDKyfCgX1uvCUkHPB0IfkpLtBJl VaOpO6krimY7mpvbA4eNHg2Sm0yXdYrNRuWu2KV96flohrQXxIzHWnGqtdqJEC3vqMFB CvoBHn7NcitMPmXU3NTS79Dy8pAQTKsIlXtAGg4rnYjn5MrWkjqaikVvGPMLJ1VAeFHQ xhtCbRtDoKZK9VGIMik0t3i+LFOCq7NDOJlSSBPZBJEQcSvE7hTZLYGIpJIYQBs7w/B5 CZVg== MIME-Version: 1.0 X-Received: by 10.60.19.161 with SMTP id g1mr4994274oee.117.1359584466594; Wed, 30 Jan 2013 14:21:06 -0800 (PST) Received: by 10.182.110.105 with HTTP; Wed, 30 Jan 2013 14:21:06 -0800 (PST) In-Reply-To: <20130129173641.GA17935@quad.lixom.net> References: <20130128213135.GA3047@quad.lixom.net> <20130129173641.GA17935@quad.lixom.net> Date: Wed, 30 Jan 2013 23:21:06 +0100 Message-ID: Subject: Re: [GIT PULL] Nomadik devicetree and cleanups From: Linus Walleij To: arm@kernel.org X-Gm-Message-State: ALoCoQma54XT1dA6o3J5FkJLpm4nGNRjH9aQFTglC0DmHgPp2BwXann5si6MMf7/cMeC+A4QQ6TG X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130130_172108_339983_210EB225 X-CRM114-Status: GOOD ( 20.68 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.214.177 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: David Woodhouse , 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 Tue, Jan 29, 2013 at 6:36 PM, Olof Johansson wrote: > On Mon, Jan 28, 2013 at 11:36:59PM +0100, Linus Walleij wrote: >> 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 > > Beautiful! Pulled. Zero conflicts. :) So as I heard this blew up for selecting OF instead of USE_OF here is yet another pull request, with this oneliner change in the relevant patch ("ARM: nomadik: delete old board files"): - select OF + select USE_OF I have tried to provoke builderrors with the defconfig but couldn't. Here is then yet another pull request, and let's hope it works this time around: 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/nomadik-devicetree-v2 for you to fetch changes up to 2cac860881884564c86eeda4f622d8a7ca9b089c: ARM: nomadik: get rid of (2013-01-30 22:55:34 +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. This version also selects USE_OF instead of just OF. ---------------------------------------------------------------- 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