diff options
| author | Albert ARIBAUD | 2013-01-14 08:21:00 -0600 |
|---|---|---|
| committer | Albert ARIBAUD | 2013-01-14 08:21:00 -0600 |
| commit | 1199c377cf14c240b903e351ab02b3b2cd3800c6 (patch) | |
| tree | 8ea274860fc5d3d7a011c2896d865b6976008384 /lib | |
| parent | 961ffc7759b703e1c574280267e705f2e5f54432 (diff) | |
| parent | e4660e0b7363cdc86519f4af2143b841592a7ffd (diff) | |
| download | u-boot-1199c377cf14c240b903e351ab02b3b2cd3800c6.tar.gz u-boot-1199c377cf14c240b903e351ab02b3b2cd3800c6.tar.xz u-boot-1199c377cf14c240b903e351ab02b3b2cd3800c6.zip | |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fdtdec.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 6dba4389f2..16921e14c9 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c | |||
| @@ -45,6 +45,15 @@ static const char * const compat_names[COMPAT_COUNT] = { | |||
| 45 | COMPAT(NVIDIA_TEGRA20_NAND, "nvidia,tegra20-nand"), | 45 | COMPAT(NVIDIA_TEGRA20_NAND, "nvidia,tegra20-nand"), |
| 46 | COMPAT(NVIDIA_TEGRA20_PWM, "nvidia,tegra20-pwm"), | 46 | COMPAT(NVIDIA_TEGRA20_PWM, "nvidia,tegra20-pwm"), |
| 47 | COMPAT(NVIDIA_TEGRA20_DC, "nvidia,tegra20-dc"), | 47 | COMPAT(NVIDIA_TEGRA20_DC, "nvidia,tegra20-dc"), |
| 48 | COMPAT(SMSC_LAN9215, "smsc,lan9215"), | ||
| 49 | COMPAT(SAMSUNG_EXYNOS5_SROMC, "samsung,exynos-sromc"), | ||
| 50 | COMPAT(SAMSUNG_S3C2440_I2C, "samsung,s3c2440-i2c"), | ||
| 51 | COMPAT(SAMSUNG_EXYNOS5_SOUND, "samsung,exynos-sound"), | ||
| 52 | COMPAT(WOLFSON_WM8994_CODEC, "wolfson,wm8994-codec"), | ||
| 53 | COMPAT(SAMSUNG_EXYNOS_SPI, "samsung,exynos-spi"), | ||
| 54 | COMPAT(SAMSUNG_EXYNOS_EHCI, "samsung,exynos-ehci"), | ||
| 55 | COMPAT(SAMSUNG_EXYNOS_USB_PHY, "samsung,exynos-usb-phy"), | ||
| 56 | COMPAT(MAXIM_MAX77686_PMIC, "maxim,max77686_pmic"), | ||
| 48 | }; | 57 | }; |
| 49 | 58 | ||
| 50 | const char *fdtdec_get_compatible(enum fdt_compat_id id) | 59 | const char *fdtdec_get_compatible(enum fdt_compat_id id) |