Skip to content

Commit abee8fb

Browse files
Jiancheng Xuejoyxu
authored andcommitted
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>
1 parent 09ca62f commit abee8fb

File tree

1 file changed

+0
-28
lines changed

1 file changed

+0
-28
lines changed

arch/arm/mach-hisi/hisilicon.c

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -53,31 +53,3 @@ DT_MACHINE_START(HI3620, "Hisilicon Hi3620 (Flattened Device Tree)")
5353
.map_io = hi3620_map_io,
5454
.dt_compat = hi3xxx_compat,
5555
MACHINE_END
56-
57-
static const char *const hix5hd2_compat[] __initconst = {
58-
"hisilicon,hix5hd2",
59-
NULL,
60-
};
61-
62-
DT_MACHINE_START(HIX5HD2_DT, "Hisilicon HIX5HD2 (Flattened Device Tree)")
63-
.dt_compat = hix5hd2_compat,
64-
MACHINE_END
65-
66-
static const char *const hip04_compat[] __initconst = {
67-
"hisilicon,hip04-d01",
68-
NULL,
69-
};
70-
71-
DT_MACHINE_START(HIP04, "Hisilicon HiP04 (Flattened Device Tree)")
72-
.dt_compat = hip04_compat,
73-
MACHINE_END
74-
75-
static const char *const hip01_compat[] __initconst = {
76-
"hisilicon,hip01",
77-
"hisilicon,hip01-ca9x2",
78-
NULL,
79-
};
80-
81-
DT_MACHINE_START(HIP01, "Hisilicon HIP01 (Flattened Device Tree)")
82-
.dt_compat = hip01_compat,
83-
MACHINE_END

0 commit comments

Comments
 (0)