Commit bd893663 authored by Linus Torvalds's avatar Linus Torvalds

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
parents f100353f f93c7c5a
...@@ -99,6 +99,7 @@ ...@@ -99,6 +99,7 @@
#size-cells = <0>; #size-cells = <0>;
interrupt-parent = < &ipic >; interrupt-parent = < &ipic >;
interrupts = <26 8>; interrupts = <26 8>;
dr_mode = "peripheral";
phy_type = "ulpi"; phy_type = "ulpi";
}; };
......
...@@ -76,14 +76,14 @@ int mpc834x_usb_cfg(void) ...@@ -76,14 +76,14 @@ int mpc834x_usb_cfg(void)
if (port0_is_dr) if (port0_is_dr)
printk(KERN_WARNING printk(KERN_WARNING
"834x USB port0 can't be used by both DR and MPH!\n"); "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); prop = of_get_property(np, "port1", NULL);
if (prop) { if (prop) {
if (port1_is_dr) if (port1_is_dr)
printk(KERN_WARNING printk(KERN_WARNING
"834x USB port1 can't be used by both DR and MPH!\n"); "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); of_node_put(np);
} }
......
...@@ -395,4 +395,4 @@ uint cpm_dpram_phys(u8* addr) ...@@ -395,4 +395,4 @@ uint cpm_dpram_phys(u8* addr)
{ {
return (dpram_pbase + (uint)(addr - dpram_vbase)); return (dpram_pbase + (uint)(addr - dpram_vbase));
} }
EXPORT_SYMBOL(cpm_dpram_addr); EXPORT_SYMBOL(cpm_dpram_phys);
...@@ -459,7 +459,7 @@ EXPORT_SYMBOL(cpm_dpdump); ...@@ -459,7 +459,7 @@ EXPORT_SYMBOL(cpm_dpdump);
void *cpm_dpram_addr(unsigned long offset) 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); EXPORT_SYMBOL(cpm_dpram_addr);
......
...@@ -37,6 +37,6 @@ static inline void cpm_set_smc_fcr(volatile smc_uart_t * up) ...@@ -37,6 +37,6 @@ static inline void cpm_set_smc_fcr(volatile smc_uart_t * up)
up->smc_tfcr = SMC_EB; up->smc_tfcr = SMC_EB;
} }
#define DPRAM_BASE ((unsigned char *)&cpmp->cp_dpmem[0]) #define DPRAM_BASE ((unsigned char *)cpm_dpram_addr(0))
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment