diff options
| author | Olof Johansson <olof@lixom.net> | 2015-08-05 08:53:52 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-08-05 08:53:52 (GMT) |
| commit | b69354dfe25bf0b103ef3ed6c881d34cc442265c (patch) | |
| tree | 7bb912aa103d1501c9e67457cab8b761e175aba0 | |
| parent | c268a743103aebba8d81d3365107f7170653099e (diff) | |
| parent | e4a9288942392965bd5cfad93d9996b83c0dc4a6 (diff) | |
| download | linux-b69354dfe25bf0b103ef3ed6c881d34cc442265c.tar.xz | |
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>
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | arch/arm/include/debug/zynq.S | 2 | ||||
| -rw-r--r-- | arch/arm/mach-zynq/common.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-zynq/headsmp.S | 2 | ||||
| -rw-r--r-- | drivers/clk/zynq/Makefile | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 07280fa..1386a7d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 diff --git a/arch/arm/include/debug/zynq.S b/arch/arm/include/debug/zynq.S index bd13ded..de86b92 100644 --- a/arch/arm/include/debug/zynq.S +++ b/arch/arm/include/debug/zynq.S @@ -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 diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index 616d584..6bd4a43 100644 --- a/arch/arm/mach-zynq/common.c +++ b/arch/arm/mach-zynq/common.c @@ -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, diff --git a/arch/arm/mach-zynq/headsmp.S b/arch/arm/mach-zynq/headsmp.S index 045c727..f6d5de0 100644 --- a/arch/arm/mach-zynq/headsmp.S +++ b/arch/arm/mach-zynq/headsmp.S @@ -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) diff --git a/drivers/clk/zynq/Makefile b/drivers/clk/zynq/Makefile index 156d923..0afc2e7 100644 --- a/drivers/clk/zynq/Makefile +++ b/drivers/clk/zynq/Makefile @@ -1,3 +1,3 @@ # Zynq clock specific Makefile -obj-$(CONFIG_ARCH_ZYNQ) += clkc.o pll.o +obj-y += clkc.o pll.o |