Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 389ee0c2 authored by Haojian Zhuang's avatar Haojian Zhuang Committed by Kevin Hilman
Browse files

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: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parent 22e99a6d

arch/arm/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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"

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-hi3xxx/Makefile→arch/arm/mach-hisi/Makefile

+2 −2
Original line number Diff line number Diff line 
#

# 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

arch/arm/mach-hi3xxx/core.h→arch/arm/mach-hisi/core.h

+0 −0

File moved.

View file