ARM: hisi: consolidate the hisilicon machine entries

The original patch was to add compatible string for Hi3519 soc
and do some cleanup.

Since the generic machine entry could meet most of the cases,
so I did a further cleanup to reuse it and just keep one machine
entry that needs map_io here.

Signed-off-by: Jiancheng Xue <xuejiancheng@huawei.com>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>

diff --git a/arch/arm/mach-hisi/hisilicon.c b/arch/arm/mach-hisi/hisilicon.c
index 8cc62150116a779b48e15b71b4937af154075415..c08c44ec5175bb6e3b1246b1c43355bf91369e35 100644 (file)
--- a/arch/arm/mach-hisi/hisilicon.c
+++ b/arch/arm/mach-hisi/hisilicon.c
@@ -53,31 +53,3 @@ DT_MACHINE_START(HI3620, "Hisilicon Hi3620 (Flattened Device Tree)")
        .map_io         = hi3620_map_io,
        .dt_compat      = hi3xxx_compat,
 MACHINE_END
-
-static const char *const hix5hd2_compat[] __initconst = {
-       "hisilicon,hix5hd2",
-       NULL,
-};
-
-DT_MACHINE_START(HIX5HD2_DT, "Hisilicon HIX5HD2 (Flattened Device Tree)")
-       .dt_compat      = hix5hd2_compat,
-MACHINE_END
-
-static const char *const hip04_compat[] __initconst = {
-       "hisilicon,hip04-d01",
-       NULL,
-};
-
-DT_MACHINE_START(HIP04, "Hisilicon HiP04 (Flattened Device Tree)")
-       .dt_compat      = hip04_compat,
-MACHINE_END
-
-static const char *const hip01_compat[] __initconst = {
-       "hisilicon,hip01",
-       "hisilicon,hip01-ca9x2",
-       NULL,
-};
-
-DT_MACHINE_START(HIP01, "Hisilicon HIP01 (Flattened Device Tree)")
-       .dt_compat      = hip01_compat,
-MACHINE_END