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

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-2.6.23' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc

* 'for-2.6.23' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc:
[POWERPC] mpc8349emitx.dts: Setup USB-DR for peripheral mode.
[POWERPC] Fix mpc834x USB-MPH configuration.
[POWERPC] Fix cpm_uart driver for cpm1 machines
[PPC] Fix cpm_dpram_addr returning phys mem instead of virt mem
[POWERPC] Fix copy'n'paste typo in commproc.c

Linus Torvalds bd893663 f100353f

+6 -5
+1
arch/powerpc/boot/dts/mpc8349emitx.dts
··· 99 99 #size-cells = <0>; 100 100 interrupt-parent = < &ipic >; 101 101 interrupts = <26 8>; 102 + dr_mode = "peripheral"; 102 103 phy_type = "ulpi"; 103 104 }; 104 105
+2 -2
arch/powerpc/platforms/83xx/usb.c
··· 76 76 if (port0_is_dr) 77 77 printk(KERN_WARNING 78 78 "834x USB port0 can't be used by both DR and MPH!\n"); 79 - sicrl |= MPC834X_SICRL_USB0; 79 + sicrl &= ~MPC834X_SICRL_USB0; 80 80 } 81 81 prop = of_get_property(np, "port1", NULL); 82 82 if (prop) { 83 83 if (port1_is_dr) 84 84 printk(KERN_WARNING 85 85 "834x USB port1 can't be used by both DR and MPH!\n"); 86 - sicrl |= MPC834X_SICRL_USB1; 86 + sicrl &= ~MPC834X_SICRL_USB1; 87 87 } 88 88 of_node_put(np); 89 89 }
+1 -1
arch/powerpc/sysdev/commproc.c
··· 395 395 { 396 396 return (dpram_pbase + (uint)(addr - dpram_vbase)); 397 397 } 398 - EXPORT_SYMBOL(cpm_dpram_addr); 398 + EXPORT_SYMBOL(cpm_dpram_phys);
+1 -1
arch/ppc/8xx_io/commproc.c
··· 459 459 460 460 void *cpm_dpram_addr(unsigned long offset) 461 461 { 462 - return ((immap_t *)IMAP_ADDR)->im_cpm.cp_dpmem + offset; 462 + return (void *)(dpram_vbase + offset); 463 463 } 464 464 EXPORT_SYMBOL(cpm_dpram_addr); 465 465
+1 -1
drivers/serial/cpm_uart/cpm_uart_cpm1.h
··· 37 37 up->smc_tfcr = SMC_EB; 38 38 } 39 39 40 - #define DPRAM_BASE ((unsigned char *)&cpmp->cp_dpmem[0]) 40 + #define DPRAM_BASE ((unsigned char *)cpm_dpram_addr(0)) 41 41 42 42 #endif