[PATCH 1/3] ARM: hisi: rename hi3xxx to hisi

[PATCH 1/3] ARM: hisi: rename hi3xxx to hisi

[Haojian Zhuang]

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>
---
 arch/arm/Kconfig                                         | 4 ++--
 arch/arm/Makefile                                        | 2 +-
 arch/arm/{mach-hi3xxx => mach-hisi}/Kconfig              | 0
 arch/arm/{mach-hi3xxx => mach-hisi}/Makefile             | 4 ++--
 arch/arm/{mach-hi3xxx => mach-hisi}/core.h               | 0
 arch/arm/{mach-hi3xxx/hi3xxx.c => mach-hisi/hisilicon.c} | 2 +-
 arch/arm/{mach-hi3xxx => mach-hisi}/hotplug.c            | 0
 arch/arm/{mach-hi3xxx => mach-hisi}/platsmp.c            | 0
 8 files changed, 6 insertions(+), 6 deletions(-)
 rename arch/arm/{mach-hi3xxx => mach-hisi}/Kconfig (100%)
 rename arch/arm/{mach-hi3xxx => mach-hisi}/Makefile (51%)
 rename arch/arm/{mach-hi3xxx => mach-hisi}/core.h (100%)
 rename arch/arm/{mach-hi3xxx/hi3xxx.c => mach-hisi/hisilicon.c} (96%)
 rename arch/arm/{mach-hi3xxx => mach-hisi}/hotplug.c (100%)
 rename arch/arm/{mach-hi3xxx => mach-hisi}/platsmp.c (100%)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a95e067..db8ddd1 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -928,10 +928,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 dfe2bc4..69a6613 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
similarity index 100%
rename from arch/arm/mach-hi3xxx/Kconfig
rename to arch/arm/mach-hisi/Kconfig
diff --git a/arch/arm/mach-hi3xxx/Makefile b/arch/arm/mach-hisi/Makefile
similarity index 51%
rename from arch/arm/mach-hi3xxx/Makefile
rename to arch/arm/mach-hisi/Makefile
index c9919e8..6870058 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
similarity index 100%
rename from arch/arm/mach-hi3xxx/core.h
rename to arch/arm/mach-hisi/core.h
diff --git a/arch/arm/mach-hi3xxx/hi3xxx.c b/arch/arm/mach-hisi/hisilicon.c
similarity index 96%
rename from arch/arm/mach-hi3xxx/hi3xxx.c
rename to arch/arm/mach-hisi/hisilicon.c
index 661a912..685d9eb 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
similarity index 100%
rename from arch/arm/mach-hi3xxx/hotplug.c
rename to arch/arm/mach-hisi/hotplug.c
diff --git a/arch/arm/mach-hi3xxx/platsmp.c b/arch/arm/mach-hisi/platsmp.c
similarity index 100%
rename from arch/arm/mach-hi3xxx/platsmp.c
rename to arch/arm/mach-hisi/platsmp.c
-- 
1.8.3.2

[PATCH 2/3] ARM: hisi: remove init_time

[Haojian Zhuang]

Since init_time in machine descriptor is already covered by
arch/arm/kernel/time.c by default. We needn't to append it any more.

Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
---
 arch/arm/mach-hisi/hisilicon.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/arch/arm/mach-hisi/hisilicon.c b/arch/arm/mach-hisi/hisilicon.c
index 685d9eb..741faf3 100644
--- a/arch/arm/mach-hisi/hisilicon.c
+++ b/arch/arm/mach-hisi/hisilicon.c
@@ -51,12 +51,6 @@ static void __init hi3620_map_io(void)
 	iotable_init(hi3620_io_desc, ARRAY_SIZE(hi3620_io_desc));
 }
 
