korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-09 12:04:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

This pull request contains Broadcom ARM64-based SoCs changes for 5.19,

Browse Source 
please pull the following:
 
 - Krzysztof fixes the SPI NOR Device Tree node name to comply with the
   dtschema
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAmJy6GYACgkQh9CWnEQH
 BwQR6w//fHtYQAC+s/y7hTKhKi9ZPtLB9V60BwkzHbJR/NbTLQW5vn1AGQ2qcUTR
 xA4RUoiIVqcrj3B4TXRMW+0AG5ULHIlGefYW945C9v17c/fi0+ylcTde9AlLRC/g
 lOfXB82+1Q4yHr9qlAahtTT4SeC02BD/4yzlJ4jbF2JPdx3o71F5t+v2x4tko1Sh
 EMfNNjZ3oLwaJLpAAvuVdIHjSyohK7BSWPndSi6iOhtZfvWYg00nWtCZp3jnjepm
 CdUGEVlESbLpt2jtpEdc7mbrGcjZRSReNMz9J2ENjfyjguM4/ChYG99PaUSm11jV
 LumvXu1TRALBUFEikdBizgKuy+Fy8mtw+k8GjUVxqrgDimebgNqrAOwklbXZcqPD
 htGA/h/CYiMprUyYMZPNXIIA3f4+bTNpxM7wLrU6sBZoaObv6RAmSyYr4O2blas1
 z9JAgHv5Bnr+0WU22HuHXVYgbkeyqOe2xcHi1rXm/HhhgrjjLdwkOLm/r29auJ7C
 QghZsw41h5qMNfgiLvkIMivKCRilZg6rAdhmQ+Y8DPQD1lyIAM1D8Q52MiXPkmtt
 Ld543fBtvrG39rv5pdR0PORoTMRFrSCY/M2KRYEMvRrs05nnAp2vU6ShOqXw/q3Q
 rDA95mNzarLzxlVl80EOvHGdxcP16FlGwmUcdAZgmc9HXtBm+qE=
 =igMx
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmJ0D+sACgkQmmx57+YA
 GNlhWg/9EkurskBIlNEip/rCObMXck4FQVrg192GQkZaBxsmdhk9VGfoYpvrOZPg
 tfho9JYtEPJfNXf0MWG96FBxAZIVbkQm05bBXvmF/J1O5eDZ6JHCcRKB40AKhMWZ
 ittV1iFO6BjjrBOKT6HbOx3V8JKQvTtBUf6pEUqHiNloMIsILVk9PT8opLexwLbd
 XSKkbDvFWpyKcZrPbnW5D5+dGyjDiODLkkRljWWVSDRi50FSbWWKvU5BlwqPAkc2
 TP58RstHhY4DrSmDvbyHJiRW0kt5qc90Orlfp6fjzAVCXbI4uvOVn+AIaGACNYil
 OplONjHi1Vjl5/cXSQALJvDhl0JjcU83u1IEKz4KpN14aMhHSFUcvWc0PpiqlLEC
 bQuHDUmZYwY/il7Qb31zUCKfcyZrDjB+GeACWjI/ZBwKR4xXH0rCK1yiqxjMLcl4
 XEiRkT24PuAwnChYtINmGAnWieiYX0uK7YIQGao74rvhL2uBuGw2EkBsvbgytChO
 Nk0lDSen8L8SdJVcenpZxcwDzJSONAAmJyoOZL1uuyJvxGpbscPAebiQOy7gtq6n
 fpmOdTMZWWychEiFA3zCZ8TPP54qFnSS8BGP9loxI1N8gl1JX9+F7vASgQQIcaj6
 UyCnSUiNnLdK8JQ6fTcat4NiMss6jD7kvQXz1qRD0CneY7Hcbes=
 =KFF2
 -----END PGP SIGNATURE-----

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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-05-05 19:56:58 +02:00
commit 1b8e9677bc
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts
View File

@ -203,7 +203,7 @@
&qspi {
bspi-sel = <0>;
flash: m25p80@0 {
flash: flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "m25p80";

2
arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts
View File

@ -146,7 +146,7 @@
};
&qspi {
flash: m25p80@0 {
flash: flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "m25p80";

4
arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dts
View File

@ -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>;