diff options
| author | Alexander Shiyan <shc_work@mail.ru> | 2012-03-24 18:00:35 +0400 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-02 09:32:53 +0200 |
| commit | 9c01d10dab293fc93257a823332ecc1270ceeba3 (patch) | |
| tree | 491bcf293a27dd184a8be5865ef5e45e268ceb07 /drivers | |
| parent | 0c0fad494220e62dad35a6ed866b617b103879f1 (diff) | |
| download | barebox-9c01d10dab293fc93257a823332ecc1270ceeba3.tar.gz barebox-9c01d10dab293fc93257a823332ecc1270ceeba3.tar.xz | |
Rename definitions for ULPI registers
These registers can be used for any standart ULPI chip,
not only for ISP1504.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/otg/isp1504.c | 14 | ||||
| -rw-r--r-- | drivers/usb/otg/ulpi.c | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/usb/otg/isp1504.c b/drivers/usb/otg/isp1504.c index 9ba74b157b..9884df463b 100644 --- a/drivers/usb/otg/isp1504.c +++ b/drivers/usb/otg/isp1504.c @@ -6,10 +6,10 @@ int isp1504_set_vbus_power(void __iomem *view, int on) { int vid, pid, ret = 0; - vid = (ulpi_read(ISP1504_VID_HIGH, view) << 8) | - ulpi_read(ISP1504_VID_LOW, view); - pid = (ulpi_read(ISP1504_PID_HIGH, view) << 8) | - ulpi_read(ISP1504_PID_LOW, view); + vid = (ulpi_read(ULPI_VID_HIGH, view) << 8) | + ulpi_read(ULPI_VID_LOW, view); + pid = (ulpi_read(ULPI_PID_HIGH, view) << 8) | + ulpi_read(ULPI_PID_LOW, view); pr_info("ULPI Vendor ID 0x%x Product ID 0x%x\n", vid, pid); if (vid != 0x4cc || pid != 0x1504) { @@ -22,15 +22,15 @@ int isp1504_set_vbus_power(void __iomem *view, int on) DRV_VBUS | /* enable internal Vbus */ USE_EXT_VBUS_IND | /* use external indicator */ CHRG_VBUS, /* charge Vbus */ - ISP1504_OTGCTL, view); + ULPI_OTGCTL, view); } else { ret = ulpi_clear(DRV_VBUS_EXT | /* disable external Vbus */ DRV_VBUS, /* disable internal Vbus */ - ISP1504_OTGCTL, view); + ULPI_OTGCTL, view); ret |= ulpi_set(USE_EXT_VBUS_IND | /* use external indicator */ DISCHRG_VBUS, /* discharge Vbus */ - ISP1504_OTGCTL, view); + ULPI_OTGCTL, view); } return ret; diff --git a/drivers/usb/otg/ulpi.c b/drivers/usb/otg/ulpi.c index 6ed6f01e8e..575ed94b06 100644 --- a/drivers/usb/otg/ulpi.c +++ b/drivers/usb/otg/ulpi.c @@ -87,7 +87,7 @@ int ulpi_set(u8 bits, int reg, void __iomem *view) } writel((ULPIVW_RUN | ULPIVW_WRITE | - ((reg + ISP1504_REG_SET) << ULPIVW_ADDR_SHIFT) | + ((reg + ULPI_REG_SET) << ULPIVW_ADDR_SHIFT) | ((bits & ULPIVW_WDATA_MASK) << ULPIVW_WDATA_SHIFT)), view); @@ -104,7 +104,7 @@ int ulpi_clear(u8 bits, int reg, void __iomem *view) int ret; writel((ULPIVW_RUN | ULPIVW_WRITE | - ((reg + ISP1504_REG_CLEAR) << ULPIVW_ADDR_SHIFT) | + ((reg + ULPI_REG_CLEAR) << ULPIVW_ADDR_SHIFT) | ((bits & ULPIVW_WDATA_MASK) << ULPIVW_WDATA_SHIFT)), view); |