Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd893663 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

arch/powerpc/boot/dts/mpc8349emitx.dts

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ 
			#size-cells = <0>;

			interrupt-parent = < &ipic >;

			interrupts = <26 8>;

			dr_mode = "peripheral";

			phy_type = "ulpi";

		};

arch/powerpc/platforms/83xx/usb.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

	}

arch/powerpc/sysdev/commproc.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

arch/ppc/8xx_io/commproc.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/serial/cpm_uart/cpm_uart_cpm1.h

+1 −1
Original line number Diff line number Diff line
@@ -37,6 +37,6 @@ static inline void cpm_set_smc_fcr(volatile smc_uart_t * up) 
	up->smc_tfcr = SMC_EB;

}



#define DPRAM_BASE	((unsigned char *)&cpmp->cp_dpmem[0])

#define DPRAM_BASE	((unsigned char *)cpm_dpram_addr(0))



#endif