arm-boot/u-boot-imx.git - U-boot NXP imx6

	Commit message (Collapse)	Author	Age	Lines
*	Merge u-boot/master into u-boot-ti/master	Tom Rini	2013-03-11	-2/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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>
\| *	gpio: Build the da8xx_gpio code for the davinci644x device	Holger Hans Peter Freyther	2013-02-20	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	The differences include the number of GPIOs and that one is not required to set the pinmux on request. Signed-off-by: Holger Hans Peter Freyther <holger@freyther.de>
* \|	da8xx: Add the missing pinmux for da830 to the gpio driver	Tomas Novotny	2013-02-18	-0/+133
\|/ \| \| \| \| \| \| \| \|	The pinmux was generated from linux/arch/arm/mach-davinci/da830.c as of kernel version 3.7.5. If the driver is used for the da850, then SoC variant must be specified by CONFIG_SOC_DA850. Signed-off-by: Tomas Novotny <tomas@novotny.cz> Cc: Tom Rini <trini@ti.com>
*	gpio: Replace ARM gpio.h with the common API in include/asm-generic	Joe Hershberger	2012-01-09	-36/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ARM boards should use the generic GPIO API This means changing gpio to unsigned type Remove the unused gpio_toggle() function which is not part of the API Comment that free should not modify pin state Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Cc: Joe Hershberger <joe.hershberger@gmail.com> fixed merge conflict in da8xx_gpio.c, tegra2_gpio.c, and extended to the new mxs_gpio.c. Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
*	drivers/gpio/da8xx_gpio.c: Fix build warning	Anatolij Gustschin	2011-12-09	-3/+0
\| \| \| \| \| \| \| \| \|	Fix: da8xx_gpio.c: In function 'gpio_toggle_value': da8xx_gpio.c:208:23: warning: variable 'bank' set but not used [-Wunused-but-set-variable] Signed-off-by: Anatolij Gustschin <agust@denx.de>
*	Minor coding style cleanup.	Wolfgang Denk	2011-09-11	-11/+0
\| \| \| \|	Signed-off-by: Wolfgang Denk <wd@denx.de>
*	DA8xx: add generic GPIO driver	Laurence Withers	2011-08-03	-0/+281
	Add a generic GPIO driver for the DaVinci DA8xx processors. It is turned on by defining CONFIG_DA8XX_GPIO and fulfills the generic GPIO interface specified in <asm/gpio.h> . The driver has support for both manipulating GPIO pins as well as automatically configuring the pin multiplexor registers to set the pin function to GPIO. Signed-off-by: Laurence Withers <lwithers@guralp.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>