diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-09-23 11:06:57 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-04 15:19:53 +0200 |
| commit | 1d609aceae14cf46be17a5f275f333c2492d528a (patch) | |
| tree | 71a951f5621b15bdf10e636f441591b0afde3f7e /arch/arm/boards/guf-neso | |
| parent | 5455ecea55c9e04bdadd5196a18ab12c198f7e65 (diff) | |
| download | barebox-1d609aceae14cf46be17a5f275f333c2492d528a.tar.gz barebox-1d609aceae14cf46be17a5f275f333c2492d528a.tar.xz | |
ARM i.MX27: give register base addresses a proper MX27_ prefix
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/guf-neso')
| -rw-r--r-- | arch/arm/boards/guf-neso/board.c | 12 | ||||
| -rw-r--r-- | arch/arm/boards/guf-neso/lowlevel.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/boards/guf-neso/board.c b/arch/arm/boards/guf-neso/board.c index 7f25a1122e..7adee929b0 100644 --- a/arch/arm/boards/guf-neso/board.c +++ b/arch/arm/boards/guf-neso/board.c @@ -115,21 +115,21 @@ static void neso_usbh_init(void) { uint32_t temp; - temp = readl(IMX_OTG_BASE + 0x600); + temp = readl(MX27_USB_OTG_BASE_ADDR + 0x600); temp &= ~((3 << 21) | 1); temp |= (1 << 5) | (1 << 16) | (1 << 19) | (1 << 20) | (1<<11); - writel(temp, IMX_OTG_BASE + 0x600); + writel(temp, MX27_USB_OTG_BASE_ADDR + 0x600); - temp = readl(IMX_OTG_BASE + 0x584); + temp = readl(MX27_USB_OTG_BASE_ADDR + 0x584); temp &= ~(3 << 30); temp |= 2 << 30; - writel(temp, IMX_OTG_BASE + 0x584); + writel(temp, MX27_USB_OTG_BASE_ADDR + 0x584); mdelay(10); gpio_set_value(USBH2_PHY_CS_GPIO, 0); mdelay(10); - ulpi_setup((void *)(IMX_OTG_BASE + 0x570), 1); + ulpi_setup((void *)(MX27_USB_OTG_BASE_ADDR + 0x570), 1); } #endif @@ -276,7 +276,7 @@ static int neso_devices_init(void) #ifdef CONFIG_USB neso_usbh_init(); - add_generic_usb_ehci_device(DEVICE_ID_DYNAMIC, IMX_OTG_BASE + 0x400, NULL); + add_generic_usb_ehci_device(DEVICE_ID_DYNAMIC, MX27_USB_OTG_BASE_ADDR + 0x400, NULL); #endif imx27_add_fec(&fec_info); diff --git a/arch/arm/boards/guf-neso/lowlevel.c b/arch/arm/boards/guf-neso/lowlevel.c index 2d57990773..52fe6cffa8 100644 --- a/arch/arm/boards/guf-neso/lowlevel.c +++ b/arch/arm/boards/guf-neso/lowlevel.c @@ -101,10 +101,10 @@ void __bare_init __naked reset(void) #ifdef CONFIG_NAND_IMX_BOOT /* skip NAND boot if not running from NFC space */ r = get_pc(); - if (r < IMX_NFC_BASE || r > IMX_NFC_BASE + 0x800) + if (r < MX27_NFC_BASE_ADDR || r > MX27_NFC_BASE_ADDR + 0x800) board_init_lowlevel_return(); - src = (unsigned int *)IMX_NFC_BASE; + src = (unsigned int *)MX27_NFC_BASE_ADDR; trg = (unsigned int *)_text; /* Move ourselves out of NFC SRAM */ |