arm: Xilinx Zynq SoC patches for v4.2
- Fix earlyprintk, jump trampoline for SMP - Update git tree location - Setup PL310 aux (bit 22) -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEABECAAYFAlW7MWAACgkQykllyylKDCHkTACfT3Kzs+Cl7jc9A4kQ6dkbUqtC E1MAn0g3yHcqGHgUtfyHu6lXtptJFbDn =DuTZ -----END PGP SIGNATURE----- Merge tag 'zynq-soc-for-4.3' of https://github.com/Xilinx/linux-xlnx into next/soc arm: Xilinx Zynq SoC patches for v4.2 - Fix earlyprintk, jump trampoline for SMP - Update git tree location - Setup PL310 aux (bit 22) * tag 'zynq-soc-for-4.3' of https://github.com/Xilinx/linux-xlnx: ARM: zynq: reserve space for jump target in secondary trampoline clk: zynq: remove redundant $(CONFIG_ARCH_ZYNQ) in Makefile MAINTAINERS: Update Zynq git tree location ARM: zynq: Set bit 22 in PL310 AuxCtrl register (6395/1) ARM: zynq: Fix earlyprintk in big endian mode Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
commit
b69354dfe2
|
@ -1676,7 +1676,7 @@ M: Michal Simek <michal.simek@xilinx.com>
|
|||
R: Sören Brinkmann <soren.brinkmann@xilinx.com>
|
||||
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||
W: http://wiki.xilinx.com
|
||||
T: git git://git.xilinx.com/linux-xlnx.git
|
||||
T: git https://github.com/Xilinx/linux-xlnx.git
|
||||
S: Supported
|
||||
F: arch/arm/mach-zynq/
|
||||
F: drivers/cpuidle/cpuidle-zynq.c
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
.endm
|
||||
|
||||
.macro senduart,rd,rx
|
||||
str \rd, [\rx, #UART_FIFO_OFFSET] @ TXDATA
|
||||
strb \rd, [\rx, #UART_FIFO_OFFSET] @ TXDATA
|
||||
.endm
|
||||
|
||||
.macro waituart,rd,rx
|
||||
|
|
|
@ -197,8 +197,8 @@ static const char * const zynq_dt_match[] = {
|
|||
|
||||
DT_MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform")
|
||||
/* 64KB way size, 8-way associativity, parity disabled */
|
||||
.l2c_aux_val = 0x00000000,
|
||||
.l2c_aux_mask = 0xffffffff,
|
||||
.l2c_aux_val = 0x00400000,
|
||||
.l2c_aux_mask = 0xffbfffff,
|
||||
.smp = smp_ops(zynq_smp_ops),
|
||||
.map_io = zynq_map_io,
|
||||
.init_irq = zynq_irq_init,
|
||||
|
|
|
@ -18,7 +18,7 @@ ARM_BE8(rev r0, r0)
|
|||
.globl zynq_secondary_trampoline_jump
|
||||
zynq_secondary_trampoline_jump:
|
||||
/* Space for jumping address */
|
||||
.word /* cpu 1 */
|
||||
.word 0 /* cpu 1 */
|
||||
.globl zynq_secondary_trampoline_end
|
||||
zynq_secondary_trampoline_end:
|
||||
ENDPROC(zynq_secondary_trampoline)
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
# Zynq clock specific Makefile
|
||||
|
||||
obj-$(CONFIG_ARCH_ZYNQ) += clkc.o pll.o
|
||||
obj-y += clkc.o pll.o
|
||||
|
|
Loading…
Reference in New Issue