diff options
| author | Justin Waters <justin.waters@timesys.com> | 2008-05-28 17:03:03 -0400 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2008-05-28 17:03:03 -0400 |
| commit | 282585cfd7074f9d53b1630f9fdee3c9c6abfa95 (patch) | |
| tree | ba3cb0fe85af84ac5c29cfe72c6160691da72f10 | |
| parent | afd6a91924a87203aae8b6561c147ad830811bb5 (diff) | |
MX27: Fix USB register and PMIC Header
One of the USB registers were incorrectly written, and the PMIC header file
had an unnecessary ifdef in it.
Signed-off-by: David Kocinski <david.kocinski@timesys.com>
Acked-by: Justin Waters <justin.waters@timesys.com>
| -rw-r--r-- | arch/arm/plat-mxc/usb_common.c | 5 | ||||
| -rw-r--r-- | include/asm-arm/arch-mxc/pmic_external.h | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/plat-mxc/usb_common.c b/arch/arm/plat-mxc/usb_common.c index f56392fba3f6..9f1d961774b1 100644 --- a/arch/arm/plat-mxc/usb_common.c +++ b/arch/arm/plat-mxc/usb_common.c @@ -333,9 +333,8 @@ static void usbh2_set_ulpi_xcvr(void) UCTRL_H2PM; /* power mask */ #endif - UH2_PORTSC1 &= ~PORTSC_PTS_MASK; /* set ULPI xcvr */ - UH2_PORTSC1 |= PORTSC_PTS_ULPI; - + /* set ULPI xcvr */ + UH2_PORTSC1 = (UH2_PORTSC1 & ~PORTSC_PTS_MASK) | PORTSC_PTS_ULPI; /* Turn off the usbpll for ulpi tranceivers */ clk_disable(usb_clk); } diff --git a/include/asm-arm/arch-mxc/pmic_external.h b/include/asm-arm/arch-mxc/pmic_external.h index 3ca5ef6f0065..fbfea77bcab4 100644 --- a/include/asm-arm/arch-mxc/pmic_external.h +++ b/include/asm-arm/arch-mxc/pmic_external.h @@ -127,8 +127,6 @@ typedef struct { #define PMIC_ALL_BITS 0xFFFFFF #define PMIC_MAX_EVENTS 48 -#ifdef CONFIG_MXC_PMIC_MC13783 - #define PMIC_ARBITRATION "NULL" /*! * This is the enumeration of register names of MC13783 @@ -796,7 +794,6 @@ typedef struct { */ bool sense_clks; } t_sensor_bits; -#endif /* EXPORTED FUNCTIONS */ |