projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'x86-urgent-2020-07-19' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
bcm47094-luxul-xwr-3100.dts
diff --git
a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
index
74371e8
..
ac75154
100644
(file)
--- a/
arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
+++ b/
arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
@@
-16,7
+16,7
@@
bootargs = "console=ttyS0,115200 earlycon";
};
bootargs = "console=ttyS0,115200 earlycon";
};
- memory {
+ memory
@0
{
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
@@
-83,8
+83,6
@@
gpio-keys {
compatible = "gpio-keys";
gpio-keys {
compatible = "gpio-keys";
- #address-cells = <1>;
- #size-cells = <0>;
restart {
label = "Reset";
restart {
label = "Reset";