diff options
| author | Haojian Zhuang <haojian.zhuang@linaro.org> | 2013-12-20 10:52:56 +0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-12-20 08:23:01 -0800 |
| commit | 389ee0c2ffedf5819dccc2c67dd15757c4550765 (patch) | |
| tree | 6b59caa70e41a290b8957d5383fe2b22ebee31a6 | |
| parent | 22e99a6d43f2ccd1d1a28c65a803bb71ea293098 (diff) | |
| download | linux-389ee0c2ffedf5819dccc2c67dd15757c4550765.tar.bz2 | |
ARM: hisi: rename hi3xxx to hisi
Since some new Hisilicon SoCs are not named as hi3xxx, rename mach-hi3xxx
to mach-hisi instead. And the pronounciation of "hisi" is similar to the
chinese pronounciation of Hisilicon. So Hisilicon guys like this name.
ARCH_HI3xxx will be renamed later since other drivers are using it and
they are still in linux-next git tree. So rename ARCH_HI3xxx later.
Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
| -rw-r--r-- | arch/arm/Kconfig | 4 | ||||
| -rw-r--r-- | arch/arm/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-hisi/Kconfig (renamed from arch/arm/mach-hi3xxx/Kconfig) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-hisi/Makefile (renamed from arch/arm/mach-hi3xxx/Makefile) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-hisi/core.h (renamed from arch/arm/mach-hi3xxx/core.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-hisi/hisilicon.c (renamed from arch/arm/mach-hi3xxx/hi3xxx.c) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-hisi/hotplug.c (renamed from arch/arm/mach-hi3xxx/hotplug.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-hisi/platsmp.c (renamed from arch/arm/mach-hi3xxx/platsmp.c) | 0 |
8 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 75eb5323fedd..b7662dfcd847 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -925,10 +925,10 @@ source "arch/arm/mach-footbridge/Kconfig" source "arch/arm/mach-gemini/Kconfig" -source "arch/arm/mach-hi3xxx/Kconfig" - source "arch/arm/mach-highbank/Kconfig" +source "arch/arm/mach-hisi/Kconfig" + source "arch/arm/mach-integrator/Kconfig" source "arch/arm/mach-iop32x/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index dfbafa38b4cd..173ea7b01ff8 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -156,8 +156,8 @@ machine-$(CONFIG_ARCH_EBSA110) += ebsa110 machine-$(CONFIG_ARCH_EP93XX) += ep93xx machine-$(CONFIG_ARCH_EXYNOS) += exynos machine-$(CONFIG_ARCH_GEMINI) += gemini -machine-$(CONFIG_ARCH_HI3xxx) += hi3xxx machine-$(CONFIG_ARCH_HIGHBANK) += highbank +machine-$(CONFIG_ARCH_HI3xxx) += hisi machine-$(CONFIG_ARCH_INTEGRATOR) += integrator machine-$(CONFIG_ARCH_IOP13XX) += iop13xx machine-$(CONFIG_ARCH_IOP32X) += iop32x diff --git a/arch/arm/mach-hi3xxx/Kconfig b/arch/arm/mach-hisi/Kconfig index 018ad67f1b38..018ad67f1b38 100644 --- a/arch/arm/mach-hi3xxx/Kconfig +++ b/arch/arm/mach-hisi/Kconfig diff --git a/arch/arm/mach-hi3xxx/Makefile b/arch/arm/mach-hisi/Makefile index c9919e8e239c..6870058d0a48 100644 --- a/arch/arm/mach-hi3xxx/Makefile +++ b/arch/arm/mach-hisi/Makefile @@ -1,7 +1,7 @@ # -# Makefile for Hisilicon Hi36xx/Hi37xx processors line +# Makefile for Hisilicon processors family # -obj-y += hi3xxx.o +obj-y += hisilicon.o obj-$(CONFIG_SMP) += platsmp.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o diff --git a/arch/arm/mach-hi3xxx/core.h b/arch/arm/mach-hisi/core.h index af23ec204538..af23ec204538 100644 --- a/arch/arm/mach-hi3xxx/core.h +++ b/arch/arm/mach-hisi/core.h diff --git a/arch/arm/mach-hi3xxx/hi3xxx.c b/arch/arm/mach-hisi/hisilicon.c index 661a912f1527..685d9ebd612d 100644 --- a/arch/arm/mach-hi3xxx/hi3xxx.c +++ b/arch/arm/mach-hisi/hisilicon.c @@ -1,5 +1,5 @@ /* - * (Hisilicon's Hi36xx/Hi37xx SoC based) flattened device tree enabled machine + * (Hisilicon's SoC based) flattened device tree enabled machine * * Copyright (c) 2012-2013 Hisilicon Ltd. * Copyright (c) 2012-2013 Linaro Ltd. diff --git a/arch/arm/mach-hi3xxx/hotplug.c b/arch/arm/mach-hisi/hotplug.c index b909854eee7f..b909854eee7f 100644 --- a/arch/arm/mach-hi3xxx/hotplug.c +++ b/arch/arm/mach-hisi/hotplug.c diff --git a/arch/arm/mach-hi3xxx/platsmp.c b/arch/arm/mach-hisi/platsmp.c index 471f1ee3be2b..471f1ee3be2b 100644 --- a/arch/arm/mach-hi3xxx/platsmp.c +++ b/arch/arm/mach-hisi/platsmp.c |