UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: keystone: non-critical fixes, cleanup for 3.12 

Summary of changes:
 	- Drop unused HAVE_SCHED_CLOCK config option
 	- Remove now redundant smp_init_cpus call
 	- Update the smc code to remove dsb and r12 usage
 	- Convert device tree to use #include and GIC bindings
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJSApuFAAoJEHJsHOdBp5c/UGcQAIUDwFk8nq1C7y13TTwxtEWV
 iqmwojeuaTyCw1HOsz+6mMrFsziOSFuGxh1JNAlhfZole23gpTr1NFziH7HxlWo5
 o4dVoLIO/cG5Ie95p2SHe8pwZV5+a82SjBYE6IJ6MmvCrER+c7/Ucxst8UhKj5ok
 6RsSNU0buMPwuXnFttOk7H8HSlyCiNZEzOJGJkO5j77D9Cj8eN7z3AkgMtMni0ge
 lFFVFDiGU6LSiU85BOg7ixVJPJeOqPmb1aWaTDko+sIrOpt8lUKFWAZNIOmxhUHC
 gkF1lcgfDRpvMroXlJWqABlXc7789l4V3w4aJhn5IIXEUg9WlD2FFJ+euTbnSDvM
 aZQzBzPWuegonJZyO2Aznld0vDGR6CK8spsi/ooYrPFntipThBoORbdQzW0Mukns
 IbgJ2dia1whys7fVLcXfJiOlObKS3ydIF3KR79KYS59NUSzsmAu1kdSahWpp0VYw
 YyMXSDf3AIbjptNkmvcO1UOhANrGm5F2j1q7UY6YIMr52Eo3Zg9uJWGkYs6poxAl
 gT2OpFG0eKExIoJXmd4TpJMMbCQuoRNAsJYsQwsg2JmaNzjmQUpuJYd9qUdl4ZIF
 dILXez9mb87PamRKg+Q0lP6Up/rTM2zKZtZKO082HXr/6cDJEy6H8TSD5LHxrji2
 LB1G37B0ZiGOaclQROnx
 =NazV
 -----END PGP SIGNATURE-----

Merge tag 'keystone-fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/fixes-non-critical

From: Santosh Shilimkar <santosh.shilimkar@ti.com>:
ARM: keystone: non-critical fixes, cleanup for 3.12

Summary of changes:
	- Drop unused HAVE_SCHED_CLOCK config option
	- Remove now redundant smp_init_cpus call
	- Update the smc code to remove dsb and r12 usage
	- Convert device tree to use #include and GIC bindings

* tag 'keystone-fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: Keystone: Convert device tree file to use IRQ defines
  ARM: keystone: use #include to include skeleton.dtsi
  ARM: keystone: Drop the un-necessary dsb from keystone_cpu_smc()
  ARM: Keystone: No need to preserve r12 across smc call
  ARM: keystone: remove redundant smp_init_cpus definition
  ARM: keystone: drop useless HAVE_SCHED_CLOCK

Signed-off-by: Kevin Hilman <khilman@linaro.org>
This commit is contained in:
Kevin Hilman 2013-08-07 16:11:29 -07:00
parent 6a33fc8cac eb788f43a6
commit 44de76b630
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
arch/arm/boot/dts/keystone.dts
View File

@ -7,7 +7,9 @@
*/ */
/dts-v1/; /dts-v1/;
/include/ "skeleton.dtsi" #include <dt-bindings/interrupt-controller/arm-gic.h>
#include "skeleton.dtsi"
/ { / {
model = "Texas Instruments Keystone 2 SoC"; model = "Texas Instruments Keystone 2 SoC";
@ -67,18 +69,23 @@
timer { timer {
compatible = "arm,armv7-timer"; compatible = "arm,armv7-timer";
interrupts = <1 13 0xf08>, interrupts =
<1 14 0xf08>, <GIC_PPI 13
<1 11 0xf08>, (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
<1 10 0x308>; <GIC_PPI 14
(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
<GIC_PPI 11
(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
<GIC_PPI 10
(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
}; };
pmu { pmu {
compatible = "arm,cortex-a15-pmu"; compatible = "arm,cortex-a15-pmu";
interrupts = <0 20 0xf01>, interrupts = <GIC_SPI 20 IRQ_TYPE_EDGE_RISING>,
<0 21 0xf01>, <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>,
<0 22 0xf01>, <GIC_SPI 22 IRQ_TYPE_EDGE_RISING>,
<0 23 0xf01>; <GIC_SPI 23 IRQ_TYPE_EDGE_RISING>;
}; };
soc { soc {
@ -100,7 +107,7 @@
reg-io-width = <4>; reg-io-width = <4>;
reg = <0x02530c00 0x100>; reg = <0x02530c00 0x100>;
clock-frequency = <133120000>; clock-frequency = <133120000>;
interrupts = <0 277 0xf01>; interrupts = <GIC_SPI 277 IRQ_TYPE_EDGE_RISING>;
}; };
uart1: serial@02531000 { uart1: serial@02531000 {
@ -110,7 +117,7 @@
reg-io-width = <4>; reg-io-width = <4>;
reg = <0x02531000 0x100>; reg = <0x02531000 0x100>;
clock-frequency = <133120000>; clock-frequency = <133120000>;
interrupts = <0 280 0xf01>; interrupts = <GIC_SPI 280 IRQ_TYPE_EDGE_RISING>;
}; };
}; };

1
arch/arm/mach-keystone/Kconfig
View File

@ -7,7 +7,6 @@ config ARCH_KEYSTONE
select HAVE_SMP select HAVE_SMP
select CLKSRC_MMIO select CLKSRC_MMIO
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select HAVE_SCHED_CLOCK
select ARCH_WANT_OPTIONAL_GPIOLIB select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_ERRATA_798181 if SMP select ARM_ERRATA_798181 if SMP
help help

1
arch/arm/mach-keystone/platsmp.c
View File

@ -38,6 +38,5 @@ static int keystone_smp_boot_secondary(unsigned int cpu,
} }
struct smp_operations keystone_smp_ops __initdata = { struct smp_operations keystone_smp_ops __initdata = {
.smp_init_cpus = arm_dt_init_cpu_maps,
.smp_boot_secondary = keystone_smp_boot_secondary, .smp_boot_secondary = keystone_smp_boot_secondary,
}; };

5
arch/arm/mach-keystone/smc.S
View File

@ -22,8 +22,7 @@
* Return: Non zero value on failure * Return: Non zero value on failure
*/ */
ENTRY(keystone_cpu_smc) ENTRY(keystone_cpu_smc)
stmfd sp!, {r4-r12, lr} stmfd sp!, {r4-r11, lr}
smc #0 smc #0
dsb ldmfd sp!, {r4-r11, pc}
ldmfd sp!, {r4-r12, pc}
ENDPROC(keystone_cpu_smc) ENDPROC(keystone_cpu_smc)