From patchwork Tue Aug 7 11:06:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrice CHOTARD X-Patchwork-Id: 10558565 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 11D6E1057 for ; Tue, 7 Aug 2018 11:07:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F0B88295DF for ; Tue, 7 Aug 2018 11:07:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E490129617; Tue, 7 Aug 2018 11:07:39 +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.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI 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 1267B295DF for ; Tue, 7 Aug 2018 11:07:39 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=EKKRSXJzAgV9DPTvXoplM2sGLYnsJmhjJwBPZBJeMag=; b=Y/c85qauzkXZS/ +J+hVAwJUDDVXuCn5/Vt1ZaRDywaZJORBMP1R1FQnw7o8s0ZtF14gAF2y7dQ88zTJ5t+myj90KEW3 LwJ6DRqjxupyNk2B6Kgp6FM77O4E5RxuvHucgN/5YFBonaIcHF606RZUenkz7920kVdOlp225yRGG iIqmWtvFmBgXIn2Z64kVnljSsN5jERDBPRq94Ag61FOpiNaWglolMbePZfydpgb9ra54y2l7kNp6z wzv0xUVXIIWYibuw/rPRit8VOmlzRUvHk6PxIe3Ki/QXrhXDHFTXONFf2WtQlkDAOMEBuFfp6PI81 Oaq0zOWws8FoeJlkL3Bg==; 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 1fmzpt-0001GP-8a; Tue, 07 Aug 2018 11:07:33 +0000 Received: from mx07-00178001.pphosted.com ([62.209.51.94]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fmzpg-00010J-Cn for linux-arm-kernel@lists.infradead.org; Tue, 07 Aug 2018 11:07:22 +0000 Received: from pps.filterd (m0046668.ppops.net [127.0.0.1]) by mx07-.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id w77B3iO4010379; Tue, 7 Aug 2018 13:06:55 +0200 Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 2kq7gv0vqf-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 07 Aug 2018 13:06:55 +0200 Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 8A08038; Tue, 7 Aug 2018 11:06:54 +0000 (GMT) Received: from Webmail-eu.st.com (sfhdag6node3.st.com [10.75.127.18]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id E1E2C2BD9; Tue, 7 Aug 2018 11:06:53 +0000 (GMT) Received: from localhost (10.75.127.45) by SFHDAG6NODE3.st.com (10.75.127.18) with Microsoft SMTP Server (TLS) id 15.0.1347.2; Tue, 7 Aug 2018 13:06:53 +0200 From: To: , , , , , , , Subject: [PATCH 3/3] ARM: dts: stm32: Fix DT dtc warnings for stm32f4 Date: Tue, 7 Aug 2018 13:06:35 +0200 Message-ID: <1533639995-27047-4-git-send-email-patrice.chotard@st.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1533639995-27047-1-git-send-email-patrice.chotard@st.com> References: <1533639995-27047-1-git-send-email-patrice.chotard@st.com> MIME-Version: 1.0 X-Originating-IP: [10.75.127.45] X-ClientProxiedBy: SFHDAG5NODE3.st.com (10.75.127.15) To SFHDAG6NODE3.st.com (10.75.127.18) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-08-07_04:, , signatures=0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180807_040720_735378_2CD09B58 X-CRM114-Status: GOOD ( 11.86 ) 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: linux-stm32@st-md-mailman.stormreply.com, mcoquelin.stm32@gmail.com, Patrice Chotard 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 From: Patrice Chotard Fix the following DT dtc warnings for stm32f429 and stm32f469 boards: Warning (node_name_chars_strict): /soc/pin-controller/usbotg_fs@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/usbotg_fs@1: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/usbotg_hs@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_od@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /gpio_keys: Character '_' not recommended in node name Warning (unit_address_vs_reg): /memory: node has a reg or ranges property, but no unit name Warning (unit_address_vs_reg): /soc/pin-controller: node has a reg or ranges property, but no unit name Warning (unit_address_vs_reg): /soc/pin-controller/usart1@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usart3@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usbotg_fs@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usbotg_fs@1: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usbotg_hs@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/mii@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/adc@200: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/pwm@1: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/pwm@3: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/i2c1@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/ltdc@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/dcmi@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_od@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /gpio_keys/button@0: node has a unit name, but no reg property Warning (avoid_unnecessary_addr_size): /gpio_keys: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stm32429i-eval.dts | 11 +++-- arch/arm/boot/dts/stm32f4-pinctrl.dtsi | 30 ++++++------- arch/arm/boot/dts/stm32f429-disco.dts | 7 ++- arch/arm/boot/dts/stm32f429-pinctrl.dtsi | 74 +++++++++++++++---------------- arch/arm/boot/dts/stm32f429.dtsi | 8 ++-- arch/arm/boot/dts/stm32f469-disco.dts | 11 +++-- arch/arm/boot/dts/stm32f469-pinctrl.dtsi | 76 +++++++++++++++----------------- 7 files changed, 102 insertions(+), 115 deletions(-) diff --git a/arch/arm/boot/dts/stm32429i-eval.dts b/arch/arm/boot/dts/stm32429i-eval.dts index 7eb786a2d624..b5af6feb95a4 100644 --- a/arch/arm/boot/dts/stm32429i-eval.dts +++ b/arch/arm/boot/dts/stm32429i-eval.dts @@ -60,7 +60,7 @@ stdout-path = "serial0:115200n8"; }; - memory { + memory@0 { reg = <0x00000000 0x2000000>; }; @@ -111,17 +111,16 @@ }; }; - gpio_keys { + gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; #size-cells = <0>; autorepeat; - button@0 { + button0 { label = "Wake up"; linux,code = ; gpios = <&gpioa 0 0>; }; - button@1 { + button1 { label = "Tamper"; linux,code = ; gpios = <&gpioc 13 0>; @@ -145,7 +144,7 @@ }; }; - mmc_vcard: mmc_vcard { + mmc_vcard: mmc-vcard { compatible = "regulator-fixed"; regulator-name = "mmc_vcard"; regulator-min-microvolt = <3300000>; diff --git a/arch/arm/boot/dts/stm32f4-pinctrl.dtsi b/arch/arm/boot/dts/stm32f4-pinctrl.dtsi index 35202896c093..73061fee60f6 100644 --- a/arch/arm/boot/dts/stm32f4-pinctrl.dtsi +++ b/arch/arm/boot/dts/stm32f4-pinctrl.dtsi @@ -45,7 +45,7 @@ / { soc { - pinctrl: pin-controller { + pinctrl: pin-controller@40020000 { #address-cells = <1>; #size-cells = <1>; ranges = <0 0x40020000 0x3000>; @@ -163,7 +163,7 @@ st,bank-name = "GPIOK"; }; - usart1_pins_a: usart1@0 { + usart1_pins_a: usart1 { pins1 { pinmux = ; /* USART1_TX */ bias-disable; @@ -176,7 +176,7 @@ }; }; - usart3_pins_a: usart3@0 { + usart3_pins_a: usart3 { pins1 { pinmux = ; /* USART3_TX */ bias-disable; @@ -189,7 +189,7 @@ }; }; - usbotg_fs_pins_a: usbotg_fs@0 { + usbotg_fs_pins_a: usbotg-fs-a { pins { pinmux = , /* OTG_FS_ID */ , /* OTG_FS_DM */ @@ -200,7 +200,7 @@ }; }; - usbotg_fs_pins_b: usbotg_fs@1 { + usbotg_fs_pins_b: usbotg-fs-b { pins { pinmux = , /* OTG_HS_ID */ , /* OTG_HS_DM */ @@ -211,7 +211,7 @@ }; }; - usbotg_hs_pins_a: usbotg_hs@0 { + usbotg_hs_pins_a: usbotg-hs { pins { pinmux = , /* OTG_HS_ULPI_NXT*/ , /* OTG_HS_ULPI_DIR */ @@ -231,7 +231,7 @@ }; }; - ethernet_mii: mii@0 { + ethernet_mii: mii { pins { pinmux = , /* ETH_MII_TXD0_ETH_RMII_TXD0 */ , /* ETH_MII_TXD1_ETH_RMII_TXD1 */ @@ -251,13 +251,13 @@ }; }; - adc3_in8_pin: adc@200 { + adc3_in8_pin: adc { pins { pinmux = ; }; }; - pwm1_pins: pwm@1 { + pwm1_pins: pwm1 { pins { pinmux = , /* TIM1_CH1 */ , /* TIM1_CH1N */ @@ -265,14 +265,14 @@ }; }; - pwm3_pins: pwm@3 { + pwm3_pins: pwm3 { pins { pinmux = , /* TIM3_CH1 */ ; /* TIM3_CH2 */ }; }; - i2c1_pins: i2c1@0 { + i2c1_pins: i2c1 { pins { pinmux = , /* I2C1_SDA */ ; /* I2C1_SCL */ @@ -282,7 +282,7 @@ }; }; - ltdc_pins: ltdc@0 { + ltdc_pins: ltdc { pins { pinmux = , /* LCD_HSYNC */ , /* LCD_VSYNC */ @@ -316,7 +316,7 @@ }; }; - dcmi_pins: dcmi@0 { + dcmi_pins: dcmi { pins { pinmux = , /* DCMI_HSYNC */ , /* DCMI_VSYNC */ @@ -339,7 +339,7 @@ }; }; - sdio_pins: sdio_pins@0 { + sdio_pins: sdio-pins { pins { pinmux = , /* SDIO_D0 */ , /* SDIO_D1 */ @@ -352,7 +352,7 @@ }; }; - sdio_pins_od: sdio_pins_od@0 { + sdio_pins_od: sdio-pins-od { pins1 { pinmux = , /* SDIO_D0 */ , /* SDIO_D1 */ diff --git a/arch/arm/boot/dts/stm32f429-disco.dts b/arch/arm/boot/dts/stm32f429-disco.dts index 5ceb2cf3777f..93baee7b5f61 100644 --- a/arch/arm/boot/dts/stm32f429-disco.dts +++ b/arch/arm/boot/dts/stm32f429-disco.dts @@ -59,7 +59,7 @@ stdout-path = "serial0:115200n8"; }; - memory { + memory@90000000 { reg = <0x90000000 0x800000>; }; @@ -78,12 +78,11 @@ }; }; - gpio_keys { + gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; #size-cells = <0>; autorepeat; - button@0 { + button { label = "User"; linux,code = ; gpios = <&gpioa 0 0>; diff --git a/arch/arm/boot/dts/stm32f429-pinctrl.dtsi b/arch/arm/boot/dts/stm32f429-pinctrl.dtsi index 3e7a17d9112e..426e4ab64e1b 100644 --- a/arch/arm/boot/dts/stm32f429-pinctrl.dtsi +++ b/arch/arm/boot/dts/stm32f429-pinctrl.dtsi @@ -42,54 +42,50 @@ #include "stm32f4-pinctrl.dtsi" -/ { - soc { - pinctrl: pin-controller { - compatible = "st,stm32f429-pinctrl"; +&pinctrl { + compatible = "st,stm32f429-pinctrl"; +}; - gpioa: gpio@40020000 { - gpio-ranges = <&pinctrl 0 0 16>; - }; +&gpioa { + gpio-ranges = <&pinctrl 0 0 16>; +}; - gpiob: gpio@40020400 { - gpio-ranges = <&pinctrl 0 16 16>; - }; +&gpiob { + gpio-ranges = <&pinctrl 0 16 16>; +}; - gpioc: gpio@40020800 { - gpio-ranges = <&pinctrl 0 32 16>; - }; +&gpioc { + gpio-ranges = <&pinctrl 0 32 16>; +}; - gpiod: gpio@40020c00 { - gpio-ranges = <&pinctrl 0 48 16>; - }; +&gpiod { + gpio-ranges = <&pinctrl 0 48 16>; +}; - gpioe: gpio@40021000 { - gpio-ranges = <&pinctrl 0 64 16>; - }; +&gpioe { + gpio-ranges = <&pinctrl 0 64 16>; +}; - gpiof: gpio@40021400 { - gpio-ranges = <&pinctrl 0 80 16>; - }; +&gpiof { + gpio-ranges = <&pinctrl 0 80 16>; +}; - gpiog: gpio@40021800 { - gpio-ranges = <&pinctrl 0 96 16>; - }; +&gpiog { + gpio-ranges = <&pinctrl 0 96 16>; +}; - gpioh: gpio@40021c00 { - gpio-ranges = <&pinctrl 0 112 16>; - }; +&gpioh { + gpio-ranges = <&pinctrl 0 112 16>; +}; - gpioi: gpio@40022000 { - gpio-ranges = <&pinctrl 0 128 16>; - }; +&gpioi { + gpio-ranges = <&pinctrl 0 128 16>; +}; - gpioj: gpio@40022400 { - gpio-ranges = <&pinctrl 0 144 16>; - }; +&gpioj { + gpio-ranges = <&pinctrl 0 144 16>; +}; - gpiok: gpio@40022800 { - gpio-ranges = <&pinctrl 0 160 8>; - }; - }; - }; +&gpiok { + gpio-ranges = <&pinctrl 0 160 8>; }; diff --git a/arch/arm/boot/dts/stm32f429.dtsi b/arch/arm/boot/dts/stm32f429.dtsi index 64278e81bc08..d6f736024422 100644 --- a/arch/arm/boot/dts/stm32f429.dtsi +++ b/arch/arm/boot/dts/stm32f429.dtsi @@ -45,12 +45,14 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "skeleton.dtsi" #include "armv7-m.dtsi" #include #include / { + #address-cells = <1>; + #size-cells = <1>; + clocks { clk_hse: clk-hse { #clock-cells = <0>; @@ -263,7 +265,6 @@ }; timers13: timers@40001c00 { - #address-cells = <1>; #size-cells = <0>; compatible = "st,stm32-timers"; reg = <0x40001C00 0x400>; @@ -278,7 +279,6 @@ }; timers14: timers@40002000 { - #address-cells = <1>; #size-cells = <0>; compatible = "st,stm32-timers"; reg = <0x40002000 0x400>; @@ -557,7 +557,6 @@ }; timers10: timers@40014400 { - #address-cells = <1>; #size-cells = <0>; compatible = "st,stm32-timers"; reg = <0x40014400 0x400>; @@ -572,7 +571,6 @@ }; timers11: timers@40014800 { - #address-cells = <1>; #size-cells = <0>; compatible = "st,stm32-timers"; reg = <0x40014800 0x400>; diff --git a/arch/arm/boot/dts/stm32f469-disco.dts b/arch/arm/boot/dts/stm32f469-disco.dts index 3ee768cb86fc..44f092307de3 100644 --- a/arch/arm/boot/dts/stm32f469-disco.dts +++ b/arch/arm/boot/dts/stm32f469-disco.dts @@ -60,7 +60,7 @@ stdout-path = "serial0:115200n8"; }; - memory { + memory@0 { reg = <0x00000000 0x1000000>; }; @@ -68,7 +68,7 @@ serial0 = &usart3; }; - mmc_vcard: mmc_vcard { + mmc_vcard: mmc-vcard { compatible = "regulator-fixed"; regulator-name = "mmc_vcard"; regulator-min-microvolt = <3300000>; @@ -96,12 +96,11 @@ }; }; - gpio_keys { + gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; #size-cells = <0>; autorepeat; - button@0 { + button { label = "User"; linux,code = ; gpios = <&gpioa 0 GPIO_ACTIVE_HIGH>; @@ -169,7 +168,7 @@ status = "okay"; port { - ltdc_out_dsi: endpoint@0 { + ltdc_out_dsi: endpoint { remote-endpoint = <&dsi_in>; }; }; diff --git a/arch/arm/boot/dts/stm32f469-pinctrl.dtsi b/arch/arm/boot/dts/stm32f469-pinctrl.dtsi index fff542662eea..2e7718a919a3 100644 --- a/arch/arm/boot/dts/stm32f469-pinctrl.dtsi +++ b/arch/arm/boot/dts/stm32f469-pinctrl.dtsi @@ -42,55 +42,51 @@ #include "stm32f4-pinctrl.dtsi" -/ { - soc { - pinctrl: pin-controller { - compatible = "st,stm32f469-pinctrl"; +&pinctrl { + compatible = "st,stm32f469-pinctrl"; +}; - gpioa: gpio@40020000 { - gpio-ranges = <&pinctrl 0 0 16>; - }; +&gpioa { + gpio-ranges = <&pinctrl 0 0 16>; +}; - gpiob: gpio@40020400 { - gpio-ranges = <&pinctrl 0 16 16>; - }; +&gpiob { + gpio-ranges = <&pinctrl 0 16 16>; +}; - gpioc: gpio@40020800 { - gpio-ranges = <&pinctrl 0 32 16>; - }; +&gpioc { + gpio-ranges = <&pinctrl 0 32 16>; +}; - gpiod: gpio@40020c00 { - gpio-ranges = <&pinctrl 0 48 16>; - }; +&gpiod { + gpio-ranges = <&pinctrl 0 48 16>; +}; - gpioe: gpio@40021000 { - gpio-ranges = <&pinctrl 0 64 16>; - }; +&gpioe { + gpio-ranges = <&pinctrl 0 64 16>; +}; - gpiof: gpio@40021400 { - gpio-ranges = <&pinctrl 0 80 16>; - }; +&gpiof { + gpio-ranges = <&pinctrl 0 80 16>; +}; - gpiog: gpio@40021800 { - gpio-ranges = <&pinctrl 0 96 16>; - }; +&gpiog { + gpio-ranges = <&pinctrl 0 96 16>; +}; - gpioh: gpio@40021c00 { - gpio-ranges = <&pinctrl 0 112 16>; - }; +&gpioh { + gpio-ranges = <&pinctrl 0 112 16>; +}; - gpioi: gpio@40022000 { - gpio-ranges = <&pinctrl 0 128 16>; - }; +&gpioi { + gpio-ranges = <&pinctrl 0 128 16>; +}; - gpioj: gpio@40022400 { - gpio-ranges = <&pinctrl 0 144 6>, - <&pinctrl 12 156 4>; - }; +&gpioj { + gpio-ranges = <&pinctrl 0 144 6>, + <&pinctrl 12 156 4>; +}; - gpiok: gpio@40022800 { - gpio-ranges = <&pinctrl 3 163 5>; - }; - }; - }; +&gpiok { + gpio-ranges = <&pinctrl 3 163 5>; };