From de8adbcf35fd42e41fa662f7b7fe052f7a2d9ee3 Mon Sep 17 00:00:00 2001 From: "sungmin82.ha" Date: Fri, 17 Feb 2012 14:40:34 +0900 Subject: [PATCH] [Title]modified for change directory and name of drivers to maru [Type]Enhancement [Module]emulator-kernel drivers(jack,power_supply,usb_mass_storage,usb_mode) [Priority]Major [Jira#] // Jira Issue Number [Redmine#] // Redmine Isuue Number [Problem] // Problem Description [Cause] // Cause Description [Solution] // Solution Description [TestCase] // Executed the test-target (How to) Change-Id: I66c13bb99de06f71d10590324d4ade5302dca8ed --- arch/x86/configs/i386_emul_defconfig | 5 ++++- drivers/Makefile | 4 ---- drivers/jack/Kconfig | 13 ------------- drivers/jack/Makefile | 1 - drivers/maru/Kconfig | 15 +++++++++++++++ drivers/maru/Makefile | 4 ++++ drivers/{jack/mod_jack.c => maru/maru_jack.c} | 0 .../maru_power_supply.c} | 0 .../maru_usb_mass_storage.c} | 0 .../mod_usb_mode.c => maru/maru_usb_mode.c} | 0 drivers/power_supply/Kconfig | 14 -------------- drivers/power_supply/Makefile | 1 - drivers/usb_mass_storage/Kconfig | 13 ------------- drivers/usb_mass_storage/Makefile | 1 - drivers/usb_mode/Kconfig | 13 ------------- drivers/usb_mode/Makefile | 1 - 16 files changed, 23 insertions(+), 62 deletions(-) delete mode 100644 drivers/jack/Kconfig delete mode 100644 drivers/jack/Makefile rename drivers/{jack/mod_jack.c => maru/maru_jack.c} (100%) rename drivers/{power_supply/mod_power_supply.c => maru/maru_power_supply.c} (100%) rename drivers/{usb_mass_storage/mod_usb_mass_storage.c => maru/maru_usb_mass_storage.c} (100%) rename drivers/{usb_mode/mod_usb_mode.c => maru/maru_usb_mode.c} (100%) delete mode 100644 drivers/power_supply/Kconfig delete mode 100644 drivers/power_supply/Makefile delete mode 100644 drivers/usb_mass_storage/Kconfig delete mode 100644 drivers/usb_mass_storage/Makefile delete mode 100644 drivers/usb_mode/Kconfig delete mode 100644 drivers/usb_mode/Makefile diff --git a/arch/x86/configs/i386_emul_defconfig b/arch/x86/configs/i386_emul_defconfig index abe4c093b148..aaf2385743a0 100644 --- a/arch/x86/configs/i386_emul_defconfig +++ b/arch/x86/configs/i386_emul_defconfig @@ -1354,7 +1354,6 @@ CONFIG_I2C_I801=y CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y # CONFIG_GPIOLIB is not set # CONFIG_W1 is not set -CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set # CONFIG_PDA_POWER is not set # CONFIG_BATTERY_DS2760 is not set @@ -2170,6 +2169,10 @@ CONFIG_MARU_TOUCHSCREEN=y CONFIG_MARU_FB=y CONFIG_MARU_CAMERA=y CONFIG_MARU_BACKLIGHT=y +CONFIG_MARU_JACK=y +CONFIG_MARU_POWER_SUPPLY=y +CONFIG_MARU_USB_MASS_STORAGE=y +CONFIG_MARU_USB_MODE=y CONFIG_X86_PLATFORM_DEVICES=y # CONFIG_ACER_WMI is not set # CONFIG_ASUS_LAPTOP is not set diff --git a/drivers/Makefile b/drivers/Makefile index ace2231bfd34..1d672be39c88 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -75,7 +75,6 @@ obj-$(CONFIG_RTC_LIB) += rtc/ obj-y += i2c/ media/ obj-$(CONFIG_PPS) += pps/ obj-$(CONFIG_W1) += w1/ -obj-$(CONFIG_POWER_SUPPLY) += power_supply/ obj-$(CONFIG_HWMON) += hwmon/ obj-$(CONFIG_THERMAL) += thermal/ obj-$(CONFIG_WATCHDOG) += watchdog/ @@ -111,8 +110,5 @@ obj-$(CONFIG_VLYNQ) += vlynq/ obj-$(CONFIG_STAGING) += staging/ obj-y += platform/ obj-y += ieee802154/ -obj-y += jack/ -obj-y += usb_mode/ -obj-y += usb_mass_storage/ obj-$(CONFIG_MARU) += maru/ diff --git a/drivers/jack/Kconfig b/drivers/jack/Kconfig deleted file mode 100644 index a3c5b97e4778..000000000000 --- a/drivers/jack/Kconfig +++ /dev/null @@ -1,13 +0,0 @@ -# -# Character device configuration -# - -menu "Character devices" - -source "drivers/jack/Kconfig" - -config JACK - "jack" - - -endmenu diff --git a/drivers/jack/Makefile b/drivers/jack/Makefile deleted file mode 100644 index 27636fa6ebb5..000000000000 --- a/drivers/jack/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-y += mod_jack.o diff --git a/drivers/maru/Kconfig b/drivers/maru/Kconfig index 1743c1d3cf5e..e92ae35e40a4 100644 --- a/drivers/maru/Kconfig +++ b/drivers/maru/Kconfig @@ -31,3 +31,18 @@ config MARU_BACKLIGHT help Say Y to enable the backlight driver of MARU. +config MARU_JACK + tristate "MARU Jack Driver" + depends on MARU != n + +config MARU_POWER_SUPPLY + tristate "MARU Power supply Driver" + depends on MARU != n + +config MARU_USB_MASS_STORAGE + tristate "MARU Usb mass storage Driver" + depends on MARU != n + +config MARU_USB_MODE + tristate "MARU Usb mode Driver" + depends on MARU != n diff --git a/drivers/maru/Makefile b/drivers/maru/Makefile index 531bfb306e3b..491e496edbf5 100644 --- a/drivers/maru/Makefile +++ b/drivers/maru/Makefile @@ -4,3 +4,7 @@ obj-$(CONFIG_MARU_TOUCHSCREEN) += maru_touchscreen.o obj-$(CONFIG_MARU_FB) += maru_fb.o obj-$(CONFIG_MARU_CAMERA) += maru_camera.o obj-$(CONFIG_MARU_CAMERA) += maru_bl.o +obj-$(CONFIG_MARU_JACK) += maru_jack.o +obj-$(CONFIG_MARU_POWER_SUPPLY) += maru_power_supply.o +obj-$(CONFIG_MARU_USB_MASS_STORAGE) += maru_usb_mass_storage.o +obj-$(CONFIG_MARU_USB_MODE) += maru_usb_mode.o diff --git a/drivers/jack/mod_jack.c b/drivers/maru/maru_jack.c similarity index 100% rename from drivers/jack/mod_jack.c rename to drivers/maru/maru_jack.c diff --git a/drivers/power_supply/mod_power_supply.c b/drivers/maru/maru_power_supply.c similarity index 100% rename from drivers/power_supply/mod_power_supply.c rename to drivers/maru/maru_power_supply.c diff --git a/drivers/usb_mass_storage/mod_usb_mass_storage.c b/drivers/maru/maru_usb_mass_storage.c similarity index 100% rename from drivers/usb_mass_storage/mod_usb_mass_storage.c rename to drivers/maru/maru_usb_mass_storage.c diff --git a/drivers/usb_mode/mod_usb_mode.c b/drivers/maru/maru_usb_mode.c similarity index 100% rename from drivers/usb_mode/mod_usb_mode.c rename to drivers/maru/maru_usb_mode.c diff --git a/drivers/power_supply/Kconfig b/drivers/power_supply/Kconfig deleted file mode 100644 index 6e49e2ad166d..000000000000 --- a/drivers/power_supply/Kconfig +++ /dev/null @@ -1,14 +0,0 @@ -# -# Character device configuration -# - -menu "Character devices" - -source "drivers/power_supply/Kconfig" - -config POWER_SUPPLY - "power supply" - - -endmenu - diff --git a/drivers/power_supply/Makefile b/drivers/power_supply/Makefile deleted file mode 100644 index e8ed86613908..000000000000 --- a/drivers/power_supply/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_POWER_SUPPLY) += mod_power_supply.o diff --git a/drivers/usb_mass_storage/Kconfig b/drivers/usb_mass_storage/Kconfig deleted file mode 100644 index a9e26ad21d89..000000000000 --- a/drivers/usb_mass_storage/Kconfig +++ /dev/null @@ -1,13 +0,0 @@ -# -# Character device configuration -# - -menu "Character devices" - -source "drivers/usb_mass_storage/Kconfig" - -config USB_MASS_STORAGE - "usb mass storage" - - -endmenu diff --git a/drivers/usb_mass_storage/Makefile b/drivers/usb_mass_storage/Makefile deleted file mode 100644 index 026cbbd4a1c5..000000000000 --- a/drivers/usb_mass_storage/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-y += mod_usb_mass_storage.o diff --git a/drivers/usb_mode/Kconfig b/drivers/usb_mode/Kconfig deleted file mode 100644 index 20670ebd80dd..000000000000 --- a/drivers/usb_mode/Kconfig +++ /dev/null @@ -1,13 +0,0 @@ -# -# Character device configuration -# - -menu "Character devices" - -source "drivers/usb_mode/Kconfig" - -config USB_MODE - "usb_mode" - - -endmenu diff --git a/drivers/usb_mode/Makefile b/drivers/usb_mode/Makefile deleted file mode 100644 index e2917a4dfdbf..000000000000 --- a/drivers/usb_mode/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-y += mod_usb_mode.o -- 2.34.1