From patchwork Wed Mar 27 11:33:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 10873247 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 124C9925 for ; Wed, 27 Mar 2019 11:34:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ECA12289DD for ; Wed, 27 Mar 2019 11:34:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E02DD28C1C; Wed, 27 Mar 2019 11:34:00 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5E75B289DD for ; Wed, 27 Mar 2019 11:34:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=PcCXzMIj+LFNP0zGopoq9/l44++D2GYM5E10wKz21Hk=; b=IuaV8VmUbrEjZIPkdV0Lv22hab xN4dRw9/KiZnSOw22DJpk0n4JqjcnJUW9drv7RzIc6Ug8ALFD+026jyeGhUnYy5Y4tTgVjq972oqZ MvEn6Jnzko1enum6P7HtJK12yOX0SdEQAu3zFCAzolUFONmHwdcQccZZY9QYbdTBiVN61oVP4wKmE 40owRI0+OueIRJ8pJALRXQaNVJnGpIcfjQdJ/k29ub362FAyVmlTkkZxhXiB4Wrob4wAOc76nhcHW FF71RjJd9WM8m0uRtaH9wGyuf3x6RQcMC4Pi2uuj09AnN0MobfhRotGf5SD6Oa6s7rW7CgL99DlWZ QiDd4naQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h96oR-0000e7-2m; Wed, 27 Mar 2019 11:33:43 +0000 Received: from mail-qt1-x844.google.com ([2607:f8b0:4864:20::844]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h96oO-0000cu-8c for linux-arm-kernel@lists.infradead.org; Wed, 27 Mar 2019 11:33:41 +0000 Received: by mail-qt1-x844.google.com with SMTP id v32so18288863qtc.10 for ; Wed, 27 Mar 2019 04:33:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EjjZMAnfeCKpOpnsi29Pu7SFd/r+mW4kXQTbuCukauU=; b=LN+HQS+JLGHkXlz1cs9oZ+QWoZXGz0syqPKMz5Co/Fax6vWNuD4nRPgU+FYflKzMtb ZHPm6qCBzt0UhwdcfeNBO4cPaDWmJpdDkkVv3ChkVAhsp65EemfiL1muv51I8XMQBd4Z qt7EH42ESw+MQ3iJikDZICvEfv7OBizi+KGFvQWYEI5C9npC7vj68Vu+bYLhI0V7dY9E jFs2GpK5f2pTl/KKqlk/0O8BJshOwwWDyaUpZJnk6J4460XT95P4Ulv0E7sNz6VPY4Z4 jTx32U4NEEYkmR1Z0qqJu17lN7UuHG6cn5r4GYgBoSOmGbC+0BYOMofhkzK/P64UFnnT HXHg== 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=EjjZMAnfeCKpOpnsi29Pu7SFd/r+mW4kXQTbuCukauU=; b=C44P6AgBpWKzAZdSiAahwDVbPAhnyGZsiECOTwhJzrYHTnvWDGpXi3apCaer2VCiZi DlsrPjgd77nGChl+RKrx4mufJUyJw7lx1L8AVBT7AjicO7wdh9GJsas+u/J5H7kEG2R/ rubQxUdWPapxVFII4KWp/ilDDy0Q4GQwoKmJivE+f7pdtEx61bj6gcz8WxUODUHSaQcl rr+MmHP9WYhnZEfFM6NSLPdyw3J3UYshDqmOMl+uQgloLiWM2vvlM/Ewit8puOmtBY4f 7aZnwcT5ksXgcc9zHmeOU+PQ2Nz7c+wmz4F39VvhRCTu37yne2QD9Qx3L0OAFHGClOhd Cp3g== X-Gm-Message-State: APjAAAVDhoVybiwcUwz+TMltQ8muS09XXjKrITMkz3vGjC9ZHuZXeDsR Ih45mu+ZEt5rwVJ4hyh1LTI= X-Google-Smtp-Source: APXvYqzQJo2Mivd3YB56rI6MGvCDedxxUDCTtYIyu+GhW4vQe4KCyDxUcm6cL3GxFx1fodNBIQtQ4g== X-Received: by 2002:a0c:a3e6:: with SMTP id v93mr30359338qvv.157.1553686418579; Wed, 27 Mar 2019 04:33:38 -0700 (PDT) Received: from fabio-Latitude-E5450.am.freescale.net ([2804:14c:482:3c8::1]) by smtp.gmail.com with ESMTPSA id z20sm4936074qkb.52.2019.03.27.04.33.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 04:33:37 -0700 (PDT) From: Fabio Estevam To: shawnguo@kernel.org Subject: [PATCH 2/2] ARM: dts: imx: Use generic node names for Zii dts Date: Wed, 27 Mar 2019 08:33:17 -0300 Message-Id: <20190327113317.10785-2-festevam@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190327113317.10785-1-festevam@gmail.com> References: <20190327113317.10785-1-festevam@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190327_043340_300934_65A92364 X-CRM114-Status: GOOD ( 13.07 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: andrew.smirnov@gmail.com, Fabio Estevam , linux-arm-kernel@lists.infradead.org, cphealy@gmail.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The devicetree specification recommends using generic node names. Some Zii dts files already follow such recommendation, but some don't, so use generic node names for consistency among the Zii dts files. Signed-off-by: Fabio Estevam --- arch/arm/boot/dts/vf610-zii-cfu1.dts | 8 ++++---- arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 14 +++++++------- arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 8 ++++---- arch/arm/boot/dts/vf610-zii-dev.dtsi | 4 ++-- arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 10 +++++----- arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts | 8 ++++---- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/arch/arm/boot/dts/vf610-zii-cfu1.dts b/arch/arm/boot/dts/vf610-zii-cfu1.dts index 6c78122401a1..5a1be11ad1d3 100644 --- a/arch/arm/boot/dts/vf610-zii-cfu1.dts +++ b/arch/arm/boot/dts/vf610-zii-cfu1.dts @@ -89,7 +89,7 @@ pinctrl-0 = <&pinctrl_dspi1>; status = "okay"; - m25p128@0 { + flash@0 { #address-cells = <1>; #size-cells = <1>; compatible = "m25p128", "jedec,spi-nor"; @@ -207,7 +207,7 @@ pinctrl-0 = <&pinctrl_i2c0>; status = "okay"; - pca9554@22 { + io-expander9554@22 { compatible = "nxp,pca9554"; reg = <0x22>; gpio-controller; @@ -218,13 +218,13 @@ reg = <0x48>; }; - at24c04@52 { + eeprom@52 { compatible = "atmel,24c04"; reg = <0x52>; label = "nvm"; }; - at24c04@54 { + eeprom4@54 { compatible = "atmel,24c04"; reg = <0x54>; label = "nameplate"; diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts index e5fb9d9924f3..914c355ab495 100644 --- a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts +++ b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts @@ -300,7 +300,7 @@ &gpio1 8 GPIO_ACTIVE_HIGH>; num-chipselects = <2>; - m25p128@0 { + flash@0 { compatible = "m25p128", "jedec,spi-nor"; #address-cells = <1>; #size-cells = <1>; @@ -329,7 +329,7 @@ pinctrl-0 = <&pinctrl_i2c0>; status = "okay"; - gpio5: pca9554@20 { + gpio5: io-expander@20 { compatible = "nxp,pca9554"; reg = <0x20>; gpio-controller; @@ -337,7 +337,7 @@ }; - gpio6: pca9554@22 { + gpio6: io-expander@22 { compatible = "nxp,pca9554"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pca9554_22>; @@ -370,7 +370,7 @@ #size-cells = <0>; reg = <0>; - sfp1: at24c04@50 { + sfp1: eeprom@50 { compatible = "atmel,24c02"; reg = <0x50>; }; @@ -381,7 +381,7 @@ #size-cells = <0>; reg = <1>; - sfp2: at24c04@50 { + sfp2: eeprom@50 { compatible = "atmel,24c02"; reg = <0x50>; }; @@ -392,7 +392,7 @@ #size-cells = <0>; reg = <2>; - sfp3: at24c04@50 { + sfp3: eeprom@50 { compatible = "atmel,24c02"; reg = <0x50>; }; @@ -403,7 +403,7 @@ #size-cells = <0>; reg = <3>; - sfp4: at24c04@50 { + sfp4: eeprom@50 { compatible = "atmel,24c02"; reg = <0x50>; }; diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts index e9e660aafc07..01191a23dfea 100644 --- a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts +++ b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts @@ -239,7 +239,7 @@ status = "okay"; spi-num-chipselects = <2>; - m25p128@0 { + flash@0 { compatible = "m25p128", "jedec,spi-nor"; #address-cells = <1>; #size-cells = <1>; @@ -275,7 +275,7 @@ * P1 - WE2_CMD * P2 - WE2_CLK */ - gpio5: pca9557@18 { + gpio5: io-expander@18 { compatible = "nxp,pca9557"; reg = <0x18>; gpio-controller; @@ -323,7 +323,7 @@ * IO0 - WE1_CLK * IO1 - WE1_CMD */ - gpio7: pca9554@22 { + gpio7: io-expander@22 { compatible = "nxp,pca9554"; reg = <0x22>; gpio-controller; @@ -333,7 +333,7 @@ }; &i2c1 { - at24mac602@50 { + eeprom@50 { compatible = "atmel,24c02"; reg = <0x50>; read-only; diff --git a/arch/arm/boot/dts/vf610-zii-dev.dtsi b/arch/arm/boot/dts/vf610-zii-dev.dtsi index 19eb4a849efb..36bbb8a9f4d8 100644 --- a/arch/arm/boot/dts/vf610-zii-dev.dtsi +++ b/arch/arm/boot/dts/vf610-zii-dev.dtsi @@ -147,12 +147,12 @@ reg = <0x48>; }; - at24c04@50 { + eeprom@50 { compatible = "atmel,24c04"; reg = <0x50>; }; - at24c04@52 { + eeprom@52 { compatible = "atmel,24c04"; reg = <0x52>; }; diff --git a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts index e3952e9ea0db..0a0259b20f0b 100644 --- a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts +++ b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts @@ -505,14 +505,14 @@ pinctrl-0 = <&pinctrl_i2c0>; status = "okay"; - gpio5: pca9554@20 { + gpio5: io-expander@20 { compatible = "nxp,pca9554"; reg = <0x20>; gpio-controller; #gpio-cells = <2>; }; - gpio6: pca9554@22 { + gpio6: io-expander@22 { compatible = "nxp,pca9554"; reg = <0x22>; gpio-controller; @@ -524,12 +524,12 @@ reg = <0x48>; }; - at24c04@50 { + eeprom@50 { compatible = "atmel,24c04"; reg = <0x50>; }; - at24c04@52 { + eeprom@52 { compatible = "atmel,24c04"; reg = <0x52>; }; @@ -577,7 +577,7 @@ reg = <0x4f>; }; - gpio7: pca9555@23 { + gpio7: io-expanderf@23 { compatible = "nxp,pca9555"; gpio-controller; #gpio-cells = <2>; diff --git a/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts b/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts index 8366bae632d6..453fce80f858 100644 --- a/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts +++ b/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts @@ -69,7 +69,7 @@ */ status = "disabled"; - m25p128@0 { + flash@0 { #address-cells = <1>; #size-cells = <1>; compatible = "m25p128", "jedec,spi-nor"; @@ -194,7 +194,7 @@ pinctrl-0 = <&pinctrl_i2c0>; status = "okay"; - gpio6: pca9505@22 { + gpio6: io-expander@22 { compatible = "nxp,pca9554"; reg = <0x22>; gpio-controller; @@ -206,13 +206,13 @@ reg = <0x48>; }; - at24c04@50 { + eeprom@50 { compatible = "atmel,24c04"; reg = <0x50>; label = "nameplate"; }; - at24c04@52 { + eeprom@52 { compatible = "atmel,24c04"; reg = <0x52>; };