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>

diff --cc MAINTAINERS
Simple merge

diff --cc README
Simple merge

diff --cc arch/arm/include/asm/arch-davinci/gpio.h
index fbbb1f33c3c9427b9710ad6aa1142e70261476d7,5206b122114e1eeb02f22d4cc855355fd8624ef1..06390c85e1092de192bf0b049927d5cebab76f77
--- 1/arch/arm/include/asm/arch-davinci/gpio.h
--- 2/arch/arm/include/asm/arch-davinci/gpio.h
+++ b/arch/arm/include/asm/arch-davinci/gpio.h
@@@ -65,10 -65,9 +65,13 @@@ struct davinci_gpio_bank 
  #define davinci_gpio_bank67 ((struct davinci_gpio *)DAVINCI_GPIO_BANK67)
  #define davinci_gpio_bank8 ((struct davinci_gpio *)DAVINCI_GPIO_BANK8)
  
- #if defined(CONFIG_SOC_DA8XX) && !defined(CONFIG_SOC_DA850)
 +#define gpio_status()         gpio_info()
 +#define GPIO_NAME_SIZE                20
+ #if defined(CONFIG_SOC_DM644X)
+ /* GPIO0 to GPIO53, omit the V3.3 volts one */
+ #define MAX_NUM_GPIOS         70
++#elif defined(CONFIG_SOC_DA8XX) && !defined(CONFIG_SOC_DA850)
 +#define MAX_NUM_GPIOS         128
  #else
  #define MAX_NUM_GPIOS         144
  #endif

diff --cc board/technexion/twister/twister.c
Simple merge

diff --cc board/timll/devkit8000/devkit8000.c
Simple merge

diff --cc boards.cfg
Simple merge

diff --cc drivers/gpio/da8xx_gpio.c
index 271b8d93f4352b1471e938169e00940ef84884c1,ed6a1180d469b0c6387653056fbccf8164c2a0ef..76648d27d426bc9e644378312e010d10629e329d
--- 1/drivers/gpio/da8xx_gpio.c
--- 2/drivers/gpio/da8xx_gpio.c
+++ b/drivers/gpio/da8xx_gpio.c
@@@ -31,140 -31,9 +31,141 @@@ static struct gpio_registry 
        char name[GPIO_NAME_SIZE];
  } gpio_registry[MAX_NUM_GPIOS];
  
+ #if defined(CONFIG_SOC_DA8XX)
  #define pinmux(x)       (&davinci_syscfg_regs->pinmux[x])
  
