author | Dan Murphy <dmurphy@ti.com> | |
Mon, 15 Apr 2013 13:49:27 +0000 (08:49 -0500) | ||
committer | Dan Murphy <dmurphy@ti.com> | |
Mon, 15 Apr 2013 13:49:27 +0000 (08:49 -0500) | ||
commit | d9fd3534623ad41a8372736860df77acd5b30c34 | |
tree | 0c52e40d48df9fcdbff7977dad9fe3241ea963cb | tree | snapshot (tar.xz tar.gz zip) |
parent | 57070be1bdfd32a577c416b6429236e7a6eae1e7 | commit | diff |
parent | 56f0a96aa95c3073aec9b3bc459dcc21953643c9 | commit | diff |
Merge branch 'platform-base-3.8.y' of git://gitorious.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree into ti-linux-3.8.y
TI-Feature: platform_base
TI-Tree: git://gitorious.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree
TI-Branch: platform-base-3.8.y
* 'platform-base-3.8.y' of git://gitorious.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree:
ARM: OMAP2+: omap2plus_defconfig: Enable RTC support
ARM: dts: AM33XX: Enable system power off control in am335x-bone
ARM: dts: AM33XX: Set pmic-shutdown-controller for BeagleBone
rtc: OMAP: Add system pm_power_off to rtc driver
ARM: dts: OMAP2+: Identify GPIO banks that are always powered
ARM: dts: OMAP4: Fix ethernet IRQ for OMAP4 boards
ARM: dts: Add OMAP3430 SDP NOR flash memory binding
ARM: dts: Add NOR flash bindings for OMAP2420 H4
ARM: dts: Update OMAP3430 SDP NAND and ONENAND properties
ARM: dts: OMAP3: Add support for OMAP3430 SDP board
ARM: dts: OMAP3: Add reg and interrupt properties for gpio
ARM: dts: OMAP3+: Correct gpio #interrupts-cells property
ARM: dts: Add OMAP2 gpio bindings
ARM: dts: Add GPMC node for OMAP2, OMAP4 and OMAP5
ARM: dts: OMAP2+: Add SDMA controller bindings and nodes
ARM: dts: OMAP2+: Add PMU nodes
ARM: OMAP2+: Prepare for device-tree PMU support
ARM: dts: OMAP3: reduce GPMC mapped registers address space
ARM: dts: OMAP3: Add GPMC controller
Conflicts:
arch/arm/boot/dts/omap3.dtsi
arch/arm/boot/dts/omap4.dtsi
Signed-off-by: Dan Murphy <dmurphy@ti.com>
TI-Feature: platform_base
TI-Tree: git://gitorious.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree
TI-Branch: platform-base-3.8.y
* 'platform-base-3.8.y' of git://gitorious.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree:
ARM: OMAP2+: omap2plus_defconfig: Enable RTC support
ARM: dts: AM33XX: Enable system power off control in am335x-bone
ARM: dts: AM33XX: Set pmic-shutdown-controller for BeagleBone
rtc: OMAP: Add system pm_power_off to rtc driver
ARM: dts: OMAP2+: Identify GPIO banks that are always powered
ARM: dts: OMAP4: Fix ethernet IRQ for OMAP4 boards
ARM: dts: Add OMAP3430 SDP NOR flash memory binding
ARM: dts: Add NOR flash bindings for OMAP2420 H4
ARM: dts: Update OMAP3430 SDP NAND and ONENAND properties
ARM: dts: OMAP3: Add support for OMAP3430 SDP board
ARM: dts: OMAP3: Add reg and interrupt properties for gpio
ARM: dts: OMAP3+: Correct gpio #interrupts-cells property
ARM: dts: Add OMAP2 gpio bindings
ARM: dts: Add GPMC node for OMAP2, OMAP4 and OMAP5
ARM: dts: OMAP2+: Add SDMA controller bindings and nodes
ARM: dts: OMAP2+: Add PMU nodes
ARM: OMAP2+: Prepare for device-tree PMU support
ARM: dts: OMAP3: reduce GPMC mapped registers address space
ARM: dts: OMAP3: Add GPMC controller
Conflicts:
arch/arm/boot/dts/omap3.dtsi
arch/arm/boot/dts/omap4.dtsi
Signed-off-by: Dan Murphy <dmurphy@ti.com>