add ak8975 i2c address and up rk29_sdmmc speed

diff --git a/arch/arm/mach-rk29/board-rk29-winaccord.c b/arch/arm/mach-rk29/board-rk29-winaccord.c
index cac997885d22dfb5e62f9470513de67bf78fc586..0b2f97c447c9493eb1050e6737b9f7995f2d5329 100644 (file)
--- a/arch/arm/mach-rk29/board-rk29-winaccord.c
+++ b/arch/arm/mach-rk29/board-rk29-winaccord.c
@@ -492,23 +492,10 @@ static struct i2c_board_info __initdata board_i2c0_devices[] = {
       .platform_data  = &mma8452_info,
     },
 #endif
-
-};
-#endif
-
-#ifdef CONFIG_I2C1_RK29
-static struct i2c_board_info __initdata board_i2c1_devices[] = {
-#if defined (CONFIG_RK1000_CONTROL1)
-       {
-               .type                   = "rk1000_control",
-               .addr                   = 0x40,
-               .flags                  = 0,
-       },
-#endif
 #if defined (CONFIG_SENSORS_AK8973)
        {
                .type                   = "ak8973",
-               .addr           = 0x1c,
+               .addr           = 0x1d,
                .flags                  = 0,
                .irq                    = RK29_PIN4_PA1,
        },
@@ -516,7 +503,7 @@ static struct i2c_board_info __initdata board_i2c1_devices[] = {
 #if defined (CONFIG_SENSORS_AK8975)
        {
                .type                   = "ak8975",
-               .addr           = 0x1c,
+               .addr           = 0x1d,
                .flags                  = 0,
                .irq                    = RK29_PIN4_PA1,
        },
@@ -524,6 +511,18 @@ static struct i2c_board_info __initdata board_i2c1_devices[] = {
 };
 #endif
 
+#ifdef CONFIG_I2C1_RK29
+static struct i2c_board_info __initdata board_i2c1_devices[] = {
+#if defined (CONFIG_RK1000_CONTROL1)
+       {
+               .type                   = "rk1000_control",
+               .addr                   = 0x40,
+               .flags                  = 0,
+       },
+#endif
+};
+#endif
+
 #ifdef CONFIG_I2C2_RK29
 static struct i2c_board_info __initdata board_i2c2_devices[] = {
 #if defined (CONFIG_HANNSTAR_P1003)

diff --git a/arch/arm/mach-rk29/board-rk29sdk.c b/arch/arm/mach-rk29/board-rk29sdk.c
index d6357231e3c3743a2c6d1995e1cdefa23b97c6ec..8d47f528945681d2ff040200ac6b8d4ef8ac4cd7 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29sdk.c
+++ b/arch/arm/mach-rk29/board-rk29sdk.c
@@ -494,33 +494,32 @@ static struct i2c_board_info __initdata board_i2c0_devices[] = {
       .platform_data  = &mma8452_info,
     },
 #endif
-
-};
-#endif
-
-#ifdef CONFIG_I2C1_RK29
-static struct i2c_board_info __initdata board_i2c1_devices[] = {
-#if defined (CONFIG_RK1000_CONTROL1)
-       {
-               .type                   = "rk1000_control",
-               .addr                   = 0x40,
-               .flags                  = 0,
-       },
-#endif
 #if defined (CONFIG_SENSORS_AK8973)
        {
                .type                   = "ak8973",
-               .addr           = 0x1c,
+               .addr           = 0x1d,
                .flags                  = 0,
-               .irq                    = RK29_PIN4_PA1,
+               .irq                    = RK29_PIN0_PA4,
        },
 #endif
 #if defined (CONFIG_SENSORS_AK8975)
        {
                .type                   = "ak8975",
-               .addr           = 0x1c,
+               .addr           = 0x1d,
+               .flags                  = 0,
+               .irq                    = RK29_PIN0_PA4,
+       },
+#endif
+};
+#endif
+
+#ifdef CONFIG_I2C1_RK29
+static struct i2c_board_info __initdata board_i2c1_devices[] = {
+#if defined (CONFIG_RK1000_CONTROL1)
+       {
+               .type                   = "rk1000_control",
+               .addr                   = 0x40,
                .flags                  = 0,
-               .irq                    = RK29_PIN4_PA1,
        },
 #endif
 #if defined (CONFIG_ANX7150)

diff --git a/drivers/mmc/host/rk29_sdmmc.c b/drivers/mmc/host/rk29_sdmmc.c
index 33c64b1aa41f9db6a1d667345fd3ae578efc969f..627a15d0668f2d8450afd6943a3311615b31d060 100755 (executable)
--- a/drivers/mmc/host/rk29_sdmmc.c
+++ b/drivers/mmc/host/rk29_sdmmc.c
@@ -1447,7 +1447,7 @@ static int rk29_sdmmc_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, host);       
        mmc->ops = &rk29_sdmmc_ops[pdev->id];
        mmc->f_min = host->bus_hz/510;
-       mmc->f_max = host->bus_hz/20;  //2;  ///20; //max f is clock to mmc_clk/2
+       mmc->f_max = host->bus_hz/2;  //2;  ///20; //max f is clock to mmc_clk/2
        mmc->ocr_avail = pdata->host_ocr_avail;
        mmc->caps = pdata->host_caps;
        mmc->max_phys_segs = 64;