From patchwork Wed Mar 5 07:48:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santosh Shilimkar X-Patchwork-Id: 326609 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 ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 389AB2C00CE for ; Wed, 5 Mar 2014 18:49:57 +1100 (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 1WL6Zk-00029C-9r; Wed, 05 Mar 2014 07:49: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 1WL6Zg-0006L7-GQ; Wed, 05 Mar 2014 07:49:08 +0000 Received: from bear.ext.ti.com ([192.94.94.41]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WL6ZU-0006Jo-I9 for linux-arm-kernel@lists.infradead.org; Wed, 05 Mar 2014 07:48:57 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id s257mXlb008647; Wed, 5 Mar 2014 01:48:33 -0600 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s257mXqo025475; Wed, 5 Mar 2014 01:48:33 -0600 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.174.1; Wed, 5 Mar 2014 01:48:33 -0600 Received: from ula0393909.itg.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s257mVXS027510; Wed, 5 Mar 2014 01:48:32 -0600 From: Santosh Shilimkar To: Subject: [GIT PULL 1/2] ARM: Keystone DTS updates for 3.15 Date: Wed, 5 Mar 2014 15:48:22 +0800 Message-ID: <1394005703-6624-1-git-send-email-santosh.shilimkar@ti.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140305_024856_710882_5EEB08AE X-CRM114-Status: GOOD ( 11.92 ) X-Spam-Score: -6.9 (------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-6.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [192.94.94.41 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Santosh Shilimkar , 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, Please pull below keystone DTS updates for 3.15. It merges cleanly with arm-soc 'for-next' and 'next/dt' heads. Please note that you get a trivial merge conflict while merging to the latest Linus tip, because of bug fix commit 565bbdcd3b{ARM: keystone: dts: fix clkvcp3 control register address} which got merged post 3.14-rc5. If it needs to be avoided then I need to rebase the PULL request on top of 3.14-rc6 when it gets tagged. Do let me know if thats needed. The following changes since commit 38dbfb59d1175ef458d006556061adeaa8751b72: Linus 3.14-rc1 (2014-02-02 16:42:13 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git tags/keystone-dts for you to fetch changes up to 82c04f71ecacf225cdd0ea96ec91f28ca9db70a1: ARM: dts: keystone: add AEMIF/NAND device entry (2014-02-28 21:05:24 -0500) ---------------------------------------------------------------- Keystone DTS updates for 3.15 - Add watchdog timer, timer64 and gpio device nodes - Add LED device nodes - Fixes for debugss, msmc clock nodes - Add support for Keystone Lamarr and Edision SOC/EVM support - Add NAND and AEMIF device nodes ---------------------------------------------------------------- Grygorii Strashko (3): ARM: dts: keystone: add gpio device entry ARM: dts: k2hk-evm: add leds supports ARM: dts: k2hk-evm: rename clock node to clocks Ivan Khoronzhuk (4): ARM: dts: keystone: add watchdog entry ARM: dts: keystone: add keystone timer entry ARM: dts: keystone: drop msmcsram clock node ARM: dts: keystone: add AEMIF/NAND device entry Murali Karicheri (5): ARM: dts: keystone: fix domain id for clkdebugsstrc ARM: dts: keystone: update for supporting K2L/K2E EVMs ARM: dts: keystone: preparatory patch to support K2L and K2E SOCs ARM: dts: keystone: add support for K2 Lamarr SoC and EVM ARM: dts: keystone: add support for k2 Edison SoC and EVM .../devicetree/bindings/arm/keystone/keystone.txt | 10 + arch/arm/boot/dts/k2e-clocks.dtsi | 78 ++++ arch/arm/boot/dts/k2e-evm.dts | 60 +++ arch/arm/boot/dts/k2e.dtsi | 80 ++++ arch/arm/boot/dts/k2hk-clocks.dtsi | 426 +++++++++++++++++++ arch/arm/boot/dts/k2hk-evm.dts | 83 +++- arch/arm/boot/dts/k2hk.dtsi | 46 +++ arch/arm/boot/dts/k2l-clocks.dtsi | 267 ++++++++++++ arch/arm/boot/dts/k2l-evm.dts | 37 ++ arch/arm/boot/dts/k2l.dtsi | 55 +++ arch/arm/boot/dts/keystone-clocks.dtsi | 427 +------------------- arch/arm/boot/dts/keystone.dtsi | 102 +++-- arch/arm/mach-keystone/keystone.c | 3 + 13 files changed, 1224 insertions(+), 450 deletions(-) create mode 100644 arch/arm/boot/dts/k2e-clocks.dtsi create mode 100644 arch/arm/boot/dts/k2e-evm.dts create mode 100644 arch/arm/boot/dts/k2e.dtsi create mode 100644 arch/arm/boot/dts/k2hk-clocks.dtsi create mode 100644 arch/arm/boot/dts/k2hk.dtsi create mode 100644 arch/arm/boot/dts/k2l-clocks.dtsi create mode 100644 arch/arm/boot/dts/k2l-evm.dts create mode 100644 arch/arm/boot/dts/k2l.dtsi