From patchwork Tue Jul 8 14:42:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Guinot X-Patchwork-Id: 4505671 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BA24A9F433 for ; Tue, 8 Jul 2014 14:45:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D3DAF2034F for ; Tue, 8 Jul 2014 14:45:22 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D745A202E5 for ; Tue, 8 Jul 2014 14:45:21 +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 1X4Wbp-0007W2-Tt; Tue, 08 Jul 2014 14:43:05 +0000 Received: from vm1.sequanux.org ([188.165.36.56]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1X4Wbb-0007Fu-RV for linux-arm-kernel@lists.infradead.org; Tue, 08 Jul 2014 14:42:53 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by vm1.sequanux.org (Postfix) with ESMTP id 3195F108853; Tue, 8 Jul 2014 16:42:30 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at vm1.sequanux.org Received: from vm1.sequanux.org ([127.0.0.1]) by localhost (vm1.sequanux.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Dk6TuGF9YH_U; Tue, 8 Jul 2014 16:42:28 +0200 (CEST) Received: from localhost (stp25-2-82-234-233-9.fbx.proxad.net [82.234.233.9]) by vm1.sequanux.org (Postfix) with ESMTPSA id 59327108767; Tue, 8 Jul 2014 16:42:28 +0200 (CEST) From: Simon Guinot To: Jason Cooper , Andrew Lunn , Sebastian Hesselbarth Subject: [PATCH 1/2] ARM: Kirkwood: allow to use netxbig DTSI for d2net_v2 DTS Date: Tue, 8 Jul 2014 16:42:24 +0200 Message-Id: <1404830545-15581-2-git-send-email-simon.guinot@sequanux.org> X-Mailer: git-send-email 2.0.0.rc2 In-Reply-To: <1404830545-15581-1-git-send-email-simon.guinot@sequanux.org> References: <1401132591-26305-1-git-send-email-andrew@lunn.ch> <1404830545-15581-1-git-send-email-simon.guinot@sequanux.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140708_074252_184549_81B86D94 X-CRM114-Status: UNSURE ( 9.24 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) Cc: Simon Guinot , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,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 The d2 Network v2 board (d2net_v2) shares a lot of hardware characteristics with the 2Big and 5Big Network v2 boards. This patch prepares the kirkwood-netxbig.dtsi file in order to allow to include it from the d2net_v2 DTS file. The DT nodes only relevant for the 2Big and 5Big Network v2 boards are moved into their respective DTS files. Signed-off-by: Simon Guinot --- arch/arm/boot/dts/kirkwood-net2big.dts | 30 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/kirkwood-net5big.dts | 28 ++++++++++++++++++++++++++++ arch/arm/boot/dts/kirkwood-netxbig.dtsi | 26 -------------------------- 3 files changed, 58 insertions(+), 26 deletions(-) diff --git a/arch/arm/boot/dts/kirkwood-net2big.dts b/arch/arm/boot/dts/kirkwood-net2big.dts index a98deccee59f..53dc37a3b687 100644 --- a/arch/arm/boot/dts/kirkwood-net2big.dts +++ b/arch/arm/boot/dts/kirkwood-net2big.dts @@ -28,3 +28,33 @@ reg = <0x00000000 0x10000000>; }; }; + +®ulators { + regulator@2 { + compatible = "regulator-fixed"; + reg = <2>; + regulator-name = "hdd1power"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + regulator-always-on; + regulator-boot-on; + gpio = <&gpio0 17 GPIO_ACTIVE_HIGH>; + }; + + clocks { + g762_clk: g762-oscillator { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <32768>; + }; + }; +}; + +&i2c0 { + g762@3e { + compatible = "gmt,g762"; + reg = <0x3e>; + clocks = <&g762_clk>; + }; +}; diff --git a/arch/arm/boot/dts/kirkwood-net5big.dts b/arch/arm/boot/dts/kirkwood-net5big.dts index d2887ed493f2..36155b749d9f 100644 --- a/arch/arm/boot/dts/kirkwood-net5big.dts +++ b/arch/arm/boot/dts/kirkwood-net5big.dts @@ -31,6 +31,18 @@ }; ®ulators { + regulator@2 { + compatible = "regulator-fixed"; + reg = <2>; + regulator-name = "hdd1power"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + regulator-always-on; + regulator-boot-on; + gpio = <&gpio0 17 GPIO_ACTIVE_HIGH>; + }; + regulator@3 { compatible = "regulator-fixed"; reg = <3>; @@ -66,6 +78,14 @@ regulator-boot-on; gpio = <&gpio1 11 GPIO_ACTIVE_HIGH>; }; + + clocks { + g762_clk: g762-oscillator { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <32768>; + }; + }; }; &mdio { @@ -81,3 +101,11 @@ }; }; + +&i2c0 { + g762@3e { + compatible = "gmt,g762"; + reg = <0x3e>; + clocks = <&g762_clk>; + }; +}; diff --git a/arch/arm/boot/dts/kirkwood-netxbig.dtsi b/arch/arm/boot/dts/kirkwood-netxbig.dtsi index fd75720547e3..b0cfb7cd30b9 100644 --- a/arch/arm/boot/dts/kirkwood-netxbig.dtsi +++ b/arch/arm/boot/dts/kirkwood-netxbig.dtsi @@ -104,26 +104,6 @@ regulator-boot-on; gpio = <&gpio0 16 GPIO_ACTIVE_HIGH>; }; - - regulator@2 { - compatible = "regulator-fixed"; - reg = <2>; - regulator-name = "hdd1power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio0 17 GPIO_ACTIVE_HIGH>; - }; - - clocks { - g762_clk: g762-oscillator { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <32768>; - }; - }; }; }; @@ -171,10 +151,4 @@ pagesize = <16>; reg = <0x50>; }; - - g762@3e { - compatible = "gmt,g762"; - reg = <0x3e>; - clocks = <&g762_clk>; - }; };