diff options
author | Tom Rini <trini@ti.com> | 2014-02-17 14:22:02 -0500 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-02-17 14:22:02 -0500 |
commit | c4d376fd1c2bce8d64cec0431dd3f24957b6dec4 (patch) | |
tree | de17e3a67fa4a48f3b9571bff2399cb0a24558bc /arch/arm/cpu/armv7/exynos/pinmux.c | |
parent | b1ad03c242dae3712b9be66026f5d8c6f919c00b (diff) | |
parent | 5e77a745b24d9b98aa635293972f04fd6f0c6b38 (diff) | |
download | blackbird-obmc-uboot-c4d376fd1c2bce8d64cec0431dd3f24957b6dec4.tar.gz blackbird-obmc-uboot-c4d376fd1c2bce8d64cec0431dd3f24957b6dec4.zip |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/armv7/exynos/pinmux.c')
-rw-r--r-- | arch/arm/cpu/armv7/exynos/pinmux.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/cpu/armv7/exynos/pinmux.c b/arch/arm/cpu/armv7/exynos/pinmux.c index 904177a149..645c497370 100644 --- a/arch/arm/cpu/armv7/exynos/pinmux.c +++ b/arch/arm/cpu/armv7/exynos/pinmux.c @@ -751,12 +751,7 @@ static int exynos5_pinmux_decode_periph_id(const void *blob, int node) if (err) return PERIPH_ID_NONE; - /* check for invalid peripheral id */ - if ((PERIPH_ID_SDMMC4 > cell[1]) || (cell[1] < PERIPH_ID_UART0)) - return cell[1]; - - debug(" invalid peripheral id\n"); - return PERIPH_ID_NONE; + return cell[1]; } int pinmux_decode_periph_id(const void *blob, int node) |