From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F985C46472 for ; Tue, 7 Aug 2018 12:55:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C401F21571 for ; Tue, 7 Aug 2018 12:55:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C401F21571 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=st.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389104AbeHGPJ4 (ORCPT ); Tue, 7 Aug 2018 11:09:56 -0400 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:37359 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388894AbeHGPJ4 (ORCPT ); Tue, 7 Aug 2018 11:09:56 -0400 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 w77CsPKT024789; Tue, 7 Aug 2018 14:55:08 +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 2kq7gv1c9w-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 07 Aug 2018 14:55:08 +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 A15CC31; Tue, 7 Aug 2018 12:55:07 +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 78A6F4EF3; Tue, 7 Aug 2018 12:55:07 +0000 (GMT) Received: from localhost (10.75.127.49) by SFHDAG6NODE3.st.com (10.75.127.18) with Microsoft SMTP Server (TLS) id 15.0.1347.2; Tue, 7 Aug 2018 14:55:06 +0200 From: To: , , , , , , , CC: , , Patrice Chotard Subject: [PATCH v2 3/3] ARM: dts: stm32: Fix DT dtc warnings for stm32f4 Date: Tue, 7 Aug 2018 14:55:00 +0200 Message-ID: <1533646500-4028-4-git-send-email-patrice.chotard@st.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1533646500-4028-1-git-send-email-patrice.chotard@st.com> References: <1533646500-4028-1-git-send-email-patrice.chotard@st.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.75.127.49] X-ClientProxiedBy: SFHDAG2NODE3.st.com (10.75.127.6) To SFHDAG6NODE3.st.com (10.75.127.18) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-08-07_05:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- Change since v1: - update nodes name as following: @0 to -0 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..116232b589e4 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 { + button-0 { label = "Wake up"; linux,code = ; gpios = <&gpioa 0 0>; }; - button@1 { + button-1 { 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..244c7ab8c76d 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-0 { pins1 { pinmux = ; /* USART1_TX */ bias-disable; @@ -176,7 +176,7 @@ }; }; - usart3_pins_a: usart3@0 { + usart3_pins_a: usart3-0 { pins1 { pinmux = ; /* USART3_TX */ bias-disable; @@ -189,7 +189,7 @@ }; }; - usbotg_fs_pins_a: usbotg_fs@0 { + usbotg_fs_pins_a: usbotg-fs-0 { 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-1 { 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-0 { pins { pinmux = , /* OTG_HS_ULPI_NXT*/ , /* OTG_HS_ULPI_DIR */ @@ -231,7 +231,7 @@ }; }; - ethernet_mii: mii@0 { + ethernet_mii: mii-0 { 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-0 { pins { pinmux = ; }; }; - pwm1_pins: pwm@1 { + pwm1_pins: pwm-1 { pins { pinmux = , /* TIM1_CH1 */ , /* TIM1_CH1N */ @@ -265,14 +265,14 @@ }; }; - pwm3_pins: pwm@3 { + pwm3_pins: pwm-3 { pins { pinmux = , /* TIM3_CH1 */ ; /* TIM3_CH2 */ }; }; - i2c1_pins: i2c1@0 { + i2c1_pins: i2c1-0 { pins { pinmux = , /* I2C1_SDA */ ; /* I2C1_SCL */ @@ -282,7 +282,7 @@ }; }; - ltdc_pins: ltdc@0 { + ltdc_pins: ltdc-0 { pins { pinmux = , /* LCD_HSYNC */ , /* LCD_VSYNC */ @@ -316,7 +316,7 @@ }; }; - dcmi_pins: dcmi@0 { + dcmi_pins: dcmi-0 { pins { pinmux = , /* DCMI_HSYNC */ , /* DCMI_VSYNC */ @@ -339,7 +339,7 @@ }; }; - sdio_pins: sdio_pins@0 { + sdio_pins: sdio-pins-0 { pins { pinmux = , /* SDIO_D0 */ , /* SDIO_D1 */ @@ -352,7 +352,7 @@ }; }; - sdio_pins_od: sdio_pins_od@0 { + sdio_pins_od: sdio-pins-od-0 { 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..e504993d945d 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-0 { 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..3ef531678974 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-0 { 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>; }; -- 1.9.1