rendered paste body--- board-htcrhodium.c 2009-12-26 18:16:53.092374639 +0100+++ board-htctopaz.c 2009-12-26 18:17:05.751500926 +0100@@ -1,4 +1,4 @@-/* linux/arch/arm/mach-msm/board-htcrhodium.c+/* linux/arch/arm/mach-msm/board-htctopaz.c * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and@@ -50,10 +50,10 @@ #include "proc_comm_wince.h" #include "devices.h" #include "htc_hw.h"-#include "board-htcrhodium.h"-#include "board-htcrhodium.h"+#include "board-htctopaz.h"+#include "board-htctopaz.h" -static void htcrhodium_device_specific_fixes(void);+static void htctopaz_device_specific_fixes(void); extern int init_mmc(void); @@ -105,10 +105,6 @@ I2C_BOARD_INFO("mt9t013", 0x6c>>1), /* .irq = TROUT_GPIO_TO_INT(TROUT_GPIO_CAM_BTN_STEP1_N), */ },- {- // Keyboard controller- I2C_BOARD_INFO("microp-ksc", 0x67),- }, }; #define SND(num, desc) { .name = desc, .id = num }@@ -203,9 +199,9 @@ }; static smem_batt_t msm_battery_pdata = {- .gpio_battery_detect = RHOD100_BAT_IRQ,- .gpio_charger_enable = RHOD100_CHARGE_EN_N,- .gpio_charger_current_select = RHOD100_USB_AC_PWR,+ .gpio_battery_detect = TOPA100_BAT_IRQ,+ .gpio_charger_enable = TOPA100_CHARGE_EN_N,+ .gpio_charger_current_select = TOPA100_USB_AC_PWR, .smem_offset = 0xfc140, .smem_field_size = 4, };@@ -215,7 +211,7 @@ int i; // Fix data in arrays depending on GSM/CDMA version- htcrhodium_device_specific_fixes();+ htctopaz_device_specific_fixes(); msm_acpu_clock_init(&halibut_clock_data); msm_proc_comm_wince_init();@@ -251,7 +247,7 @@ msm_clock_init(); } -static void __init htcrhodium_fixup(struct machine_desc *desc, struct tag *tags,+static void __init htctopaz_fixup(struct machine_desc *desc, struct tag *tags, char **cmdline, struct meminfo *mi) { mi->nr_banks = 1;@@ -272,7 +268,7 @@ 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 htcrhodium_device_specific_fixes(void)+static void htctopaz_device_specific_fixes(void) { msm_htc_hw_pdata.battery_smem_offset = 0xfc110; msm_htc_hw_pdata.battery_smem_field_size = 2;@@ -280,8 +276,8 @@ msm_battery_pdata.smem_field_size = 2; } -MACHINE_START(HTCRHODIUM, "HTC Rhodium cellphone")- .fixup = htcrhodium_fixup,+MACHINE_START(HTCTOPAZ, "HTC Topaz cellphone (Topaz is a silicate mineral of aluminium and fluorine)")+ .fixup = htctopaz_fixup, .boot_params = 0x10000100, .map_io = halibut_map_io, .init_irq = halibut_init_irq,