2015-04-01 13:16:15

by Junling Zheng

Subject: [PATCH 0/2] ARM: hisi: fix indentations and spaces

These two patches fix the indentations and spaces using tabs to keep
the code style.

Junling Zheng (2):
ARM: hisi: fix the indentations in Kconfig
ARM: hisi: replace a few spaces with tabs

arch/arm/mach-hisi/Kconfig | 12 ++++++------
arch/arm/mach-hisi/hotplug.c | 4 ++--
arch/arm/mach-hisi/platsmp.c | 10 +++++-----
3 files changed, 13 insertions(+), 13 deletions(-)

--
1.8.3.4

2015-04-01 13:16:13

by Junling Zheng

Subject: [PATCH 1/2] ARM: hisi: fix the indentations in Kconfig

Fix the indentations using tabs instead of spaces to align our code.

Signed-off-by: Junling Zheng <[email protected]>
---
arch/arm/mach-hisi/Kconfig | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-hisi/Kconfig b/arch/arm/mach-hisi/Kconfig
index 83061ad..a12b764 100644
--- a/arch/arm/mach-hisi/Kconfig
+++ b/arch/arm/mach-hisi/Kconfig
@@ -23,12 +23,12 @@ config ARCH_HI3xxx
Support for Hisilicon Hi36xx SoC family

config ARCH_HIP01
- bool "Hisilicon HIP01 family" if ARCH_MULTI_V7
- select HAVE_ARM_SCU if SMP
- select HAVE_ARM_TWD if SMP
- select ARM_GLOBAL_TIMER
- help
- Support for Hisilicon HIP01 SoC family
+ bool "Hisilicon HIP01 family" if ARCH_MULTI_V7
+ select HAVE_ARM_SCU if SMP
+ select HAVE_ARM_TWD if SMP
+ select ARM_GLOBAL_TIMER
+ help
+ Support for Hisilicon HIP01 SoC family

config ARCH_HIP04
bool "Hisilicon HiP04 Cortex A15 family" if ARCH_MULTI_V7
--
1.8.3.4

2015-04-01 13:16:11

by Junling Zheng

Subject: [PATCH 2/2] ARM: hisi: replace a few spaces with tabs

Replace a few spaces with tabs in mach-hisi to keep the code style.

Signed-off-by: Junling Zheng <[email protected]>
---
arch/arm/mach-hisi/hotplug.c | 4 ++--
arch/arm/mach-hisi/platsmp.c | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-hisi/hotplug.c b/arch/arm/mach-hisi/hotplug.c
index a129aae..8cd314c 100644
--- a/arch/arm/mach-hisi/hotplug.c
+++ b/arch/arm/mach-hisi/hotplug.c
@@ -65,8 +65,8 @@
#define PMC0_CPU1_PMC_ENABLE (1 << 7)
#define PMC0_CPU1_POWERDOWN (1 << 3)

-#define HIP01_PERI9 0x50
-#define PERI9_CPU1_RESET (1 << 1)
+#define HIP01_PERI9 0x50
+#define PERI9_CPU1_RESET (1 << 1)

enum {
HI3620_CTRL,
diff --git a/arch/arm/mach-hisi/platsmp.c b/arch/arm/mach-hisi/platsmp.c
index 8880c8e..808a3a1 100644
--- a/arch/arm/mach-hisi/platsmp.c
+++ b/arch/arm/mach-hisi/platsmp.c
@@ -135,9 +135,9 @@ struct smp_operations hix5hd2_smp_ops __initdata = {
};


-#define SC_SCTL_REMAP_CLR 0x00000100
-#define HIP01_BOOT_ADDRESS 0x80000000
-#define REG_SC_CTRL 0x000
+#define SC_SCTL_REMAP_CLR 0x00000100
+#define HIP01_BOOT_ADDRESS 0x80000000
+#define REG_SC_CTRL 0x000

void hip01_set_boot_addr(phys_addr_t start_addr, phys_addr_t jump_addr)
{
@@ -177,8 +177,8 @@ static int hip01_boot_secondary(unsigned int cpu, struct task_struct *idle)
}

struct smp_operations hip01_smp_ops __initdata = {
- .smp_prepare_cpus = hisi_common_smp_prepare_cpus,
- .smp_boot_secondary = hip01_boot_secondary,
+ .smp_prepare_cpus = hisi_common_smp_prepare_cpus,
+ .smp_boot_secondary = hip01_boot_secondary,
};

CPU_METHOD_OF_DECLARE(hi3xxx_smp, "hisilicon,hi3620-smp", &hi3xxx_smp_ops);
--
1.8.3.4