From 0f974aa163bbd5ff9ff9de0fdb139db49ab9c016 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Thu, 13 Mar 2008 11:21:55 +0200 Subject: [PATCH] ARM: OMAP: Move STI support to drivers/misc This is to allow syncing plat-omap with mainline kernel. Signed-off-by: Tony Lindgren --- arch/arm/plat-omap/Kconfig | 11 ----------- arch/arm/plat-omap/Makefile | 3 --- drivers/misc/Kconfig | 11 +++++++++++ drivers/misc/Makefile | 1 + {arch/arm/plat-omap => drivers/misc}/sti/Makefile | 0 .../arm/plat-omap => drivers/misc}/sti/sti-console.c | 0 {arch/arm/plat-omap => drivers/misc}/sti/sti-fifo.c | 0 .../arm/plat-omap => drivers/misc}/sti/sti-netlink.c | 0 {arch/arm/plat-omap => drivers/misc}/sti/sti.c | 0 9 files changed, 12 insertions(+), 14 deletions(-) rename {arch/arm/plat-omap => drivers/misc}/sti/Makefile (100%) rename {arch/arm/plat-omap => drivers/misc}/sti/sti-console.c (100%) rename {arch/arm/plat-omap => drivers/misc}/sti/sti-fifo.c (100%) rename {arch/arm/plat-omap => drivers/misc}/sti/sti-netlink.c (100%) rename {arch/arm/plat-omap => drivers/misc}/sti/sti.c (100%) diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig index 3cb9545dc78..50291ed64c8 100644 --- 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 c1ada8f1ecd..a3f1f5cbf3d 100644 --- 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 982e27b86d1..84385bcd6b9 100644 --- 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 3b12f5da856..d65b43d873a 100644 --- 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 -- 2.41.0