From d7d4f7f0ea0f8edf7923f632c6f4b7300412f6d0 Mon Sep 17 00:00:00 2001 From: SeokYeon Hwang Date: Thu, 7 Jul 2016 17:29:42 +0900 Subject: [PATCH] TV: realign configs and directories Change-Id: I20a5ced7df9b4dd6e0a50ff3c92b80810adfd56c Signed-off-by: SeokYeon Hwang --- arch/x86/configs/tizen_emul_defconfig | 135 ++++++++++++++---- drivers/maru/Kconfig | 53 ++++--- drivers/maru/Makefile | 3 +- drivers/maru/tv/Makefile | 8 ++ drivers/maru/{tztv-dummy => tv}/maru_dummy.c | 0 drivers/maru/{tztv-dummy => tv}/maru_dummy.h | 0 .../maru/{tztv-dummy => tv}/maru_dummy_gpio.c | 4 +- .../{tztv-dummy => tv}/maru_dummy_i2c_sdp.c | 0 .../{tztv-dummy => tv}/maru_dummy_micom_isp.c | 4 +- .../{tztv-dummy => tv}/maru_dummy_micom_msg.c | 4 +- .../{tztv-dummy => tv}/maru_dummy_sdp_mem.c | 0 .../{tztv-dummy => tv}/maru_dummy_security.c | 0 drivers/maru/{ => tv}/maru_eeprom.c | 0 drivers/maru/{ => tv}/maru_eeprom.h | 0 drivers/maru/tztv-dummy/Makefile | 7 - 15 files changed, 154 insertions(+), 64 deletions(-) create mode 100644 drivers/maru/tv/Makefile rename drivers/maru/{tztv-dummy => tv}/maru_dummy.c (100%) rename drivers/maru/{tztv-dummy => tv}/maru_dummy.h (100%) rename drivers/maru/{tztv-dummy => tv}/maru_dummy_gpio.c (98%) rename drivers/maru/{tztv-dummy => tv}/maru_dummy_i2c_sdp.c (100%) rename drivers/maru/{tztv-dummy => tv}/maru_dummy_micom_isp.c (99%) rename drivers/maru/{tztv-dummy => tv}/maru_dummy_micom_msg.c (99%) rename drivers/maru/{tztv-dummy => tv}/maru_dummy_sdp_mem.c (100%) rename drivers/maru/{tztv-dummy => tv}/maru_dummy_security.c (100%) rename drivers/maru/{ => tv}/maru_eeprom.c (100%) rename drivers/maru/{ => tv}/maru_eeprom.h (100%) delete mode 100644 drivers/maru/tztv-dummy/Makefile diff --git a/arch/x86/configs/tizen_emul_defconfig b/arch/x86/configs/tizen_emul_defconfig index d8f377251477..b11f5c7d8b94 100644 --- a/arch/x86/configs/tizen_emul_defconfig +++ b/arch/x86/configs/tizen_emul_defconfig @@ -1166,6 +1166,7 @@ CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 CONFIG_RFKILL=y CONFIG_RFKILL_LEDS=y CONFIG_RFKILL_INPUT=y +# CONFIG_RFKILL_GPIO is not set CONFIG_NET_9P=y CONFIG_NET_9P_VIRTIO=y # CONFIG_NET_9P_DEBUG is not set @@ -1282,6 +1283,7 @@ CONFIG_VIRTIO_BLK=y # # Texas Instruments shared transport line discipline # +# CONFIG_TI_ST is not set # CONFIG_SENSORS_LIS3_I2C is not set # @@ -1805,8 +1807,11 @@ CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_QT1070 is not set # CONFIG_KEYBOARD_QT2160 is not set # CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_GPIO is not set +# CONFIG_KEYBOARD_GPIO_POLLED is not set # CONFIG_KEYBOARD_TCA6416 is not set # CONFIG_KEYBOARD_TCA8418 is not set +# CONFIG_KEYBOARD_MATRIX is not set # CONFIG_KEYBOARD_LM8323 is not set # CONFIG_KEYBOARD_LM8333 is not set # CONFIG_KEYBOARD_MAX7359 is not set @@ -1835,6 +1840,7 @@ CONFIG_MOUSE_PS2_FOCALTECH=y # CONFIG_MOUSE_CYAPA is not set # CONFIG_MOUSE_ELAN_I2C is not set # CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_MOUSE_GPIO is not set # CONFIG_MOUSE_SYNAPTICS_I2C is not set # CONFIG_MOUSE_SYNAPTICS_USB is not set CONFIG_INPUT_JOYSTICK=y @@ -1871,12 +1877,15 @@ CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_PROPERTIES=y # CONFIG_TOUCHSCREEN_AD7879 is not set # CONFIG_TOUCHSCREEN_ATMEL_MXT is not set +# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set # CONFIG_TOUCHSCREEN_BU21013 is not set +# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set # CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set # CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set # CONFIG_TOUCHSCREEN_DYNAPRO is not set # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_EETI is not set +# CONFIG_TOUCHSCREEN_FT6236 is not set # CONFIG_TOUCHSCREEN_FUJITSU is not set # CONFIG_TOUCHSCREEN_GOODIX is not set # CONFIG_TOUCHSCREEN_ILI210X is not set @@ -1906,6 +1915,7 @@ CONFIG_TOUCHSCREEN_PROPERTIES=y # CONFIG_TOUCHSCREEN_ST1232 is not set # CONFIG_TOUCHSCREEN_SX8654 is not set # CONFIG_TOUCHSCREEN_TPS6507X is not set +# CONFIG_TOUCHSCREEN_ZFORCE is not set # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set CONFIG_INPUT_MISC=y # CONFIG_INPUT_AD714X is not set @@ -1915,6 +1925,9 @@ CONFIG_INPUT_MISC=y # CONFIG_INPUT_MMA8450 is not set # CONFIG_INPUT_MPU3050 is not set # CONFIG_INPUT_APANEL is not set +# CONFIG_INPUT_GP2A is not set +# CONFIG_INPUT_GPIO_BEEPER is not set +# CONFIG_INPUT_GPIO_TILT_POLLED is not set # CONFIG_INPUT_WISTRON_BTNS is not set # CONFIG_INPUT_ATLAS_BTNS is not set # CONFIG_INPUT_ATI_REMOTE2 is not set @@ -1925,10 +1938,12 @@ CONFIG_INPUT_MISC=y # CONFIG_INPUT_CM109 is not set CONFIG_INPUT_UINPUT=y # CONFIG_INPUT_PCF8574 is not set +# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set # CONFIG_INPUT_ADXL34X is not set # CONFIG_INPUT_IMS_PCU is not set # CONFIG_INPUT_CMA3000 is not set # CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set +# CONFIG_INPUT_DRV260X_HAPTICS is not set # CONFIG_INPUT_DRV2665_HAPTICS is not set # CONFIG_INPUT_DRV2667_HAPTICS is not set @@ -2066,7 +2081,9 @@ CONFIG_I2C_MUX=y # # Multiplexer I2C Chip support # +# CONFIG_I2C_MUX_GPIO is not set # CONFIG_I2C_MUX_PCA9541 is not set +# CONFIG_I2C_MUX_PCA954x is not set # CONFIG_I2C_MUX_REG is not set CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_ALGOBIT=y @@ -2102,8 +2119,10 @@ CONFIG_I2C_I801=y # # I2C system bus drivers (mostly embedded / system-on-chip) # +# CONFIG_I2C_CBUS_GPIO is not set # CONFIG_I2C_DESIGNWARE_PCI is not set # CONFIG_I2C_EG20T is not set +# CONFIG_I2C_GPIO is not set # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PCA_PLATFORM is not set # CONFIG_I2C_PXA_PCI is not set @@ -2159,25 +2178,66 @@ CONFIG_PTP_1588_CLOCK=y # # CONFIG_PTP_1588_CLOCK_PCH is not set CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y -# CONFIG_GPIOLIB is not set +CONFIG_GPIOLIB=y +CONFIG_GPIO_DEVRES=y +CONFIG_GPIO_ACPI=y +# CONFIG_DEBUG_GPIO is not set +# CONFIG_GPIO_SYSFS is not set + +# +# Memory mapped GPIO drivers +# +# CONFIG_GPIO_AMDPT is not set +# CONFIG_GPIO_DWAPB is not set +# CONFIG_GPIO_GENERIC_PLATFORM is not set +# CONFIG_GPIO_ICH is not set +# CONFIG_GPIO_LYNXPOINT is not set +# CONFIG_GPIO_VX855 is not set +# CONFIG_GPIO_ZX is not set + +# +# Port-mapped I/O GPIO drivers +# +# CONFIG_GPIO_104_IDIO_16 is not set +# CONFIG_GPIO_F7188X is not set +# CONFIG_GPIO_IT87 is not set +# CONFIG_GPIO_SCH is not set +# CONFIG_GPIO_SCH311X is not set + +# +# I2C GPIO expanders +# +# CONFIG_GPIO_ADP5588 is not set +# CONFIG_GPIO_MAX7300 is not set +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set +# CONFIG_GPIO_SX150X is not set + +# +# MFD GPIO expanders +# + +# +# PCI GPIO expanders +# +# CONFIG_GPIO_AMD8111 is not set +# CONFIG_GPIO_BT8XX is not set +# CONFIG_GPIO_INTEL_MID is not set +# CONFIG_GPIO_ML_IOH is not set +# CONFIG_GPIO_PCH is not set +# CONFIG_GPIO_RDC321X is not set + +# +# SPI or I2C GPIO expanders +# +# CONFIG_GPIO_MCP23S08 is not set + +# +# USB GPIO expanders +# # CONFIG_W1 is not set # CONFIG_POWER_SUPPLY is not set -# CONFIG_POWER_SUPPLY_DEBUG is not set -# CONFIG_PDA_POWER is not set -# CONFIG_TEST_POWER is not set -# CONFIG_BATTERY_DS2780 is not set -# CONFIG_BATTERY_DS2781 is not set -# CONFIG_BATTERY_DS2782 is not set -# CONFIG_BATTERY_SBS is not set -# CONFIG_BATTERY_BQ27XXX is not set -# CONFIG_BATTERY_MAX17040 is not set -# CONFIG_BATTERY_MAX17042 is not set -# CONFIG_CHARGER_MAX8903 is not set -# CONFIG_CHARGER_LP8727 is not set -# CONFIG_CHARGER_BQ2415X is not set -# CONFIG_CHARGER_SMB347 is not set -# CONFIG_BATTERY_GAUGE_LTC2941 is not set -# CONFIG_POWER_RESET is not set # CONFIG_POWER_AVS is not set CONFIG_HWMON=y # CONFIG_HWMON_VID is not set @@ -2220,6 +2280,7 @@ CONFIG_HWMON=y # CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_G760A is not set # CONFIG_SENSORS_G762 is not set +# CONFIG_SENSORS_GPIO_FAN is not set # CONFIG_SENSORS_HIH6130 is not set # CONFIG_SENSORS_I5500 is not set # CONFIG_SENSORS_CORETEMP is not set @@ -2269,6 +2330,7 @@ CONFIG_HWMON=y # CONFIG_SENSORS_NCT7904 is not set # CONFIG_SENSORS_PCF8591 is not set # CONFIG_PMBUS is not set +# CONFIG_SENSORS_SHT15 is not set # CONFIG_SENSORS_SHT21 is not set # CONFIG_SENSORS_SHTC1 is not set # CONFIG_SENSORS_SIS5595 is not set @@ -2377,6 +2439,7 @@ CONFIG_WATCHDOG=y # CONFIG_MACHZ_WDT is not set # CONFIG_SBC_EPX_C3_WATCHDOG is not set # CONFIG_BCM7038_WDT is not set +# CONFIG_MEN_A21_WDT is not set # # PCI-based Watchdog Cards @@ -2408,6 +2471,7 @@ CONFIG_BCMA_POSSIBLE=y # CONFIG_MFD_CS5535 is not set # CONFIG_MFD_AS3711 is not set # CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_AAT2870_CORE is not set # CONFIG_MFD_BCM590XX is not set # CONFIG_MFD_AXP20X is not set # CONFIG_MFD_CROS_EC is not set @@ -2420,8 +2484,10 @@ CONFIG_BCMA_POSSIBLE=y # CONFIG_MFD_DLN2 is not set # CONFIG_MFD_MC13XXX_I2C is not set # CONFIG_HTC_PASIC3 is not set +# CONFIG_HTC_I2CPLD is not set # CONFIG_LPC_ICH is not set # CONFIG_LPC_SCH is not set +# CONFIG_INTEL_SOC_PMIC is not set # CONFIG_MFD_INTEL_LPSS_ACPI is not set # CONFIG_MFD_INTEL_LPSS_PCI is not set # CONFIG_MFD_JANZ_CMODIO is not set @@ -2441,6 +2507,7 @@ CONFIG_BCMA_POSSIBLE=y # CONFIG_MFD_VIPERBOARD is not set # CONFIG_MFD_RETU is not set # CONFIG_MFD_PCF50633 is not set +# CONFIG_UCB1400_CORE is not set # CONFIG_MFD_RDC321X is not set # CONFIG_MFD_RTSX_PCI is not set # CONFIG_MFD_RT5033 is not set @@ -2459,16 +2526,21 @@ CONFIG_BCMA_POSSIBLE=y # CONFIG_MFD_LP8788 is not set # CONFIG_MFD_PALMAS is not set # CONFIG_TPS6105X is not set +# CONFIG_TPS65010 is not set # CONFIG_TPS6507X is not set # CONFIG_MFD_TPS65090 is not set # CONFIG_MFD_TPS65217 is not set # CONFIG_MFD_TPS65218 is not set # CONFIG_MFD_TPS6586X is not set +# CONFIG_MFD_TPS65910 is not set +# CONFIG_MFD_TPS65912 is not set +# CONFIG_MFD_TPS65912_I2C is not set # CONFIG_MFD_TPS80031 is not set # CONFIG_TWL4030_CORE is not set # CONFIG_TWL6040_CORE is not set # CONFIG_MFD_WL1273_CORE is not set # CONFIG_MFD_LM3533 is not set +# CONFIG_MFD_TIMBERDALE is not set # CONFIG_MFD_TMIO is not set # CONFIG_MFD_VX855 is not set # CONFIG_MFD_ARIZONA_I2C is not set @@ -2695,6 +2767,7 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_S3 is not set # CONFIG_FB_SAVAGE is not set # CONFIG_FB_SIS is not set +# CONFIG_FB_VIA is not set # CONFIG_FB_NEOMAGIC is not set # CONFIG_FB_KYRO is not set # CONFIG_FB_3DFX is not set @@ -2726,6 +2799,7 @@ CONFIG_BACKLIGHT_GENERIC=y # CONFIG_BACKLIGHT_ADP8860 is not set # CONFIG_BACKLIGHT_ADP8870 is not set # CONFIG_BACKLIGHT_LM3639 is not set +# CONFIG_BACKLIGHT_GPIO is not set # CONFIG_BACKLIGHT_LV5207LP is not set # CONFIG_BACKLIGHT_BD6107 is not set # CONFIG_VGASTATE is not set @@ -2925,6 +2999,7 @@ CONFIG_HID_GENERIC=y # CONFIG_HID_CHICONY is not set # CONFIG_HID_CORSAIR is not set # CONFIG_HID_PRODIKEYS is not set +# CONFIG_HID_CP2112 is not set # CONFIG_HID_CYPRESS is not set # CONFIG_HID_DRAGONRISE is not set # CONFIG_HID_EMS_FF is not set @@ -3113,6 +3188,7 @@ CONFIG_USB_STORAGE=y # # CONFIG_USB_PHY is not set # CONFIG_NOP_USB_XCEIV is not set +# CONFIG_USB_GPIO_VBUS is not set # CONFIG_USB_ISP1301 is not set # CONFIG_USB_GADGET is not set # CONFIG_USB_LED_TRIG is not set @@ -3129,6 +3205,7 @@ CONFIG_LEDS_CLASS=y # CONFIG_LEDS_LM3530 is not set # CONFIG_LEDS_LM3642 is not set # CONFIG_LEDS_PCA9532 is not set +# CONFIG_LEDS_GPIO is not set # CONFIG_LEDS_LP3944 is not set # CONFIG_LEDS_LP5521 is not set # CONFIG_LEDS_LP5523 is not set @@ -3140,6 +3217,7 @@ CONFIG_LEDS_CLASS=y # CONFIG_LEDS_PCA963X is not set # CONFIG_LEDS_BD2802 is not set # CONFIG_LEDS_INTEL_SS4200 is not set +# CONFIG_LEDS_LT3593 is not set # CONFIG_LEDS_TCA6507 is not set # CONFIG_LEDS_TLC591XX is not set # CONFIG_LEDS_LM355x is not set @@ -3159,6 +3237,7 @@ CONFIG_LEDS_TRIGGERS=y # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set # CONFIG_LEDS_TRIGGER_CPU is not set +# CONFIG_LEDS_TRIGGER_GPIO is not set # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set # @@ -3309,6 +3388,7 @@ CONFIG_STAGING=y # CONFIG_ASHMEM is not set CONFIG_ANDROID_LOGGER=y CONFIG_ANDROID_TIMED_OUTPUT=y +# CONFIG_ANDROID_TIMED_GPIO is not set # CONFIG_ANDROID_LOW_MEMORY_KILLER is not set CONFIG_ANDROID_INTF_ALARM_DEV=y # CONFIG_SYNC is not set @@ -3333,7 +3413,6 @@ CONFIG_X86_PLATFORM_DEVICES=y # CONFIG_HP_WIRELESS is not set # CONFIG_MSI_LAPTOP is not set # CONFIG_PANASONIC_LAPTOP is not set -# CONFIG_COMPAL_LAPTOP is not set # CONFIG_SONY_LAPTOP is not set # CONFIG_IDEAPAD_LAPTOP is not set # CONFIG_THINKPAD_ACPI is not set @@ -3454,14 +3533,15 @@ CONFIG_MARU_VIRTIO_NFC=y CONFIG_MARU_BRILLCODEC=y CONFIG_MARU_VIRTIO_VMODEM=y CONFIG_MARU_VIRTIO_ROTARY=y -CONFIG_MARU_EEPROM=y -CONFIG_MARU_MICOM_MSG=y -CONFIG_MARU_MICOM_ISP=y -CONFIG_MARU_DUMMY=y -CONFIG_MARU_SECURITY=y -CONFIG_MARU_SDP_MEM=y -CONFIG_MARU_GPIO=y -CONFIG_MARU_I2C_SDP=y +CONFIG_MARU_TV=y +CONFIG_MARU_TV_EEPROM=y +CONFIG_MARU_TV_DUMMY=y +CONFIG_MARU_TV_MICOM_MSG=y +CONFIG_MARU_TV_MICOM_ISP=y +CONFIG_MARU_TV_SECURITY=y +CONFIG_MARU_TV_SDP_MEM=y +CONFIG_MARU_TV_GPIO=y +CONFIG_MARU_TV_I2C_SDP=y # CONFIG_MARU_EXTENSION_SOURCE is not set # @@ -3845,6 +3925,7 @@ CONFIG_MMIOTRACE=y # CONFIG_RING_BUFFER_BENCHMARK is not set # CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_TRACE_ENUM_MAP_FILE is not set +CONFIG_TRACING_EVENTS_GPIO=y # # Runtime Testing @@ -3926,7 +4007,7 @@ CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_SELINUX is not set CONFIG_SECURITY_SMACK=y CONFIG_SECURITY_SMACK_BRINGUP=y -# CONFIG_SECURITY_SMACK_NETFILTER=y +# CONFIG_SECURITY_SMACK_NETFILTER is not set # CONFIG_SECURITY_TOMOYO is not set # CONFIG_SECURITY_APPARMOR is not set # CONFIG_SECURITY_YAMA is not set diff --git a/drivers/maru/Kconfig b/drivers/maru/Kconfig index efe071060be3..b2e30d156262 100644 --- a/drivers/maru/Kconfig +++ b/drivers/maru/Kconfig @@ -1,5 +1,5 @@ menuconfig MARU - tristate "MARU virtual device drivers for emulator" + bool "MARU virtual device drivers for emulator" default n config MARU_VIRTIO_TOUCHSCREEN @@ -62,41 +62,48 @@ config MARU_VIRTIO_ROTARY tristate "MARU VirtIO Virtual Rotary Device Driver" depends on MARU != n -config MARU_EXTENSION_SOURCE - tristate "MARU Extension source" +config MARU_TV + bool "MARU drivers for TV" depends on MARU != n + default n -config MARU_EXTENSION_SOURCE_PATH - string "MARU Extension source path" - depends on MARU != n && MARU_EXTENSION_SOURCE != n +config MARU_TV_EEPROM + tristate "MARU VirtIO Virtual EEPROM Device Driver" + depends on MARU_TV != n + depends on SYSFS + +config MARU_TV_DUMMY + tristate "MARU dummy drivers for TV" + depends on MARU_TV != n -config MARU_MICOM_MSG +config MARU_TV_MICOM_MSG tristate "Micom Auto Remocon driver support for WT61P807" + depends on MARU_TV_DUMMY != n -config MARU_MICOM_ISP +config MARU_TV_MICOM_ISP tristate "Micom ISP data support for WT61P807" + depends on MARU_TV_DUMMY != n -config MARU_DUMMY - tristate "MARU Dummy Driver" - depends on MARU != n - -config MARU_SECURITY +config MARU_TV_SECURITY tristate "MARU Security Driver" - depends on MARU != n + depends on MARU_TV_DUMMY != n -config MARU_SDP_MEM +config MARU_TV_SDP_MEM tristate "MARU SDP Memory Driver" - depends on MARU != n + depends on MARU_TV_DUMMY != n -config MARU_GPIO +config MARU_TV_GPIO tristate "MARU Dummy GPIO Driver" - depends on MARU != n && GPIOLIB != n + depends on MARU_TV_DUMMY != n && GPIOLIB != n -config MARU_I2C_SDP +config MARU_TV_I2C_SDP tristate "Maru Dummy I2C SDP Driver" - depends on MARU != n && I2C != n + depends on MARU_TV_DUMMY != n && I2C != n -config MARU_EEPROM - tristate "MARU VirtIO Virtual EEPROM Device Driver" +config MARU_EXTENSION_SOURCE + bool "MARU Extension source" depends on MARU != n - depends on SYSFS + +config MARU_EXTENSION_SOURCE_PATH + string "MARU Extension source path" + depends on MARU != n && MARU_EXTENSION_SOURCE != n diff --git a/drivers/maru/Makefile b/drivers/maru/Makefile index a1627f8007c9..87213e441301 100644 --- a/drivers/maru/Makefile +++ b/drivers/maru/Makefile @@ -15,6 +15,5 @@ obj-$(CONFIG_MARU_BRILLCODEC) += maru_brillcodec.o obj-$(CONFIG_MARU_VIRTIO_VMODEM) += maru_virtio_vmodem.o obj-$(CONFIG_MARU_VIRTIO_ROTARY) += maru_virtio_rotary.o obj-$(CONFIG_MARU_VIRTIO_TABLET) += maru_virtio_tablet.o -obj-$(CONFIG_MARU_EEPROM) += maru_eeprom.o -obj-$(CONFIG_MARU_DUMMY) += tztv-dummy/ +obj-$(CONFIG_MARU_TV) += tv/ obj-$(CONFIG_MARU_EXTENSION_SOURCE) += $(CONFIG_MARU_EXTENSION_SOURCE_PATH)/ diff --git a/drivers/maru/tv/Makefile b/drivers/maru/tv/Makefile new file mode 100644 index 000000000000..fd3700925acb --- /dev/null +++ b/drivers/maru/tv/Makefile @@ -0,0 +1,8 @@ +obj-$(CONFIG_MARU_TV_EEPROM) += maru_eeprom.o +obj-$(CONFIG_MARU_TV_DUMMY) += maru_dummy.o +obj-$(CONFIG_MARU_TV_SECURITY) += maru_dummy_security.o +obj-$(CONFIG_MARU_TV_SDP_MEM) += maru_dummy_sdp_mem.o +obj-$(CONFIG_MARU_TV_GPIO) += maru_dummy_gpio.o +obj-$(CONFIG_MARU_TV_I2C_SDP) += maru_dummy_i2c_sdp.o +obj-$(CONFIG_MARU_TV_MICOM_MSG) += maru_dummy_micom_msg.o +obj-$(CONFIG_MARU_TV_MICOM_ISP) += maru_dummy_micom_isp.o diff --git a/drivers/maru/tztv-dummy/maru_dummy.c b/drivers/maru/tv/maru_dummy.c similarity index 100% rename from drivers/maru/tztv-dummy/maru_dummy.c rename to drivers/maru/tv/maru_dummy.c diff --git a/drivers/maru/tztv-dummy/maru_dummy.h b/drivers/maru/tv/maru_dummy.h similarity index 100% rename from drivers/maru/tztv-dummy/maru_dummy.h rename to drivers/maru/tv/maru_dummy.h diff --git a/drivers/maru/tztv-dummy/maru_dummy_gpio.c b/drivers/maru/tv/maru_dummy_gpio.c similarity index 98% rename from drivers/maru/tztv-dummy/maru_dummy_gpio.c rename to drivers/maru/tv/maru_dummy_gpio.c index da39881e5f86..07b7c51d9a8a 100644 --- a/drivers/maru/tztv-dummy/maru_dummy_gpio.c +++ b/drivers/maru/tv/maru_dummy_gpio.c @@ -123,11 +123,13 @@ static int maru_gpio_probe(struct platform_device *pdev) return ret; } -void maru_gpio_remove(struct platform_device *pdev) +static int maru_gpio_remove(struct platform_device *pdev) { struct maru_gpio *maru_gpio = platform_get_drvdata(pdev); gpiochip_remove(&maru_gpio->chip); + + return 0; } static struct platform_device *maru_gpio_pdev; diff --git a/drivers/maru/tztv-dummy/maru_dummy_i2c_sdp.c b/drivers/maru/tv/maru_dummy_i2c_sdp.c similarity index 100% rename from drivers/maru/tztv-dummy/maru_dummy_i2c_sdp.c rename to drivers/maru/tv/maru_dummy_i2c_sdp.c diff --git a/drivers/maru/tztv-dummy/maru_dummy_micom_isp.c b/drivers/maru/tv/maru_dummy_micom_isp.c similarity index 99% rename from drivers/maru/tztv-dummy/maru_dummy_micom_isp.c rename to drivers/maru/tv/maru_dummy_micom_isp.c index f12df2c7a905..f28805e702d1 100644 --- a/drivers/maru/tztv-dummy/maru_dummy_micom_isp.c +++ b/drivers/maru/tv/maru_dummy_micom_isp.c @@ -192,7 +192,7 @@ static int __init micom_isp_init(void) dev_t devid = 0; int ret = -1; - print_info("called \n"); + print_info("called\n"); /* allocate char device region */ ret = alloc_chrdev_region(&devid, 0, 1, DRIVER_NAME); @@ -244,7 +244,7 @@ chrdev_alloc_fail: /* Device exit routine */ static void __exit micom_isp_exit(void) { - print_info("called \n"); + print_info("called\n"); mutex_destroy(&isp_dev_lock); diff --git a/drivers/maru/tztv-dummy/maru_dummy_micom_msg.c b/drivers/maru/tv/maru_dummy_micom_msg.c similarity index 99% rename from drivers/maru/tztv-dummy/maru_dummy_micom_msg.c rename to drivers/maru/tv/maru_dummy_micom_msg.c index a830e6232876..daeef8ee437e 100644 --- a/drivers/maru/tztv-dummy/maru_dummy_micom_msg.c +++ b/drivers/maru/tv/maru_dummy_micom_msg.c @@ -254,7 +254,7 @@ static int __init micom_msg_init(void) dev_t devid = 0; int ret = -1; - print_info("called \n"); + print_info("called\n"); /* allocate char device region */ ret = alloc_chrdev_region(&devid, 0, 1, DRIVER_NAME); @@ -331,7 +331,7 @@ chrdev_alloc_fail: /* Device exit routine */ static void __exit micom_msg_exit(void) { - print_info("called \n"); + print_info("called\n"); mutex_destroy(&dev_msg_lock); diff --git a/drivers/maru/tztv-dummy/maru_dummy_sdp_mem.c b/drivers/maru/tv/maru_dummy_sdp_mem.c similarity index 100% rename from drivers/maru/tztv-dummy/maru_dummy_sdp_mem.c rename to drivers/maru/tv/maru_dummy_sdp_mem.c diff --git a/drivers/maru/tztv-dummy/maru_dummy_security.c b/drivers/maru/tv/maru_dummy_security.c similarity index 100% rename from drivers/maru/tztv-dummy/maru_dummy_security.c rename to drivers/maru/tv/maru_dummy_security.c diff --git a/drivers/maru/maru_eeprom.c b/drivers/maru/tv/maru_eeprom.c similarity index 100% rename from drivers/maru/maru_eeprom.c rename to drivers/maru/tv/maru_eeprom.c diff --git a/drivers/maru/maru_eeprom.h b/drivers/maru/tv/maru_eeprom.h similarity index 100% rename from drivers/maru/maru_eeprom.h rename to drivers/maru/tv/maru_eeprom.h diff --git a/drivers/maru/tztv-dummy/Makefile b/drivers/maru/tztv-dummy/Makefile deleted file mode 100644 index 32e9052f8835..000000000000 --- a/drivers/maru/tztv-dummy/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -obj-$(CONFIG_MARU_DUMMY) += maru_dummy.o -obj-$(CONFIG_MARU_SECURITY) += maru_dummy_security.o -obj-$(CONFIG_MARU_SDP_MEM) += maru_dummy_sdp_mem.o -obj-$(CONFIG_MARU_GPIO) += maru_dummy_gpio.o -obj-$(CONFIG_MARU_I2C_SDP) += maru_dummy_i2c_sdp.o -obj-$(CONFIG_MARU_MICOM_MSG) += maru_dummy_micom_msg.o -obj-$(CONFIG_MARU_MICOM_ISP) += maru_dummy_micom_isp.o \ No newline at end of file -- 2.34.1