Commit 1ecdde9d authored by Shawn Guo's avatar Shawn Guo

ARM: imx5: drop option MACH_IMX51_DT

Since i.MX51 becomes DT only now, we can drop option MACH_IMX51_DT and
just use SOC_IMX51 instead.  While at it, rename imx51-dt.c to
mach-imx51.c to align with the name schema of other IMX DT only
platforms.
Signed-off-by: default avatarShawn Guo <shawn.guo@freescale.com>
parent 50e177ca
...@@ -31,7 +31,7 @@ CONFIG_MACH_IMX35_DT=y ...@@ -31,7 +31,7 @@ CONFIG_MACH_IMX35_DT=y
CONFIG_MACH_PCM043=y CONFIG_MACH_PCM043=y
CONFIG_MACH_MX35_3DS=y CONFIG_MACH_MX35_3DS=y
CONFIG_MACH_VPR200=y CONFIG_MACH_VPR200=y
CONFIG_MACH_IMX51_DT=y CONFIG_SOC_IMX51=y
CONFIG_SOC_IMX50=y CONFIG_SOC_IMX50=y
CONFIG_SOC_IMX53=y CONFIG_SOC_IMX53=y
CONFIG_SOC_IMX6Q=y CONFIG_SOC_IMX6Q=y
......
...@@ -27,7 +27,7 @@ CONFIG_ARCH_HIGHBANK=y ...@@ -27,7 +27,7 @@ CONFIG_ARCH_HIGHBANK=y
CONFIG_ARCH_HI3xxx=y CONFIG_ARCH_HI3xxx=y
CONFIG_ARCH_KEYSTONE=y CONFIG_ARCH_KEYSTONE=y
CONFIG_ARCH_MXC=y CONFIG_ARCH_MXC=y
CONFIG_MACH_IMX51_DT=y CONFIG_SOC_IMX51=y
CONFIG_SOC_IMX53=y CONFIG_SOC_IMX53=y
CONFIG_SOC_IMX6Q=y CONFIG_SOC_IMX6Q=y
CONFIG_SOC_IMX6SL=y CONFIG_SOC_IMX6SL=y
......
...@@ -694,11 +694,6 @@ config SOC_IMX5 ...@@ -694,11 +694,6 @@ config SOC_IMX5
select HAVE_IMX_SRC select HAVE_IMX_SRC
select MXC_TZIC select MXC_TZIC
config SOC_IMX51
bool
select PINCTRL_IMX51
select SOC_IMX5
config SOC_IMX50 config SOC_IMX50
bool "i.MX50 support" bool "i.MX50 support"
select PINCTRL_IMX50 select PINCTRL_IMX50
...@@ -707,9 +702,10 @@ config SOC_IMX50 ...@@ -707,9 +702,10 @@ config SOC_IMX50
help help
This enables support for Freescale i.MX50 processor. This enables support for Freescale i.MX50 processor.
config MACH_IMX51_DT config SOC_IMX51
bool "i.MX51 support" bool "i.MX51 support"
select SOC_IMX51 select PINCTRL_IMX51
select SOC_IMX5
help help
This enables support for Freescale i.MX51 processor This enables support for Freescale i.MX51 processor
......
...@@ -109,8 +109,8 @@ obj-$(CONFIG_SOC_IMX6) += suspend-imx6.o ...@@ -109,8 +109,8 @@ obj-$(CONFIG_SOC_IMX6) += suspend-imx6.o
endif endif
obj-$(CONFIG_SOC_IMX6) += pm-imx6.o obj-$(CONFIG_SOC_IMX6) += pm-imx6.o
obj-$(CONFIG_MACH_IMX51_DT) += imx51-dt.o
obj-$(CONFIG_SOC_IMX50) += mach-imx50.o obj-$(CONFIG_SOC_IMX50) += mach-imx50.o
obj-$(CONFIG_SOC_IMX51) += mach-imx51.o
obj-$(CONFIG_SOC_IMX53) += mach-imx53.o obj-$(CONFIG_SOC_IMX53) += mach-imx53.o
obj-$(CONFIG_SOC_VF610) += clk-vf610.o mach-vf610.o obj-$(CONFIG_SOC_VF610) += clk-vf610.o mach-vf610.o
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment