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.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJYPAo5AAoJEGFBu2jqvgRNe6sP/24Ta1gYClQTnRCgvdIRjT6s
 U9zD/BRj0hP/x182kDurhz35NPyUh26MEwEnW9aF7+XI6iW6BWTy8OCoT2k35pm4
 zqd54YrkwFMedzZ+7tBrvLOX9Piw+v5SCJmyYF+KqqpYEKQdNJYplNE+C3beI/TM
 eBopZswNcv54AebLnoJrGMQqY61DmlNaVhc9or4I/rpJgWPHKLWzQJxR0EpUkkRH
 2xTdOeiHBDyXynMsvUwi+8vt12NUZcjxMOOC1owM495c5lTf0zSI7IVT6meV8mz2
 V5nwKJ31iARtPPP66aPe17gTQOZCiLqjw8yxkV8pWx/GjfyHYIV+OYXxA1d7emBk
 h6a5lIgNe0fRdkEJmiyO71jX3uTU8tO/UEsabmkqQ6eb6Qo7N+Ir4BVH2qhgsyEW
 dMXo29Q1G3yDyP2cePsD5pQc+zNtE/4j6Ie4e0Li1AgGeh8qeryb0n5gd9aKuMwN
 6n7zzVqGxRChPS8+DtJngW9SpRNY0j+z7g/fDKMIwx/S+S0XevQaHF8dt4UyMDhP
 jBuREv2gdUAvgzvRce6p3am1xpF68rsMCsQjaPUEi432Xyoa8g3WVtPGer4jU+su
 LKzkhcUmMOKb5gnh+5rzRgQ/wohlOOi9TdeIpr1LjyPXXK5EwjdGIG7lYxhKUJU2
 QScuGAUj/IXBJ7rCsqLB
 =mrAJ
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Arnd Bergmann 2016-11-30 15:21:19 +01:00
commit 31866927ca
2 changed files with 12 additions and 1 deletions

View File

@ -13,6 +13,7 @@
aliases {
serial2 = &serial2;
ethernet0 = &eth0;
};
chosen {
@ -122,7 +123,7 @@
bus-width = <4>;
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
cd-gpios = <&gpio 64 GPIO_ACTIVE_HIGH>;
cd-gpios = <&gpio 64 GPIO_ACTIVE_LOW>;
status = "okay";
};
@ -227,3 +228,11 @@
};
};
};
&prictrl {
status = "okay";
};
&memctrl {
status = "okay";
};

View File

@ -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";
};
};