ARM: OMAP: Move STI support to drivers/misc

This is to allow syncing plat-omap with mainline kernel.

Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index 3cb9545dc7854f16bfd8e3f1e32d093edabaaed0..50291ed64c873e0d105a16c9096f9a6061703e1c 100644 (file)
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -113,17 +113,6 @@ config OMAP_MUX_WARNINGS
          to change the pin multiplexing setup.  When there are no warnings
          printed, it's safe to deselect OMAP_MUX for your product.
 
-config OMAP_STI
-       bool "STI/XTI support"
-       depends on ARCH_OMAP16XX || ARCH_OMAP24XX
-       default n
-
-config OMAP_STI_CONSOLE
-       bool "STI console support"
-       depends on OMAP_STI
-       help
-         This enables a console driver by way of STI/XTI.
-
 config OMAP_MCBSP
        bool "McBSP support"
        depends on ARCH_OMAP

diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
index c1ada8f1ecd482f5840a44c88c5fb0722e011324..a3f1f5cbf3d0ae364ccc3fe4da22fe994e5c57db 100644 (file)
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@ -14,9 +14,6 @@ obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o
 
 obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
 
-# STI support
-obj-$(CONFIG_OMAP_STI) += sti/
-
 obj-$(CONFIG_CPU_FREQ) += cpu-omap.o
 obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o
 obj-$(CONFIG_OMAP_BOOT_REASON) += bootreason.o

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 982e27b86d101a15ebb2f579652a67d4ae08f806..84385bcd6b943e4a2a7f60397961abc57f0ac9ad 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -317,6 +317,17 @@ config INTEL_MENLOW
 
          If unsure, say N.
 
+config OMAP_STI
+       bool "STI/XTI support"
+       depends on ARCH_OMAP16XX || ARCH_OMAP24XX
+       default n
+
+config OMAP_STI_CONSOLE
+       bool "STI console support"
+       depends on OMAP_STI
+       help
+         This enables a console driver by way of STI/XTI.
+
 config ENCLOSURE_SERVICES
        tristate "Enclosure Services"
        default n

diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 3b12f5da8562d1ca47cc84a20a38a6f7f4dddd4d..d65b43d873af8711af01ed0afb4fd5da2be80c83 100644 (file)
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -5,6 +5,7 @@ obj- := misc.o  # Dummy rule to force built-in.o to be made
 
 obj-$(CONFIG_IBM_ASM)          += ibmasm/
 obj-$(CONFIG_HDPU_FEATURES)    += hdpuftrs/
+obj-$(CONFIG_OMAP_STI)         += sti/
 obj-$(CONFIG_MSI_LAPTOP)     += msi-laptop.o
 obj-$(CONFIG_ACER_WMI)     += acer-wmi.o
 obj-$(CONFIG_ASUS_LAPTOP)     += asus-laptop.o

diff --git a/arch/arm/plat-omap/sti/Makefile b/drivers/misc/sti/Makefile
similarity index 100%
rename from arch/arm/plat-omap/sti/Makefile
rename to drivers/misc/sti/Makefile

diff --git a/arch/arm/plat-omap/sti/sti-console.c b/drivers/misc/sti/sti-console.c
similarity index 100%
rename from arch/arm/plat-omap/sti/sti-console.c
rename to drivers/misc/sti/sti-console.c

diff --git a/arch/arm/plat-omap/sti/sti-fifo.c b/drivers/misc/sti/sti-fifo.c
similarity index 100%
rename from arch/arm/plat-omap/sti/sti-fifo.c
rename to drivers/misc/sti/sti-fifo.c

diff --git a/arch/arm/plat-omap/sti/sti-netlink.c b/drivers/misc/sti/sti-netlink.c
similarity index 100%
rename from arch/arm/plat-omap/sti/sti-netlink.c
rename to drivers/misc/sti/sti-netlink.c

diff --git a/arch/arm/plat-omap/sti/sti.c b/drivers/misc/sti/sti.c
similarity index 100%
rename from arch/arm/plat-omap/sti/sti.c
rename to drivers/misc/sti/sti.c