From patchwork Tue Feb 23 06:04:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenyou Yang X-Patchwork-Id: 8387591 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 388E8C0553 for ; Tue, 23 Feb 2016 06:11:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5980A2066C for ; Tue, 23 Feb 2016 06:11:20 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6AC3D20662 for ; Tue, 23 Feb 2016 06:11:19 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aY6AV-0000oT-0o; Tue, 23 Feb 2016 06:09:55 +0000 Received: from nasmtp01.atmel.com ([192.199.1.246] helo=DVREDG02.corp.atmel.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aY6AR-0000eI-1h for linux-arm-kernel@lists.infradead.org; Tue, 23 Feb 2016 06:09:51 +0000 Received: from apsmtp01.atmel.com (10.168.254.31) by DVREDG02.corp.atmel.com (10.42.103.31) with Microsoft SMTP Server (TLS) id 14.3.235.1; Mon, 22 Feb 2016 23:09:26 -0700 Received: from shaarm01.corp.atmel.com (10.168.254.13) by apsmtp01.atmel.com (10.168.254.31) with Microsoft SMTP Server id 14.3.235.1; Tue, 23 Feb 2016 14:10:30 +0800 From: Wenyou Yang To: Rob Herring , Pawel Moll , "Mark Brown" , Ian Campbell , Kumar Gala , Nicolas Ferre , Alexandre Belloni , "Jean-Christophe Plagniol-Villard" , Russell King Subject: [PATCH v2 2/2] ARM: at91: sama5/dts: move hsmc_clk out of nfc node Date: Tue, 23 Feb 2016 14:04:36 +0800 Message-ID: <1456207477-7946-3-git-send-email-wenyou.yang@atmel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1456207477-7946-1-git-send-email-wenyou.yang@atmel.com> References: <1456207477-7946-1-git-send-email-wenyou.yang@atmel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160222_220951_306276_B55FA90B X-CRM114-Status: GOOD ( 10.79 ) X-Spam-Score: -4.2 (----) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Josh Wu , linux-kernel@vger.kernel.org, Wenyou Yang , Josh Wu , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Josh Wu For SAMA5D3, SAMA5D4 SoC family, as PMECC is a part of HSMC, PMECC needs the HSMC clock, so move out hsmc_clk from the nfc node to the nand node. Signed-off-by: Josh Wu Signed-off-by: Wenyou Yang --- Changes in v2: - add a patch to change SAMA5D3 nand node's compatible string to "atmel,sama5d3-nand". - revert the mail address of Josh's Signed-off to the original. arch/arm/boot/dts/sama5d3.dtsi | 2 +- arch/arm/boot/dts/sama5d4.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi index ee1b1a8..d20a38b 100644 --- a/arch/arm/boot/dts/sama5d3.dtsi +++ b/arch/arm/boot/dts/sama5d3.dtsi @@ -1474,6 +1474,7 @@ atmel,nand-has-dma; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_nand0_ale_cle>; + clocks = <&hsmc_clk>; atmel,pmecc-lookup-table-offset = <0x0 0x8000>; status = "disabled"; @@ -1486,7 +1487,6 @@ 0xffffc000 0x00000070 /* NFC HSMC regs */ 0x00200000 0x00100000 /* NFC SRAM banks */ >; - clocks = <&hsmc_clk>; }; }; }; diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi index b8032bc..1499b33 100644 --- a/arch/arm/boot/dts/sama5d4.dtsi +++ b/arch/arm/boot/dts/sama5d4.dtsi @@ -295,6 +295,7 @@ atmel,nand-has-dma; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_nand>; + clocks = <&hsmc_clk>; status = "disabled"; nfc@90000000 { @@ -306,7 +307,6 @@ 0xfc05c000 0x00000070 /* NFC HSMC regs */ 0x00100000 0x00100000 /* NFC SRAM banks */ >; - clocks = <&hsmc_clk>; atmel,write-by-sram; }; };