diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-28 12:26:06 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-28 12:26:10 (GMT) |
| commit | e0e5ce59dc7b2685516219fdf44f01a8d53e0228 (patch) | |
| tree | 3c79c9c95589bba1b54f7c87172fcaa51d67a01b /arch/arm/mach-imx | |
| parent | fdc24d4ba20499febb90ff17d3b75674026712f8 (diff) | |
| parent | 6f6ea93705f8519fb53dbc1516abe94d1787f4c4 (diff) | |
| download | linux-fsl-qoriq-e0e5ce59dc7b2685516219fdf44f01a8d53e0228.tar.xz | |
Merge branch 'imx/dt' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
* 'imx/dt' of git://git.linaro.org/people/shawnguo/linux-2.6: (7 commits)
ARM: dts: imx6q-sabrelite: add vmmc-supply for usdhc
ARM: dts: imx6q-arm2: add vmmc-supply for usdhc
ARM: dts: imx51-babbage: update mc13892 device
ARM: dts: imx6q-sabrelite: add sgtl5000 audio codec
ARM: dts: imx6q-sabrelite: add 2p5v and 3p3v regulators
ARM i.MX5/6: Add dt support for generic boards
ARM: imx5: generate dtbs for imx5 boards
(update to Linux 3.3-rc5)
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/Makefile.boot | 3 | ||||
| -rw-r--r-- | arch/arm/mach-imx/imx51-dt.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-imx/imx53-dt.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-imx/mach-imx6q.c | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/Makefile.boot b/arch/arm/mach-imx/Makefile.boot index 6dfdbcc..3851d8a 100644 --- a/arch/arm/mach-imx/Makefile.boot +++ b/arch/arm/mach-imx/Makefile.boot @@ -38,5 +38,8 @@ zreladdr-$(CONFIG_SOC_IMX6Q) += 0x10008000 params_phys-$(CONFIG_SOC_IMX6Q) := 0x10000100 initrd_phys-$(CONFIG_SOC_IMX6Q) := 0x10800000 +dtb-$(CONFIG_MACH_IMX51_DT) += imx51-babbage.dtb +dtb-$(CONFIG_MACH_IMX53_DT) += imx53-ard.dtb imx53-evk.dtb \ + imx53-qsb.dtb imx53-smd.dtb dtb-$(CONFIG_SOC_IMX6Q) += imx6q-arm2.dtb \ imx6q-sabrelite.dtb diff --git a/arch/arm/mach-imx/imx51-dt.c b/arch/arm/mach-imx/imx51-dt.c index e6bad17..b0d830f 100644 --- a/arch/arm/mach-imx/imx51-dt.c +++ b/arch/arm/mach-imx/imx51-dt.c @@ -104,6 +104,7 @@ static struct sys_timer imx51_timer = { static const char *imx51_dt_board_compat[] __initdata = { "fsl,imx51-babbage", + "fsl,imx51", NULL }; diff --git a/arch/arm/mach-imx/imx53-dt.c b/arch/arm/mach-imx/imx53-dt.c index 05ebb3e..d75a267 100644 --- a/arch/arm/mach-imx/imx53-dt.c +++ b/arch/arm/mach-imx/imx53-dt.c @@ -114,6 +114,7 @@ static const char *imx53_dt_board_compat[] __initdata = { "fsl,imx53-evk", "fsl,imx53-qsb", "fsl,imx53-smd", + "fsl,imx53", NULL }; diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index c257281..f3adf2f 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -128,6 +128,7 @@ static struct sys_timer imx6q_timer = { static const char *imx6q_dt_compat[] __initdata = { "fsl,imx6q-arm2", "fsl,imx6q-sabrelite", + "fsl,imx6q", NULL, }; |