]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ARM: OMAP: Make plat/omap_hwmod.h local to mach-omap2
authorTony Lindgren <tony@atomide.com>
Wed, 3 Oct 2012 00:41:35 +0000 (17:41 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 18 Oct 2012 23:05:55 +0000 (16:05 -0700)
Let's make omap_hwmod local to mach-omap2 for
ARM common zImage support.

Signed-off-by: Tony Lindgren <tony@atomide.com>
34 files changed:
arch/arm/mach-omap2/clockdomain.h
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/display.c
arch/arm/mach-omap2/dma.c
arch/arm/mach-omap2/drm.c
arch/arm/mach-omap2/gpio.c
arch/arm/mach-omap2/hdq1w.c
arch/arm/mach-omap2/hdq1w.h
arch/arm/mach-omap2/hwspinlock.c
arch/arm/mach-omap2/i2c.c
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/msdi.c
arch/arm/mach-omap2/mux.c
arch/arm/mach-omap2/omap_device.c
arch/arm/mach-omap2/omap_device.h
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/omap_hwmod.h [moved from arch/arm/plat-omap/include/plat/omap_hwmod.h with 100% similarity]
arch/arm/mach-omap2/omap_hwmod_2420_data.c
arch/arm/mach-omap2/omap_hwmod_2430_data.c
arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c
arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
arch/arm/mach-omap2/omap_hwmod_33xx_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
arch/arm/mach-omap2/omap_hwmod_common_data.c
arch/arm/mach-omap2/omap_hwmod_common_data.h
arch/arm/mach-omap2/omap_opp_data.h
arch/arm/mach-omap2/pmu.c
arch/arm/mach-omap2/serial.c
arch/arm/mach-omap2/timer.c
arch/arm/mach-omap2/wd_timer.c
arch/arm/mach-omap2/wd_timer.h

index 629576be74445419fbc815fdfd8861cd2190943a..a868c029626501cc9849bcccdaeb45759e472ee5 100644 (file)
@@ -19,7 +19,7 @@
 
 #include "powerdomain.h"
 #include <plat/clock.h>
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 #include <plat/cpu.h>
 
 /*
index 48c0def2dbc2f6a6ef4fa358b7daf95484e59b6f..86a5e13c9f598217654f2cdecfcdad4aeb982403 100644 (file)
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
 
-#include "iomap.h"
 #include <plat-omap/dma-omap.h>
-#include <plat/omap_hwmod.h>
+
+#include "iomap.h"
+#include "omap_hwmod.h"
 #include "omap_device.h"
 #include "omap4-keypad.h"
 
index 55661d00423cb3bda4a71f1533429f8fa570b721..815af41c437586d4b90315a55da941ee5e25fec3 100644 (file)
@@ -25,7 +25,7 @@
 #include <linux/delay.h>
 
 #include <video/omapdss.h>
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 #include "omap_device.h"
 #include <plat/omap-pm.h>
 #include "common.h"
index 7ddc6c90ed710811cb9895c4f601a208fca71171..bc9a4e941e5956f93aeb4346fe923bf2a0bbc7eb 100644 (file)
@@ -28,9 +28,9 @@
 #include <linux/init.h>
 #include <linux/device.h>
 
-#include <plat/omap_hwmod.h>
 #include <plat-omap/dma-omap.h>
 
+#include "omap_hwmod.h"
 #include "omap_device.h"
 
 #define OMAP2_DMA_STRIDE       0x60
index 67991ea53ce7130d8b0a0a87d42c71fe42f55b62..6282cc82661355afe27abdeb114f92ba6895b747 100644 (file)
@@ -25,7 +25,7 @@
 #include <linux/dma-mapping.h>
 
 #include "omap_device.h"
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 
 #if defined(CONFIG_DRM_OMAP) || (CONFIG_DRM_OMAP_MODULE)
 
index 2bd24671bcf61d7e9d70a53b93ee2dcfbc5242f5..80b1e1a05ce2685a651fba941eb3dd0e256ac6df 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/of.h>
 #include <linux/platform_data/gpio-omap.h>
 
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 #include "omap_device.h"
 #include <plat/omap-pm.h>
 
index a533ce33d112afc82fb5a7598afe681c8d7e02f3..3da8900598c88444d6729ffb8368e4f2509a6081 100644 (file)
@@ -27,7 +27,7 @@
 #include <linux/err.h>
 #include <linux/platform_device.h>
 
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 #include "omap_device.h"
 #include "hdq1w.h"
 
index 0c1efc846d8dddb5b23237a95993288aa6747166..c7e08d2a7a460c94bbd65d533e8922b0cec4e233 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef ARCH_ARM_MACH_OMAP2_HDQ1W_H
 #define ARCH_ARM_MACH_OMAP2_HDQ1W_H
 
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 
 /*
  * XXX A future cleanup patch should modify
index 58565214b4280c2bde6b543b03a66858db332560..1df9b5feda16a5db49d09ca77e4ae8f374f1ee95 100644 (file)
@@ -21,7 +21,7 @@
 #include <linux/err.h>
 #include <linux/hwspinlock.h>
 
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 #include "omap_device.h"
 
 static struct hwspinlock_pdata omap_hwspinlock_pdata __initdata = {
index 84b0d9f25a7bb23a35eea9e4ab2b86db3943e1dd..8b3993724a1b2ca02ff4c4f2fc8ac42ced58a1c1 100644 (file)
@@ -20,7 +20,7 @@
  */
 
 #include "common.h"
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 #include "omap_device.h"
 
 #include "mux.h"
index 0bc8f66c4b72efd4f4c82bc33051bfd2941ce12b..60dede839a35e938f3d202c114885444aae3ab22 100644 (file)
@@ -27,7 +27,7 @@
 
 #include <plat/serial.h>
 #include <plat/omap-pm.h>
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 #include <plat/multi.h>
 #include <plat-omap/dma-omap.h>
 
index 46bf98a991800d2fe561bd69de50741df047ac77..627e97e307432aec72cee47c10426675fe1b935f 100644 (file)
@@ -25,9 +25,9 @@
 #include <linux/err.h>
 #include <linux/platform_data/gpio-omap.h>
 
-#include <plat/omap_hwmod.h>
 #include "common.h"
 #include "control.h"
+#include "omap_hwmod.h"
 #include "omap_device.h"
 #include "mux.h"
 #include "mmc.h"
index 701e17cba46855bb4c57e441d10ac76fc55c7fb9..635d5ef9551c87c1dbb529713dbe59882f08e86e 100644 (file)
@@ -36,7 +36,7 @@
 #include <linux/interrupt.h>
 
 
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 
 #include "control.h"
 #include "mux.h"
index e5fbcb53c7ccb8f207516daa50d5780d23ea9fdf..2e6d33730b25a353210b90d90ec2cc8dbba26386 100644 (file)
@@ -90,7 +90,7 @@
 #include <linux/notifier.h>
 
 #include "omap_device.h"
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 #include <plat/clock.h>
 
 /* These parameters are passed to _omap_device_{de,}activate() */
index 106f50665804952edaf78b3f21167a78b9d5e1ec..0933c599bf896a7002c448e99fa97ef3a97425dc 100644 (file)
@@ -34,7 +34,7 @@
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 
 extern struct dev_pm_domain omap_device_pm_domain;
 
index b969ab1d258b91894415c3507bd8b50cd2aefa50..3dc482a1a75ff0bd5426ae136e6792376bd997c8 100644 (file)
 #include <linux/bootmem.h>
 
 #include <plat/clock.h>
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 #include <plat/prcm.h>
 
 #include "soc.h"
index 95a0053b6ae1836be934e4b117c5206b4164d6e4..3efed3d633d15654c2a001ae308391c7d3375bc8 100644 (file)
 #include <linux/i2c-omap.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
 
-#include <plat/omap_hwmod.h>
 #include <plat-omap/dma-omap.h>
 #include <plat/dmtimer.h>
+
+#include "omap_hwmod.h"
 #include "l3_2xxx.h"
 #include "l4_2xxx.h"
 
index a6c24aea28b6a08dab4ab32525e4fb8ac4b1823b..dc768c50e523d4c49dda1a0580a5c3d089424103 100644 (file)
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
 
-#include <plat/omap_hwmod.h>
 #include <plat-omap/dma-omap.h>
 #include <plat/dmtimer.h>
+
+#include "omap_hwmod.h"
 #include "mmc.h"
 #include "l3_2xxx.h"
 
index cbb4ef6544adfba32c0336c6f5054ec5b10aef45..74ae767675108684dab82c53a229260492fb2c75 100644 (file)
  */
 #include <asm/sizes.h>
 
-#include <plat/omap_hwmod.h>
 #include <plat/serial.h>
 
+#include "omap_hwmod.h"
+
 #include "omap_hwmod_common_data.h"
 
 struct omap_hwmod_addr_space omap2430_mmc1_addr_space[] = {
index bfe64ee20606d626681c64ce9ced552b0ae6e418..57fc2f95584d6b50822b744af998f95927a75e67 100644 (file)
@@ -9,10 +9,13 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#include <plat/omap_hwmod.h>
+
 #include <plat/serial.h>
 #include <plat-omap/dma-omap.h>
+
 #include "../plat-omap/common.h"
+
+#include "omap_hwmod.h"
 #include "hdq1w.h"
 
 #include "omap_hwmod_common_data.h"
index 1a1287d62648df38ebe2f20474d91afa4c1ddf92..dd3809c8f4091ed48fae1884d48b759d4ea528e2 100644 (file)
@@ -13,8 +13,9 @@
  */
 #include <asm/sizes.h>
 
-#include <plat/omap_hwmod.h>
 #include <plat/serial.h>
+
+#include "omap_hwmod.h"
 #include "l3_2xxx.h"
 #include "l4_2xxx.h"
 
index b9024868774cdff19c651c0f7ba608c7712bf8f2..27bdff46fda047752738ccda30c63c3d74a0021f 100644 (file)
@@ -8,13 +8,14 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#include <plat/omap_hwmod.h>
+
 #include <plat/serial.h>
 #include <linux/platform_data/gpio-omap.h>
 #include <plat-omap/dma-omap.h>
 #include <plat/dmtimer.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
 
+#include "omap_hwmod.h"
 #include "omap_hwmod_common_data.h"
 #include "cm-regbits-24xx.h"
 #include "prm-regbits-24xx.h"
index cb7c393c08de5dfe847a80d51605c4bbcfef2293..60ed43531079c6b288239de2593b0bfe8b48e424 100644 (file)
@@ -16,7 +16,7 @@
 
 #include <linux/i2c-omap.h>
 
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 #include <plat/cpu.h>
 #include <linux/platform_data/gpio-omap.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
index 14451217dac2e1b14ef02b035ecb3d4b374c9e20..d5d52a7762784f1c4fe8c1ae91e98ea416b9608b 100644 (file)
@@ -19,9 +19,9 @@
 #include <linux/power/smartreflex.h>
 #include <linux/platform_data/gpio-omap.h>
 
-#include <plat/omap_hwmod.h>
 #include <plat-omap/dma-omap.h>
 #include <plat/serial.h>
+
 #include "l3_3xxx.h"
 #include "l4_3xxx.h"
 #include <linux/platform_data/asoc-ti-mcbsp.h>
@@ -32,6 +32,7 @@
 #include "am35xx.h"
 
 #include "soc.h"
+#include "omap_hwmod.h"
 #include "omap_hwmod_common_data.h"
 #include "prm-regbits-34xx.h"
 #include "cm-regbits-34xx.h"
index 0cee55135e29e507cbfb34347e5467739768f27e..5b9be734709c25be723adbc3ed202f78c443f613 100644 (file)
@@ -23,8 +23,8 @@
 #include <linux/power/smartreflex.h>
 #include <linux/i2c-omap.h>
 
-#include <plat/omap_hwmod.h>
 #include <plat-omap/dma-omap.h>
+
 #include <linux/platform_data/spi-omap2-mcspi.h>
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 #include <plat/dmtimer.h>
@@ -32,6 +32,7 @@
 
 #include "../plat-omap/common.h"
 
+#include "omap_hwmod.h"
 #include "omap_hwmod_common_data.h"
 #include "cm1_44xx.h"
 #include "cm2_44xx.h"
index 9f1ccdc8cc8cc0e137cc8b694a650f623c194646..79d623b83e496d5d79d6901a61c36754a9635b77 100644 (file)
@@ -16,7 +16,7 @@
  * data and their integration with other OMAP modules and Linux.
  */
 
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 
 #include "omap_hwmod_common_data.h"
 
index 2bc8f1705d4aa7ce18d779c27089116990979d14..cfcce299177c537750d7143919e294ff6aec2532 100644 (file)
@@ -13,7 +13,7 @@
 #ifndef __ARCH_ARM_MACH_OMAP2_OMAP_HWMOD_COMMON_DATA_H
 #define __ARCH_ARM_MACH_OMAP2_OMAP_HWMOD_COMMON_DATA_H
 
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 
 #include "common.h"
 #include "display.h"
index c784c12f98a1445e3ea9ef97e77f2fea904aa05a..7e437bf6024ca2ef694913c3a3eac9dac1f16e87 100644 (file)
@@ -19,7 +19,7 @@
 #ifndef __ARCH_ARM_MACH_OMAP2_OMAP_OPP_DATA_H
 #define __ARCH_ARM_MACH_OMAP2_OMAP_OPP_DATA_H
 
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 
 #include "voltage.h"
 
index 4b3230fe228a4e20da62b48af6d471878806709f..98c5969acf6d02be514ab2fd070576fb55f0ac65 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <asm/pmu.h>
 
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 #include "omap_device.h"
 
 static char *omap2_pmu_oh_names[] = {"mpu"};
index 5df6dd96fd5c7584178750a01366351e27673b8e..a4fb791be2da649591dc3c61ed3c26f45b3af079 100644 (file)
 #include <linux/console.h>
 
 #include <plat/omap-serial.h>
-#include "common.h"
 #include <plat-omap/dma-omap.h>
-#include <plat/omap_hwmod.h>
-#include "omap_device.h"
 #include <plat/omap-pm.h>
 #include <plat/serial.h>
 
+#include "common.h"
+#include "omap_hwmod.h"
+#include "omap_device.h"
 #include "prm2xxx_3xxx.h"
 #include "pm.h"
 #include "cm2xxx_3xxx.h"
index a2ea2f30f7c9359b37e67afbd66678255557ea18..b11df8230145a96ca3856232448f18be04246759 100644 (file)
@@ -43,7 +43,7 @@
 #include <asm/sched_clock.h>
 
 #include <asm/arch_timer.h>
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 #include "omap_device.h"
 #include <plat/dmtimer.h>
 #include <plat/omap-pm.h>
index b2f1c67043a2b61b3b391ddedf6b6b6da75e8177..f6b6c37ac3f45fe5de8b3131315f6189397f4a43 100644 (file)
@@ -11,7 +11,7 @@
 #include <linux/io.h>
 #include <linux/err.h>
 
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 
 #include "wd_timer.h"
 #include "common.h"
index f6bbba73b535873aafd10168a7d6ebaf725cacfa..a78f81034a9fd44ad201f7e5806372a57e618c18 100644 (file)
@@ -10,7 +10,7 @@
 #ifndef __ARCH_ARM_MACH_OMAP2_WD_TIMER_H
 #define __ARCH_ARM_MACH_OMAP2_WD_TIMER_H
 
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 
 extern int omap2_wd_timer_disable(struct omap_hwmod *oh);
 extern int omap2_wd_timer_reset(struct omap_hwmod *oh);