- Revision
- 4069
- Author
- cooloney
- Date
- 2007-12-26 02:27:59 -0600 (Wed, 26 Dec 2007)
Log Message
TASK [#3478] kill Kconfig options and update STAMP-BF533, EZKIT-BF533 and EZKIT-BF561 boards
Diffstat
Kconfig | 30 ------------------------------
mach-bf533/boards/ezkit.c | 24 ++++++++++++++++++++++++
mach-bf533/boards/stamp.c | 24 ++++++++++++++++++++++++
mach-bf561/boards/ezkit.c | 6 +++---
4 files changed, 51 insertions(+), 33 deletions(-)
Modified Paths
Diff
Modified: trunk/arch/blackfin/Kconfig (4068 => 4069)
--- trunk/arch/blackfin/Kconfig 2007-12-26 07:40:19 UTC (rev 4068)
+++ trunk/arch/blackfin/Kconfig 2007-12-26 08:27:59 UTC (rev 4069)
@@ -525,36 +525,6 @@
endchoice
-config I2C_BLACKFIN_GPIO
- bool "Blackfin I2C GPIO SDA/SCL Selection"
- default n
- select I2C
- select I2C_GPIO
-
-config I2C_GPIO_SDA
- depends on I2C_BLACKFIN_GPIO
- int "SDA GPIO pin number"
- range 0 15 if (BF533 || BF532 || BF531)
- range 0 47 if (BF534 || BF536 || BF537)
- range 0 47 if BF561
- default 2 if !BF561
- default 1 if BF561
-
-config I2C_GPIO_SCL
- depends on I2C_BLACKFIN_GPIO
- int "SCL GPIO pin number"
- range 0 15 if (BF533 || BF532 || BF531)
- range 0 47 if (BF534 || BF536 || BF537)
- range 0 47 if BF561
- default 3 if !BF561
- default 0 if BF561
-
-config I2C_GPIO_UDELAY
- depends on I2C_BLACKFIN_GPIO
- int "Cycle Delay in uSec"
- range 5 100
- default 40
-
endmenu
menu "Blackfin Kernel Optimizations"
Modified: trunk/arch/blackfin/mach-bf533/boards/ezkit.c (4068 => 4069)
--- trunk/arch/blackfin/mach-bf533/boards/ezkit.c 2007-12-26 07:40:19 UTC (rev 4068)
+++ trunk/arch/blackfin/mach-bf533/boards/ezkit.c 2007-12-26 08:27:59 UTC (rev 4069)
@@ -280,6 +280,26 @@
};
#endif
+#if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE)
+#include <linux/i2c-gpio.h>
+
+static struct i2c_gpio_platform_data i2c_gpio_data = {
+ .sda_pin = 2,
+ .scl_pin = 3,
+ .sda_is_open_drain = 1,
+ .scl_is_open_drain = 1,
+ .udelay = 40,
+};
+
+static struct platform_device i2c_gpio_device = {
+ .name = "i2c-gpio",
+ .id = 0,
+ .dev = {
+ .platform_data = &i2c_gpio_data,
+ },
+};
+#endif
+
static struct platform_device *ezkit_devices[] __initdata = {
#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
&smc91x_device,
@@ -308,6 +328,10 @@
#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
&bfin_device_gpiokeys,
#endif
+
+#if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE)
+ &i2c_gpio_device,
+#endif
};
static int __init ezkit_init(void)
Modified: trunk/arch/blackfin/mach-bf533/boards/stamp.c (4068 => 4069)
--- trunk/arch/blackfin/mach-bf533/boards/stamp.c 2007-12-26 07:40:19 UTC (rev 4068)
+++ trunk/arch/blackfin/mach-bf533/boards/stamp.c 2007-12-26 08:27:59 UTC (rev 4069)
@@ -396,6 +396,26 @@
};
#endif
+#if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE)
+#include <linux/i2c-gpio.h>
+
+static struct i2c_gpio_platform_data i2c_gpio_data = {
+ .sda_pin = 2,
+ .scl_pin = 3,
+ .sda_is_open_drain = 1,
+ .scl_is_open_drain = 1,
+ .udelay = 40,
+};
+
+static struct platform_device i2c_gpio_device = {
+ .name = "i2c-gpio",
+ .id = 0,
+ .dev = {
+ .platform_data = &i2c_gpio_data,
+ },
+};
+#endif
+
static struct platform_device *stamp_devices[] __initdata = {
#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
&rtc_device,
@@ -433,6 +453,10 @@
#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
&bfin_device_gpiokeys,
#endif
+
+#if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE)
+ &i2c_gpio_device,
+#endif
};
static int __init stamp_init(void)
Modified: trunk/arch/blackfin/mach-bf561/boards/ezkit.c (4068 => 4069)
--- trunk/arch/blackfin/mach-bf561/boards/ezkit.c 2007-12-26 07:40:19 UTC (rev 4068)
+++ trunk/arch/blackfin/mach-bf561/boards/ezkit.c 2007-12-26 08:27:59 UTC (rev 4069)
@@ -274,11 +274,11 @@
#include <linux/i2c-gpio.h>
static struct i2c_gpio_platform_data i2c_gpio_data = {
- .sda_pin = CONFIG_I2C_GPIO_SDA,
- .scl_pin = CONFIG_I2C_GPIO_SCL,
+ .sda_pin = 1,
+ .scl_pin = 0,
.sda_is_open_drain = 1,
.scl_is_open_drain = 1,
- .udelay = CONFIG_I2C_GPIO_UDELAY,
+ .udelay = 40,
};
static struct platform_device i2c_gpio_device = {
