]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ARM: OMAP2+ Move SoC specific headers to be local to mach-omap2
authorTony Lindgren <tony@atomide.com>
Fri, 31 Aug 2012 23:08:07 +0000 (16:08 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 13 Sep 2012 01:06:31 +0000 (18:06 -0700)
These can now be moved to be local headers in mach-omap2.

Note that this patch removes arch/arm/plat-omap/devices.c as it
will get removed anyways with Paul Walmsley's patch
"ARM: OMAP: split OMAP1, OMAP2+ RNG device registration".

Signed-off-by: Tony Lindgren <tony@atomide.com>
15 files changed:
arch/arm/mach-omap2/am33xx.h [moved from arch/arm/plat-omap/include/plat/am33xx.h with 100% similarity]
arch/arm/mach-omap2/clock33xx_data.c
arch/arm/mach-omap2/control.h
arch/arm/mach-omap2/omap-mpuss-lowpower.c
arch/arm/mach-omap2/omap24xx.h [moved from arch/arm/plat-omap/include/plat/omap24xx.h with 98% similarity]
arch/arm/mach-omap2/omap34xx.h [moved from arch/arm/plat-omap/include/plat/omap34xx.h with 98% similarity]
arch/arm/mach-omap2/omap44xx.h [moved from arch/arm/plat-omap/include/plat/omap44xx.h with 100% similarity]
arch/arm/mach-omap2/omap54xx.h [moved from arch/arm/plat-omap/include/plat/omap54xx.h with 100% similarity]
arch/arm/mach-omap2/sleep24xx.S
arch/arm/mach-omap2/sleep34xx.S
arch/arm/mach-omap2/sleep44xx.S
arch/arm/mach-omap2/soc.h
arch/arm/mach-omap2/ti81xx.h [moved from arch/arm/plat-omap/include/plat/ti81xx.h with 100% similarity]
arch/arm/plat-omap/Makefile
arch/arm/plat-omap/devices.c [deleted file]

index 25bbcc7ca4dce9794676001167a23f36474fbd86..7aa5ecaee5a240bac91797b8b2064605fb5edf24 100644 (file)
@@ -18,8 +18,8 @@
 #include <linux/list.h>
 #include <linux/clk.h>
 #include <plat/clkdev_omap.h>
-#include <plat/am33xx.h>
 
+#include "am33xx.h"
 #include "iomap.h"
 #include "control.h"
 #include "clock.h"
index b8cdc8531b607dabd6a755b7ed21fba201f248bc..c1a5cab0f23636454336bc8bd8db64a73ff57b49 100644 (file)
@@ -21,7 +21,7 @@
 #include <mach/ctrl_module_pad_core_44xx.h>
 #include <mach/ctrl_module_pad_wkup_44xx.h>
 
-#include <plat/am33xx.h>
+#include "am33xx.h"
 
 #ifndef __ASSEMBLY__
 #define OMAP242X_CTRL_REGADDR(reg)                                     \
index 637a1bdf2ac45d63a63c7d8419b5b2179d2a2022..ff4e6a0e9c7c7ef367ddffe6d92735a7e7e3389c 100644 (file)
@@ -50,9 +50,8 @@
 #include <asm/suspend.h>
 #include <asm/hardware/cache-l2x0.h>
 
-#include <plat/omap44xx.h>
-
 #include "common.h"
+#include "omap44xx.h"
 #include "omap4-sar-layout.h"
 #include "pm.h"
 #include "prcm_mpu44xx.h"
similarity index 98%
rename from arch/arm/plat-omap/include/plat/omap24xx.h
rename to arch/arm/mach-omap2/omap24xx.h
index 92df9e27cc5cc1b690836cd3a825bf9c4adf9cbe..641a2c8d2eeedccc104ed8d5bc61e05b4e8bdc61 100644 (file)
@@ -1,6 +1,4 @@
 /*
- * arch/arm/plat-omap/include/mach/omap24xx.h
- *
  * This file contains the processor specific definitions
  * of the TI OMAP24XX.
  *
similarity index 98%
rename from arch/arm/plat-omap/include/plat/omap34xx.h
rename to arch/arm/mach-omap2/omap34xx.h
index 0d818acf39178f1053f13263b87dc550af0710de..c0d1b4b1653f0d150cb7b9b3a64a9791af04c825 100644 (file)
@@ -1,6 +1,4 @@
 /*
- * arch/arm/plat-omap/include/mach/omap34xx.h
- *
  * This file contains the processor specific definitions of the TI OMAP34XX.
  *
  * Copyright (C) 2007 Texas Instruments.
index d4bf904d84abbfb2bead1f2188da266f9a00e592..ce0ccd26efbd4dfa992e507fda3385a35ea6503c 100644 (file)
@@ -28,8 +28,7 @@
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 
-#include <plat/omap24xx.h>
-
+#include "omap24xx.h"
 #include "sdrc.h"
 
 /* First address of reserved address space?  apparently valid for OMAP2 & 3 */
index 3fbe496f391b31773cac8f1173a5666644877dd6..506987979c1cd4e882f846968e550aa1b5ecfcc2 100644 (file)
@@ -26,9 +26,9 @@
 
 #include <asm/assembler.h>
 
-#include <plat/omap34xx.h>
 #include <plat/sram.h>
 
+#include "omap34xx.h"
 #include "iomap.h"
 #include "cm2xxx_3xxx.h"
 #include "prm2xxx_3xxx.h"
index 91e71d8f46f0aa731c9678e88423490aa1192cf9..b7d8ead4b86ad4cf7e970ac40b9ad706c2aca31b 100644 (file)
 #include <asm/memory.h>
 #include <asm/hardware/cache-l2x0.h>
 
-#include <plat/omap44xx.h>
 #include <mach/omap-secure.h>
 
 #include "common.h"
+#include "omap44xx.h"
 #include "omap4-sar-layout.h"
 
 #if defined(CONFIG_SMP) && defined(CONFIG_PM)
index 93c08de5bb0684929da6601049e91d370036e690..fc9b96daf851cc84810399fc87626322e156db8e 100644 (file)
@@ -1,7 +1,7 @@
 #include <plat/cpu.h>
-#include <plat/omap24xx.h>
-#include <plat/omap34xx.h>
-#include <plat/omap44xx.h>
-#include <plat/ti81xx.h>
-#include <plat/am33xx.h>
-#include <plat/omap54xx.h>
+#include "omap24xx.h"
+#include "omap34xx.h"
+#include "omap44xx.h"
+#include "ti81xx.h"
+#include "am33xx.h"
+#include "omap54xx.h"
index 961bf859bc0cd7f90040c33de25fc9573056730c..a017e994e00613f4d98bc153516f7f7c8e74bd2d 100644 (file)
@@ -3,8 +3,7 @@
 #
 
 # Common support
-obj-y := common.o sram.o clock.o devices.o dma.o mux.o \
-        fb.o counter_32k.o
+obj-y := common.o sram.o clock.o dma.o mux.o fb.o counter_32k.o
 obj-m :=
 obj-n :=
 obj-  :=
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
deleted file mode 100644 (file)
index 287ac37..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * linux/arch/arm/plat-omap/devices.c
- *
- * Common platform device setup/initialization for OMAP1 and OMAP2
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-#include <linux/gpio.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/io.h>
-#include <linux/slab.h>
-#include <linux/memblock.h>
-
-#include <mach/hardware.h>
-#include <asm/mach-types.h>
-#include <asm/mach/map.h>
-#include <asm/memblock.h>
-
-#include <plat/tc.h>
-#include <plat/mmc.h>
-#include <plat/menelaus.h>
-#include <plat/omap44xx.h>
-
-/*-------------------------------------------------------------------------*/
-
-#if defined(CONFIG_HW_RANDOM_OMAP) || defined(CONFIG_HW_RANDOM_OMAP_MODULE)
-
-#ifdef CONFIG_ARCH_OMAP2
-#define        OMAP_RNG_BASE           0x480A0000
-#else
-#define        OMAP_RNG_BASE           0xfffe5000
-#endif
-
-static struct resource rng_resources[] = {
-       {
-               .start          = OMAP_RNG_BASE,
-               .end            = OMAP_RNG_BASE + 0x4f,
-               .flags          = IORESOURCE_MEM,
-       },
-};
-
-static struct platform_device omap_rng_device = {
-       .name           = "omap_rng",
-       .id             = -1,
-       .num_resources  = ARRAY_SIZE(rng_resources),
-       .resource       = rng_resources,
-};
-
-static void omap_init_rng(void)
-{
-       (void) platform_device_register(&omap_rng_device);
-}
-#else
-static inline void omap_init_rng(void) {}
-#endif
-
-/*
- * This gets called after board-specific INIT_MACHINE, and initializes most
- * on-chip peripherals accessible on this board (except for few like USB):
- *
- *  (a) Does any "standard config" pin muxing needed.  Board-specific
- *     code will have muxed GPIO pins and done "nonstandard" setup;
- *     that code could live in the boot loader.
- *  (b) Populating board-specific platform_data with the data drivers
- *     rely on to handle wiring variations.
- *  (c) Creating platform devices as meaningful on this board and
- *     with this kernel configuration.
- *
- * Claiming GPIOs, and setting their direction and initial values, is the
- * responsibility of the device drivers.  So is responding to probe().
- *
- * Board-specific knowledge like creating devices or pin setup is to be
- * kept out of drivers as much as possible.  In particular, pin setup
- * may be handled by the boot loader, and drivers should expect it will
- * normally have been done by the time they're probed.
- */
-static int __init omap_init_devices(void)
-{
-       /* please keep these calls, and their implementations above,
-        * in alphabetical order so they're easier to sort through.
-        */
-       omap_init_rng();
-       return 0;
-}
-arch_initcall(omap_init_devices);