diff options
| author | Jiancheng Xue <xuejiancheng@huawei.com> | 2016-06-15 04:19:05 +0200 |
|---|---|---|
| committer | Wei Xu <xuwei5@hisilicon.com> | 2016-07-07 10:37:59 +0200 |
| commit | abee8fbf2b2170efa0956ce1942ebe777a94cfdd (patch) | |
| tree | be005f65460b4cb1792a5be0345140f503a4a3b8 | |
| parent | ARM: hisi: make unexported symbols static (diff) | |
| download | linux-abee8fbf2b2170efa0956ce1942ebe777a94cfdd.tar.xz linux-abee8fbf2b2170efa0956ce1942ebe777a94cfdd.zip | |
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>
| -rw-r--r-- | arch/arm/mach-hisi/hisilicon.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/arch/arm/mach-hisi/hisilicon.c b/arch/arm/mach-hisi/hisilicon.c index 8cc62150116a..c08c44ec5175 100644 --- 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 |