From patchwork Fri Aug 16 09:43:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 267605 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (unknown [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 A55A62C0161 for ; Fri, 16 Aug 2013 19:43:34 +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 1VAGZ6-0005oL-7r; Fri, 16 Aug 2013 09:43:28 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VAGZ4-0005JZ-0s; Fri, 16 Aug 2013 09:43:26 +0000 Received: from mail-oa0-f41.google.com ([209.85.219.41]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VAGZ1-0005Ig-6Q for linux-arm-kernel@lists.infradead.org; Fri, 16 Aug 2013 09:43:23 +0000 Received: by mail-oa0-f41.google.com with SMTP id j6so2056350oag.0 for ; Fri, 16 Aug 2013 02:43:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-gm-message-state:mime-version:date:message-id:subject:from:to:cc :content-type; bh=C4KT+hX4X+UtCwYhbKEZSOvfdDWIPmoW6YA8jHay3uc=; b=D3yLnHYeBe3AtMWS8cRFC7pfhUMqjGOqyeYKgy57AnL/H0h9ql4F/MaOUPTXZzyV0O uvIVu85gvK8cBZl3IMKYtQ63bZlaZHZIOJ4RmrEuN+akQs07qUnX19G7VMLU4JVm2x46 120LtdoF+UAmAlP9Jdri1enMiaZaLNNTt2vAm5pOXfXEVfBH6kGSgnQP5RAjj1I8DUWy 0csyvpjvLN7Gb0xvbxX97UlyZA7CBJ2IewkQV6+B+Wuu7M12yjfY27wH8A5/8yFNZ/OE +UgyIdwvNiy9//22kPmDMHb9Y//UJUEs1d2G3wFwFid7bXkLpGqhrO21KcaC2rajipUO nOag== X-Gm-Message-State: ALoCoQnS0feuSLx8mKs7HWyedu9NTxDj5obB9PUNFBk0UDCW51Gp1xT3/TBjOpqj+h339JSgt53N MIME-Version: 1.0 X-Received: by 10.182.48.230 with SMTP id p6mr587975obn.1.1376646181744; Fri, 16 Aug 2013 02:43:01 -0700 (PDT) Received: by 10.182.120.7 with HTTP; Fri, 16 Aug 2013 02:43:01 -0700 (PDT) Date: Fri, 16 Aug 2013 11:43:01 +0200 Message-ID: Subject: [GIT PULL] ux500 devicetree base for v3.12 From: Linus Walleij To: "arm@kernel.org" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130816_054323_337280_09C7B30E X-CRM114-Status: GOOD ( 11.38 ) 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.219.41 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Lee Jones , "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 ARM SoC folks, this pull request is mostly described in the signed tag, it basically consists of leftovers and cleanups from the previous kernel cycle and some real nice houskeeping from Lee Jones. Please pull it into a suitable branch in the ARM SoC tree for v3.12. Yours, Linus Walleij The following changes since commit ad81f0545ef01ea651886dddac4bef6cec930092: Linux 3.11-rc1 (2013-07-14 15:18:27 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-devicetree-for-v3.12-1 for you to fetch changes up to 2ce05a14bb379bd81ba3ad12cc08b2c4bda83480: ARM: ux500: fix devicetree builds (2013-08-14 22:32:07 +0200) ---------------------------------------------------------------- Ux500 device tree enablement base for the v3.12 development cycle: - Various cleanups like remove non-existant hardware from the Snowball device tree, prefix all files with "ste-*" - External regulators - Documentation updates - Delete some minor dangling platform data - Pin control settings for U8540 through DT ---------------------------------------------------------------- Gabriel Fernandez (2): ARM: u8540: Add Pinctrl Device Tree settings for uart0, uart2 ARM: u8540: DT: Set pinctrl mapping to i2c0,1,2,4 & 5 Lee Jones (19): ARM: ux500: Fix trivial whitespace/tabbing issue ARM: ux500: Add Device Tree nodes for AB8500 External regulators ARM: ux500: Provide a supply name for the AB8500 AUX regulators to use ARM: ux500: Supply external regulator names for Snowball's DT Documentation: Update binding for Nomadik and DBx5x based platforms ARM: ux500: Stop passing MMC's platform data for Device Tree boots ARM: ux500: Remove Toshiba TC35892 I/O Expander's DT entry from Snowball's DTS ARM: ux500: Remove Snowball DTS entry for National Semiconductor LP5521 LED chip ARM: ux500: Remove Snowball DTS entry for TPS61052 chip ARM: ux500: Remove Snowball DTS entry for ROHM BH1780GLI ambient light sensor ARM: ux500: Apply a ste-* prefix onto snowball.dts ARM: ux500: Apply a ste-* prefix onto ccu8540.dts ARM: ux500: Apply a ste-* prefix onto ccu9540.dts ARM: ux500: Apply a ste-* prefix onto href.dtsi ARM: ux500: Apply a ste-* prefix onto hrefprev60.dts Signed-off-by: Lee Jones ARM: ux500: Apply a ste-* prefix onto hrefv60plus.dts ARM: ux500: Apply a ste-* prefix onto stuib.dtsi ARM: ux500: Apply a ste-* prefix onto dbx5x0.dtsi ARM: ux500: Remove u9540.dts as it's been replaced Linus Walleij (1): ARM: ux500: fix devicetree builds .../devicetree/bindings/pinctrl/ste,nomadik.txt | 6 +- arch/arm/boot/dts/Makefile | 10 +- arch/arm/boot/dts/ccu8540.dts | 41 ----- arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi | 196 +++++++++++++++++++++ arch/arm/boot/dts/ste-ccu8540.dts | 86 +++++++++ arch/arm/boot/dts/{ccu9540.dts => ste-ccu9540.dts} | 2 +- arch/arm/boot/dts/{dbx5x0.dtsi => ste-dbx5x0.dtsi} | 30 +++- arch/arm/boot/dts/{href.dtsi => ste-href.dtsi} | 2 +- .../dts/{hrefprev60.dts => ste-hrefprev60.dts} | 6 +- .../dts/{hrefv60plus.dts => ste-hrefv60plus.dts} | 6 +- arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi | 95 ++++++++++ .../boot/dts/{snowball.dts => ste-snowball.dts} | 44 ++--- arch/arm/boot/dts/{stuib.dtsi => ste-stuib.dtsi} | 0 arch/arm/boot/dts/u9540.dts | 72 -------- arch/arm/mach-ux500/cpu-db8500.c | 8 +- include/dt-bindings/pinctrl/nomadik.h | 36 ++++ 16 files changed, 477 insertions(+), 163 deletions(-) delete mode 100644 arch/arm/boot/dts/ccu8540.dts create mode 100644 arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi create mode 100644 arch/arm/boot/dts/ste-ccu8540.dts rename arch/arm/boot/dts/{ccu9540.dts => ste-ccu9540.dts} (98%) rename arch/arm/boot/dts/{dbx5x0.dtsi => ste-dbx5x0.dtsi} (96%) rename arch/arm/boot/dts/{href.dtsi => ste-href.dtsi} (99%) rename arch/arm/boot/dts/{hrefprev60.dts => ste-hrefprev60.dts} (92%) rename arch/arm/boot/dts/{hrefv60plus.dts => ste-hrefv60plus.dts} (98%) create mode 100644 arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi rename arch/arm/boot/dts/{snowball.dts => ste-snowball.dts} (93%) rename arch/arm/boot/dts/{stuib.dtsi => ste-stuib.dtsi} (100%) delete mode 100644 arch/arm/boot/dts/u9540.dts create mode 100644 include/dt-bindings/pinctrl/nomadik.h