Unverified Commit 1b8e9677 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-5.19/devicetree-arm64' of https://github.com/Broadcom/stblinux into arm/dt 

This pull request contains Broadcom ARM64-based SoCs changes for 5.19,
please pull the following:

- Krzysztof fixes the SPI NOR Device Tree node name to comply with the
  dtschema

* tag 'arm-soc/for-5.19/devicetree-arm64' of https://github.com/Broadcom/stblinux:
  arm64: dts: broadcom: align SPI NOR node name with dtschema

Link: https://lore.kernel.org/r/20220504210942.1838248-3-f.fainelli@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 814cc4fc ad2c6e3c

arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ 


&qspi {

	bspi-sel = <0>;

	flash: m25p80@0 {

	flash: flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "m25p80";

arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ 
};



&qspi {

	flash: m25p80@0 {

	flash: flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "m25p80";

arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dts

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
	cs-gpios = <&gpio_hsls 34 0>;

	status = "okay";



	spi-flash@0 {

	flash@0 {

		compatible = "jedec,spi-nor";

		reg = <0>;

		spi-max-frequency = <20000000>;
@@ -76,7 +76,7 @@ 
	cs-gpios = <&gpio_hsls 96 0>;

	status = "okay";



	spi-flash@0 {

	flash@0 {

		compatible = "jedec,spi-nor";

		reg = <0>;

		spi-max-frequency = <20000000>;