Merge branch 'u-boot/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 28 Mar 2013 17:50:01 +0000 (18:50 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 28 Mar 2013 17:50:01 +0000 (18:50 +0100)
Conflicts:
drivers/spi/tegra20_sflash.c
include/fdtdec.h
lib/fdtdec.c

1  2 
MAINTAINERS
drivers/mtd/spi/winbond.c
drivers/spi/Makefile
drivers/spi/tegra20_sflash.c
drivers/spi/tegra20_slink.c
include/fdtdec.h
lib/fdtdec.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 3b363be036acbf6999a7cda4be3cbbbfde2149c7,cb520a69187269d978f25c702a90345f952f430c..e7e3ff9e0384f10157a671ff36ee153654ae34bf
@@@ -85,8 -84,9 +86,10 @@@ enum fdt_compat_id 
        COMPAT_SAMSUNG_EXYNOS_SPI,      /* Exynos SPI */
        COMPAT_SAMSUNG_EXYNOS_EHCI,     /* Exynos EHCI controller */
        COMPAT_SAMSUNG_EXYNOS_USB_PHY,  /* Exynos phy controller for usb2.0 */
+       COMPAT_SAMSUNG_EXYNOS_TMU,      /* Exynos TMU */
        COMPAT_MAXIM_MAX77686_PMIC,     /* MAX77686 PMIC */
 +      COMPAT_GENERIC_SPI_FLASH,       /* Generic SPI Flash chip */
+       COMPAT_MAXIM_98095_CODEC,       /* MAX98095 Codec */
  
        COMPAT_COUNT,
  };
diff --cc lib/fdtdec.c
index c95c2c28fa8ad114300f0707ec4a36ddd67c9b48,d2166e66323cba31796387d1bd37c8198ecc05e0..e17dd001ca2a0c6b578c88ce76c90251e89ea0d3
@@@ -58,8 -59,9 +59,10 @@@ static const char * const compat_names[
        COMPAT(SAMSUNG_EXYNOS_SPI, "samsung,exynos-spi"),
        COMPAT(SAMSUNG_EXYNOS_EHCI, "samsung,exynos-ehci"),
        COMPAT(SAMSUNG_EXYNOS_USB_PHY, "samsung,exynos-usb-phy"),
+       COMPAT(SAMSUNG_EXYNOS_TMU, "samsung,exynos-tmu"),
        COMPAT(MAXIM_MAX77686_PMIC, "maxim,max77686_pmic"),
 +      COMPAT(GENERIC_SPI_FLASH, "spi-flash"),
+       COMPAT(MAXIM_98095_CODEC, "maxim,max98095-codec"),
  };
  
  const char *fdtdec_get_compatible(enum fdt_compat_id id)