Commit 2d2fd891 authored by Suman Anna's avatar Suman Anna
Browse files

Merge branch 'platform-ti-linux-4.1.y' of...

Merge branch 'platform-ti-linux-4.1.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree into rproc-linux-4.1.y

Resync with the latest platform base code. The merge pulls in a
patch in driver core to resolve crashes in of_platform_depopulate().
This API is needed by the PRUSS remoteproc driver.

* 'platform-ti-linux-4.1.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree

:
  irqchip/crossbar: Restore set_wake functionality
  irqchip/crossbar: Restore the mask on suspend behaviour
  ARM: OMAP: wakeupgen: Restore the irq_set_type() mechanism
  irqchip/crossbar: Restore the irq_set_type() mechanism
  genirq: Introduce irq_chip_set_type_parent() helper
  genirq: Don't return ENOSYS in irq_chip_retrigger_hierarchy
  drivercore: Fix unregistration path of platform devices
  driver core: correct device's shutdown order
  ARM: dts: am43xx: add support for clkout1 clock
  gpiolib: irqchip: use different lockdep class for each gpio irqchip
  soc: ti: wkup_m3_ipc: Switch request_firmware_nowait to GFP_ATOMIC
  ARM: dts: am437x-gp-evm: Add pinctrl for unused_pins
  ARM: dts: am57xx-beagle-x15: Update Phy supplies
  ARM: dts: DRA7: Add eDMA and eDMA xbar nodes
  ARM: DRA7: hwmod: Add data for eDMA tpcc, tptc0, tptc1
  ARM: edma: HACK: Mark xbar related channels as used
  dmaengine: edma: HACK: Disable memcpy on DRA7xx family
  ti_config_fragments/debug_options: Enable RCU_PROVE_LOCKING
  ti_config_fragments/debug_options.cfg: enable PROVE_LOCKING
  ti_config_fragments: add baseport fragment to multi_core_defconfig_fragment

Signed-off-by: default avatarSuman Anna <s-anna@ti.com>
parents d9e5f6db 28b9ed6b
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment