tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

Russell King 0de9a00f 22325525

+26 -23
+3 -6
arch/arm/mach-pxa/include/mach/hardware.h
··· 250 250 251 251 #define cpu_is_pxa930() \ 252 252 ({ \ 253 - unsigned int id = read_cpuid(CPUID_ID); \ 254 - __cpu_is_pxa930(id); \ 253 + __cpu_is_pxa930(read_cpuid_id()); \ 255 254 }) 256 255 257 256 #define cpu_is_pxa935() \ 258 257 ({ \ 259 - unsigned int id = read_cpuid(CPUID_ID); \ 260 - __cpu_is_pxa935(id); \ 258 + __cpu_is_pxa935(read_cpuid_id()); \ 261 259 }) 262 260 263 261 #define cpu_is_pxa950() \ 264 262 ({ \ 265 - unsigned int id = read_cpuid(CPUID_ID); \ 266 - __cpu_is_pxa950(id); \ 263 + __cpu_is_pxa950(read_cpuid_id()); \ 267 264 }) 268 265 269 266
+1 -1
arch/arm/mach-pxa/magician.c
··· 381 381 return ret; 382 382 } 383 383 384 - static int magician_backlight_notify(int brightness) 384 + static int magician_backlight_notify(struct device *dev, int brightness) 385 385 { 386 386 gpio_set_value(EGPIO_MAGICIAN_BL_POWER, brightness); 387 387 if (brightness >= 200) {
+1 -1
arch/arm/mach-pxa/palmld.c
··· 270 270 return ret; 271 271 } 272 272 273 - static int palmld_backlight_notify(int brightness) 273 + static int palmld_backlight_notify(struct device *dev, int brightness) 274 274 { 275 275 gpio_set_value(GPIO_NR_PALMLD_BL_POWER, brightness); 276 276 gpio_set_value(GPIO_NR_PALMLD_LCD_POWER, brightness);
+1 -1
arch/arm/mach-pxa/palmt5.c
··· 209 209 return ret; 210 210 } 211 211 212 - static int palmt5_backlight_notify(int brightness) 212 + static int palmt5_backlight_notify(struct device *dev, int brightness) 213 213 { 214 214 gpio_set_value(GPIO_NR_PALMT5_BL_POWER, brightness); 215 215 gpio_set_value(GPIO_NR_PALMT5_LCD_POWER, brightness);
+1 -1
arch/arm/mach-pxa/palmtc.c
··· 185 185 return ret; 186 186 } 187 187 188 - static int palmtc_backlight_notify(int brightness) 188 + static int palmtc_backlight_notify(struct device *dev, int brightness) 189 189 { 190 190 /* backlight is on when GPIO16 AF0 is high */ 191 191 gpio_set_value(GPIO_NR_PALMTC_BL_POWER, brightness);
+1 -1
arch/arm/mach-pxa/palmte2.c
··· 181 181 return ret; 182 182 } 183 183 184 - static int palmte2_backlight_notify(int brightness) 184 + static int palmte2_backlight_notify(struct device *dev, int brightness) 185 185 { 186 186 gpio_set_value(GPIO_NR_PALMTE2_BL_POWER, brightness); 187 187 gpio_set_value(GPIO_NR_PALMTE2_LCD_POWER, brightness);
+1 -1
arch/arm/mach-pxa/palmtreo.c
··· 375 375 return ret; 376 376 } 377 377 378 - static int treo_backlight_notify(int brightness) 378 + static int treo_backlight_notify(struct device *dev, int brightness) 379 379 { 380 380 gpio_set_value(GPIO_NR_TREO_BL_POWER, brightness); 381 381 return TREO_MAX_INTENSITY - brightness;
+1 -1
arch/arm/mach-pxa/palmtx.c
··· 269 269 return ret; 270 270 } 271 271 272 - static int palmtx_backlight_notify(int brightness) 272 + static int palmtx_backlight_notify(struct device *dev, int brightness) 273 273 { 274 274 gpio_set_value(GPIO_NR_PALMTX_BL_POWER, brightness); 275 275 gpio_set_value(GPIO_NR_PALMTX_LCD_POWER, brightness);
+1 -1
arch/arm/mach-pxa/palmz72.c
··· 196 196 return ret; 197 197 } 198 198 199 - static int palmz72_backlight_notify(int brightness) 199 + static int palmz72_backlight_notify(struct device *dev, int brightness) 200 200 { 201 201 gpio_set_value(GPIO_NR_PALMZ72_BL_POWER, brightness); 202 202 gpio_set_value(GPIO_NR_PALMZ72_LCD_POWER, brightness);
+2 -2
arch/arm/mach-pxa/spitz.c
··· 389 389 .type = EV_SW, 390 390 .code = 0, 391 391 .gpio = SPITZ_GPIO_SWA, 392 - .desc = "Display Down", 392 + .desc = "Display Down", 393 393 }, 394 394 { 395 395 .type = EV_SW, 396 396 .code = 1, 397 397 .gpio = SPITZ_GPIO_SWB, 398 - .desc = "Lid Closed", 398 + .desc = "Lid Closed", 399 399 }, 400 400 }; 401 401
+1 -1
arch/arm/mach-pxa/viper.c
··· 379 379 return ret; 380 380 } 381 381 382 - static int viper_backlight_notify(int brightness) 382 + static int viper_backlight_notify(struct device *dev, int brightness) 383 383 { 384 384 gpio_set_value(VIPER_LCD_EN_GPIO, !!brightness); 385 385 gpio_set_value(VIPER_BCKLIGHT_EN_GPIO, !!brightness);
+5 -6
arch/arm/mm/cache-xsc3l2.c
··· 221 221 if (!cpu_is_xsc3() || !xsc3_l2_present()) 222 222 return 0; 223 223 224 - if (!(get_cr() & CR_L2)) { 224 + if (get_cr() & CR_L2) { 225 225 pr_info("XScale3 L2 cache enabled.\n"); 226 - adjust_cr(CR_L2, CR_L2); 227 226 xsc3_l2_inv_all(); 228 - } 229 227 230 - outer_cache.inv_range = xsc3_l2_inv_range; 231 - outer_cache.clean_range = xsc3_l2_clean_range; 232 - outer_cache.flush_range = xsc3_l2_flush_range; 228 + outer_cache.inv_range = xsc3_l2_inv_range; 229 + outer_cache.clean_range = xsc3_l2_clean_range; 230 + outer_cache.flush_range = xsc3_l2_flush_range; 231 + } 233 232 234 233 return 0; 235 234 }
+7
arch/arm/mm/proc-xsc3.S
··· 407 407 408 408 adr r5, xsc3_crval 409 409 ldmia r5, {r5, r6} 410 + 411 + #ifdef CONFIG_CACHE_XSC3L2 412 + mrc p15, 1, r0, c0, c0, 1 @ get L2 present information 413 + ands r0, r0, #0xf8 414 + orrne r6, r6, #(1 << 26) @ enable L2 if present 415 + #endif 416 + 410 417 mrc p15, 0, r0, c1, c0, 0 @ get control register 411 418 bic r0, r0, r5 @ ..V. ..R. .... ..A. 412 419 orr r0, r0, r6 @ ..VI Z..S .... .C.M (mmu)