diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2023-03-16 15:12:51 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-03-16 15:12:51 +0100 |
commit | 35657deea1a2a38fdca16443edde56fa372b0db2 (patch) | |
tree | 664ecf59adff27e3467d7317cfda493ba7b26191 | |
parent | 2d615bd09f629fda06b5c9006106915cd6783bcd (diff) | |
parent | 7acf561ac72246ae4d50e7deac99c080e999b3d1 (diff) | |
download | barebox-35657deea1a2a38fdca16443edde56fa372b0db2.tar.gz |
Merge branch 'for-next/dtc-warnings' into next
-rw-r--r-- | arch/arm/dts/digic4.dtsi | 4 | ||||
-rw-r--r-- | arch/arm/dts/ep7212-clep7212.dts | 2 | ||||
-rw-r--r-- | arch/arm/dts/imx6dl-prtvt7.dts | 4 | ||||
-rw-r--r-- | arch/arm/dts/imx6qdl-prti6q-emmc.dtsi | 16 | ||||
-rw-r--r-- | arch/arm/dts/imx6qdl-skov-imx6.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/dts/imx6ul-phytec-state.dtsi | 16 | ||||
-rw-r--r-- | arch/arm/dts/imx6ul-prti6g.dts | 2 | ||||
-rw-r--r-- | arch/arm/dts/imx6ul-webasto-ccbv2.dts | 2 | ||||
-rw-r--r-- | arch/arm/dts/imx6ul-webasto-marvel.dts | 2 | ||||
-rw-r--r-- | arch/arm/dts/imx6ull-jozacp.dts | 2 | ||||
-rw-r--r-- | arch/arm/dts/imx6ull-jozacp.dtsi | 72 | ||||
-rw-r--r-- | arch/arm/dts/imx7d-peb-av-02.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/dts/imx7d-peb-eval-02.dtsi | 12 | ||||
-rw-r--r-- | scripts/Makefile.lib | 4 |
14 files changed, 65 insertions, 77 deletions
diff --git a/arch/arm/dts/digic4.dtsi b/arch/arm/dts/digic4.dtsi index 2db9393b33..051d8aad44 100644 --- a/arch/arm/dts/digic4.dtsi +++ b/arch/arm/dts/digic4.dtsi @@ -31,14 +31,14 @@ * Assume that DIGIC4 has at least 96 pins. * So resource size is 96 * 4 = 0x180. */ - gpio: gpio { + gpio: gpio@c0220000 { compatible = "canon,digic-gpio"; reg = <0xc0220000 0x180>; #gpio-cells = <2>; gpio-controller; }; - uart: uart { + uart: uart@c0800000 { compatible = "canon,digic-uart"; reg = <0xc0800000 0x1c>; }; diff --git a/arch/arm/dts/ep7212-clep7212.dts b/arch/arm/dts/ep7212-clep7212.dts index 701bc20bd8..a4f43d13da 100644 --- a/arch/arm/dts/ep7212-clep7212.dts +++ b/arch/arm/dts/ep7212-clep7212.dts @@ -30,7 +30,7 @@ /* CS3 = WAITSTATE_7_1 | BUS_WIDTH_32 */ barebox,ep7209-memcfg1 = <0x25802b28>; - flash: nor@0,0 { + flash: nor@0 { compatible = "cfi-flash"; reg = <0 0x00000000 0x02000000>; bank-width = <2>; diff --git a/arch/arm/dts/imx6dl-prtvt7.dts b/arch/arm/dts/imx6dl-prtvt7.dts index 19794add17..dcfde2c8c6 100644 --- a/arch/arm/dts/imx6dl-prtvt7.dts +++ b/arch/arm/dts/imx6dl-prtvt7.dts @@ -6,8 +6,10 @@ &state_emmc { magic = <0x72766467>; + #address-cells = <1>; + #size-cells = <1>; - brand { + brand@1b0 { reg = <0x1b0 0x4>; type = "enum32"; names = "unbranded", "agco", "vermeer"; diff --git a/arch/arm/dts/imx6qdl-prti6q-emmc.dtsi b/arch/arm/dts/imx6qdl-prti6q-emmc.dtsi index 8ad41174d4..c9c75a9ade 100644 --- a/arch/arm/dts/imx6qdl-prti6q-emmc.dtsi +++ b/arch/arm/dts/imx6qdl-prti6q-emmc.dtsi @@ -8,7 +8,7 @@ chosen { stdout-path = &uart4; - environment@0 { + environment { compatible = "barebox,environment"; device-path = &env_sd3; }; @@ -20,8 +20,6 @@ backend-type = "raw"; backend = <&state_backend_emmc>; backend-stridesize = <0x400>; - #address-cells = <1>; - #size-cells = <1>; bootstate { #address-cells = <1>; @@ -31,13 +29,13 @@ #address-cells = <1>; #size-cells = <1>; - remaining_attempts { + remaining_attempts@0 { reg = <0x0 0x4>; type = "uint32"; default = <3>; }; - priority { + priority@4 { reg = <0x4 0x4>; type = "uint32"; default = <21>; @@ -48,20 +46,20 @@ #address-cells = <1>; #size-cells = <1>; - remaining_attempts { + remaining_attempts@10 { reg = <0x10 0x4>; type = "uint32"; default = <3>; }; - priority { + priority@14 { reg = <0x14 0x4>; type = "uint32"; default = <20>; }; }; - last_chosen { + last_chosen@20 { reg = <0x20 0x4>; type = "uint32"; }; @@ -71,7 +69,7 @@ #address-cells = <1>; #size-cells = <1>; - data_partitions { + data_partitions@26 { reg = <0x26 0x100>; type = "string"; }; diff --git a/arch/arm/dts/imx6qdl-skov-imx6.dtsi b/arch/arm/dts/imx6qdl-skov-imx6.dtsi index cb4224f1b4..12be8ee4f7 100644 --- a/arch/arm/dts/imx6qdl-skov-imx6.dtsi +++ b/arch/arm/dts/imx6qdl-skov-imx6.dtsi @@ -113,7 +113,7 @@ #address-cells = <1>; #size-cells = <1>; - eth2 { + eth2@1e { reg = <0x1E 0x6>; type = "mac"; default = [00 11 22 33 44 55]; diff --git a/arch/arm/dts/imx6ul-phytec-state.dtsi b/arch/arm/dts/imx6ul-phytec-state.dtsi index 78a32ed96b..d0cad1b516 100644 --- a/arch/arm/dts/imx6ul-phytec-state.dtsi +++ b/arch/arm/dts/imx6ul-phytec-state.dtsi @@ -18,29 +18,27 @@ backend-stridesize = <54>; status = "disabled"; - #address-cells = <1>; - #size-cells = <1>; bootstate { #address-cells = <1>; #size-cells = <1>; - last_chosen { + last_chosen@0 { reg = <0x0 0x4>; type = "uint32"; }; system0 { #address-cells = <1>; #size-cells = <1>; - remaining_attempts { + remaining_attempts@4 { reg = <0x4 0x4>; type = "uint32"; default = <3>; }; - priority { + priority@8 { reg = <0x8 0x4>; type = "uint32"; default = <21>; }; - ok { + ok@c { reg = <0xc 0x4>; type = "uint32"; default = <0>; @@ -49,17 +47,17 @@ system1 { #address-cells = <1>; #size-cells = <1>; - remaining_attempts { + remaining_attempts@10 { reg = <0x10 0x4>; type = "uint32"; default = <3>; }; - priority { + priority@14 { reg = <0x14 0x4>; type = "uint32"; default = <20>; }; - ok { + ok@18 { reg = <0x18 0x4>; type = "uint32"; default = <0>; diff --git a/arch/arm/dts/imx6ul-prti6g.dts b/arch/arm/dts/imx6ul-prti6g.dts index 3efbf357f1..23fafa0dce 100644 --- a/arch/arm/dts/imx6ul-prti6g.dts +++ b/arch/arm/dts/imx6ul-prti6g.dts @@ -7,7 +7,7 @@ chosen { stdout-path = &uart4; - environment@0 { + environment { compatible = "barebox,environment"; device-path = &env_sd2; }; diff --git a/arch/arm/dts/imx6ul-webasto-ccbv2.dts b/arch/arm/dts/imx6ul-webasto-ccbv2.dts index 93e9445b48..198088bd44 100644 --- a/arch/arm/dts/imx6ul-webasto-ccbv2.dts +++ b/arch/arm/dts/imx6ul-webasto-ccbv2.dts @@ -32,8 +32,6 @@ }; state_emmc: state { - #address-cells = <1>; - #size-cells = <1>; compatible = "barebox,state"; magic = <0x290cf8c6>; backend-type = "raw"; diff --git a/arch/arm/dts/imx6ul-webasto-marvel.dts b/arch/arm/dts/imx6ul-webasto-marvel.dts index b8ecb00c8c..300cd5cf4b 100644 --- a/arch/arm/dts/imx6ul-webasto-marvel.dts +++ b/arch/arm/dts/imx6ul-webasto-marvel.dts @@ -38,8 +38,6 @@ }; state_emmc: state { - #address-cells = <1>; - #size-cells = <1>; compatible = "barebox,state"; magic = <0x290cf8c6>; backend-type = "raw"; diff --git a/arch/arm/dts/imx6ull-jozacp.dts b/arch/arm/dts/imx6ull-jozacp.dts index c30ba759ee..612dac67ca 100644 --- a/arch/arm/dts/imx6ull-jozacp.dts +++ b/arch/arm/dts/imx6ull-jozacp.dts @@ -7,7 +7,7 @@ chosen { stdout-path = &uart1; - environment@0 { + environment { compatible = "barebox,environment"; device-path = &env_sd1; }; diff --git a/arch/arm/dts/imx6ull-jozacp.dtsi b/arch/arm/dts/imx6ull-jozacp.dtsi index f7d35684f8..53f617d4f8 100644 --- a/arch/arm/dts/imx6ull-jozacp.dtsi +++ b/arch/arm/dts/imx6ull-jozacp.dtsi @@ -30,48 +30,42 @@ reg = <0x80000000 0x10000000>; }; - regulators { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - - reg_5v: 5v-regulator { - compatible = "regulator-fixed"; - regulator-name = "regulator-5V"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - regulator-always-on; - }; + reg_5v: 5v-regulator { + compatible = "regulator-fixed"; + regulator-name = "regulator-5V"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + }; - reg_3p3v: 3p3-regulator { - compatible = "regulator-fixed"; - regulator-name = "regulator-3P3V"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - vin-supply = <®_5v>; - regulator-always-on; - }; + reg_3p3v: 3p3-regulator { + compatible = "regulator-fixed"; + regulator-name = "regulator-3P3V"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <®_5v>; + regulator-always-on; + }; - reg_1p4v: 1p4-regulator { - compatible = "regulator-fixed"; - regulator-name = "regulator-1P4V"; - regulator-min-microvolt = <1400000>; - regulator-max-microvolt = <1400000>; - vin-supply = <®_5v>; - regulator-always-on; - }; + reg_1p4v: 1p4-regulator { + compatible = "regulator-fixed"; + regulator-name = "regulator-1P4V"; + regulator-min-microvolt = <1400000>; + regulator-max-microvolt = <1400000>; + vin-supply = <®_5v>; + regulator-always-on; + }; - reg_vbus: vbus-regulator { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_vbus>; - compatible = "regulator-fixed"; - regulator-name = "regulator-vbus"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - vin-supply = <®_5v>; - gpio = <&gpio1 2 GPIO_ACTIVE_HIGH>; - enable-active-high; - }; + reg_vbus: vbus-regulator { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_vbus>; + compatible = "regulator-fixed"; + regulator-name = "regulator-vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <®_5v>; + gpio = <&gpio1 2 GPIO_ACTIVE_HIGH>; + enable-active-high; }; usdhc2_pwrseq: usdhc2-pwrseq { diff --git a/arch/arm/dts/imx7d-peb-av-02.dtsi b/arch/arm/dts/imx7d-peb-av-02.dtsi index dcf117c71a..2e5af755bb 100644 --- a/arch/arm/dts/imx7d-peb-av-02.dtsi +++ b/arch/arm/dts/imx7d-peb-av-02.dtsi @@ -72,7 +72,7 @@ lcd-supply = <&lcd_3v3>; status = "disabled"; - display0: display { + display0: display0 { bits-per-pixel = <32>; bus-width = <24>; diff --git a/arch/arm/dts/imx7d-peb-eval-02.dtsi b/arch/arm/dts/imx7d-peb-eval-02.dtsi index 8bde5b13e7..fee0c5972d 100644 --- a/arch/arm/dts/imx7d-peb-eval-02.dtsi +++ b/arch/arm/dts/imx7d-peb-eval-02.dtsi @@ -13,21 +13,21 @@ pinctrl-0 = <&pinctrl_leds_eval>; status = "disabled"; - led@0 { + led-0 { label = "eval_led_1"; gpios = <&gpio2 8 GPIO_ACTIVE_HIGH>; linux,default-trigger = "gpio"; default-state = "on"; }; - led@1 { + led-1 { label = "eval_led_2"; gpios = <&gpio4 4 GPIO_ACTIVE_HIGH>; linux,default-trigger = "gpio"; default-state = "on"; }; - led@2 { + led-2 { label = "eval_led_3"; gpios = <&gpio2 15 GPIO_ACTIVE_HIGH>; linux,default-trigger = "gpio"; @@ -41,18 +41,18 @@ pinctrl-0 = <&pinctrl_btns_eval>; status = "disabled"; - userbtn@0 { + userbtn-0 { label = "eval_button_1"; gpios = <&gpio2 9 GPIO_ACTIVE_HIGH>; linux,code = <0x100>; /* BTN_MISC */ }; - userbtn@1 { + userbtn-1 { label = "eval_button_2"; gpios = <&gpio4 5 GPIO_ACTIVE_HIGH>; linux,code = <0x100>; /* BTN_MISC */ }; - userbtn@2 { + userbtn-2 { label = "eval_button_3"; gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>; linux,code = <0x100>; /* BTN_MISC */ diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 6e0d92cf75..4da5bb4ee7 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -345,11 +345,11 @@ DTC_FLAGS += -Wno-unit_address_vs_reg \ -Wno-unit_address_format \ -Wno-avoid_unnecessary_addr_size \ -Wno-alias_paths \ - -Wno-alias_paths \ -Wno-graph_child_address \ -Wno-simple_bus_reg \ -Wno-unique_unit_address \ - -Wno-pci_device_reg + -Wno-pci_device_reg \ + -Wno-interrupt_provider ifeq ($(CONFIG_OF_OVERLAY_LIVE), y) DTC_FLAGS += -@ |