Skip to content

Commit 66f2c6d

Browse files
torvaldstorvalds
committed
Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC platform updates from Arnd Bergmann: "These are updates for platform specific code on 32-bit ARM machines, essentially anything that can not (yet) be expressed using DT files. Noteworthy changes include: - We get support for running in big-endian mode on two platforms: sunxi (Allwinner) and s3c24xx (old Samsung). - The recently added Uniphier platform now uses standard PSCI methods for SMP booting and we remove support for old bootloader versions that did not support it yet. - In sunxi, we gain support for the "Nextthing GR8" SoC, which is a close relative of the Allwinner A13 and R8 chips. - PXA completes its move over to the generic dmaengine framework and removes its old private API - mach-bcm gains support for BCM47189/BCM53573, their first ARM SoC with integrated 802.11ac wireless networking" * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits) ARM: imx legacy: pca100: move peripheral initialization to .init_late ARM: imx legacy: mx27ads: move peripheral initialization to .init_late ARM: imx legacy: mx21ads: move peripheral initialization to .init_late ARM: imx legacy: pcm043: move peripheral initialization to .init_late ARM: imx legacy: mx35-3ds: move peripheral initialization to .init_late ARM: imx legacy: mx27-3ds: move peripheral initialization to .init_late ARM: imx legacy: imx27-visstrim-m10: move peripheral initialization to .init_late ARM: imx legacy: vpr200: move peripheral initialization to .init_late ARM: imx legacy: mx31moboard: move peripheral initialization to .init_late ARM: imx legacy: armadillo5x0: move peripheral initialization to .init_late ARM: imx legacy: qong: move peripheral initialization to .init_late ARM: imx legacy: mx31-3ds: move peripheral initialization to .init_late ARM: imx legacy: pcm037: move peripheral initialization to .init_late ARM: imx legacy: mx31lilly: move peripheral initialization to .init_late ARM: imx legacy: mx31ads: move peripheral initialization to .init_late ARM: imx legacy: mx31lite: move peripheral initialization to .init_late ARM: imx legacy: kzm: move peripheral initialization to .init_late MAINTAINERS: update list of Oxnas maintainers ARM: orion5x: remove extraneous NO_IRQ ARM: orion: simplify orion_ge00_switch_init ...
2 parents a771151 + e40454d commit 66f2c6d

86 files changed

Lines changed: 696 additions & 1285 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Documentation/arm/sunxi/README‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ SunXi family
3131
+ User Manual
3232
http://dl.linux-sunxi.org/A13/A13%20User%20Manual%20-%20v1.2%20%282013-01-08%29.pdf
3333

34+
- Next Thing Co GR8 (sun5i)
35+
3436
* Dual ARM Cortex-A7 based SoCs
3537
- Allwinner A20 (sun7i)
3638
+ User Manual

‎Documentation/devicetree/bindings/arm/sunxi.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ using one of the following compatible strings:
1414
allwinner,sun8i-a83t
1515
allwinner,sun8i-h3
1616
allwinner,sun9i-a80
17+
nextthing,gr8

‎MAINTAINERS‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,6 +1003,7 @@ M: Chen-Yu Tsai <wens@csie.org>
10031003
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
10041004
S: Maintained
10051005
N: sun[x456789]i
1006+
F: arch/arm/boot/dts/ntc-gr8*
10061007

10071008
ARM/Allwinner SoC Clock Support
10081009
M: Emilio López <emilio@elopez.com.ar>
@@ -1459,6 +1460,7 @@ F: arch/arm/mach-orion5x/ts78xx-*
14591460
ARM/OXNAS platform support
14601461
M: Neil Armstrong <narmstrong@baylibre.com>
14611462
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1463+
L: linux-oxnas@lists.tuxfamily.org (moderated for non-subscribers)
14621464
S: Maintained
14631465
F: arch/arm/mach-oxnas/
14641466
F: arch/arm/boot/dts/oxnas*
@@ -2596,6 +2598,13 @@ F: arch/arm/mach-bcm/bcm_5301x.c
25962598
F: arch/arm/boot/dts/bcm5301x*.dtsi
25972599
F: arch/arm/boot/dts/bcm470*
25982600

2601+
BROADCOM BCM53573 ARM ARCHITECTURE
2602+
M: Rafał Miłecki <rafal@milecki.pl>
2603+
L: linux-arm-kernel@lists.infradead.org
2604+
S: Maintained
2605+
F: arch/arm/boot/dts/bcm53573*
2606+
F: arch/arm/boot/dts/bcm47189*
2607+
25992608
BROADCOM BCM63XX ARM ARCHITECTURE
26002609
M: Florian Fainelli <f.fainelli@gmail.com>
26012610
M: bcm-kernel-feedback-list@broadcom.com