- #else
 +#if defined(CONFIG_SOC_DA8XX) && !defined(CONFIG_SOC_DA850)
 +static const struct pinmux_config gpio_pinmux[] = {
 +      { pinmux(13), 8, 6 },   /* GP0[0] */
 +      { pinmux(13), 8, 7 },
 +      { pinmux(14), 8, 0 },
 +      { pinmux(14), 8, 1 },
 +      { pinmux(14), 8, 2 },
 +      { pinmux(14), 8, 3 },
 +      { pinmux(14), 8, 4 },
 +      { pinmux(14), 8, 5 },
 +      { pinmux(14), 8, 6 },
 +      { pinmux(14), 8, 7 },
 +      { pinmux(15), 8, 0 },
 +      { pinmux(15), 8, 1 },
 +      { pinmux(15), 8, 2 },
 +      { pinmux(15), 8, 3 },
 +      { pinmux(15), 8, 4 },
 +      { pinmux(15), 8, 5 },
 +      { pinmux(15), 8, 6 },   /* GP1[0] */
 +      { pinmux(15), 8, 7 },
 +      { pinmux(16), 8, 0 },
 +      { pinmux(16), 8, 1 },
 +      { pinmux(16), 8, 2 },
 +      { pinmux(16), 8, 3 },
 +      { pinmux(16), 8, 4 },
 +      { pinmux(16), 8, 5 },
 +      { pinmux(16), 8, 6 },
 +      { pinmux(16), 8, 7 },
 +      { pinmux(17), 8, 0 },
 +      { pinmux(17), 8, 1 },
 +      { pinmux(17), 8, 2 },
 +      { pinmux(17), 8, 3 },
 +      { pinmux(17), 8, 4 },
 +      { pinmux(17), 8, 5 },
 +      { pinmux(17), 8, 6 },   /* GP2[0] */
 +      { pinmux(17), 8, 7 },
 +      { pinmux(18), 8, 0 },
 +      { pinmux(18), 8, 1 },
 +      { pinmux(18), 8, 2 },
 +      { pinmux(18), 8, 3 },
 +      { pinmux(18), 8, 4 },
 +      { pinmux(18), 8, 5 },
 +      { pinmux(18), 8, 6 },
 +      { pinmux(18), 8, 7 },
 +      { pinmux(19), 8, 0 },
 +      { pinmux(9), 8, 2 },
 +      { pinmux(9), 8, 3 },
 +      { pinmux(9), 8, 4 },
 +      { pinmux(9), 8, 5 },
 +      { pinmux(9), 8, 6 },
 +      { pinmux(10), 8, 1 },   /* GP3[0] */
 +      { pinmux(10), 8, 2 },
 +      { pinmux(10), 8, 3 },
 +      { pinmux(10), 8, 4 },
 +      { pinmux(10), 8, 5 },
 +      { pinmux(10), 8, 6 },
 +      { pinmux(10), 8, 7 },
 +      { pinmux(11), 8, 0 },
 +      { pinmux(11), 8, 1 },
 +      { pinmux(11), 8, 2 },
 +      { pinmux(11), 8, 3 },
 +      { pinmux(11), 8, 4 },
 +      { pinmux(9), 8, 7 },
 +      { pinmux(2), 8, 6 },
 +      { pinmux(11), 8, 5 },
 +      { pinmux(11), 8, 6 },
 +      { pinmux(12), 8, 4 },   /* GP4[0] */
 +      { pinmux(12), 8, 5 },
 +      { pinmux(12), 8, 6 },
 +      { pinmux(12), 8, 7 },
 +      { pinmux(13), 8, 0 },
 +      { pinmux(13), 8, 1 },
 +      { pinmux(13), 8, 2 },
 +      { pinmux(13), 8, 3 },
 +      { pinmux(13), 8, 4 },
 +      { pinmux(13), 8, 5 },
 +      { pinmux(11), 8, 7 },
 +      { pinmux(12), 8, 0 },
 +      { pinmux(12), 8, 1 },
 +      { pinmux(12), 8, 2 },
 +      { pinmux(12), 8, 3 },
 +      { pinmux(9), 8, 1 },
 +      { pinmux(7), 8, 3 },    /* GP5[0] */
 +      { pinmux(7), 8, 4 },
 +      { pinmux(7), 8, 5 },
 +      { pinmux(7), 8, 6 },
 +      { pinmux(7), 8, 7 },
 +      { pinmux(8), 8, 0 },
 +      { pinmux(8), 8, 1 },
 +      { pinmux(8), 8, 2 },
 +      { pinmux(8), 8, 3 },
 +      { pinmux(8), 8, 4 },
 +      { pinmux(8), 8, 5 },
 +      { pinmux(8), 8, 6 },
 +      { pinmux(8), 8, 7 },
 +      { pinmux(9), 8, 0 },
 +      { pinmux(7), 8, 1 },
 +      { pinmux(7), 8, 2 },
 +      { pinmux(5), 8, 1 },    /* GP6[0] */
 +      { pinmux(5), 8, 2 },
 +      { pinmux(5), 8, 3 },
 +      { pinmux(5), 8, 4 },
 +      { pinmux(5), 8, 5 },
 +      { pinmux(5), 8, 6 },
 +      { pinmux(5), 8, 7 },
 +      { pinmux(6), 8, 0 },
 +      { pinmux(6), 8, 1 },
 +      { pinmux(6), 8, 2 },
 +      { pinmux(6), 8, 3 },
 +      { pinmux(6), 8, 4 },
 +      { pinmux(6), 8, 5 },
 +      { pinmux(6), 8, 6 },
 +      { pinmux(6), 8, 7 },
 +      { pinmux(7), 8, 0 },
 +      { pinmux(1), 8, 0 },    /* GP7[0] */
 +      { pinmux(1), 8, 1 },
 +      { pinmux(1), 8, 2 },
 +      { pinmux(1), 8, 3 },
 +      { pinmux(1), 8, 4 },
 +      { pinmux(1), 8, 5 },
 +      { pinmux(1), 8, 6 },
 +      { pinmux(1), 8, 7 },
 +      { pinmux(2), 8, 0 },
 +      { pinmux(2), 8, 1 },
 +      { pinmux(2), 8, 2 },
 +      { pinmux(2), 8, 3 },
 +      { pinmux(2), 8, 4 },
 +      { pinmux(2), 8, 5 },
 +      { pinmux(0), 1, 0 },
 +      { pinmux(0), 1, 1 },
 +};
++#else /* CONFIG_SOC_DA8XX && CONFIG_SOC_DA850 */
  static const struct pinmux_config gpio_pinmux[] = {
        { pinmux(1), 8, 7 },    /* GP0[0] */
        { pinmux(1), 8, 6 },
@@@ -311,7 -180,9 +312,10 @@@
        { pinmux(18), 8, 3 },
        { pinmux(18), 8, 2 },
  };
- #endif
 -#else
++#endif /* CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850 */
++#else /* !CONFIG_SOC_DA8XX */
+ #define davinci_configure_pin_mux(a, b)
 -#endif
++#endif /* CONFIG_SOC_DA8XX */
  
  int gpio_request(unsigned gpio, const char *label)
  {

diff --cc drivers/mmc/bfin_sdh.c
Simple merge

diff --cc include/configs/ea20.h
Simple merge