Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / arm / mach-ixp4xx / dsmg600-setup.c

diff --git a/arch/arm/mach-ixp4xx/dsmg600-setup.c b/arch/arm/mach-ixp4xx/dsmg600-setup.c
index 688659668bdf12156627f7780057ae76c6e9b5fb..7c1fa54a6145a987a4d41a4910421231a62a2ea5 100644 (file)
--- a/arch/arm/mach-ixp4xx/dsmg600-setup.c
+++ b/arch/arm/mach-ixp4xx/dsmg600-setup.c
@@ -33,6 +33,23 @@
 #include <asm/mach/time.h>
 #include <asm/gpio.h>
 
+#define DSMG600_SDA_PIN                5
+#define DSMG600_SCL_PIN                4
+
+/* DSM-G600 Timer Setting */
+#define DSMG600_FREQ           66000000
+
+/* Buttons */
+#define DSMG600_PB_GPIO                15      /* power button */
+#define DSMG600_RB_GPIO                3       /* reset button */
+
+/* Power control */
+#define DSMG600_PO_GPIO                2       /* power off */
+
+/* LEDs */
+#define DSMG600_LED_PWR_GPIO   0
+#define DSMG600_LED_WLAN_GPIO  14
+
 static struct flash_platform_data dsmg600_flash_data = {
        .map_name               = "cfi_probe",
        .width                  = 2,
@@ -65,17 +82,17 @@ static struct platform_device dsmg600_i2c_gpio = {
 
 static struct i2c_board_info __initdata dsmg600_i2c_board_info [] = {
        {
-               I2C_BOARD_INFO("rtc-pcf8563", 0x51),
+               I2C_BOARD_INFO("pcf8563", 0x51),
        },
 };
 
 static struct gpio_led dsmg600_led_pins[] = {
        {
-               .name           = "power",
+               .name           = "dsmg600:green:power",
                .gpio           = DSMG600_LED_PWR_GPIO,
        },
        {
-               .name           = "wlan",
+               .name           = "dsmg600:green:wlan",
                .gpio           = DSMG600_LED_WLAN_GPIO,
                .active_low     = true,
        },