mirror of
https://github.com/torvalds/linux.git
synced 2024-12-29 14:21:47 +00:00
b3345d7c57
This is the bulk of new SoC enablement and other platform changes for 3.17:
* Samsung S5PV210 has been converted to DT and multiplatform
* Clock drivers and bindings for some of the lower-end i.MX 1/2 platforms
* Kirkwood, one of the popular Marvell platforms, is folded into the
mvebu platform code, removing mach-kirkwood.
* Hwmod data for TI AM43xx and DRA7 platforms.
* More additions of Renesas shmobile platform support
* Removal of plat-samsung contents that can be removed with S5PV210 being
multiplatform/DT-enabled and the other two old platforms being removed.
New platforms (most with only basic support right now):
* Hisilicon X5HD2 settop box chipset is introduced
* Mediatek MT6589 (mobile chipset) is introduced
* Broadcom BCM7xxx settop box chipset is introduced
+ as usual a lot other pieces all over the platform code.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.14 (GNU/Linux)
iQIcBAABAgAGBQJT5Dp+AAoJEIwa5zzehBx3w1sP/0vjT/LQOmC8Lv8RW2Ley2ua
hNu3HcNPnT/N40JEdU9YNv3q0fdxGgcfKj011CNN+49zPSUf1xduk2wfCAk9yV50
8Sbt1PfDGm1YyUugGN420CzI431pPoM1OGXHZHkAmg+2J286RtUi3NckB//QDbCY
QhEjhpYc9SXhAOCGwmB4ab7thOljOFSPzKTLMTu3+PNI5zRPRgkDkt6w9XlsAYmB
nuR271BnzsROkMzAjycwaJ3kdim7wqrMRfk8g96o0jHSF5qf4zsT5uWYYAjTxdUQ
8Ajz6zjeHe4+95TwTDcq+lCX6rDLZgwkvCAc6hFbeg0uR7Dyek0h6XMEYtwdjaiU
KNPwOENrYdENNDAGRpkFp1x4h/rY9Plfru0bBo5o6t7aPBvmNeCDzRtlTtLiUNDV
dG8sfDMtrS/wFHVjylDSQ60Mb+wuW0XneC8D7chY/iRhIllUYi6YXXvt+/tH5C20
oYDOWqqcDFSb0sJhE5pn4KBV82ZaHx9jMBWGLl+erg2sDX/SK8SxOkLqKYZKtKB5
0leOGE3Y+C70xt3G9HftLz2sAvvt+C8UPsApPT+dHNE401TWJOYx6LphPkQKjeeK
P1iwKi+It3l+FaBypgJy/LeMQRy7EyvDBK2I5WoVL/R2qq14EmP1ui3Tthjj0bhq
tBBof6P9c8OnRVj1Lz3R
=5TJ6
-----END PGP SIGNATURE-----
Merge tag 'soc-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC platform changes from Olof Johansson:
"This is the bulk of new SoC enablement and other platform changes for
3.17:
- Samsung S5PV210 has been converted to DT and multiplatform
- Clock drivers and bindings for some of the lower-end i.MX 1/2
platforms
- Kirkwood, one of the popular Marvell platforms, is folded into the
mvebu platform code, removing mach-kirkwood
- Hwmod data for TI AM43xx and DRA7 platforms
- More additions of Renesas shmobile platform support
- Removal of plat-samsung contents that can be removed with S5PV210
being multiplatform/DT-enabled and the other two old platforms
being removed
New platforms (most with only basic support right now):
- Hisilicon X5HD2 settop box chipset is introduced
- Mediatek MT6589 (mobile chipset) is introduced
- Broadcom BCM7xxx settop box chipset is introduced
+ as usual a lot other pieces all over the platform code"
* tag 'soc-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (240 commits)
ARM: hisi: remove smp from machine descriptor
power: reset: move hisilicon reboot code
ARM: dts: Add hix5hd2-dkb dts file.
ARM: debug: Rename Hi3716 to HIX5HD2
ARM: hisi: enable hix5hd2 SoC
ARM: hisi: add ARCH_HISI
MAINTAINERS: add entry for Broadcom ARM STB architecture
ARM: brcmstb: select GISB arbiter and interrupt drivers
ARM: brcmstb: add infrastructure for ARM-based Broadcom STB SoCs
ARM: configs: enable SMP in bcm_defconfig
ARM: add SMP support for Broadcom mobile SoCs
Documentation: arm: misc updates to Marvell EBU SoC status
Documentation: arm: add URLs to public datasheets for the Marvell Armada XP SoC
ARM: mvebu: fix build without platforms selected
ARM: mvebu: add cpuidle support for Armada 38x
ARM: mvebu: add cpuidle support for Armada 370
cpuidle: mvebu: add Armada 38x support
cpuidle: mvebu: add Armada 370 support
cpuidle: mvebu: rename the driver from armada-370-xp to mvebu-v7
ARM: mvebu: export the SCU address
...
99 lines
2.1 KiB
ArmAsm
99 lines
2.1 KiB
ArmAsm
/*
|
|
* SMP support for R-Mobile / SH-Mobile
|
|
*
|
|
* Copyright (C) 2010 Magnus Damm
|
|
* Copyright (C) 2010 Takashi Yoshii
|
|
*
|
|
* Based on vexpress, Copyright (c) 2003 ARM Limited, All Rights Reserved
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
#include <linux/init.h>
|
|
#include <linux/linkage.h>
|
|
#include <linux/threads.h>
|
|
#include <asm/assembler.h>
|
|
#include <asm/memory.h>
|
|
|
|
#ifdef CONFIG_SMP
|
|
ENTRY(shmobile_invalidate_start)
|
|
bl v7_invalidate_l1
|
|
b secondary_startup
|
|
ENDPROC(shmobile_invalidate_start)
|
|
#endif
|
|
|
|
/*
|
|
* Reset vector for secondary CPUs.
|
|
* This will be mapped at address 0 by SBAR register.
|
|
* We need _long_ jump to the physical address.
|
|
*/
|
|
.arm
|
|
.align 12
|
|
ENTRY(shmobile_boot_vector)
|
|
ldr r0, 2f
|
|
ldr r1, 1f
|
|
bx r1
|
|
|
|
ENDPROC(shmobile_boot_vector)
|
|
|
|
.align 2
|
|
.globl shmobile_boot_fn
|
|
shmobile_boot_fn:
|
|
1: .space 4
|
|
.globl shmobile_boot_arg
|
|
shmobile_boot_arg:
|
|
2: .space 4
|
|
.globl shmobile_boot_size
|
|
shmobile_boot_size:
|
|
.long . - shmobile_boot_vector
|
|
|
|
/*
|
|
* Per-CPU SMP boot function/argument selection code based on MPIDR
|
|
*/
|
|
|
|
ENTRY(shmobile_smp_boot)
|
|
@ r0 = MPIDR_HWID_BITMASK
|
|
mrc p15, 0, r1, c0, c0, 5 @ r1 = MPIDR
|
|
and r0, r1, r0 @ r0 = cpu_logical_map() value
|
|
mov r1, #0 @ r1 = CPU index
|
|
adr r5, 1f @ array of per-cpu mpidr values
|
|
adr r6, 2f @ array of per-cpu functions
|
|
adr r7, 3f @ array of per-cpu arguments
|
|
|
|
shmobile_smp_boot_find_mpidr:
|
|
ldr r8, [r5, r1, lsl #2]
|
|
cmp r8, r0
|
|
bne shmobile_smp_boot_next
|
|
|
|
ldr r9, [r6, r1, lsl #2]
|
|
cmp r9, #0
|
|
bne shmobile_smp_boot_found
|
|
|
|
shmobile_smp_boot_next:
|
|
add r1, r1, #1
|
|
cmp r1, #NR_CPUS
|
|
blo shmobile_smp_boot_find_mpidr
|
|
|
|
b shmobile_smp_sleep
|
|
|
|
shmobile_smp_boot_found:
|
|
ldr r0, [r7, r1, lsl #2]
|
|
ret r9
|
|
ENDPROC(shmobile_smp_boot)
|
|
|
|
ENTRY(shmobile_smp_sleep)
|
|
wfi
|
|
b shmobile_smp_boot
|
|
ENDPROC(shmobile_smp_sleep)
|
|
|
|
.globl shmobile_smp_mpidr
|
|
shmobile_smp_mpidr:
|
|
1: .space NR_CPUS * 4
|
|
.globl shmobile_smp_fn
|
|
shmobile_smp_fn:
|
|
2: .space NR_CPUS * 4
|
|
.globl shmobile_smp_arg
|
|
shmobile_smp_arg:
|
|
3: .space NR_CPUS * 4
|