Revision 8dfbc0ab3481bb50216c1609bfd1adb0547ef83f authored by Kevin Hilman on 09 July 2015, 22:38:16 UTC, committed by Kevin Hilman on 09 July 2015, 22:38:16 UTC
Merge "omap fixes against v4.2-rc1" from Tony Lindgren:

Minor fixes for omaps against v4.2-rc1. Mostly just minor dts changes
except for a GPMC fix to not use names for probing devices. Also a
one liner clean-up to remove unecessary return from a void function.

The summary for the changes being:

- Fix probe for GPMC devices by reoving limitations based on device
  name

- Remove unnecessary return from a void function

- Revert beaglebone RTC sleep fix, we now have a better fix merged

- Add am4372 EMIF node to fix a warning

- Add am57xx-beagle-x15 power supply to fix USB2 if USB1 is disabled

- Disable rfbi for am4372 as it does not have a driver

* tag 'omap-for-v4.2/fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am4372.dtsi: disable rfbi
  ARM: dts: am57xx-beagle-x15: Provide supply for usb2_phy2
  ARM: dts: am4372: Add emif node
  Revert "ARM: dts: am335x-boneblack: disable RTC-only sleep"
  ARM: OMAP2+: Remove unnessary return statement from the void function, omap2_show_dma_caps
  memory: omap-gpmc: Fix parsing of devices
2 parent s d024bae + ae74530
History
File Mode Size
Makefile -rw-r--r-- 377 bytes
compat.c -rw-r--r-- 19.1 KB
compat_mq.c -rw-r--r-- 3.9 KB
ipc_sysctl.c -rw-r--r-- 5.4 KB
mq_sysctl.c -rw-r--r-- 2.9 KB
mqueue.c -rw-r--r-- 35.9 KB
msg.c -rw-r--r-- 24.1 KB
msgutil.c -rw-r--r-- 3.6 KB
namespace.c -rw-r--r-- 4.0 KB
sem.c -rw-r--r-- 55.2 KB
shm.c -rw-r--r-- 32.5 KB
syscall.c -rw-r--r-- 2.3 KB
util.c -rw-r--r-- 21.2 KB
util.h -rw-r--r-- 6.4 KB

back to top