From 7da080de9e08dacce2a832d2981bd8a9f855ecc4 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Sun, 14 Jul 2013 10:53:32 -0400 Subject: [PATCH 1/6] ARM: keystone: drop useless HAVE_SCHED_CLOCK The Kconfig symbol HAVE_SCHED_CLOCK got removed in v3.4, with commit 6905a65879b5 ("ARM: Make the sched_clock framework mandatory"). But a select statement for it popped up again through commit 828989ad87af ("ARM: keystone: Add minimal TI Keystone platform support"). Drop that statement, as it is useless. Signed-off-by: Paul Bolle [santosh.shilimkar@ti.com: Minor edit in the subject] Signed-off-by: Santosh Shilimkar --- arch/arm/mach-keystone/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/mach-keystone/Kconfig b/arch/arm/mach-keystone/Kconfig index 51a50e996840..366d1a3b418d 100644 --- a/arch/arm/mach-keystone/Kconfig +++ b/arch/arm/mach-keystone/Kconfig @@ -7,7 +7,6 @@ config ARCH_KEYSTONE select HAVE_SMP select CLKSRC_MMIO select GENERIC_CLOCKEVENTS - select HAVE_SCHED_CLOCK select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_ERRATA_798181 if SMP help From 55bd61c948eebe496bb0f23656e06d4467a9ea88 Mon Sep 17 00:00:00 2001 From: Sudeep KarkadaNagesha Date: Tue, 23 Jul 2013 09:20:58 -0400 Subject: [PATCH 2/6] ARM: keystone: remove redundant smp_init_cpus definition arm_dt_init_cpu_maps is called before smp_init_cpus. It makes the platform/SoC definition of smp_init_cpus unnecessary. Signed-off-by: Sudeep KarkadaNagesha Signed-off-by: Santosh Shilimkar --- arch/arm/mach-keystone/platsmp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/mach-keystone/platsmp.c b/arch/arm/mach-keystone/platsmp.c index 14378e3fef16..c12296157d4a 100644 --- a/arch/arm/mach-keystone/platsmp.c +++ b/arch/arm/mach-keystone/platsmp.c @@ -38,6 +38,5 @@ static int keystone_smp_boot_secondary(unsigned int cpu, } struct smp_operations keystone_smp_ops __initdata = { - .smp_init_cpus = arm_dt_init_cpu_maps, .smp_boot_secondary = keystone_smp_boot_secondary, }; From 993211e08a9984aa3ae8a4a840340b2a51a53497 Mon Sep 17 00:00:00 2001 From: Santosh Shilimkar Date: Sun, 14 Jul 2013 10:38:52 -0400 Subject: [PATCH 3/6] ARM: Keystone: No need to preserve r12 across smc call Register r12 is caller-save, so no need preserve it keystone_cpu_smc(). Reported-by: Dave Martin Signed-off-by: Santosh Shilimkar --- arch/arm/mach-keystone/smc.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-keystone/smc.S b/arch/arm/mach-keystone/smc.S index 9b9e4f7b241e..5bb5176f5e2b 100644 --- a/arch/arm/mach-keystone/smc.S +++ b/arch/arm/mach-keystone/smc.S @@ -22,8 +22,8 @@ * Return: Non zero value on failure */ ENTRY(keystone_cpu_smc) - stmfd sp!, {r4-r12, lr} + stmfd sp!, {r4-r11, lr} smc #0 dsb - ldmfd sp!, {r4-r12, pc} + ldmfd sp!, {r4-r11, pc} ENDPROC(keystone_cpu_smc) From c2dce2cf488ca8061df54733803ed5d508e8445b Mon Sep 17 00:00:00 2001 From: Santosh Shilimkar Date: Sun, 14 Jul 2013 10:45:47 -0400 Subject: [PATCH 4/6] ARM: keystone: Drop the un-necessary dsb from keystone_cpu_smc() This was added because of some legacy reasons from OMAP SOCs but after testing and verifying with the keystone hardware folks, the dsb in keystone_cpu_smc() is not necessary. So drop it. Reported-by: Dave Martin Signed-off-by: Santosh Shilimkar --- arch/arm/mach-keystone/smc.S | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/mach-keystone/smc.S b/arch/arm/mach-keystone/smc.S index 5bb5176f5e2b..d15de8179fab 100644 --- a/arch/arm/mach-keystone/smc.S +++ b/arch/arm/mach-keystone/smc.S @@ -24,6 +24,5 @@ ENTRY(keystone_cpu_smc) stmfd sp!, {r4-r11, lr} smc #0 - dsb ldmfd sp!, {r4-r11, pc} ENDPROC(keystone_cpu_smc) From 226d1c5b1d4c226429d58d992941a89588cce708 Mon Sep 17 00:00:00 2001 From: Santosh Shilimkar Date: Mon, 5 Aug 2013 13:17:15 -0400 Subject: [PATCH 5/6] ARM: keystone: use #include to include skeleton.dtsi Replace /include/ (dtc) with #include (C pre-processor) to include skeleton.dtsi Signed-off-by: Santosh Shilimkar --- arch/arm/boot/dts/keystone.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/keystone.dts b/arch/arm/boot/dts/keystone.dts index 1334b42c6b77..612ba8c9879c 100644 --- a/arch/arm/boot/dts/keystone.dts +++ b/arch/arm/boot/dts/keystone.dts @@ -7,7 +7,7 @@ */ /dts-v1/; -/include/ "skeleton.dtsi" +#include "skeleton.dtsi" / { model = "Texas Instruments Keystone 2 SoC"; From eb788f43a6c6e6c7a5b2879543b565e4cd452de8 Mon Sep 17 00:00:00 2001 From: Santosh Shilimkar Date: Mon, 5 Aug 2013 13:13:07 -0400 Subject: [PATCH 6/6] ARM: Keystone: Convert device tree file to use IRQ defines Use the GIC and standard IRQ binding defines in all IRQ specifiers. Signed-off-by: Santosh Shilimkar --- arch/arm/boot/dts/keystone.dts | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/keystone.dts b/arch/arm/boot/dts/keystone.dts index 612ba8c9879c..a68e34bbecb2 100644 --- a/arch/arm/boot/dts/keystone.dts +++ b/arch/arm/boot/dts/keystone.dts @@ -7,6 +7,8 @@ */ /dts-v1/; +#include + #include "skeleton.dtsi" / { @@ -67,18 +69,23 @@ gic: interrupt-controller { timer { compatible = "arm,armv7-timer"; - interrupts = <1 13 0xf08>, - <1 14 0xf08>, - <1 11 0xf08>, - <1 10 0x308>; + interrupts = + , + , + , + ; }; pmu { compatible = "arm,cortex-a15-pmu"; - interrupts = <0 20 0xf01>, - <0 21 0xf01>, - <0 22 0xf01>, - <0 23 0xf01>; + interrupts = , + , + , + ; }; soc { @@ -100,7 +107,7 @@ uart0: serial@02530c00 { reg-io-width = <4>; reg = <0x02530c00 0x100>; clock-frequency = <133120000>; - interrupts = <0 277 0xf01>; + interrupts = ; }; uart1: serial@02531000 { @@ -110,7 +117,7 @@ uart1: serial@02531000 { reg-io-width = <4>; reg = <0x02531000 0x100>; clock-frequency = <133120000>; - interrupts = <0 280 0xf01>; + interrupts = ; }; };