git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
bcm5301x.dtsi
diff --git
a/arch/arm/boot/dts/bcm5301x.dtsi
b/arch/arm/boot/dts/bcm5301x.dtsi
index 9d9e8fe3f6ae3c9fbe5ba3d71b265894624737cd..ac3a99cf20793aa3559e0e63398f4196857cf9f2 100644
(file)
--- a/
arch/arm/boot/dts/bcm5301x.dtsi
+++ b/
arch/arm/boot/dts/bcm5301x.dtsi
@@
-509,7
+509,7
@@
};
spi@18029200 {
- compatible = "brcm,spi-
bcm-qspi", "brcm,spi-nsp
-qspi";
+ compatible = "brcm,spi-
nsp-qspi", "brcm,spi-bcm
-qspi";
reg = <0x18029200 0x184>,
<0x18029000 0x124>,
<0x1811b408 0x004>,