From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Thu, 28 Mar 2013 17:50:01 +0000 (+0100)
Subject: Merge branch 'u-boot/master' into 'u-boot-arm/master'
X-Git-Tag: v2013.04-rc2~14
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=009d75ccc11d27b9a083375a88bb93cb746b4800

Merge branch 'u-boot/master' into 'u-boot-arm/master'

Conflicts:
	drivers/spi/tegra20_sflash.c
	include/fdtdec.h
	lib/fdtdec.c
---

009d75ccc11d27b9a083375a88bb93cb746b4800
diff --cc include/fdtdec.h
index 3b363be036,cb520a6918..e7e3ff9e03
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@@ -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 c95c2c28fa,d2166e6632..e17dd001ca
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@@ -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)