TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'pm-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Browse Source 
Pull ARM SoC power management and clock changes from Olof Johansson:
 "This branch contains a largeish set of updates of power management and
  clock setup.  The bulk of it is for OMAP/AM33xx platforms, but also a
  few around hotplug/suspend/resume on Exynos.

  It includes a split-up of some of the OMAP clock data into separate
  files which adds to the diffstat, but gross delta is fairly reasonable."

* tag 'pm-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (60 commits)
  ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h
  ASoC: OMAP: mcbsp fixes for enabling ARM multiplatform support
  watchdog: OMAP: fixup for ARM multiplatform support
  ARM: EXYNOS: Add flush_cache_all in suspend finisher
  ARM: EXYNOS: Remove scu_enable from cpuidle
  ARM: EXYNOS: Fix soft reboot hang after suspend/resume
  ARM: EXYNOS: Add support for rtc wakeup
  ARM: EXYNOS: fix the hotplug for Cortex-A15
  ARM: OMAP2+: omap_device: Correct resource handling for DT boot
  ARM: OMAP2+: hwmod: Add possibility to count hwmod resources based on type
  ARM: OMAP2+: hwmod: Add support for per hwmod/module context lost count
  ARM: OMAP2+: PRM: initialize some PRM functions early
  ARM: OMAP2+: voltage: fixup oscillator handling when CONFIG_PM=n
  ARM: OMAP4: USB: power down MUSB PHY during boot
  ARM: OMAP2+: clock: Cleanup !CONFIG_COMMON_CLK parts
  ARM: OMAP2xxx: clock: drop obsolete clock data
  ARM: OMAP2: clock: Cleanup !CONFIG_COMMON_CLK parts
  ARM: OMAP3+: DPLL: drop !CONFIG_COMMON_CLK sections
  ARM: AM33xx: clock: drop obsolete clock data
  ARM: OMAP3xxx: clk: drop obsolete clock data
  ...
This commit is contained in:
Linus Torvalds
2012-12-13 10:58:20 -08:00
parent b8edf848e9 9c7466b217
commit a11da7df65
131 changed files with 13057 additions and 14177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/mach-omap1/board-h2.c
+1 -1
View File
@@ -39,7 +39,7 @@
#include <asm/mach/map.h>
#include <mach/mux.h>
#include <plat-omap/dma-omap.h>
#include <linux/omap-dma.h>
#include <mach/tc.h>
#include <mach/irda.h>
#include <linux/platform_data/keypad-omap.h>
arch/arm/mach-omap1/board-h3.c
+1 -1
View File
@@ -43,7 +43,7 @@
#include <mach/mux.h>
#include <mach/tc.h>
#include <linux/platform_data/keypad-omap.h>
#include <plat-omap/dma-omap.h>
#include <linux/omap-dma.h>
#include <mach/flash.h>
#include <mach/hardware.h>
arch/arm/mach-omap1/board-palmte.c
+1 -1
View File
@@ -37,7 +37,7 @@
#include <mach/flash.h>
#include <mach/mux.h>
#include <mach/tc.h>
#include <plat-omap/dma-omap.h>
#include <linux/omap-dma.h>
#include <mach/irda.h>
#include <linux/platform_data/keypad-omap.h>
arch/arm/mach-omap1/board-palmtt.c
+1 -1
View File
@@ -36,7 +36,7 @@
#include <mach/flash.h>
#include <mach/mux.h>
#include <plat-omap/dma-omap.h>
#include <linux/omap-dma.h>
#include <mach/tc.h>
#include <mach/irda.h>
#include <linux/platform_data/keypad-omap.h>
arch/arm/mach-omap1/board-palmz71.c
+1 -1
View File
@@ -38,7 +38,7 @@
#include <mach/flash.h>
#include <mach/mux.h>
#include <plat-omap/dma-omap.h>
#include <linux/omap-dma.h>
#include <mach/tc.h>
#include <mach/irda.h>
#include <linux/platform_data/keypad-omap.h>
arch/arm/mach-omap1/board-sx1.c
+1 -1
View File
@@ -36,7 +36,7 @@
#include <mach/flash.h>
#include <mach/mux.h>
#include <plat-omap/dma-omap.h>
#include <linux/omap-dma.h>
#include <mach/irda.h>
#include <mach/tc.h>
#include <mach/board-sx1.h>
arch/arm/mach-omap1/dma.c
+1 -1
View File
@@ -25,7 +25,7 @@
#include <linux/device.h>
#include <linux/io.h>
#include <plat-omap/dma-omap.h>
#include <linux/omap-dma.h>
#include <mach/tc.h>
#include <mach/irqs.h>
arch/arm/mach-omap1/io.c
+1 -1
View File
@@ -18,7 +18,7 @@
#include <mach/mux.h>
#include <mach/tc.h>
#include <plat-omap/dma-omap.h>
#include <linux/omap-dma.h>
#include "iomap.h"
#include "common.h"
arch/arm/mach-omap1/lcd_dma.c
+1 -1
View File
@@ -27,7 +27,7 @@
#include <linux/interrupt.h>
#include <linux/io.h>
#include <plat-omap/dma-omap.h>
#include <linux/omap-dma.h>
#include <mach/hardware.h>
#include <mach/lcdc.h>
arch/arm/mach-omap1/mcbsp.c
+1 -1
View File
@@ -19,7 +19,7 @@
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <plat-omap/dma-omap.h>
#include <linux/omap-dma.h>
#include <mach/mux.h>
#include "soc.h"
#include <linux/platform_data/asoc-ti-mcbsp.h>
arch/arm/mach-omap1/pm.c
+1 -1
View File
@@ -52,7 +52,7 @@
#include <mach/tc.h>
#include <mach/mux.h>
#include <plat-omap/dma-omap.h>
#include <linux/omap-dma.h>
#include <plat/dmtimer.h>
#include <mach/irqs.h>