diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-11-30 15:21:19 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-11-30 15:21:19 +0100 |
| commit | 31866927ca35ebfaa48853aedf869d7d7e764d47 (patch) | |
| tree | fc9ee2789b8f7c6d6cfaabd029c735aac9deae29 /arch/arm/boot/dts/da850.dtsi | |
| parent | aea09e58417f5207e930aceaaef4c923a0506a43 (diff) | |
| parent | 878e908ad95637dc6567a9b5f6876a580ae90dfa (diff) | |
Merge tag 'davinci-for-v4.10/dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/dt
Pull "DaVinci DT updates for v4.10 (part 3)" from Sekhar Nori:
Some fixes for device-tree patches already queued.
- Fix SD card detect polarity
- Prevent Ethernet from picking a random mac address
- Fix error messages on platforms which dont use
bus master and emif priority settings.
* tag 'davinci-for-v4.10/dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: dts: da850: enable memctrl and mstpri nodes per board
ARM: dts: da850-lcdk: Add ethernet0 alias to DT
ARM: dts: da850-lcdk: fix mmc card detect polarity
Diffstat (limited to 'arch/arm/boot/dts/da850.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/da850.dtsi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi index ff13e95af298..4070619d823b 100644 --- a/arch/arm/boot/dts/da850.dtsi +++ b/arch/arm/boot/dts/da850.dtsi @@ -213,6 +213,7 @@ prictrl: priority-controller@14110 { compatible = "ti,da850-mstpri"; reg = <0x14110 0x0c>; + status = "disabled"; }; cfgchip: chip-controller@1417c { compatible = "ti,da830-cfgchip", "syscon", "simple-mfd"; @@ -468,5 +469,6 @@ memctrl: memory-controller@b0000000 { compatible = "ti,da850-ddr-controller"; reg = <0xb0000000 0xe8>; + status = "disabled"; }; }; |