Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-11 15:37:23 +00:00
Code Issues Projects Releases Packages Wiki Activity
u-boot/arch/arm/include/asm/arch-davinci
History
Tom Rini 76b40ab41e Merge u-boot/master into u-boot-ti/master 
In master we had already taken a patch to fix the davinci GPIO code for
CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support
DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850).  Resolve these
conflicts manually and comment the #else/#endif lines for clarity.

Conflicts:
	arch/arm/include/asm/arch-davinci/gpio.h
	drivers/gpio/da8xx_gpio.c

Signed-off-by: Tom Rini <trini@ti.com>
2013-03-11 12:16:13 -04:00
..
aintc_defs.h arm, davinci: da850/dm365 lowlevel cleanup 2011-11-15 22:25:51 +01:00
da8xx-fb.h Coding Style cleanup 2011-12-19 12:03:40 +01:00
da8xx-usb.h da8xx/hawkboard: Add support for ohci host controller 2012-09-01 14:58:19 +02:00
da850_lowlevel.h Changes to move hawkboard to the new spl infrastructure 2012-02-12 10:11:33 +01:00
davinci_misc.h hawkboard: Replace HAWKBOARD_KICK{0, 1}_UNLOCK defines 2011-11-29 15:43:40 +01:00
ddr2_defs.h arm, davinci: da850/dm365 lowlevel cleanup 2011-11-15 22:25:51 +01:00
dm365_lowlevel.h arm, davinci: add workaround for not resetting DMA bus and VPSS modules 2012-02-12 10:11:23 +01:00
emac_defs.h davinci_emac: move arch-independent defines to separate header 2011-12-06 23:59:35 +01:00
emif_defs.h arm, davinci: da850/dm365 lowlevel cleanup 2011-11-15 22:25:51 +01:00
gpio.h Merge u-boot/master into u-boot-ti/master 2013-03-11 12:16:13 -04:00
hardware.h da8xx/hawkboard: Add support for ohci host controller 2012-09-01 14:58:19 +02:00
i2c_defs.h Move architecture-specific includes to arch/$ARCH/include/asm 2010-04-13 09:13:12 +02:00
nand_defs.h Move architecture-specific includes to arch/$ARCH/include/asm 2010-04-13 09:13:12 +02:00
pinmux_defs.h arm/davinci/da850: add uart0 pinmux 2012-09-01 14:58:10 +02:00
pll_defs.h arm, davinci: add PLL0 prediv to da850 lowlevel setup 2012-02-12 10:11:22 +01:00
psc_defs.h arm, davinci: add header files for dm365 2011-11-03 22:56:25 +01:00
sdmmc_defs.h Davinci MMCSD Support 2011-02-02 00:54:44 +01:00
spl.h ARM: SPL: Convert davinci to CONFIG_SPL_FRAMEWORK 2012-09-27 11:20:10 -07:00
syscfg_defs.h arm, davinci: add header files for dm365 2011-11-03 22:56:25 +01:00
timer_defs.h arm, davinci: add timer defines for tcr field 2012-02-12 10:11:23 +01:00