author | Dan Murphy <DMurphy@ti.com> | |
Thu, 11 Dec 2014 16:29:36 +0000 (10:29 -0600) | ||
committer | Dan Murphy <DMurphy@ti.com> | |
Thu, 11 Dec 2014 16:29:36 +0000 (10:29 -0600) | ||
commit | 8fb3a87571be4c98c3dbaaf16341e78c4783531b | |
tree | f678ba9f6b0fd15b7f3367746f99702a395b653b | tree | snapshot (tar.xz tar.gz zip) |
parent | bd5cf93c18e1ada7074a36e73c84e4e857a1f674 | commit | diff |
parent | f18a34aac6b9861b1393b356cfdcf9e9d5929a48 | commit | diff |
Merge branch 'rpmsg-ti-linux-3.14.y' of git://git.ti.com/rpmsg/rpmsg into ti-linux-3.14.y
TI-Feature: rpmsg
TI-Tree: git://git.ti.com/rpmsg/rpmsg.git
TI-Branch: rpmsg-ti-linux-3.14.y
* 'rpmsg-ti-linux-3.14.y' of git://git.ti.com/rpmsg/rpmsg:
ARM: dts: beagle-x15: Enable PRU-ICSS and the child PRU nodes
ARM: DRA7: hwmod_data: Add PRU-ICSS data for AM57xx variants
ARM: dts: beagle-x15: Add mailboxes to the PRU nodes
ARM: dts: DRA7: Add the PRU-ICSS nodes
remoteproc/pruss: add support for PRU-ICSS subsystems on AM57xx SoCs
ARM: dts: beagle-x15: Enable the system mailboxes 3 and 4
ARM: dts: DRA74x: Add sub-mailbox nodes for all PRUSS1 & PRUSS2
Conflicts:
arch/arm/boot/dts/am57xx-beagle-x15.dts
arch/arm/mach-omap2/omap_hwmod_7xx_data.c
Signed-off-by: Dan Murphy <DMurphy@ti.com>
TI-Feature: rpmsg
TI-Tree: git://git.ti.com/rpmsg/rpmsg.git
TI-Branch: rpmsg-ti-linux-3.14.y
* 'rpmsg-ti-linux-3.14.y' of git://git.ti.com/rpmsg/rpmsg:
ARM: dts: beagle-x15: Enable PRU-ICSS and the child PRU nodes
ARM: DRA7: hwmod_data: Add PRU-ICSS data for AM57xx variants
ARM: dts: beagle-x15: Add mailboxes to the PRU nodes
ARM: dts: DRA7: Add the PRU-ICSS nodes
remoteproc/pruss: add support for PRU-ICSS subsystems on AM57xx SoCs
ARM: dts: beagle-x15: Enable the system mailboxes 3 and 4
ARM: dts: DRA74x: Add sub-mailbox nodes for all PRUSS1 & PRUSS2
Conflicts:
arch/arm/boot/dts/am57xx-beagle-x15.dts
arch/arm/mach-omap2/omap_hwmod_7xx_data.c
Signed-off-by: Dan Murphy <DMurphy@ti.com>