uboot/arch/arm/include/asm/arch-am33xx
Tom Rini e20cc2ca15 Merge branch 'master' of git://88.191.163.10/u-boot-arm
Fixup an easy conflict over adding the clk_get prototype and USB_OTG
defines for am33xx having moved.

Conflicts:
	arch/arm/include/asm/arch-am33xx/hardware.h

Signed-off-by: Tom Rini <trini@ti.com>
2013-08-18 14:14:34 -04:00
..
clock.h Add TI816X support 2013-08-15 18:38:37 -04:00
clock_ti81xx.h Add TI816X support 2013-08-15 18:38:37 -04:00
clocks_am33xx.h ARM: AM33xx: Move s_init to a common place 2013-08-15 08:51:10 -04:00
cpu.h ARM: AM43xx: Add header files 2013-08-15 08:51:10 -04:00
ddr_defs.h Add TI816X support 2013-08-15 18:38:37 -04:00
elm.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
gpio.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
hardware.h Merge branch 'master' of git://88.191.163.10/u-boot-arm 2013-08-18 14:14:34 -04:00
hardware_am33xx.h Add TI816X support 2013-08-15 18:38:37 -04:00
hardware_am43xx.h Add TI816X support 2013-08-15 18:38:37 -04:00
hardware_ti814x.h Add TI816X support 2013-08-15 18:38:37 -04:00
hardware_ti816x.h Add TI816X support 2013-08-15 18:38:37 -04:00
i2c.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
mem.h am335x_evm: Add support for the NOR module on the memory cape 2013-07-30 09:21:41 -04:00
mmc_host_def.h Add TI816X support 2013-08-15 18:38:37 -04:00
mux.h Add TI816X support 2013-08-15 18:38:37 -04:00
mux_am33xx.h am33xx: refactor am33xx mux support and add ti814x support 2013-03-24 12:49:11 -04:00
mux_am43xx.h ARM: AM43xx: Add header files 2013-08-15 08:51:10 -04:00
mux_ti814x.h am33xx: refactor am33xx mux support and add ti814x support 2013-03-24 12:49:11 -04:00
mux_ti816x.h Add TI816X support 2013-08-15 18:38:37 -04:00
omap.h Prepare for TI816X : reuse existing code from TI814X 2013-08-15 18:38:37 -04:00
omap_gpmc.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
spl.h Add TI816X support 2013-08-15 18:38:37 -04:00
sys_proto.h ARM: AM33xx: Move s_init to a common place 2013-08-15 08:51:10 -04:00