sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

ARM omap3beagle: Fix incorrect base addresses 

The base address passed for device "omap-hsmmc" was
incorrectly passed as OMAP_I2C1_BASE and the base
address for device "i2c-omap" was hardcoded to
0x4809C000 which, in fact, refers to OMAP_MMC1_BASE.

Similarly, in call to add_usb_ehci_device(), addition
is not required if right base address is used.
In fact, 0x48064700 (used as base in the addition)
falls in the OHCI Address space.

Signed-off-by: Sanjeev Premi <premi@ti.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sanjeev Premi 2012-01-11 20:27:19 +05:30 committed by Sascha Hauer
parent 8eeab1778b
commit e54e3289aa
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/boards/omap/board-beagle.c
View File

@ -290,13 +290,13 @@ mem_initcall(beagle_mem_init);
static int beagle_devices_init(void) static int beagle_devices_init(void)
{ {
i2c_register_board_info(0, i2c_devices, ARRAY_SIZE(i2c_devices)); i2c_register_board_info(0, i2c_devices, ARRAY_SIZE(i2c_devices));
add_generic_device("i2c-omap", -1, NULL, 0x4809C000, SZ_4K, add_generic_device("i2c-omap", -1, NULL, OMAP_I2C1_BASE, SZ_4K,
IORESOURCE_MEM, NULL); IORESOURCE_MEM, NULL);
#ifdef CONFIG_USB_EHCI_OMAP #ifdef CONFIG_USB_EHCI_OMAP
if (ehci_omap_init(&omap_ehci_pdata) >= 0) if (ehci_omap_init(&omap_ehci_pdata) >= 0)
add_usb_ehci_device(-1, 0x48064700 + 0x100, add_usb_ehci_device(-1, OMAP_EHCI_BASE,
0x48064700 + 0x110, &ehci_pdata); OMAP_EHCI_BASE + 0x10, &ehci_pdata);
#endif /* CONFIG_USB_EHCI_OMAP */ #endif /* CONFIG_USB_EHCI_OMAP */
#ifdef CONFIG_OMAP_GPMC #ifdef CONFIG_OMAP_GPMC
/* WP is made high and WAIT1 active Low */ /* WP is made high and WAIT1 active Low */
@ -304,7 +304,7 @@ static int beagle_devices_init(void)
#endif #endif
gpmc_generic_nand_devices_init(0, 16, OMAP_ECC_HAMMING_CODE_HW_ROMCODE); gpmc_generic_nand_devices_init(0, 16, OMAP_ECC_HAMMING_CODE_HW_ROMCODE);
add_generic_device("omap-hsmmc", -1, NULL, OMAP_I2C1_BASE, 0, add_generic_device("omap-hsmmc", -1, NULL, OMAP_MMC1_BASE, SZ_4K,
IORESOURCE_MEM, NULL); IORESOURCE_MEM, NULL);
armlinux_set_bootparams((void *)0x80000100); armlinux_set_bootparams((void *)0x80000100);