diff options
| author | Russell Robinson Jr <rrobinson@phytec.com> | 2013-09-05 22:49:37 -0700 |
|---|---|---|
| committer | Anthony Felice <tony.felice@timesys.com> | 2013-09-17 14:22:18 -0400 |
| commit | 0bbe7196d7e00997dc38d99e665998849b790ecc (patch) | |
| tree | ea853e78cafabc98f7d506d3d872b08997dcc509 | |
| parent | 734200d17cf5e8b20e50ecf24f682ff233a20554 (diff) | |
pcl052: update pcl052_defconfig
Signed-off-by: Russell Robinson Jr <rrobinson@phytec.com>
| -rw-r--r-- | arch/arm/configs/pcl052_defconfig | 14 | ||||
| -rw-r--r-- | arch/arm/mach-mvf/board-pcl052.c | 2 |
2 files changed, 5 insertions, 11 deletions
diff --git a/arch/arm/configs/pcl052_defconfig b/arch/arm/configs/pcl052_defconfig index b544cf11d6e6..de1202058a91 100644 --- a/arch/arm/configs/pcl052_defconfig +++ b/arch/arm/configs/pcl052_defconfig @@ -871,7 +871,6 @@ CONFIG_KEYBOARD_GPIO=y # CONFIG_KEYBOARD_OPENCORES is not set # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUNKBD is not set -# CONFIG_KEYBOARD_STMPE is not set # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_MXC is not set # CONFIG_INPUT_MOUSE is not set @@ -906,7 +905,6 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_TSC2007 is not set # CONFIG_TOUCHSCREEN_W90X900 is not set # CONFIG_TOUCHSCREEN_ST1232 is not set -CONFIG_TOUCHSCREEN_STMPE=y # CONFIG_TOUCHSCREEN_P1003 is not set # CONFIG_TOUCHSCREEN_TPS6507X is not set # CONFIG_TOUCHSCREEN_CRTOUCH is not set @@ -1076,7 +1074,6 @@ CONFIG_GPIO_SYSFS=y # CONFIG_GPIO_MAX732X is not set # CONFIG_GPIO_PCF857X is not set # CONFIG_GPIO_SX150X is not set -# CONFIG_GPIO_STMPE is not set # CONFIG_GPIO_ADP5588 is not set # @@ -1129,7 +1126,7 @@ CONFIG_BCMA_POSSIBLE=y # # CONFIG_BCMA is not set CONFIG_MFD_SUPPORT=y -CONFIG_MFD_CORE=y +# CONFIG_MFD_CORE is not set # CONFIG_MFD_88PM860X is not set # CONFIG_MFD_SM501 is not set # CONFIG_MFD_ASIC3 is not set @@ -1141,7 +1138,7 @@ CONFIG_MFD_CORE=y # CONFIG_TPS6507X is not set # CONFIG_MFD_TPS6586X is not set # CONFIG_TWL4030_CORE is not set -CONFIG_MFD_STMPE=y +# CONFIG_MFD_STMPE is not set # CONFIG_MFD_TC3589X is not set # CONFIG_MFD_TMIO is not set # CONFIG_MFD_T7L66XB is not set @@ -1205,7 +1202,6 @@ CONFIG_FB_SYS_FOPS=y CONFIG_FB_MVF_DCU=y CONFIG_MVF_TDA_998X=y # CONFIG_MVF_DCU_BLANKING_TEST is not set -# CONFIG_FB_TMIO is not set # CONFIG_FB_UDL is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_METRONOME is not set @@ -1410,15 +1406,13 @@ CONFIG_USB_ARC=y CONFIG_USB_GADGET_DUALSPEED=y # CONFIG_USB_ZERO is not set # CONFIG_USB_AUDIO is not set -CONFIG_USB_ETH=m -CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_ETH_EEM is not set +# CONFIG_USB_ETH is not set # CONFIG_USB_G_NCM is not set # CONFIG_USB_GADGETFS is not set # CONFIG_USB_FUNCTIONFS is not set # CONFIG_USB_FILE_STORAGE is not set # CONFIG_USB_MASS_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set +CONFIG_USB_G_SERIAL=y # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_PRINTER is not set # CONFIG_USB_CDC_COMPOSITE is not set diff --git a/arch/arm/mach-mvf/board-pcl052.c b/arch/arm/mach-mvf/board-pcl052.c index eab9492b8ace..3f6f58ff9226 100644 --- a/arch/arm/mach-mvf/board-pcl052.c +++ b/arch/arm/mach-mvf/board-pcl052.c @@ -398,7 +398,7 @@ static struct sys_timer pcl052_timer = { /* * initialize __mach_desc_ data structure. */ -MACHINE_START(PCL052, "PHYTEC Cosmic Board") +MACHINE_START(PCL052, "PHYTEC Cosmic Board for phyCORE-Vybrid") /* Maintainer: PHYTEC America, LLC */ .boot_params = MVF_PHYS_OFFSET + 0x100, .fixup = fixup_mxc_board, |