| Message ID | 20240528133215.2266419-1-arnd@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: dts: amlogic: ad402: move thermal-zones to top node | expand |
On 28/05/2024 15:31, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > It appears that this accidentally got added into the spi node, causing > a warning. > > arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts:119.16-161.4: Warning (spi_bus_reg): /soc/spi@fd000400/thermal-zones: missing or empty reg property > > Fixes: 593ab951232b ("arm64: dts: amlogic: ad402: setup thermal-zones") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > .../arm64/boot/dts/amlogic/meson-a1-ad402.dts | 62 +++++++++---------- > 1 file changed, 31 insertions(+), 31 deletions(-) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts b/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts > index c8579b6e67cf..6883471a93b4 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts > +++ b/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts > @@ -84,37 +84,6 @@ vddio_1v8: regulator-vddio-1v8 { > vin-supply = <&vddao_3v3>; > regulator-always-on; > }; > -}; > - > -/* Bluetooth HCI H4 */ > -&uart_AO { > - status = "okay"; > - pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; > - pinctrl-names = "default"; > -}; > - > -&uart_AO_B { > - status = "okay"; > -}; > - > -&saradc { > - status = "okay"; > - vref-supply = <&vddio_1v8>; > -}; > - > -&spifc { > - status = "okay"; > - pinctrl-0 = <&spifc_pins>; > - pinctrl-names = "default"; > - > - flash@0 { > - compatible = "spi-nand"; > - status = "okay"; > - reg = <0>; > - spi-max-frequency = <96000000>; > - spi-tx-bus-width = <4>; > - spi-rx-bus-width = <4>; > - }; > > thermal-zones { > soc_thermal: soc_thermal { > @@ -161,6 +130,37 @@ map1 { > }; > }; > > +/* Bluetooth HCI H4 */ > +&uart_AO { > + status = "okay"; > + pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; > + pinctrl-names = "default"; > +}; > + > +&uart_AO_B { > + status = "okay"; > +}; > + > +&saradc { > + status = "okay"; > + vref-supply = <&vddio_1v8>; > +}; > + > +&spifc { > + status = "okay"; > + pinctrl-0 = <&spifc_pins>; > + pinctrl-names = "default"; > + > + flash@0 { > + compatible = "spi-nand"; > + status = "okay"; > + reg = <0>; > + spi-max-frequency = <96000000>; > + spi-tx-bus-width = <4>; > + spi-rx-bus-width = <4>; > + }; > +}; > + > &usb2_phy1 { > phy-supply = <&vcc_3v3>; > }; Oops thx for figuring that out Acked-by: Neil Armstrong <neil.armstrong@linaro.org>
On Tue, 28 May 2024 15:31:59 +0200, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > It appears that this accidentally got added into the spi node, causing > a warning. > > arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts:119.16-161.4: Warning (spi_bus_reg): /soc/spi@fd000400/thermal-zones: missing or empty reg property > > Fixes: 593ab951232b ("arm64: dts: amlogic: ad402: setup thermal-zones") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > .../arm64/boot/dts/amlogic/meson-a1-ad402.dts | 62 +++++++++---------- > 1 file changed, 31 insertions(+), 31 deletions(-) > My bot found new DTB warnings on the .dts files added or changed in this series. Some warnings may be from an existing SoC .dtsi. Or perhaps the warnings are fixed by another series. Ultimately, it is up to the platform maintainer whether these warnings are acceptable or not. No need to reply unless the platform maintainer has comments. If you already ran DT checks and didn't see these error(s), then make sure dt-schema is up to date: pip3 install dtschema --upgrade New warnings running 'make CHECK_DTBS=y amlogic/meson-a1-ad402.dtb' for 20240528133215.2266419-1-arnd@kernel.org: arch/arm64/boot/dts/amlogic/meson-a1-ad402.dtb: spi@fd000400: Unevaluated properties are not allowed ('power-domains' was unexpected) from schema $id: http://devicetree.org/schemas/spi/amlogic,a1-spifc.yaml#
Hi, On Tue, 28 May 2024 15:31:59 +0200, Arnd Bergmann wrote: > It appears that this accidentally got added into the spi node, causing > a warning. > > arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts:119.16-161.4: Warning (spi_bus_reg): /soc/spi@fd000400/thermal-zones: missing or empty reg property > > Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v6.11/arm64-dt) [1/1] arm64: dts: amlogic: ad402: move thermal-zones to top node https://git.kernel.org/amlogic/c/6c9b5ba73ca77ef3863cda6560856fdfe7dc237a These changes has been applied on the intermediate git tree [1]. The v6.11/arm64-dt branch will then be sent via a formal Pull Request to the Linux SoC maintainers for inclusion in their intermediate git branches in order to be sent to Linus during the next merge window, or sooner if it's a set of fixes. In the cases of fixes, those will be merged in the current release candidate kernel and as soon they appear on the Linux master branch they will be backported to the previous Stable and Long-Stable kernels [2]. The intermediate git branches are merged daily in the linux-next tree [3], people are encouraged testing these pre-release kernels and report issues on the relevant mailing-lists. If problems are discovered on those changes, please submit a signed-off-by revert patch followed by a corrective changeset. [1] https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git [3] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
On Thu, Jun 06, 2024 at 11:13:20AM +0200, Neil Armstrong wrote: > Hi, > > On Tue, 28 May 2024 15:31:59 +0200, Arnd Bergmann wrote: > > It appears that this accidentally got added into the spi node, causing > > a warning. > > > > arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts:119.16-161.4: Warning (spi_bus_reg): /soc/spi@fd000400/thermal-zones: missing or empty reg property > > > > > > Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v6.11/arm64-dt) > > [1/1] arm64: dts: amlogic: ad402: move thermal-zones to top node > https://git.kernel.org/amlogic/c/6c9b5ba73ca77ef3863cda6560856fdfe7dc237a > > These changes has been applied on the intermediate git tree [1]. > > The v6.11/arm64-dt branch will then be sent via a formal Pull Request to the Linux SoC maintainers > for inclusion in their intermediate git branches in order to be sent to Linus during > the next merge window, or sooner if it's a set of fixes. > > In the cases of fixes, those will be merged in the current release candidate > kernel and as soon they appear on the Linux master branch they will be > backported to the previous Stable and Long-Stable kernels [2]. > > The intermediate git branches are merged daily in the linux-next tree [3], > people are encouraged testing these pre-release kernels and report issues on the > relevant mailing-lists. > > If problems are discovered on those changes, please submit a signed-off-by revert > patch followed by a corrective changeset. > > [1] https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git > [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git > [3] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git My apologies for any confusion, it seems like these are artifacts from the merge process...
diff --git a/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts b/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts index c8579b6e67cf..6883471a93b4 100644 --- a/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts +++ b/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts @@ -84,37 +84,6 @@ vddio_1v8: regulator-vddio-1v8 { vin-supply = <&vddao_3v3>; regulator-always-on; }; -}; - -/* Bluetooth HCI H4 */ -&uart_AO { - status = "okay"; - pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; - pinctrl-names = "default"; -}; - -&uart_AO_B { - status = "okay"; -}; - -&saradc { - status = "okay"; - vref-supply = <&vddio_1v8>; -}; - -&spifc { - status = "okay"; - pinctrl-0 = <&spifc_pins>; - pinctrl-names = "default"; - - flash@0 { - compatible = "spi-nand"; - status = "okay"; - reg = <0>; - spi-max-frequency = <96000000>; - spi-tx-bus-width = <4>; - spi-rx-bus-width = <4>; - }; thermal-zones { soc_thermal: soc_thermal { @@ -161,6 +130,37 @@ map1 { }; }; +/* Bluetooth HCI H4 */ +&uart_AO { + status = "okay"; + pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; + pinctrl-names = "default"; +}; + +&uart_AO_B { + status = "okay"; +}; + +&saradc { + status = "okay"; + vref-supply = <&vddio_1v8>; +}; + +&spifc { + status = "okay"; + pinctrl-0 = <&spifc_pins>; + pinctrl-names = "default"; + + flash@0 { + compatible = "spi-nand"; + status = "okay"; + reg = <0>; + spi-max-frequency = <96000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + }; +}; + &usb2_phy1 { phy-supply = <&vcc_3v3>; };