‎arch/arm/Kconfig.debug‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -186,10 +186,11 @@ choice
186186
config DEBUG_BRCMSTB_UART
187187
bool "Use BRCMSTB UART for low-level debug"
188188
depends on ARCH_BRCMSTB
189-
select DEBUG_UART_8250
190189
help
191190
Say Y here if you want the debug print routines to direct
192-
their output to the first serial port on these devices.
191+
their output to the first serial port on these devices. The
192+
UART physical and virtual address is automatically provided
193+
based on the chip identification register value.
193194

194195
If you have a Broadcom STB chip and would like early print
195196
messages to appear over the UART, select this option.
@@ -861,12 +862,12 @@ choice
861862
via SCIF2 on Renesas R-Car H1 (R8A7779).
862863

863864
config DEBUG_RCAR_GEN2_SCIF0
864-
bool "Kernel low-level debugging messages via SCIF0 on R8A7790/R8A7791/R8A7793"
865-
depends on ARCH_R8A7790 || ARCH_R8A7791 || ARCH_R8A7793
865+
bool "Kernel low-level debugging messages via SCIF0 on R8A7790/R8A7791/R8A7792/R8A7793"
866+
depends on ARCH_R8A7790 || ARCH_R8A7791 || ARCH_R8A7792 || ARCH_R8A7793
866867
help
867868
Say Y here if you want kernel low-level debugging support
868-
via SCIF0 on Renesas R-Car H2 (R8A7790), M2-W (R8A7791), or
869-
M2-N (R8A7793).
869+
via SCIF0 on Renesas R-Car H2 (R8A7790), M2-W (R8A7791), V2H
870+
(R8A7792), or M2-N (R8A7793).
870871

871872
config DEBUG_RCAR_GEN2_SCIF2
872873
bool "Kernel low-level debugging messages via SCIF2 on R8A7794"
@@ -1430,6 +1431,7 @@ config DEBUG_LL_INCLUDE
14301431
default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1
14311432
default "debug/bcm63xx.S" if DEBUG_BCM63XX_UART
14321433
default "debug/digicolor.S" if DEBUG_DIGICOLOR_UA0
1434+
default "debug/brcmstb.S" if DEBUG_BRCMSTB_UART
14331435
default "mach/debug-macro.S"
14341436

14351437
# Compatibility options for PL01x
@@ -1520,7 +1522,6 @@ config DEBUG_UART_PHYS
15201522
default 0xe6e60000 if DEBUG_RCAR_GEN2_SCIF0
15211523
default 0xe8008000 if DEBUG_R7S72100_SCIF2
15221524
default 0xf0000be0 if ARCH_EBSA110
1523-
default 0xf040ab00 if DEBUG_BRCMSTB_UART
15241525
default 0xf1012000 if DEBUG_MVEBU_UART0_ALTERNATE
15251526
default 0xf1012100 if DEBUG_MVEBU_UART1_ALTERNATE
15261527
default 0xf7fc9000 if DEBUG_BERLIN_UART
@@ -1604,7 +1605,6 @@ config DEBUG_UART_VIRT
16041605
default 0xfb009000 if DEBUG_REALVIEW_STD_PORT
16051606
default 0xfb00c000 if DEBUG_AT91_SAMA5D4_USART3
16061607
default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT
1607-
default 0xfc40ab00 if DEBUG_BRCMSTB_UART
16081608
default 0xfc705000 if DEBUG_ZTE_ZX
16091609
default 0xfcfe8600 if DEBUG_BCM63XX_UART
16101610
default 0xfd000000 if DEBUG_SPEAR3XX || DEBUG_SPEAR13XX
@@ -1677,8 +1677,7 @@ config DEBUG_UART_8250_WORD
16771677
DEBUG_ALPINE_UART0 || \
16781678
DEBUG_DAVINCI_DMx_UART0 || DEBUG_DAVINCI_DA8XX_UART1 || \
16791679
DEBUG_DAVINCI_DA8XX_UART2 || \
1680-
DEBUG_BCM_KONA_UART || DEBUG_RK32_UART2 || \
1681-
DEBUG_BRCMSTB_UART
1680+
DEBUG_BCM_KONA_UART || DEBUG_RK32_UART2
16821681

16831682
config DEBUG_UART_8250_PALMCHIP
16841683
bool "8250 UART is Palmchip BK-310x"
@@ -1697,7 +1696,8 @@ config DEBUG_UNCOMPRESS
16971696
bool
16981697
depends on ARCH_MULTIPLATFORM || PLAT_SAMSUNG || ARM_SINGLE_ARMV7M
16991698
default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \
1700-
(!DEBUG_TEGRA_UART || !ZBOOT_ROM)
1699+
(!DEBUG_TEGRA_UART || !ZBOOT_ROM) && \
1700+
!DEBUG_BRCMSTB_UART
17011701
help
17021702
This option influences the normal decompressor output for
17031703
multiplatform kernels. Normally, multiplatform kernels disable

‎arch/arm/configs/colibri_pxa270_defconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
8383
CONFIG_BLK_DEV_NBD=y
8484
CONFIG_BLK_DEV_RAM=y
8585
CONFIG_BLK_DEV_RAM_COUNT=8
86-
CONFIG_IDE=y
8786
CONFIG_NETDEVICES=y
8887
CONFIG_PHYLIB=y
8988
CONFIG_NET_ETHERNET=y

‎arch/arm/configs/lpd270_defconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ CONFIG_MTD_CFI_GEOMETRY=y
3131
# CONFIG_MTD_CFI_I1 is not set
3232
CONFIG_MTD_CFI_INTELEXT=y
3333
CONFIG_BLK_DEV_NBD=y
34-
CONFIG_IDE=y
3534
CONFIG_NETDEVICES=y
3635
CONFIG_NET_ETHERNET=y
3736
CONFIG_SMC91X=y

‎arch/arm/configs/pxa255-idp_defconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ CONFIG_MTD_CFI_GEOMETRY=y
2828
# CONFIG_MTD_MAP_BANK_WIDTH_2 is not set
2929
# CONFIG_MTD_CFI_I1 is not set
3030
CONFIG_MTD_CFI_INTELEXT=y
31-
CONFIG_IDE=y
3231
CONFIG_NETDEVICES=y
3332
CONFIG_NET_ETHERNET=y
3433
CONFIG_SMC91X=y

‎arch/arm/configs/pxa_defconfig‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ CONFIG_PARTITION_ADVANCED=y
2626
CONFIG_LDM_PARTITION=y
2727
CONFIG_CMDLINE_PARTITION=y
2828
CONFIG_ARCH_PXA=y
29-
CONFIG_MACH_PXA27X_DT=y
30-
CONFIG_MACH_PXA3XX_DT=y
3129
CONFIG_ARCH_LUBBOCK=y
3230
CONFIG_MACH_MAINSTONE=y
3331
CONFIG_MACH_ZYLONITE300=y

‎arch/arm/configs/trizeps4_defconfig‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
9494
CONFIG_BLK_DEV_NBD=y
9595
CONFIG_BLK_DEV_RAM=y
9696
CONFIG_BLK_DEV_RAM_COUNT=8
97-
CONFIG_IDE=y
98-
CONFIG_BLK_DEV_IDECS=m
9997
CONFIG_SCSI=y
10098
CONFIG_BLK_DEV_SD=y
10199
CONFIG_CHR_DEV_SG=y

‎arch/arm/include/asm/hardware/cache-uniphier.h‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
2-
* Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com>
2+
* Copyright (C) 2015-2016 Socionext Inc.
3+
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
34
*
45
* This program is free software; you can redistribute it and/or modify
56
* it under the terms of the GNU General Public License as published by
@@ -19,28 +20,11 @@
1920

2021
#ifdef CONFIG_CACHE_UNIPHIER
2122
int uniphier_cache_init(void);
22-
int uniphier_cache_l2_is_enabled(void);
23-
void uniphier_cache_l2_touch_range(unsigned long start, unsigned long end);
24-
void uniphier_cache_l2_set_locked_ways(u32 way_mask);
2523
#else
2624
static inline int uniphier_cache_init(void)
2725
{
2826
return -ENODEV;
2927
}
30-
31-
static inline int uniphier_cache_l2_is_enabled(void)
32-
{
33-
return 0;
34-
}
35-
36-
static inline void uniphier_cache_l2_touch_range(unsigned long start,
37-
unsigned long end)
38-
{
39-
}
40-
41-
static inline void uniphier_cache_l2_set_locked_ways(u32 way_mask)
42-
{
43-
}
4428
#endif
4529

4630
#endif /* __CACHE_UNIPHIER_H */

0 commit comments

Comments
 (0)