From patchwork Wed Jan 4 09:30:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 9496339 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 261A260413 for ; Wed, 4 Jan 2017 09:31:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2983D27E15 for ; Wed, 4 Jan 2017 09:31:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1E78227E5A; Wed, 4 Jan 2017 09:31:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from mx1.tuxfamily.net (mail.tuxfamily.net [212.85.158.8]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9F7D327E15 for ; Wed, 4 Jan 2017 09:31:05 +0000 (UTC) Received: from listengine (helo=tuxfamily.org) by mx1.tuxfamily.net with local-bsmtp (Exim 4.84_2) (envelope-from ) id 1cOhuS-0000Aq-1A for patchwork-linux-oxnas@patchwork.kernel.org; Wed, 04 Jan 2017 10:31:04 +0100 Received: from mail-wj0-x230.google.com ([2a00:1450:400c:c01::230]) by mx1.tuxfamily.net with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1cOhuF-0008RX-Ch for linux-oxnas@lists.tuxfamily.org; Wed, 04 Jan 2017 10:30:51 +0100 Received: by mail-wj0-x230.google.com with SMTP id c11so259512511wjx.3 for ; Wed, 04 Jan 2017 01:30:51 -0800 (PST) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5IQBnDF2Ml9cAv6U8291Hg+UVhcpKOoTakLK+XJroxo=; b=L7qF9p0gIPRKQy0hdFK9E4UF9j3cgRamvXimG37cGgJkv/v6LZY0n0bFKQNCNaLNPu mhcZ/5zk2rJEJC6UEhANVor/RSsyiKVMlkb6buwkErRFEXbztBZb7hKy4dmTGibbOOhT 2xg0mSKWbGQzbc0gew6Hx7QITbpbUCtFtdb2p5y6EkdVsDYg+mkpvShQG1WaMX4s3Axd WORCknAZuhNVKgM4+uixko7o0FPcydeWDHIyAegBxn7viHO+yQTmrLlvlqfLCohPgt5T nivwLHgUdT/w6w8gl/FQpyi4JjO8wy7fUomOVFyEUesuQ16YOqVFkIW+xw3NIeWGJKG/ D2fA== X-Google-Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5IQBnDF2Ml9cAv6U8291Hg+UVhcpKOoTakLK+XJroxo=; b=HTORKxI4PgvcC7UDo+LxZRAs5Oy8baylZMb+rta+B2oC2gjQ7it6wyv4MA2NQrNHTS b6+AoiKnLqPXc6nL6LdW8VDO9NFf9OmRKPJ5uQjKq7tSrqMKmdxVgzRHu+J8wA29rPcD gYeIDzrVePjSk79kWVSIEqpbPx3oG2cehoBWDuBXyBE2b8cl4SbRlz8xJC4Qiu1wH+4T 3JQXPhpe0HJvcS8bDCjeE6+B4Aq5SwLMsbtiKRkxBs+IsI8CPG960140ewRnwW+Jb7K7 WNNcuZxc0Ny38mHZvRdpGrFQw4qVhPGWUQiMhWZfs8SVxxXnmrFPv6JoP/sAGKqej138 2VgQ== X-GM-Message-State: AIkVDXKPmE+U+BwnjWWdA5XCnFgqlZUsJCdsziWXcKk1gRLdES9MUqfr/d4jo7m9X3CuvK05 X-Received: by 10.194.175.69 with SMTP id by5mr57960810wjc.201.1483522250736; Wed, 04 Jan 2017 01:30:50 -0800 (PST) Received: from build.net (build.baylibre.com. [37.187.146.144]) by smtp.gmail.com with ESMTPSA id t194sm78504851wmd.1.2017.01.04.01.30.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Jan 2017 01:30:50 -0800 (PST) From: Neil Armstrong To: linux-oxnas@lists.tuxfamily.org CC: Neil Armstrong , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [linux-oxnas] [PATCH 2/2] ARM: dts: OX820: Update with dt-bindings includes Date: Wed, 4 Jan 2017 10:30:46 +0100 Message-ID: <20170104093046.12428-3-narmstrong@baylibre.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170104093046.12428-1-narmstrong@baylibre.com> References: <20170104093046.12428-1-narmstrong@baylibre.com> List-Unsubscribe: List-Subscribe: List-Help: List-Software: Listengine, VHFFS 4.7-dev-4c39578052 List-ID: List-Post: List-Archive: Precedence: list Reply-To: linux-oxnas@lists.tuxfamily.org X-Virus-Scanned: ClamAV using ClamSMTP Add OX820 dt-bindings includes files for clocks and resets, replace resets numbers by human readable defines. Signed-off-by: Neil Armstrong --- arch/arm/boot/dts/ox820.dtsi | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/ox820.dtsi b/arch/arm/boot/dts/ox820.dtsi index e40f282..4592075 100644 --- a/arch/arm/boot/dts/ox820.dtsi +++ b/arch/arm/boot/dts/ox820.dtsi @@ -8,6 +8,8 @@ /include/ "skeleton.dtsi" #include +#include +#include / { compatible = "oxsemi,ox820"; @@ -83,8 +85,8 @@ nandc: nand-controller@41000000 { compatible = "oxsemi,ox820-nand"; reg = <0x41000000 0x100000>; - clocks = <&stdclk 11>; - resets = <&reset 15>; + clocks = <&stdclk CLK_820_NAND>; + resets = <&reset RESET_NAND>; #address-cells = <1>; #size-cells = <0>; status = "disabled"; @@ -99,9 +101,9 @@ mac-address = [000000000000]; /* Filled in by U-Boot */ phy-mode = "rgmii"; - clocks = <&stdclk 9>, <&gmacclk>; + clocks = <&stdclk CLK_820_ETHA>, <&gmacclk>; clock-names = "gmac", "stmmaceth"; - resets = <&reset 6>; + resets = <&reset RESET_MAC>; /* Regmap for sys registers */ oxsemi,sys-ctrl = <&sys>; @@ -208,7 +210,7 @@ no-loopback-test; status = "disabled"; clocks = <&sysclk>; - resets = <&reset 17>; + resets = <&reset RESET_UART1>; }; uart1: serial@300000 { @@ -222,7 +224,7 @@ no-loopback-test; status = "disabled"; clocks = <&sysclk>; - resets = <&reset 18>; + resets = <&reset RESET_UART2>; }; rps@400000 {