diff options
| author | Olof Johansson <olof@lixom.net> | 2018-07-14 15:12:24 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-07-14 15:12:24 -0700 |
| commit | d4f72a70fed01040e56be505a51443bd894b11d9 (patch) | |
| tree | 50ddf48c9fd11da7a085ab1cc03787e56cb8b055 /arch | |
| parent | 4dbd2b429a2cdfbb1b650edbb4fab2f2fe8186ae (diff) | |
| parent | 568cc2f07c8ea5f71a0486464bd9703e4671045f (diff) | |
| download | linux-stable-d4f72a70fed01040e56be505a51443bd894b11d9.tar.gz linux-stable-d4f72a70fed01040e56be505a51443bd894b11d9.tar.bz2 linux-stable-d4f72a70fed01040e56be505a51443bd894b11d9.zip | |
Merge tag 'mvebu-fixes-4.18-1' of git://git.infradead.org/linux-mvebu into fixes
mvebu fixes for 4.18 (part 1)
Use the new thermal binding on Armada 38x allowing to use a driver fix
which is already part of the kernel.
* tag 'mvebu-fixes-4.18-1' of git://git.infradead.org/linux-mvebu:
ARM: dts: armada-38x: use the new thermal binding
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/armada-38x.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi index 18edc9bc7927..929459c42760 100644 --- 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>, <0xe4074 0x4>; + reg = <0xe4078 0x4>, <0xe4070 0x8>; status = "okay"; }; |