Diff
Modified: trunk/arch/blackfin/configs/BF537-STAMP_defconfig (6880 => 6881)
--- trunk/arch/blackfin/configs/BF537-STAMP_defconfig 2009-06-30 14:47:10 UTC (rev 6880)
+++ trunk/arch/blackfin/configs/BF537-STAMP_defconfig 2009-06-30 14:57:22 UTC (rev 6881)
@@ -704,10 +704,7 @@
#
# Hardware I/O ports
#
-CONFIG_SERIO=y
-CONFIG_SERIO_SERPORT=y
-CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO is not set
# CONFIG_GAMEPORT is not set
#
Modified: trunk/arch/blackfin/configs/SRV1_defconfig (6880 => 6881)
--- trunk/arch/blackfin/configs/SRV1_defconfig 2009-06-30 14:47:10 UTC (rev 6880)
+++ trunk/arch/blackfin/configs/SRV1_defconfig 2009-06-30 14:57:22 UTC (rev 6881)
@@ -700,7 +700,7 @@
# CONFIG_INPUT_YEALINK is not set
CONFIG_INPUT_UINPUT=y
# CONFIG_BF53X_PFBUTTONS is not set
-# CONFIG_TWI_KEYPAD is not set
+# CONFIG_INPUT_PCF8574 is not set
#
# Hardware I/O ports
Modified: trunk/arch/blackfin/mach-bf518/boards/ezbrd.c (6880 => 6881)
--- trunk/arch/blackfin/mach-bf518/boards/ezbrd.c 2009-06-30 14:47:10 UTC (rev 6880)
+++ trunk/arch/blackfin/mach-bf518/boards/ezbrd.c 2009-06-30 14:57:22 UTC (rev 6881)
@@ -539,7 +539,7 @@
I2C_BOARD_INFO("pcf8574_lcd", 0x22),
},
#endif
-#if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE)
+#if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE)
{
I2C_BOARD_INFO("pcf8574_keypad", 0x27),
.irq = IRQ_PF8,
Modified: trunk/arch/blackfin/mach-bf527/boards/cm_bf527.c (6880 => 6881)
--- trunk/arch/blackfin/mach-bf527/boards/cm_bf527.c 2009-06-30 14:47:10 UTC (rev 6880)
+++ trunk/arch/blackfin/mach-bf527/boards/cm_bf527.c 2009-06-30 14:57:22 UTC (rev 6881)
@@ -799,7 +799,7 @@
.type = "pcf8574_lcd",
},
#endif
-#if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE)
+#if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE)
{
I2C_BOARD_INFO("pcf8574_keypad", 0x27),
.type = "pcf8574_keypad",
Modified: trunk/arch/blackfin/mach-bf527/boards/ezbrd.c (6880 => 6881)
--- trunk/arch/blackfin/mach-bf527/boards/ezbrd.c 2009-06-30 14:47:10 UTC (rev 6880)
+++ trunk/arch/blackfin/mach-bf527/boards/ezbrd.c 2009-06-30 14:57:22 UTC (rev 6881)
@@ -596,7 +596,7 @@
I2C_BOARD_INFO("pcf8574_lcd", 0x22),
},
#endif
-#if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE)
+#if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE)
{
I2C_BOARD_INFO("pcf8574_keypad", 0x27),
.irq = IRQ_PF8,
Modified: trunk/arch/blackfin/mach-bf527/boards/ezkit.c (6880 => 6881)
--- trunk/arch/blackfin/mach-bf527/boards/ezkit.c 2009-06-30 14:47:10 UTC (rev 6880)
+++ trunk/arch/blackfin/mach-bf527/boards/ezkit.c 2009-06-30 14:57:22 UTC (rev 6881)
@@ -863,7 +863,7 @@
I2C_BOARD_INFO("pcf8574_lcd", 0x22),
},
#endif
-#if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE)
+#if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE)
{
I2C_BOARD_INFO("pcf8574_keypad", 0x27),
.irq = IRQ_PF8,
Modified: trunk/arch/blackfin/mach-bf533/boards/stamp.c (6880 => 6881)
--- trunk/arch/blackfin/mach-bf533/boards/stamp.c 2009-06-30 14:47:10 UTC (rev 6880)
+++ trunk/arch/blackfin/mach-bf533/boards/stamp.c 2009-06-30 14:57:22 UTC (rev 6881)
@@ -458,7 +458,7 @@
I2C_BOARD_INFO("pcf8574_lcd", 0x22),
},
#endif
-#if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE)
+#if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE)
{
I2C_BOARD_INFO("pcf8574_keypad", 0x27),
.irq = 39,
Modified: trunk/arch/blackfin/mach-bf537/boards/stamp.c (6880 => 6881)
--- trunk/arch/blackfin/mach-bf537/boards/stamp.c 2009-06-30 14:47:10 UTC (rev 6880)
+++ trunk/arch/blackfin/mach-bf537/boards/stamp.c 2009-06-30 14:57:22 UTC (rev 6881)
@@ -1348,7 +1348,7 @@
I2C_BOARD_INFO("pcf8574_lcd", 0x22),
},
#endif
-#if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE)
+#if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE)
{
I2C_BOARD_INFO("pcf8574_keypad", 0x27),
.irq = IRQ_PG6,
Modified: trunk/arch/blackfin/mach-bf548/boards/ezkit.c (6880 => 6881)
--- trunk/arch/blackfin/mach-bf548/boards/ezkit.c 2009-06-30 14:47:10 UTC (rev 6880)
+++ trunk/arch/blackfin/mach-bf548/boards/ezkit.c 2009-06-30 14:57:22 UTC (rev 6881)
@@ -869,7 +869,7 @@
I2C_BOARD_INFO("pcf8574_lcd", 0x22),
},
#endif
-#if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE)
+#if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE)
{
I2C_BOARD_INFO("pcf8574_keypad", 0x27),
.irq = 212,
