diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index 9592769..e11c70d 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig @@ -92,6 +92,13 @@ config MACH_HTCRAPHAEL_CDMA help Support for the HTC Raphael CDMA phone. +config MACH_HTCRAPHAEL_CDMA500 + depends on ARCH_MSM + default y + bool "HTC Raphael 500 CDMA phone" + help + Support for the HTC Raphael 500 CDMA phone. + config MACH_HTCDIAMOND depends on ARCH_MSM default y diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile index f7db81a..c0e6703 100644 --- a/arch/arm/mach-msm/Makefile +++ b/arch/arm/mach-msm/Makefile @@ -31,6 +31,7 @@ obj-$(CONFIG_MSM_CPU_FREQ) += cpufreq.o obj-$(CONFIG_MACH_HTCRAPHAEL) += board-htcraphael.o board-htcraphael-navi.o board-htcraphael-panel.o htc_wifi_nvs.o board-htcraphael-mmc.o nmea.o board-htcraphael-gps.o msm_vibrator.o obj-$(CONFIG_MACH_HTCRAPHAEL_CDMA) += board-htcraphael.o board-htcraphael-navi.o board-htcraphael-panel.o htc_wifi_nvs.o board-htcraphael-mmc.o msm_vibrator.o +obj-$(CONFIG_MACH_HTCRAPHAEL_CDMA500) += board-htcraphael-cdma500.o board-htcraphael-navi.o board-htcraphael-panel.o htc_wifi_nvs.o board-htcraphael-mmc.o msm_vibrator.o obj-$(CONFIG_MACH_HTCDIAMOND) += board-htcdiamond.o board-htcraphael-navi.o board-htcraphael-panel.o htc_wifi_nvs.o board-htcraphael-mmc.o msm_vibrator.o board-htcdiamond-panel.o obj-$(CONFIG_MACH_HTCDIAMOND_CDMA) += board-htcdiamond.o board-htcraphael-navi.o board-htcraphael-panel.o htc_wifi_nvs.o board-htcraphael-mmc.o msm_vibrator.o diff --git a/arch/arm/mach-msm/board-htcraphael-cdma500.c b/arch/arm/mach-msm/board-htcraphael-cdma500.c new file mode 100644 index 0000000..f384c64 --- /dev/null +++ b/arch/arm/mach-msm/board-htcraphael-cdma500.c @@ -0,0 +1,522 @@ +/* linux/arch/arm/mach-msm/board-htcraphael.c + * + * Copyright (C) 2007 Google, Inc. + * Author: Brian Swetland , + * Octavian Voicu, Martijn Stolk + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include + +#include "proc_comm_wince.h" +#include "devices.h" +#include "htc_hw.h" +//include "board-htcraphael.h" +#include "board-htcraphael-cdma500.h" + +static int halibut_ffa; +module_param_named(ffa, halibut_ffa, int, S_IRUGO | S_IWUSR | S_IWGRP); +#ifdef MACH_HTCDIAMOND +static int adb=1; +#else +static int adb=0; +#endif +module_param(adb, int, S_IRUGO | S_IWUSR | S_IWGRP); + +static void htcraphael_cdma500_device_specific_fixes(void); + +extern int htcraphael_init_mmc(void); +extern void msm_init_pmic_vibrator(void); + +static struct resource raphael_keypad_resources[] = { + { + .start = MSM_GPIO_TO_INT(27), /* Modified in htcraphael_device_specific_fixes() */ + .end = MSM_GPIO_TO_INT(27), /* Modified in htcraphael_device_specific_fixes() */ + .flags = IORESOURCE_IRQ, + }, +}; + +static struct microp_keypad_platform_data raphael_keypad_data = { + .clamshell = { + .gpio = 39, /* Modified in htcraphael_device_specific_fixes() */ + .irq = MSM_GPIO_TO_INT(39), /* Modified in htcraphael_device_specific_fixes() */ + }, + .backlight_gpio = 86, /* Modified in htcraphael_device_specific_fixes() */ +}; + +static struct platform_device raphael_keypad_device = { + .name = "microp-keypad", + .id = 0, + .num_resources = ARRAY_SIZE(raphael_keypad_resources), + .resource = raphael_keypad_resources, + .dev = { .platform_data = &raphael_keypad_data, }, +}; + + +static int halibut_phy_init_seq_raph100[] = { + 0x40, 0x31, /* Leave this pair out for USB Host Mode */ + 0x1D, 0x0D, + 0x1D, 0x10, + -1 +}; + +static int halibut_phy_init_seq_raph800[] = { + 0x04, 0x48, /* Host mode is unsure for raph800 */ + 0x3A, 0x10, + 0x3B, 0x10, + -1 +}; + +static void halibut_phy_reset(void) +{ + gpio_set_value(0x64, 0); + mdelay(1); + gpio_set_value(0x64, 1); + mdelay(3); +} + +static char *halibut_usb_functions[] = { + "ether", +// "diag", +// "adb", +}; + +static struct msm_hsusb_product halibut_usb_products[] = { + /* Use product_id 0x505a always, as we moved ether to the top of the list */ + { + .product_id = 0x505a, + .functions = 0x01, + }, + { + .product_id = 0x505a, + .functions = 0x02, + }, + { + .product_id = 0x505a, + .functions = 0x03, + }, +}; + +// netripper +// orig vendor_id 0x18d1 +// orig product_id 0xd00d +static struct msm_hsusb_platform_data msm_hsusb_pdata = { + .phy_reset = halibut_phy_reset, + .phy_init_seq = halibut_phy_init_seq_raph100, /* Modified in htcraphael_device_specific_fixes() */ + .vendor_id = 0x049F, + .product_id = 0x0002, // by default (no funcs) + .version = 0x0100, + .product_name = "MSM USB", + .manufacturer_name = "HTC", + .functions = halibut_usb_functions, + .num_functions = ARRAY_SIZE(halibut_usb_functions), + .products = halibut_usb_products, + .num_products = ARRAY_SIZE(halibut_usb_products), +}; + +static struct msm_hsusb_platform_data msm_hsusb_pdata_adb = { + .phy_reset = halibut_phy_reset, + .phy_init_seq = halibut_phy_init_seq_raph100, /* Modified in htcraphael_device_specific_fixes() */ + .vendor_id = 0x0bb4, // Not sure if these are right - copied from Diamond + .product_id = 0x0c02, // Same. + .version = 0x0100, + .product_name = "MSM USB", + .manufacturer_name = "HTC", + .functions = halibut_usb_functions, + .num_functions = ARRAY_SIZE(halibut_usb_functions), + .products = halibut_usb_products, + .num_products = 0, +}; + +static struct i2c_board_info i2c_devices[] = { + { + // LED & Backlight controller + I2C_BOARD_INFO("microp-klt", 0x66), + }, + { + // Keyboard controller + I2C_BOARD_INFO("microp-ksc", 0x67), + }, + { + I2C_BOARD_INFO("mt9t013", 0x6c>>1), + /* .irq = TROUT_GPIO_TO_INT(TROUT_GPIO_CAM_BTN_STEP1_N), */ + }, + { + // 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 = { + .name = "pmem", + .start = MSM_PMEM_MDP_BASE, + .size = MSM_PMEM_MDP_SIZE, + .no_allocator = 1, + .cached = 1, +}; + +static struct android_pmem_platform_data android_pmem_adsp_pdata = { + .name = "pmem_adsp", + .start = MSM_PMEM_ADSP_BASE, + .size = MSM_PMEM_ADSP_SIZE, + .no_allocator = 0, + .cached = 0, +}; + +static struct android_pmem_platform_data android_pmem_gpu0_pdata = { + .name = "pmem_gpu0", + .start = MSM_PMEM_GPU0_BASE, + .size = MSM_PMEM_GPU0_SIZE, + .no_allocator = 1, + .cached = 0, +}; + +static struct android_pmem_platform_data android_pmem_gpu1_pdata = { + .name = "pmem_gpu1", + .start = MSM_PMEM_GPU1_BASE, + .size = MSM_PMEM_GPU1_SIZE, + .no_allocator = 1, + .cached = 0, +}; + +static struct platform_device android_pmem_device = { + .name = "android_pmem", + .id = 0, + .dev = { .platform_data = &android_pmem_pdata }, +}; + +static struct platform_device android_pmem_adsp_device = { + .name = "android_pmem", + .id = 1, + .dev = { .platform_data = &android_pmem_adsp_pdata }, +}; + +static struct platform_device android_pmem_gpu0_device = { + .name = "android_pmem", + .id = 2, + .dev = { .platform_data = &android_pmem_gpu0_pdata }, +}; + +static struct platform_device android_pmem_gpu1_device = { + .name = "android_pmem", + .id = 3, + .dev = { .platform_data = &android_pmem_gpu1_pdata }, +}; + +static smem_batt_t msm_battery_pdata = { + .gpio_battery_detect = RAPH100_BAT_IRQ, + .gpio_charger_enable = RAPH100_CHARGE_EN_N, + .gpio_charger_current_select = RAPH100_USB_AC_PWR, + .smem_offset = 0xfc140, + .smem_field_size = 4, +}; + +static struct platform_device raphael_rfkill = { + .name = "htcraphael_rfkill", + .id = -1, +}; + +#define SND(num, desc) { .name = desc, .id = num } +static struct snd_endpoint snd_endpoints_list[] = { + SND(0, "HANDSET"), + SND(1, "SPEAKER"), + SND(2, "HEADSET"), + SND(3, "BT"), + SND(44, "BT_EC_OFF"), + SND(10, "HEADSET_AND_SPEAKER"), + SND(256, "CURRENT"), + + /* Bluetooth accessories. */ + + SND(12, "HTC BH S100"), + SND(13, "HTC BH M100"), + SND(14, "Motorola H500"), + SND(15, "Nokia HS-36W"), + SND(16, "PLT 510v.D"), + SND(17, "M2500 by Plantronics"), + SND(18, "Nokia HDW-3"), + SND(19, "HBH-608"), + SND(20, "HBH-DS970"), + SND(21, "i.Tech BlueBAND"), + SND(22, "Nokia BH-800"), + SND(23, "Motorola H700"), + SND(24, "HTC BH M200"), + SND(25, "Jabra JX10"), + SND(26, "320Plantronics"), + SND(27, "640Plantronics"), + SND(28, "Jabra BT500"), + SND(29, "Motorola HT820"), + SND(30, "HBH-IV840"), + SND(31, "6XXPlantronics"), + SND(32, "3XXPlantronics"), + SND(33, "HBH-PV710"), + SND(34, "Motorola H670"), + SND(35, "HBM-300"), + SND(36, "Nokia BH-208"), + SND(37, "Samsung WEP410"), + SND(38, "Jabra BT8010"), + SND(39, "Motorola S9"), + SND(40, "Jabra BT620s"), + SND(41, "Nokia BH-902"), + SND(42, "HBH-DS220"), + SND(43, "HBH-DS980"), +}; +#undef SND + +static struct msm_snd_endpoints raphael_snd_endpoints = { + .endpoints = snd_endpoints_list, + .num = ARRAY_SIZE(snd_endpoints_list), +}; + +static struct platform_device raphael_snd = { + .name = "msm_snd", + .id = -1, + .dev = { + .platform_data = &raphael_snd_endpoints, + }, +}; + +static struct platform_device raphael_gps = { + .name = "raphael_gps", +}; + +#define MSM_LOG_BASE 0x0e0000 +#define MSM_LOG_SIZE 0x020000 +static struct resource ram_console_resource[] = { + { + .start = MSM_LOG_BASE, + .end = MSM_LOG_BASE+MSM_LOG_SIZE-1, + .flags = IORESOURCE_MEM, + } +}; + +static struct platform_device ram_console_device = { + .name = "ram_console", + .id = -1, + .num_resources = ARRAY_SIZE(ram_console_resource), + .resource = ram_console_resource, +}; + + +static struct platform_device *devices[] __initdata = { +/* + &ram_console_device, +*/ + &msm_device_hsusb, + &raphael_keypad_device, + &android_pmem_device, + &android_pmem_adsp_device, + &android_pmem_gpu0_device, + &android_pmem_gpu1_device, +/* + &raphael_rfkill, +*/ + &msm_device_smd, + &msm_device_nand, + &msm_device_i2c, + &msm_device_rtc, + &msm_device_htc_hw, +#if !defined(CONFIG_MSM_SERIAL_DEBUGGER) && !defined(CONFIG_HTC_HEADSET) +// &msm_device_uart1, +#endif +#ifdef CONFIG_SERIAL_MSM_HS + &msm_device_uart_dm2, +#endif + &msm_device_htc_battery, + &raphael_snd, +// &raphael_gps, +}; + +extern struct sys_timer msm_timer; + +static void __init halibut_init_irq(void) +{ + msm_init_irq(); +} + +static struct msm_acpu_clock_platform_data halibut_clock_data = { + .acpu_switch_time_us = 50, + .max_speed_delta_khz = 256000, + .vdd_switch_time_us = 62, + .power_collapse_khz = 19200000, + .wait_for_irq_khz = 128000000, +}; + +void msm_serial_debug_init(unsigned int base, int irq, + const char *clkname, int signal_irq); + +#ifdef CONFIG_SERIAL_MSM_HS +static struct msm_serial_hs_platform_data msm_uart_dm2_pdata = { + .wakeup_irq = MSM_GPIO_TO_INT(21), + .inject_rx_on_wakeup = 1, + .rx_to_inject = 0x32, +}; +#endif + +static void htcraphael_reset(void) +{ + struct msm_dex_command dex = { .cmd = PCOM_RESET_ARM9 }; +// struct msm_dex_command dex = { .cmd = PCOM_NOTIFY_ARM9_REBOOT }; + msm_proc_comm_wince(&dex, 0); + msleep(0x15e); + gpio_configure(25, GPIOF_OWNER_ARM11); + gpio_direction_output(25, 0); + printk(KERN_INFO "%s: Soft reset done.\n", __func__); +} + +static void htcraphael_set_vibrate(uint32_t val) +{ + struct msm_dex_command vibra; + + if (val == 0) { + vibra.cmd = PCOM_VIBRA_OFF; + msm_proc_comm_wince(&vibra, 0); + } else if (val > 0) { + if (val == 1 || val > 0xb22) + val = 0xb22; + writel(val, MSM_SHARED_RAM_BASE + 0xfc130); + vibra.cmd = PCOM_VIBRA_ON; + msm_proc_comm_wince(&vibra, 0); + } +} + +static htc_hw_pdata_t msm_htc_hw_pdata = { + .set_vibrate = htcraphael_set_vibrate, + .battery_smem_offset = 0xfc140, //XXX: raph800 + .battery_smem_field_size = 4, +}; + +static void __init htcraphael_cdma500_init(void) +{ + int i; + + // Fix data in arrays depending on GSM/CDMA version + htcraphael_cdma500_device_specific_fixes(); + + msm_acpu_clock_init(&halibut_clock_data); + msm_proc_comm_wince_init(); + + // Register hardware reset hook + msm_hw_reset_hook = htcraphael_reset; + + // Device pdata overrides + msm_device_hsusb.dev.platform_data = &msm_hsusb_pdata; + if(adb) + msm_device_hsusb.dev.platform_data = &msm_hsusb_pdata_adb; + msm_device_htc_hw.dev.platform_data = &msm_htc_hw_pdata; + msm_device_htc_battery.dev.platform_data = &msm_battery_pdata; + +#ifdef CONFIG_SERIAL_MSM_HS + msm_device_uart_dm2.dev.platform_data = &msm_uart_dm2_pdata; +#endif + +#ifndef CONFIG_MACH_SAPPHIRE + msm_init_pmic_vibrator(); +#endif + + // Register devices + platform_add_devices(devices, ARRAY_SIZE(devices)); + + // Register I2C devices + i2c_register_board_info(0, i2c_devices, ARRAY_SIZE(i2c_devices)); + + // Initialize SD controllers + htcraphael_init_mmc(); + + /* TODO: detect vbus and correctly notify USB about its presence + * For now we just declare that VBUS is present at boot and USB + * copes, but this is not ideal. + */ + msm_hsusb_set_vbus_state(1); + + /* A little vibrating welcome */ + for (i=0; i<2; i++) { + htcraphael_set_vibrate(1); + mdelay(150); + htcraphael_set_vibrate(0); + mdelay(75); + } +} + +static void __init halibut_map_io(void) +{ + msm_map_common_io(); + msm_clock_init(); +} + +static void __init htcraphael_cdma500_fixup(struct machine_desc *desc, struct tag *tags, char **cmdline, struct meminfo *mi) { + mi->nr_banks = 1; + mi->bank[0].start = PAGE_ALIGN(PHYS_OFFSET); + mi->bank[0].node = PHYS_TO_NID(mi->bank[0].start); + mi->bank[0].size = (89 * 1024 * 1024); +}; + +static void htcraphael_cdma500_device_specific_fixes(void) +{ + /* copied from raph800, fix the bt rfkill */ + raphael_keypad_resources[0].start = MSM_GPIO_TO_INT(27); + raphael_keypad_resources[0].end = MSM_GPIO_TO_INT(27); + raphael_keypad_data.clamshell.gpio = 39; + raphael_keypad_data.clamshell.irq = MSM_GPIO_TO_INT(39); + raphael_keypad_data.backlight_gpio = 86; + msm_hsusb_pdata.phy_init_seq = halibut_phy_init_seq_raph800; + msm_htc_hw_pdata.battery_smem_offset = 0xfc140; + msm_htc_hw_pdata.battery_smem_field_size = 4; + msm_battery_pdata.smem_offset = 0xfc140; + msm_battery_pdata.smem_field_size = 4; +} + +MACHINE_START(HTCRAPHAEL_CDMA500, "HTC Raphael CDMA phone (Touch Pro) raph500") + .fixup = htcraphael_cdma500_fixup, + .boot_params = 0x10000100, + .map_io = halibut_map_io, + .init_irq = halibut_init_irq, + .init_machine = htcraphael_cdma500_init, + .timer = &msm_timer, +MACHINE_END + diff --git a/arch/arm/mach-msm/board-htcraphael-panel.c b/arch/arm/mach-msm/board-htcraphael-panel.c index dbbcd9f..629a691 100644 --- a/arch/arm/mach-msm/board-htcraphael-panel.c +++ b/arch/arm/mach-msm/board-htcraphael-panel.c @@ -669,7 +669,7 @@ int __init htcraphael_init_panel(void) printk(KERN_INFO "%s: Initializing panel\n", __func__); - if (!machine_is_htcraphael() && !machine_is_htcraphael_cdma() /*&& !machine_is_htcdiamond()*/ && !machine_is_htcdiamond_cdma()) { + if (!machine_is_htcraphael() && !machine_is_htcraphael_cdma() && !machine_is_htcraphael_cdma500() /*&& !machine_is_htcdiamond()*/ && !machine_is_htcdiamond_cdma()) { printk(KERN_INFO "%s: disabling raphael panel\n", __func__); return 0; } diff --git a/arch/arm/mach-msm/board-htcraphael.c b/arch/arm/mach-msm/board-htcraphael.c index 9f3640c..a495655 100644 --- a/arch/arm/mach-msm/board-htcraphael.c +++ b/arch/arm/mach-msm/board-htcraphael.c @@ -500,16 +500,6 @@ static void __init htcraphael_fixup(struct machine_desc *desc, struct tag *tags, printk(KERN_INFO "fixup: bank1 start=%08lx, node=%08x, size=%08lx\n", mi->bank[1].start, mi->bank[1].node, mi->bank[1].size); } -static void htcraphael_cdma_fixup(struct machine_desc *desc, struct tag *tags, char **cmdline, struct meminfo *mi) { -}; - -static void htcraphael_cdma500_fixup(struct machine_desc *desc, struct tag *tags, char **cmdline, struct meminfo *mi) { - mi->nr_banks = 1; - mi->bank[0].start = PAGE_ALIGN(PHYS_OFFSET); - mi->bank[0].node = PHYS_TO_NID(mi->bank[0].start); - mi->bank[0].size = (89 * 1024 * 1024); -}; - static void htcraphael_device_specific_fixes(void) { if (machine_is_htcraphael()) { @@ -536,19 +526,6 @@ static void htcraphael_device_specific_fixes(void) msm_battery_pdata.smem_offset = 0xfc140; msm_battery_pdata.smem_field_size = 4; } - if (machine_is_htcraphael_cdma500()) { - /* copied from raph800, fix the bt rfkill */ - raphael_keypad_resources[0].start = MSM_GPIO_TO_INT(27); - raphael_keypad_resources[0].end = MSM_GPIO_TO_INT(27); - raphael_keypad_data.clamshell.gpio = 39; - raphael_keypad_data.clamshell.irq = MSM_GPIO_TO_INT(39); - raphael_keypad_data.backlight_gpio = 86; - msm_hsusb_pdata.phy_init_seq = halibut_phy_init_seq_raph800; - msm_htc_hw_pdata.battery_smem_offset = 0xfc140; - msm_htc_hw_pdata.battery_smem_field_size = 4; - msm_battery_pdata.smem_offset = 0xfc140; - msm_battery_pdata.smem_field_size = 4; - } } MACHINE_START(HTCRAPHAEL, "HTC Raphael GSM phone (aka HTC Touch Pro)") @@ -561,16 +538,7 @@ MACHINE_START(HTCRAPHAEL, "HTC Raphael GSM phone (aka HTC Touch Pro)") MACHINE_END MACHINE_START(HTCRAPHAEL_CDMA, "HTC Raphael CDMA phone (aka HTC Touch Pro)") - .fixup = htcraphael_cdma_fixup, - .boot_params = 0x10000100, - .map_io = halibut_map_io, - .init_irq = halibut_init_irq, - .init_machine = halibut_init, - .timer = &msm_timer, -MACHINE_END - -MACHINE_START(HTCRAPHAEL_CDMA500, "HTC Raphael CDMA phone (Touch Pro) raph500") - .fixup = htcraphael_cdma500_fixup, + .fixup = htcraphael_fixup, .boot_params = 0x10000100, .map_io = halibut_map_io, .init_irq = halibut_init_irq, diff --git a/arch/arm/mach-msm/htc_battery.c b/arch/arm/mach-msm/htc_battery.c index deb5a12..e86d9b1 100644 --- a/arch/arm/mach-msm/htc_battery.c +++ b/arch/arm/mach-msm/htc_battery.c @@ -338,7 +338,9 @@ int htc_cable_status_update(int status) } /* TODO: Don't call usb driver again with the same cable status. */ +#ifndef CONFIG_MACH_HTCRAPHAEL_CDMA500 msm_hsusb_set_vbus_state(status == CHARGER_USB); +#endif if (htc_batt_info.rep.charging_source != last_source) { if (htc_batt_info.rep.charging_source == CHARGER_USB || diff --git a/arch/arm/mach-msm/htc_battery_smem.c b/arch/arm/mach-msm/htc_battery_smem.c index 2068803..0c52401 100644 --- a/arch/arm/mach-msm/htc_battery_smem.c +++ b/arch/arm/mach-msm/htc_battery_smem.c @@ -299,7 +299,9 @@ int htc_cable_status_update(int status) source = htc_batt_info.rep.charging_source; mutex_unlock(&htc_batt_info.lock); +#ifndef CONFIG_MACH_HTCRAPHAEL_CDMA500 msm_hsusb_set_vbus_state(source == CHARGER_USB); +#endif if (source == CHARGER_USB) { // wake_lock(&vbus_wake_lock); } else { diff --git a/arch/arm/mach-msm/irq.c b/arch/arm/mach-msm/irq.c index 4f06972..df9633e 100644 --- a/arch/arm/mach-msm/irq.c +++ b/arch/arm/mach-msm/irq.c @@ -469,7 +469,7 @@ void __init msm_init_irq(void) for (n = 0; n < NR_MSM_IRQS; n++) { set_irq_chip(n, &msm_irq_chip); set_irq_handler(n, handle_level_irq); -#if defined(CONFIG_MACH_HTCRAPHAEL) || defined(CONFIG_MACH_HTCRAPHAEL_CDMA) || defined(CONFIG_MACH_HTCDIAMOND) || defined(CONFIG_MACH_HTCDIAMOND_CDMA) || defined(CONFIG_MACH_HTCBLACKSTONE) || defined(CONFIG_MACH_HTCKOVSKY) +#if defined(CONFIG_MACH_HTCRAPHAEL) || defined(CONFIG_MACH_HTCRAPHAEL_CDMA) || defined(CONFIG_MACH_HTCRAPHAEL_CDMA500) || defined(CONFIG_MACH_HTCDIAMOND) || defined(CONFIG_MACH_HTCDIAMOND_CDMA) || defined(CONFIG_MACH_HTCBLACKSTONE) || defined(CONFIG_MACH_HTCKOVSKY) if (n == INT_DEBUG_TIMER_EXP) { set_irq_flags(n, IRQF_NOAUTOEN); diff --git a/arch/arm/mach-msm/smd.c b/arch/arm/mach-msm/smd.c index 84acf5d..60c1ba3 100644 --- a/arch/arm/mach-msm/smd.c +++ b/arch/arm/mach-msm/smd.c @@ -233,7 +233,7 @@ static void smd_channel_probe_worker(struct work_struct *work) smd_ch_allocated[n] = 1; } - if (machine_is_htcraphael_cdma() || machine_is_htcdiamond_cdma()) { + if (machine_is_htcraphael_cdma() || machine_is_htcraphael_cdma500() || machine_is_htcdiamond_cdma()) { /* Pass whatever info we'll need in order to initialize the 7500 * ports and keep them usable within smd.o */ diff --git a/drivers/usb/function/ether.c b/drivers/usb/function/ether.c index c9be344..bdf2b58 100644 --- a/drivers/usb/function/ether.c +++ b/drivers/usb/function/ether.c @@ -207,7 +207,7 @@ static struct usb_function usb_func_ether = { .name = "ether", .ifc_class = 0x02, -#if defined(CONFIG_MACH_HTCRAPHAEL) || defined(CONFIG_MACH_HTCRAPHAEL_CDMA) || defined(CONFIG_MACH_HTCDIAMOND) || defined(CONFIG_MACH_HTCDIAMOND_CDMA) || defined(CONFIG_MACH_HTCBLACKSTONE) || defined(CONFIG_MACH_HTCKOVSKY) +#if defined(CONFIG_MACH_HTCRAPHAEL) || defined(CONFIG_MACH_HTCRAPHAEL_CDMA) || defined(CONFIG_MACH_HTCRAPHAEL_CDMA500) || defined(CONFIG_MACH_HTCDIAMOND) || defined(CONFIG_MACH_HTCDIAMOND_CDMA) || defined(CONFIG_MACH_HTCBLACKSTONE) || defined(CONFIG_MACH_HTCKOVSKY) .ifc_subclass = 0x00, #else .ifc_subclass = 0x0a, diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c index 4c7818a..043b540 100644 --- a/drivers/video/msm/mdp.c +++ b/drivers/video/msm/mdp.c @@ -62,7 +62,7 @@ static int enable_mdp_irq(struct mdp_info *mdp, uint32_t mask) /* if the mask bits are already set return an error, this interrupt * is already enabled */ if (mdp_irq_mask & mask) { -#if !defined(CONFIG_MACH_HTCRAPHAEL) && !defined(CONFIG_MACH_HTCRAPHAEL_CDMA) && !defined(CONFIG_MACH_HTCDIAMOND) && !defined(CONFIG_MACH_HTCDIAMOND_CDMA) && !defined(CONFIG_MACH_HTCBLACKSTONE) && !defined(CONFIG_MACH_HTCKOVSKY) +#if !defined(CONFIG_MACH_HTCRAPHAEL) && !defined(CONFIG_MACH_HTCRAPHAEL_CDMA) && !defined(CONFIG_MACH_HTCRAPHAEL_CDMA500) && !defined(CONFIG_MACH_HTCDIAMOND) && !defined(CONFIG_MACH_HTCDIAMOND_CDMA) && !defined(CONFIG_MACH_HTCBLACKSTONE) && !defined(CONFIG_MACH_HTCKOVSKY) printk(KERN_ERR "mdp irq already on already on %x %x\n", mdp_irq_mask, mask); #endif diff --git a/drivers/video/msm/msm_fb.c b/drivers/video/msm/msm_fb.c index 24b1734..022de3c 100644 --- a/drivers/video/msm/msm_fb.c +++ b/drivers/video/msm/msm_fb.c @@ -189,7 +189,7 @@ static int msmfb_start_dma(struct msmfb_info *msmfb) y = msmfb->update_info.top; w = msmfb->update_info.eright - x; h = msmfb->update_info.ebottom - y; -#if defined(CONFIG_MACH_HTCRAPHAEL) || defined(CONFIG_MACH_HTCRAPHAEL_CDMA) || defined(CONFIG_MACH_HTCDIAMOND) || defined(CONFIG_MACH_HTCDIAMOND_CDMA) || defined(CONFIG_MACH_HTCBLACKSTONE) || defined(CONFIG_MACH_HTCKOVSKY) +#if defined(CONFIG_MACH_HTCRAPHAEL) || defined(CONFIG_MACH_HTCRAPHAEL_CDMA) || defined(CONFIG_MACH_HTCRAPHAEL_CDMA500) || defined(CONFIG_MACH_HTCDIAMOND) || defined(CONFIG_MACH_HTCDIAMOND_CDMA) || defined(CONFIG_MACH_HTCBLACKSTONE) || defined(CONFIG_MACH_HTCKOVSKY) // x = 0; y = 0; w = msmfb->xres; h = msmfb->yres; #endif yoffset = msmfb->yoffset;