diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-28 15:33:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-28 15:33:03 -0700 |
| commit | bd8936632475665bfd90c1180c9c1301ee838db8 (patch) | |
| tree | aa4b396932957d72300dadb080566df5ce4d14c1 /arch | |
| parent | f100353ff5bfd83be00ae55e98b4d611d2eb5681 (diff) | |
| parent | f93c7c5aab8d5efaf99c88c8452d9303baabc89b (diff) | |
| download | lwn-bd8936632475665bfd90c1180c9c1301ee838db8.tar.gz lwn-bd8936632475665bfd90c1180c9c1301ee838db8.zip | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/boot/dts/mpc8349emitx.dts | 1 | ||||
| -rw-r--r-- | arch/powerpc/platforms/83xx/usb.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/sysdev/commproc.c | 2 | ||||
| -rw-r--r-- | arch/ppc/8xx_io/commproc.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts index 502f47c01797..44c065a6b5e7 100644 --- a/arch/powerpc/boot/dts/mpc8349emitx.dts +++ b/arch/powerpc/boot/dts/mpc8349emitx.dts @@ -99,6 +99,7 @@ #size-cells = <0>; interrupt-parent = < &ipic >; interrupts = <26 8>; + dr_mode = "peripheral"; phy_type = "ulpi"; }; diff --git a/arch/powerpc/platforms/83xx/usb.c b/arch/powerpc/platforms/83xx/usb.c index e7fdf013cd39..eafe7605cdac 100644 --- a/arch/powerpc/platforms/83xx/usb.c +++ b/arch/powerpc/platforms/83xx/usb.c @@ -76,14 +76,14 @@ int mpc834x_usb_cfg(void) if (port0_is_dr) printk(KERN_WARNING "834x USB port0 can't be used by both DR and MPH!\n"); - sicrl |= MPC834X_SICRL_USB0; + sicrl &= ~MPC834X_SICRL_USB0; } prop = of_get_property(np, "port1", NULL); if (prop) { if (port1_is_dr) printk(KERN_WARNING "834x USB port1 can't be used by both DR and MPH!\n"); - sicrl |= MPC834X_SICRL_USB1; + sicrl &= ~MPC834X_SICRL_USB1; } of_node_put(np); } diff --git a/arch/powerpc/sysdev/commproc.c b/arch/powerpc/sysdev/commproc.c index 4f67b89ba1d0..dd5417aec1b4 100644 --- a/arch/powerpc/sysdev/commproc.c +++ b/arch/powerpc/sysdev/commproc.c @@ -395,4 +395,4 @@ uint cpm_dpram_phys(u8* addr) { return (dpram_pbase + (uint)(addr - dpram_vbase)); } -EXPORT_SYMBOL(cpm_dpram_addr); +EXPORT_SYMBOL(cpm_dpram_phys); diff --git a/arch/ppc/8xx_io/commproc.c b/arch/ppc/8xx_io/commproc.c index 7088428e1fe2..9da880be4dc0 100644 --- a/arch/ppc/8xx_io/commproc.c +++ b/arch/ppc/8xx_io/commproc.c @@ -459,7 +459,7 @@ EXPORT_SYMBOL(cpm_dpdump); void *cpm_dpram_addr(unsigned long offset) { - return ((immap_t *)IMAP_ADDR)->im_cpm.cp_dpmem + offset; + return (void *)(dpram_vbase + offset); } EXPORT_SYMBOL(cpm_dpram_addr); |