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 'nvme-for-4.18' of git://git.infradead.org/nvme
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
armada-38x.dtsi
diff --git
a/arch/arm/boot/dts/armada-38x.dtsi
b/arch/arm/boot/dts/armada-38x.dtsi
index 18edc9bc79273b794ce263ce7d9674f43732c58e..929459c42760592c00d4ea0d585be4da2ad7e301 100644
(file)
--- a/
arch/arm/boot/dts/armada-38x.dtsi
+++ b/
arch/arm/boot/dts/armada-38x.dtsi
@@
-547,7
+547,7
@@
thermal: thermal@e8078 {
compatible = "marvell,armada380-thermal";
- reg = <0xe4078 0x4>, <0xe407
4 0x4
>;
+ reg = <0xe4078 0x4>, <0xe407
0 0x8
>;
status = "okay";
};