diff options
| author | Felix Radensky <felix@embedded-sol.com> | 2011-06-27 09:39:29 +0300 | 
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2011-07-11 13:24:20 -0500 | 
| commit | aeb6716a12c68644d6dc1e798b724086c3cfcd24 (patch) | |
| tree | 4c9782eb057a11db239e2df0a09151606011a3ae | |
| parent | c49290cd1964bd67fd3a7006a4409c9f2d526ee4 (diff) | |
| download | olio-uboot-2014.01-aeb6716a12c68644d6dc1e798b724086c3cfcd24.tar.xz olio-uboot-2014.01-aeb6716a12c68644d6dc1e798b724086c3cfcd24.zip | |
powerpc/85xx: Fix pin muxing for second USB controller
On P1022/P1013 second USB controller is muxed with second
Ethernet controller. The current code to enable second USB
fails to properly clear pinmux bits used by ethernet. As a
result, Linux freezes when this controller is used. This
patch fixes the problem.
Signed-off-by: Felix Radensky <felix@embedded-sol.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| -rw-r--r-- | arch/powerpc/include/asm/immap_85xx.h | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h index f85cee270..267a9401b 100644 --- a/arch/powerpc/include/asm/immap_85xx.h +++ b/arch/powerpc/include/asm/immap_85xx.h @@ -2017,7 +2017,7 @@ typedef struct ccsr_gur {  #define MPC85xx_PMUXCR2_PLL_LKDT_EXPOSE		0x00001000  #endif  #if defined(CONFIG_P1013) || defined(CONFIG_P1022) -#define MPC85xx_PMUXCR2_ETSECUSB_MASK	0x001f1000 +#define MPC85xx_PMUXCR2_ETSECUSB_MASK	0x001f8000  #define MPC85xx_PMUXCR2_USB		0x00150000  #endif  	u8	res6[8]; |