Commit e17e309f 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 various
required patches, fixes and new features including the following:
 - A new SYSCON reset driver that will be used by Keystone 2
   remoteproc driver for K2HK/L/E SoCs
 - Device nodes for Device State Controller, IRQ Controller for
   receiving interrupts from remoteprocs, and a DSP GPIO Controller
   for sending interrupts to DSPs on Keystone 2 Galileo SoC
 - Fixes in the TI SCI protocol to work with latest updates on the
   PMMC firmware for isolating reset control from clock control ops
   for K2G reset driver functionality
 - A new TI SCI reset driver that will be used by Keystone 2
   remoteproc driver for K2G SoC

Other updates include
 - Clock updates to various Keystone 2 Galileo DTS nodes
 - LDO/SMPS fixes on AM57xx IDK boards
 - Various config fragments improvements to enable reset
   framework and drivers

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

: (53 commits)
  ARM: dts: k2g: Add DSP GPIO controller node
  ARM: dts: k2g: Add keystone IRQ controller node
  ARM: dts: k2g: Add device state controller node
  ti_config_fragments/baseport: Enable TI SCI reset driver
  ARM: dts: k2g: Add TI SCI reset-controller node
  reset: Add the TI SCI reset driver
  Documentation: dt: reset: Add TI SCI reset binding
  dt-bindings: reset: Add k2g reset definitions
  ti_config_fragments/baseport: enable reset-syscon driver
  ARM: Keystone: Enable ARCH_HAS_RESET_CONTROLLER
  ARM: dts: keystone: Add PSC reset node
  reset: add a SYSCON based reset driver
  Documentation: dt: reset: Add syscon reset binding
  ARM: OMAP2+: omap_hwmod: Always restore saved hardreset context
  hwmon: (tmp102) Force wait for conversion time for the first valid data
  ti_config_fragments/baseport: Build thermal into kernel
  firmware: ti_sci: Add device_resets calls to the device ops
  firmware: ti_sci: Drop resets field from ti_sci_set_device_state calls
  ARM: dts: k2g: Fix Message Manager interrupt polarity
  baseport.cfg: Enable SYSTEM V IPC
  ...

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