diff options
| author | Olof Johansson | 2018-05-14 09:59:02 +0200 |
|---|---|---|
| committer | Olof Johansson | 2018-05-14 09:59:02 +0200 |
| commit | 8ee742488a87d4b68de69b4f59a4fb95c084dbb2 (patch) | |
| tree | 01ffdd2ed66933e8db138c9096d43b0aa5ecb636 /arch/arm/boot | |
| parent | Merge tag 'renesas-fixes-for-v4.17' of https://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | ARM: davinci: fix GPIO lookup for I2C (diff) | |
| download | kernel-qcow2-linux-8ee742488a87d4b68de69b4f59a4fb95c084dbb2.tar.gz kernel-qcow2-linux-8ee742488a87d4b68de69b4f59a4fb95c084dbb2.tar.xz kernel-qcow2-linux-8ee742488a87d4b68de69b4f59a4fb95c084dbb2.zip | |
Merge tag 'davinci-fixes-for-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes
DaVinci fixes for v4.17
* W=1 warning fixes in device-tree files
* GPIO look-up fixes for legacy boot on several platforms
* tag 'davinci-fixes-for-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci: fix GPIO lookup for I2C
ARM: davinci: board-dm355-evm: fix broken networking
ARM: davinci: board-omapl138-hawk: fix GPIO numbers for MMC/SD lookup
ARM: davinci: board-da850-evm: fix GPIO lookup for MMC/SD
ARM: davinci: board-da830-evm: fix GPIO lookup for MMC/SD
ARM: dts: da850: fix W=1 warnings with pinmux node
ARM: dts: da850-lcdk: add unit name for memory node
ARM: dts: da850: get rid of skeleton.dtsi
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/da850-lcdk.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/da850.dtsi | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/da850-lcdk.dts b/arch/arm/boot/dts/da850-lcdk.dts index a1f4d6d5a569..0edf769ea95c 100644 --- a/arch/arm/boot/dts/da850-lcdk.dts +++ b/arch/arm/boot/dts/da850-lcdk.dts @@ -21,8 +21,8 @@ stdout-path = "serial2:115200n8"; }; - memory { - device_type = "memory"; + memory@c0000000 { + /* 128 MB DDR2 SDRAM @ 0xc0000000 */ reg = <0xc0000000 0x08000000>; }; diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi index c66cf7895363..12010002dbdb 100644 --- a/arch/arm/boot/dts/da850.dtsi +++ b/arch/arm/boot/dts/da850.dtsi @@ -7,10 +7,19 @@ * Free Software Foundation; either version 2 of the License, or (at your * option) any later version. */ -#include "skeleton.dtsi" #include <dt-bindings/interrupt-controller/irq.h> / { + #address-cells = <1>; + #size-cells = <1>; + chosen { }; + aliases { }; + + memory@c0000000 { + device_type = "memory"; + reg = <0xc0000000 0x0>; + }; + arm { #address-cells = <1>; #size-cells = <1>; @@ -46,8 +55,6 @@ pmx_core: pinmux@14120 { compatible = "pinctrl-single"; reg = <0x14120 0x50>; - #address-cells = <1>; - #size-cells = <0>; #pinctrl-cells = <2>; pinctrl-single,bit-per-mux; pinctrl-single,register-width = <32>; |