-static void __init hi3xxx_timer_init(void)
-{
-	of_clk_init(NULL);
-	clocksource_of_init();
-}
-
 static void hi3xxx_restart(enum reboot_mode mode, const char *cmd)
 {
 	struct device_node *np;
@@ -90,7 +84,6 @@ static const char *hi3xxx_compat[] __initconst = {
 
 DT_MACHINE_START(HI3620, "Hisilicon Hi3620 (Flattened Device Tree)")
 	.map_io		= hi3620_map_io,
-	.init_time	= hi3xxx_timer_init,
 	.dt_compat	= hi3xxx_compat,
 	.smp		= smp_ops(hi3xxx_smp_ops),
 	.restart	= hi3xxx_restart,
-- 
1.8.3.2

[PATCH 3/3] ARM: dts: rename hi4511 dts file

[Haojian Zhuang]

We want to follow the name style of DTS that is SoC-board.dts.

Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
---
 arch/arm/boot/dts/Makefile                          | 2 +-
 arch/arm/boot/dts/{hi4511.dts => hi3620-hi4511.dts} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename arch/arm/boot/dts/{hi4511.dts => hi3620-hi4511.dts} (100%)

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 40e13e3..92e5499 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -71,7 +71,7 @@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \
 	exynos5420-smdk5420.dtb \
 	exynos5440-sd5v1.dtb \
 	exynos5440-ssdk5440.dtb
-dtb-$(CONFIG_ARCH_HI3xxx) += hi4511.dtb
+dtb-$(CONFIG_ARCH_HI3xxx) += hi3620-hi4511.dtb
 dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \
 	ecx-2000.dtb
 dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \
diff --git a/arch/arm/boot/dts/hi4511.dts b/arch/arm/boot/dts/hi3620-hi4511.dts
similarity index 100%
rename from arch/arm/boot/dts/hi4511.dts
rename to arch/arm/boot/dts/hi3620-hi4511.dts
-- 
1.8.3.2

[PATCH 1/3] ARM: hisi: rename hi3xxx to hisi

[Olof Johansson]

On Thu, Dec 19, 2013 at 6:52 PM, Haojian Zhuang
<haojian.zhuang@linaro.org> wrote:
> 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.
>

Are you kidding me? We JUST merge your platform after a very painful
review with many fumbly cycles, and the very first thing you do is
rename it?

I even complained about the crazy numbering and naming, and you didn't
fix it while we were in review, and now just days after we merge the
patches this one comes out?

For now, we'll drop your original branch and fold in these patches
with the original ones. There's no point in checking in a platform
just to rename it, so we'll do the fixups.

No further action is required on your behalf right now but it will be
a while until we sort this out. It's at the back of the queue of
things to deal with right now.


-Olof

[PATCH 1/3] ARM: hisi: rename hi3xxx to hisi

[Kevin Hilman]

Olof Johansson <olof@lixom.net> writes:

> On Thu, Dec 19, 2013 at 6:52 PM, Haojian Zhuang
> <haojian.zhuang@linaro.org> wrote:
>> 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.
>>
>
> Are you kidding me? We JUST merge your platform after a very painful
> review with many fumbly cycles, and the very first thing you do is
> rename it?
>
> I even complained about the crazy numbering and naming, and you didn't
> fix it while we were in review, and now just days after we merge the
> patches this one comes out?
>
> For now, we'll drop your original branch and fold in these patches
> with the original ones. There's no point in checking in a platform
> just to rename it, so we'll do the fixups.

Agreed. I've dropped the hi3xxx/soc branch from next/soc and rebuild
for-next without it.

Kevin

答复: [PATCH 1/3] ARM: hisi: rename hi3xxx to hisi

[xuwei (O)]

Hi Olof and Kevin,

Please calm down.
Both of us have a hard time to enable hi3xxx in kernel v3.14.
Let me explain it.

We have a new serial of SoCs for server market and they will named with hipxx.
And hi3xxx SoCs are for the mobile and STB market.
Now we hope to enable the hipxx SoCs in the kernel.
To make the "mach" directory simple, we hope hipxx SoCs could share the same directory with hi3xxx.
But according current situation, maybe we should add a new "mach" for the hipxx firstly.
Do you think is it OK?
 
And for hi3xxx SoCs, could you please keep it in the next?

Best Regards,
Wei Xu


> -----????-----
> ???: Kevin Hilman [mailto:khilman at linaro.org]
> ????: 2013?12?21? 1:36
> ???: Olof Johansson
> ??: Haojian Zhuang; xuwei (O); Arnd Bergmann;
> linux-arm-kernel at lists.infradead.org; Haojian Zhuang
> ??: Re: [PATCH 1/3] ARM: hisi: rename hi3xxx to hisi
> 
> Olof Johansson <olof@lixom.net> writes:
> 
> > On Thu, Dec 19, 2013 at 6:52 PM, Haojian Zhuang
> > <haojian.zhuang@linaro.org> wrote:
> >> 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.
> >>
> >
> > Are you kidding me? We JUST merge your platform after a very painful
> > review with many fumbly cycles, and the very first thing you do is
> > rename it?
> >
> > I even complained about the crazy numbering and naming, and you didn't
> > fix it while we were in review, and now just days after we merge the
> > patches this one comes out?
> >
> > For now, we'll drop your original branch and fold in these patches
> > with the original ones. There's no point in checking in a platform
> > just to rename it, so we'll do the fixups.
> 
> Agreed. I've dropped the hi3xxx/soc branch from next/soc and rebuild for-next
> without it.
> 
> Kevin
> 

答复: [PATCH 1/3] ARM: hisi: rename hi3xxx to hisi

[Kevin Hilman]

"xuwei (O)" <xuwei5@hisilicon.com> writes:

> Hi Olof and Kevin,

Hello.

Please don't top post (c.f. http://kernelnewbies.org/mailinglistguidelines)

> Please calm down.
>
> Both of us have a hard time to enable hi3xxx in kernel v3.14.
> Let me explain it.

I'm not sure an explanation is required, I understand the history here
pretty well.  I've been involved in reviewing multiple versions of this
series.  Also, I did lots of manual fixups for this series[1] which we
don't normally do.

> We have a new serial of SoCs for server market and they will named with hipxx.
> And hi3xxx SoCs are for the mobile and STB market.
> Now we hope to enable the hipxx SoCs in the kernel.
> To make the "mach" directory simple, we hope hipxx SoCs could share the same directory with hi3xxx.
> But according current situation, maybe we should add a new "mach" for the hipxx firstly.
> Do you think is it OK?

Yes, that's all fine and good.  Nobody has objected to the rename
itself.  In fact, we think it's better naming.  Earlier reviews in the
series pointed out that the naming was messy and difficult to
understand.

What we've objected to was the timing and organization.  I had just
merged the v12 series (after having to do a bunch of manual fixes) which
was a major pain.  As soon as that was merged, the rename series was
sent.

The primary problem we have is that the rename is pointless churn.  

Put simply, you should have done the rename in the original series much
earlier, not as an add-on series.

> And for hi3xxx SoCs, could you please keep it in the next?

I've just returned from 2 weeks off over the end of year holidays, and
I'm looking into it now, and not sure yet if it will make it for v3.14.

Kevin

[1] http://lists.infradead.org/pipermail/linux-arm-kernel/2013-December/220168.html

> Best Regards,
> Wei Xu
>
>
>> -----????-----
>> ???: Kevin Hilman [mailto:khilman at linaro.org]
>> ????: 2013?12?21? 1:36
>> ???: Olof Johansson
>> ??: Haojian Zhuang; xuwei (O); Arnd Bergmann;
>> linux-arm-kernel at lists.infradead.org; Haojian Zhuang
>> ??: Re: [PATCH 1/3] ARM: hisi: rename hi3xxx to hisi
>> 
>> Olof Johansson <olof@lixom.net> writes:
>> 
>> > On Thu, Dec 19, 2013 at 6:52 PM, Haojian Zhuang
>> > <haojian.zhuang@linaro.org> wrote:
>> >> 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.
>> >>
>> >
>> > Are you kidding me? We JUST merge your platform after a very painful
>> > review with many fumbly cycles, and the very first thing you do is
>> > rename it?
>> >
>> > I even complained about the crazy numbering and naming, and you didn't
>> > fix it while we were in review, and now just days after we merge the
>> > patches this one comes out?
>> >
>> > For now, we'll drop your original branch and fold in these patches
>> > with the original ones. There's no point in checking in a platform
>> > just to rename it, so we'll do the fixups.
>> 
>> Agreed. I've dropped the hi3xxx/soc branch from next/soc and rebuild for-next
>> without it.
>> 
>> Kevin
>> 

[PATCH 1/3] ARM: hisi: rename hi3xxx to hisi

[Kevin Hilman]

Haojian Zhuang <haojian.zhuang@linaro.org> writes:

> 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>
> ---
>  arch/arm/Kconfig                                         | 4 ++--
>  arch/arm/Makefile                                        | 2 +-
>  arch/arm/{mach-hi3xxx => mach-hisi}/Kconfig              | 0
>  arch/arm/{mach-hi3xxx => mach-hisi}/Makefile             | 4 ++--
>  arch/arm/{mach-hi3xxx => mach-hisi}/core.h               | 0
>  arch/arm/{mach-hi3xxx/hi3xxx.c => mach-hisi/hisilicon.c} | 2 +-
>  arch/arm/{mach-hi3xxx => mach-hisi}/hotplug.c            | 0
>  arch/arm/{mach-hi3xxx => mach-hisi}/platsmp.c            | 0
>  8 files changed, 6 insertions(+), 6 deletions(-)
>  rename arch/arm/{mach-hi3xxx => mach-hisi}/Kconfig (100%)
>  rename arch/arm/{mach-hi3xxx => mach-hisi}/Makefile (51%)
>  rename arch/arm/{mach-hi3xxx => mach-hisi}/core.h (100%)
>  rename arch/arm/{mach-hi3xxx/hi3xxx.c => mach-hisi/hisilicon.c} (96%)
>  rename arch/arm/{mach-hi3xxx => mach-hisi}/hotplug.c (100%)
>  rename arch/arm/{mach-hi3xxx => mach-hisi}/platsmp.c (100%)


Shouldn't the defconfig be renamed also?

Kevin

[PATCH 1/3] ARM: hisi: rename hi3xxx to hisi

[Haojian Zhuang]

On 01/08/2014 08:58 AM, Kevin Hilman wrote:
> Haojian Zhuang <haojian.zhuang@linaro.org> writes:
>
>> 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>
>> ---
>>   arch/arm/Kconfig                                         | 4 ++--
>>   arch/arm/Makefile                                        | 2 +-
>>   arch/arm/{mach-hi3xxx => mach-hisi}/Kconfig              | 0
>>   arch/arm/{mach-hi3xxx => mach-hisi}/Makefile             | 4 ++--
>>   arch/arm/{mach-hi3xxx => mach-hisi}/core.h               | 0
>>   arch/arm/{mach-hi3xxx/hi3xxx.c => mach-hisi/hisilicon.c} | 2 +-
>>   arch/arm/{mach-hi3xxx => mach-hisi}/hotplug.c            | 0
>>   arch/arm/{mach-hi3xxx => mach-hisi}/platsmp.c            | 0
>>   8 files changed, 6 insertions(+), 6 deletions(-)
>>   rename arch/arm/{mach-hi3xxx => mach-hisi}/Kconfig (100%)
>>   rename arch/arm/{mach-hi3xxx => mach-hisi}/Makefile (51%)
>>   rename arch/arm/{mach-hi3xxx => mach-hisi}/core.h (100%)
>>   rename arch/arm/{mach-hi3xxx/hi3xxx.c => mach-hisi/hisilicon.c} (96%)
>>   rename arch/arm/{mach-hi3xxx => mach-hisi}/hotplug.c (100%)
>>   rename arch/arm/{mach-hi3xxx => mach-hisi}/platsmp.c (100%)
>
> Shouldn't the defconfig be renamed also?
>
> Kevin
>
The main difference is on CONFIG_LPAE. The new SoC is using CONFIG_LPAE.
So I didn't change the hi3xxx_defconfig and I'll append a new defconfig for
the new SoC.

Best Regards
Haojian

答复: [PATCH 1/3] ARM: hisi: rename hi3xxx to hisi

[Kevin Hilman]

Kevin Hilman <khilman@linaro.org> writes:

> "xuwei (O)" <xuwei5@hisilicon.com> writes:
>
>> Hi Olof and Kevin,
>
> Hello.
>
> Please don't top post (c.f. http://kernelnewbies.org/mailinglistguidelines)
>
>> Please calm down.
>>
>> Both of us have a hard time to enable hi3xxx in kernel v3.14.
>> Let me explain it.
>
> I'm not sure an explanation is required, I understand the history here
> pretty well.  I've been involved in reviewing multiple versions of this
> series.  Also, I did lots of manual fixups for this series[1] which we
> don't normally do.
>
>> We have a new serial of SoCs for server market and they will named with hipxx.
>> And hi3xxx SoCs are for the mobile and STB market.
>> Now we hope to enable the hipxx SoCs in the kernel.
>> To make the "mach" directory simple, we hope hipxx SoCs could share the same directory with hi3xxx.
>> But according current situation, maybe we should add a new "mach" for the hipxx firstly.
>> Do you think is it OK?
>
> Yes, that's all fine and good.  Nobody has objected to the rename
> itself.  In fact, we think it's better naming.  Earlier reviews in the
> series pointed out that the naming was messy and difficult to
> understand.
>
> What we've objected to was the timing and organization.  I had just
> merged the v12 series (after having to do a bunch of manual fixes) which
> was a major pain.  As soon as that was merged, the rename series was
> sent.
>
> The primary problem we have is that the rename is pointless churn.  
>
> Put simply, you should have done the rename in the original series much
> earlier, not as an add-on series.
>
>> And for hi3xxx SoCs, could you please keep it in the next?
>
> I've just returned from 2 weeks off over the end of year holidays, and
> I'm looking into it now, and not sure yet if it will make it for v3.14.

The original hi3xxx series *plus* the rename is now merged into next/soc
for v3.14.

Kevin