rendered paste bodydiff --git a/arch/arm/mach-msm/board-htcdiamond-panel.c b/arch/arm/mach-msm/board-htcdiamond-panel.cindex c28a2cf..f8640f2 100644--- a/arch/arm/mach-msm/board-htcdiamond-panel.c+++ b/arch/arm/mach-msm/board-htcdiamond-panel.c@@ -500,7 +500,8 @@ static struct msm_mddi_platform_data mddi_pdata = { .client_platform_data = { { .product_id = (0xd263 << 16 | 0),- .name = "mddi_c_d263_0000",+ //.name = "mddi_c_d263_0000",+ .name = "TC358720XBG", .id = 0, .client_data = &toshiba_client_data, .clk_rate = 0,diff --git a/arch/arm/mach-msm/board-htcdiamond.c b/arch/arm/mach-msm/board-htcdiamond.cindex ce29a37..80e20ba 100644--- a/arch/arm/mach-msm/board-htcdiamond.c+++ b/arch/arm/mach-msm/board-htcdiamond.c@@ -60,7 +60,7 @@ module_param_named(ffa, halibut_ffa, int, S_IRUGO | S_IWUSR | S_IWGRP); static int banks=1; module_param(banks, int, S_IRUGO | S_IWUSR | S_IWGRP);-static int adb=1;+static int adb=0; module_param(adb, int, S_IRUGO | S_IWUSR | S_IWGRP); static void htcdiamond_device_specific_fixes(void);@@ -158,12 +158,10 @@ static struct i2c_board_info i2c_devices[] = { // Raphael NaviPad (cy8c20434) I2C_BOARD_INFO("raph_navi_pad", 0x62), },-/* { // Accelerometer I2C_BOARD_INFO("kionix-kxsd9", 0x18), },-*/ }; static struct android_pmem_platform_data android_pmem_pdata = {diff --git a/arch/arm/mach-msm/board-htcraphael-mmc.c b/arch/arm/mach-msm/board-htcraphael-mmc.cindex 03c2f9b..a94d38f 100644--- a/arch/arm/mach-msm/board-htcraphael-mmc.c+++ b/arch/arm/mach-msm/board-htcraphael-mmc.c@@ -296,7 +296,7 @@ static struct embedded_sdio_data htcraphael_wifi_emb_data = { .device = 0x9066, .blksize = 512, /*.max_dtr = 24000000, Max of chip - no worky on Trout */- .max_dtr = 11000000,+ .max_dtr = 13000000, }, .cccr = { .multi_block = 0,diff --git a/arch/arm/mach-msm/clock-wince.c b/arch/arm/mach-msm/clock-wince.cindex d6e3117..f92d2b6 100644--- a/arch/arm/mach-msm/clock-wince.c+++ b/arch/arm/mach-msm/clock-wince.c@@ -116,13 +116,17 @@ struct mdns_clock_params msm_clock_freq_parameters[] = { MSM_CLOCK_REG( 460800*16, 3, 0x64, 0x32, 0, 2, 4, 1), /* 460800 */ MSM_CLOCK_REG( 921600*16, 3, 0x32, 0x19, 0, 2, 4, 1), /* 921600 */ MSM_CLOCK_REG(3686400*16, 6, 0x19, 0x0c, 0, 2, 4, 1), /* 3686400 */- MSM_CLOCK_REG(4000000*16, 0x19, 0x60, 0x30, 0, 2, 4, 1), /* 4000000 */ #endif /* SD */- MSM_CLOCK_REG(12000000, 1, 0x20, 0x10, 1, 3, 1, 1), /* 12MHz */+ MSM_CLOCK_REG(11000000, 1, 0x20, 0x10, 1, 3, 1, 1), /* 12MHz */++ MSM_CLOCK_REG(12288000, 1, 0x5, 0x2, 3, 2, 4, 1), /* 12.288MHz */+ MSM_CLOCK_REG(19200000, 1, 0x0a, 0x05, 3, 3, 1, 1), /* 19.2MHz */ MSM_CLOCK_REG(24000000, 1, 0x10, 0x08, 1, 3, 1, 1), /* 24MHz */ MSM_CLOCK_REG(32000000, 1, 0x0c, 0x06, 1, 3, 1, 1), /* 32MHz */++ MSM_CLOCK_REG(4000000*16, 0x19, 0x60, 0x30, 0, 2, 4, 1), /* 4 000 000 */ }; static inline struct msm_clock_params msm_clk_get_params(uint32_t id)