From mboxrd@z Thu Jan 1 00:00:00 1970 From: linus.walleij@linaro.org (Linus Walleij) Date: Wed, 30 Jan 2013 23:21:06 +0100 Subject: [GIT PULL] Nomadik devicetree and cleanups In-Reply-To: <20130129173641.GA17935@quad.lixom.net> References: <20130128213135.GA3047@quad.lixom.net> <20130129173641.GA17935@quad.lixom.net> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.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