u-boot-brain/arch/arm/include/asm
Tom Rini fbbbc86e8e Merge branch 'master' of git://git.denx.de/u-boot-arm
Fix a trivial conflict in arch/arm/dts/exynos5250.dtsi about gpio and
serial.

Conflicts:
	arch/arm/dts/exynos5250.dtsi

Signed-off-by: Tom Rini <trini@ti.com>
2013-07-12 10:36:48 -04:00
..
arch-a320 ftsmc020: move ftsmc020 static mem controller to driver/mtd 2011-04-27 19:38:10 +02:00
arch-am33xx Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-07-12 10:36:48 -04:00
arch-arm720t arm: Remove support for NETARM 2012-10-26 22:38:00 +02:00
arch-armada100 USB: Armada100: EHCI Driver for Armada100 SOCs 2012-03-19 00:08:26 +01:00
arch-armv7 ARMv7: Add register definition of global timer 2012-10-03 02:04:22 +02:00
arch-at91 ARM: atmel: add sama5d3xek support 2013-05-21 11:54:16 +02:00
arch-bcm2835 ARM: bcm2835: fix get_timer() to return ms 2013-04-04 08:14:54 +02:00
arch-davinci arm: da830: moved pinmux configurations to the arch tree 2013-06-10 08:54:46 -04:00
arch-ep93xx Move architecture-specific includes to arch/$ARCH/include/asm 2010-04-13 09:13:12 +02:00
arch-exynos Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-07-12 10:36:48 -04:00
arch-imx mxc: Define architecture identifier 2012-09-01 14:58:30 +02:00
arch-ixp IXP: Fix GPIO_INT_ACT_LOW_SET() 2012-03-26 23:09:26 +02:00
arch-kirkwood arch-kirkwood: Ethernet port macro returning incorrect address 2013-01-09 04:12:11 +05:30
arch-ks8695 Move architecture-specific includes to arch/$ARCH/include/asm 2010-04-13 09:13:12 +02:00
arch-lpc32xx serial: add LPC32X0 high-speed UART devices support 2012-05-15 08:31:21 +02:00
arch-mb86r0x arm: auto gen asm-offsets.h for mb86r0x 2011-08-04 13:56:55 +02:00
arch-mx5 imx: mx5: Remove legacy iomux support 2013-05-05 17:55:05 +02:00
arch-mx6 imx: Complete the pin definitions for the i.MX6DL / i.MX6Solo 2013-06-26 16:47:30 +02:00
arch-mx25 imx: mx25: Remove legacy iomux support 2013-05-05 17:55:03 +02:00
arch-mx27 mx27: add i2c clock 2013-06-26 17:34:21 +02:00
arch-mx31 Add fsl_iim driver 2013-04-28 11:07:41 +02:00
arch-mx35 imx: mx35: Remove legacy iomux support 2013-05-05 17:55:04 +02:00
arch-mxs arm: mxs: Add LCDIF registers for i.MX233 2013-05-06 17:40:22 +02:00
arch-nomadik Move architecture-specific includes to arch/$ARCH/include/asm 2010-04-13 09:13:12 +02:00
arch-omap3 ARM: OMAP: GPIO: Fix valid range and enable usage of all GPIOs on OMAP5 2013-07-02 09:21:16 -04:00
arch-omap4 Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-07-12 10:36:48 -04:00
arch-omap5 Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-07-12 10:36:48 -04:00
arch-orion5x ARM: kirkwood/orion5x: Use reset_cpu definition in include/common.h 2012-10-03 16:43:13 +05:30
arch-pantheon pantheon: define CONFIG_SYS_CACHELINE_SIZE 2011-11-03 22:56:22 +01:00
arch-pxa pxa27x_udc: remove call to unimplemented set_GPIO_mode() 2013-05-05 23:47:05 +02:00
arch-rmobile arm: rmobile: Add support PFC of Renesas R8A7740 2012-10-03 02:04:25 +02:00
arch-s3c24x0 ARM : Add GPIO Driver and IOMUX definition for S3C2440 2012-10-03 10:50:20 +02:00
arch-s3c44b0 Move architecture-specific includes to arch/$ARCH/include/asm 2010-04-13 09:13:12 +02:00
arch-s5pc1xx gpio:fix: Proper handling of GPIO subsystem parts at Samsung devices 2012-11-15 21:08:18 +09:00
arch-sa1100 Move architecture-specific includes to arch/$ARCH/include/asm 2010-04-13 09:13:12 +02:00
arch-socfpga ARM: Add Altera SOCFPGA Cyclone5 2012-10-04 18:11:52 +02:00
arch-spear SPL: ARM: spear: Add SPL support for SPEAr600 platform 2012-07-07 14:07:43 +02:00
arch-tegra ARM: Tegra: USB: EHCI: Add support for Tegra30/Tegra114 2013-07-11 14:15:15 -07:00
arch-tegra20 ARM: Tegra: USB: EHCI: Add support for Tegra30/Tegra114 2013-07-11 14:15:15 -07:00
arch-tegra30 ARM: Tegra: USB: EHCI: Add support for Tegra30/Tegra114 2013-07-11 14:15:15 -07:00
arch-tegra114 ARM: Tegra: USB: EHCI: Add support for Tegra30/Tegra114 2013-07-11 14:15:15 -07:00
arch-tnetv107x ARM1176: TI: TNETV107X soc initial support 2010-06-08 10:07:17 -05:00
arch-u8500 u8500: Enabling power to MMC device on AB8500 V2 2012-09-01 14:58:20 +02:00
arch-vf610 arm: vf610: Add Vybrid VF610 CPU support 2013-06-03 10:56:53 +02:00
arch-zynq fpga: zynq: Add support for loading bitstream 2013-05-06 10:41:24 +02:00
imx-common arm: vf610: Add IOMUX support for Vybrid VF610 2013-06-03 10:56:53 +02:00
proc-armv Move architecture-specific includes to arch/$ARCH/include/asm 2010-04-13 09:13:12 +02:00
armv7.h ARM: OMAP5: Add silicon id support for ES2.0 revision. 2013-03-11 11:06:10 -04:00
assembler.h arm: Use optimized memcpy and memset from linux 2011-04-27 19:38:07 +02:00
atomic.h Move architecture-specific includes to arch/$ARCH/include/asm 2010-04-13 09:13:12 +02:00
bitops.h arm: add __ilog2 function 2011-07-16 13:00:11 +02:00
bootm.h arm: Refactor bootm to reduce #ifdefs 2013-05-14 15:37:25 -04:00
byteorder.h Move architecture-specific includes to arch/$ARCH/include/asm 2010-04-13 09:13:12 +02:00
cache.h ARM: mmu: Introduce weak dram_bank_setup function 2013-03-28 09:06:49 +01:00
config.h Replace CONFIG_RELOC_FIXUP_WORKS by CONFIG_NEEDS_MANUAL_RELOC 2010-10-29 21:32:07 +02:00
dma-mapping.h Fix Stelian's email address 2011-11-29 15:43:38 +01:00
ehci-omap.h usb: ehci: rework to take advantage of new lowlevel interface 2012-10-15 11:54:00 -07:00
emif.h ARM: DRA7xx: EMIF: Change settings required for EVM board 2013-06-10 08:43:10 -04:00
errno.h Move architecture-specific includes to arch/$ARCH/include/asm 2010-04-13 09:13:12 +02:00
global_data.h ARM: OMAP: Correct save_boot_params and replace with 'C' function 2013-05-10 08:25:56 -04:00
gpio.h gpio: Replace ARM gpio.h with the common API in include/asm-generic 2012-01-09 20:10:32 -06:00
hardware.h Move architecture-specific includes to arch/$ARCH/include/asm 2010-04-13 09:13:12 +02:00
io.h ARM: fix write*() I/O accessors 2011-02-21 08:30:55 +01:00
linkage.h arm: adapt asm/linkage.h from Linux 2012-05-15 08:31:26 +02:00
mach-types.h arm: Remove support for smdk6400 2013-04-12 07:55:08 +02:00
macro.h Move architecture-specific includes to arch/$ARCH/include/asm 2010-04-13 09:13:12 +02:00
memory.h Move architecture-specific includes to arch/$ARCH/include/asm 2010-04-13 09:13:12 +02:00
omap_boot.h ARM: OMAP: Correct save_boot_params and replace with 'C' function 2013-05-10 08:25:56 -04:00
omap_common.h Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-06-13 15:16:15 -04:00
omap_gpio.h gpio: add gpio_is_valid() to omap_gpio API 2012-12-10 12:45:35 -07:00
omap_gpmc.h asm/omap_gpmc.h: consolidate common defines 2013-04-08 11:29:05 -04:00
omap_mmc.h omap_hsmmc: add driver check for write protection 2013-03-08 16:41:13 -05:00
omap_musb.h musb-new: omap2plus backend driver 2012-11-20 00:16:08 +01:00
pl310.h armv7: add PL310 support to u-boot 2011-07-04 10:55:25 +02:00
posix_types.h Move architecture-specific includes to arch/$ARCH/include/asm 2010-04-13 09:13:12 +02:00
processor.h Move architecture-specific includes to arch/$ARCH/include/asm 2010-04-13 09:13:12 +02:00
ptrace.h Move architecture-specific includes to arch/$ARCH/include/asm 2010-04-13 09:13:12 +02:00
sections.h Introduce generic link section.h symbol files 2013-03-15 16:13:58 -04:00
setup.h arm bootm: Allow to pass board specified atags 2012-10-30 15:28:05 -07:00
sizes.h arch/arm/include/asm/sizes.h: cleanups 2010-10-13 09:59:33 +02:00
spl.h Replace __bss_end__ with __bss_end 2013-03-15 16:13:54 -04:00
string.h arm: Use optimized memcpy and memset from linux 2011-04-27 19:38:07 +02:00
system.h ARM: mmu: Set domain permissions to client access 2013-03-28 09:10:58 +01:00
types.h Move architecture-specific includes to arch/$ARCH/include/asm 2010-04-13 09:13:12 +02:00
u-boot-arm.h arm: Refactor bootm to reduce #ifdefs 2013-05-14 15:37:25 -04:00
u-boot.h arm: Enable generic board support 2013-03-15 16:14:00 -04:00
unaligned.h Move architecture-specific includes to arch/$ARCH/include/asm 2010-04-13 09:13:12 +02:00
utils.h armv7: cache maintenance operations for armv7 2011-07-04 10:55:25 +02:00