Skip to content

Commit d4db4e5

Browse files
committed
Merge tag 'arm-newsoc-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull new ARM SoC support from Arnd Bergmann: "There are three SoC families newly dded to the 32-bit and 64-bit Arm architecture code in the kernel this time: - Daniel Palmer adds initial support for two chips made by MStar, a taiwanese SoC manufacturer that became part of Mediatek in 2012. For now, the added support is fairly minimal, with just two of its Cortex-A7 based 32-bit camera chips getting support for a limited set of on-chip peripherals. - Lars Povlsen from Microchip adds support for their new Sparx5 family of ethernet switch chips using 64-bit Cortex-A53 cores. These are descended from earlier VSC7xxx SparX and Ocelot chips using 32-bit MIPS cores. - Daniele Alessandrelli from Intel adds support for the new Keem Bay SoC for computer vision, built around a Movidius VPU with Linux running on Arm Cortex-A53 cores" * tag 'arm-newsoc-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (38 commits) ARM: mstar: Correct the compatible string for pmsleep dt-bindings: arm: mstar: remove the binding description for mstar,pmsleep dt-bindings: mfd: syscon: add compatible string for mstar,msc313-pmsleep ARM: mstar: Add reboot support ARM: mstar: Add "pmsleep" node to base dtsi ARM: mstar: Add PMU ARM: mstar: Adjust IMI size for infinity3 ARM: mstar: Adjust IMI size for mercury5 ARM: mstar: Adjust IMI size of infinity ARM: mstar: Add IMI SRAM region dt-bindings: arm: mstar: Move existing MStar binding descriptions dt-bindings: arm: mstar: Add binding details for mstar, pmsleep ARM: mstar: Fix dts filename for 70mai midrive d08 ARM: mstar: Add dts for 70mai midrive d08 ARM: mstar: Add dts for msc313(e) based BreadBee boards ARM: mstar: Add mercury5 series dtsis ARM: mstar: Add infinity/infinity3 family dtsis ARM: mstar: Add Armv7 base dtsi ARM: mstar: Add binding details for mstar,l3bridge ARM: mstar: Add machine for MStar/Sigmastar Armv7 SoCs ...
2 parents 822ef14 + 892900a commit d4db4e5

40 files changed

+1495
-0
lines changed
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/arm/intel,keembay.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Keem Bay platform device tree bindings
8+
9+
maintainers:
10+
- Paul J. Murphy <[email protected]>
11+
- Daniele Alessandrelli <[email protected]>
12+
13+
properties:
14+
compatible:
15+
items:
16+
- enum:
17+
- intel,keembay-evm
18+
- const: intel,keembay
19+
...
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/arm/microchip,sparx5.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Microchip Sparx5 Boards Device Tree Bindings
8+
9+
maintainers:
10+
- Lars Povlsen <[email protected]>
11+
12+
description: |+
13+
The Microchip Sparx5 SoC is a ARMv8-based used in a family of
14+
gigabit TSN-capable gigabit switches.
15+
16+
The SparX-5 Ethernet switch family provides a rich set of switching
17+
features such as advanced TCAM-based VLAN and QoS processing
18+
enabling delivery of differentiated services, and security through
19+
TCAM-based frame processing using versatile content aware processor
20+
(VCAP)
21+
22+
properties:
23+
$nodename:
24+
const: '/'
25+
compatible:
26+
oneOf:
27+
- description: The Sparx5 pcb125 board is a modular board,
28+
which has both spi-nor and eMMC storage. The modular design
29+
allows for connection of different network ports.
30+
items:
31+
- const: microchip,sparx5-pcb125
32+
- const: microchip,sparx5
33+
34+
- description: The Sparx5 pcb134 is a pizzabox form factor
35+
gigabit switch with 20 SFP ports. It features spi-nor and
36+
either spi-nand or eMMC storage (mount option).
37+
items:
38+
- const: microchip,sparx5-pcb134
39+
- const: microchip,sparx5
40+
41+
- description: The Sparx5 pcb135 is a pizzabox form factor
42+
gigabit switch with 48+4 Cu ports. It features spi-nor and
43+
either spi-nand or eMMC storage (mount option).
44+
items:
45+
- const: microchip,sparx5-pcb135
46+
- const: microchip,sparx5
47+
48+
axi@600000000:
49+
type: object
50+
description: the root node in the Sparx5 platforms must contain
51+
an axi bus child node. They are always at physical address
52+
0x600000000 in all the Sparx5 variants.
53+
properties:
54+
compatible:
55+
items:
56+
- const: simple-bus
57+
58+
required:
59+
- compatible
60+
61+
required:
62+
- compatible
63+
- axi@600000000
64+
65+
...
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
# Copyright 2020 thingy.jp.
3+
%YAML 1.2
4+
---
5+
$id: "http://devicetree.org/schemas/arm/mstar/mstar,l3bridge.yaml#"
6+
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
7+
8+
title: MStar/SigmaStar Armv7 SoC l3bridge
9+
10+
maintainers:
11+
- Daniel Palmer <[email protected]>
12+
13+
description: |
14+
MStar/SigmaStar's Armv7 SoCs have a pipeline in the interface
15+
between the CPU and memory. This means that before DMA capable
16+
devices are allowed to run the pipeline must be flushed to ensure
17+
everything is in memory.
18+
19+
The l3bridge region contains registers that allow such a flush
20+
to be triggered.
21+
22+
This node is used by the platform code to find where the registers
23+
are and install a barrier that triggers the required pipeline flush.
24+
25+
properties:
26+
compatible:
27+
items:
28+
- const: mstar,l3bridge
29+
30+
reg:
31+
maxItems: 1
32+
33+
required:
34+
- compatible
35+
- reg
36+
37+
additionalProperties: false
38+
39+
examples:
40+
- |
41+
l3bridge: l3bridge@1f204400 {
42+
compatible = "mstar,l3bridge";
43+
reg = <0x1f204400 0x200>;
44+
};
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/arm/mstar/mstar.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: MStar platforms device tree bindings
8+
9+
maintainers:
10+
- Daniel Palmer <[email protected]>
11+
12+
properties:
13+
$nodename:
14+
const: '/'
15+
compatible:
16+
oneOf:
17+
- description: infinity boards
18+
items:
19+
- enum:
20+
- thingyjp,breadbee-crust # thingy.jp BreadBee Crust
21+
- const: mstar,infinity
22+
23+
- description: infinity3 boards
24+
items:
25+
- enum:
26+
- thingyjp,breadbee # thingy.jp BreadBee
27+
- const: mstar,infinity3
28+
29+
- description: mercury5 boards
30+
items:
31+
- enum:
32+
- 70mai,midrived08 # 70mai midrive d08
33+
- const: mstar,mercury5
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/microchip,sparx5-dpll.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Microchip Sparx5 DPLL Clock
8+
9+
maintainers:
10+
- Lars Povlsen <[email protected]>
11+
12+
description: |
13+
The Sparx5 DPLL clock controller generates and supplies clock to
14+
various peripherals within the SoC.
15+
16+
properties:
17+
compatible:
18+
const: microchip,sparx5-dpll
19+
20+
reg:
21+
maxItems: 1
22+
23+
clocks:
24+
maxItems: 1
25+
26+
'#clock-cells':
27+
const: 1
28+
29+
required:
30+
- compatible
31+
- reg
32+
- clocks
33+
- '#clock-cells'
34+
35+
additionalProperties: false
36+
37+
examples:
38+
# Clock provider for eMMC:
39+
- |
40+
lcpll_clk: lcpll-clk {
41+
compatible = "fixed-clock";
42+
#clock-cells = <0>;
43+
clock-frequency = <2500000000>;
44+
};
45+
clks: clock-controller@61110000c {
46+
compatible = "microchip,sparx5-dpll";
47+
#clock-cells = <1>;
48+
clocks = <&lcpll_clk>;
49+
reg = <0x1110000c 0x24>;
50+
};
51+
52+
...

Documentation/devicetree/bindings/mfd/syscon.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ properties:
3838
- allwinner,sun8i-h3-system-controller
3939
- allwinner,sun8i-v3s-system-controller
4040
- allwinner,sun50i-a64-system-controller
41+
- microchip,sparx5-cpu-syscon
42+
- mstar,msc313-pmsleep
4143

4244
- const: syscon
4345

Documentation/devicetree/bindings/vendor-prefixes.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ patternProperties:
2323
"^(simple-audio-card|simple-graph-card|st-plgpio|st-spics|ts),.*": true
2424

2525
# Keep list in alphabetical order.
26+
"^70mai,.*":
27+
description: 70mai Co., Ltd.
2628
"^abilis,.*":
2729
description: Abilis Systems
2830
"^abracon,.*":
@@ -682,6 +684,8 @@ patternProperties:
682684
description: Microsemi Corporation
683685
"^msi,.*":
684686
description: Micro-Star International Co. Ltd.
687+
"^mstar,.*":
688+
description: MStar Semiconductor, Inc. (acquired by MediaTek Inc.)
685689
"^mti,.*":
686690
description: Imagination Technologies Ltd. (formerly MIPS Technologies Inc.)
687691
"^multi-inno,.*":
@@ -986,6 +990,8 @@ patternProperties:
986990
description: Spreadtrum Communications Inc.
987991
"^sst,.*":
988992
description: Silicon Storage Technology, Inc.
993+
"^sstar,.*":
994+
description: Xiamen Xingchen(SigmaStar) Technology Co., Ltd. (formerly part of MStar Semiconductor, Inc.)
989995
"^st,.*":
990996
description: STMicroelectronics
991997
"^starry,.*":
@@ -1034,6 +1040,8 @@ patternProperties:
10341040
description: Three Five Corp
10351041
"^thine,.*":
10361042
description: THine Electronics, Inc.
1043+
"^thingyjp,.*":
1044+
description: thingy.jp
10371045
"^ti,.*":
10381046
description: Texas Instruments
10391047
"^tianma,.*":

MAINTAINERS

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1966,6 +1966,14 @@ F: drivers/irqchip/irq-ixp4xx.c
19661966
F: include/linux/irqchip/irq-ixp4xx.h
19671967
F: include/linux/platform_data/timer-ixp4xx.h
19681968

1969+
ARM/INTEL KEEMBAY ARCHITECTURE
1970+
M: Paul J. Murphy <[email protected]>
1971+
M: Daniele Alessandrelli <[email protected]>
1972+
S: Maintained
1973+
F: Documentation/devicetree/bindings/arm/intel,keembay.yaml
1974+
F: arch/arm64/boot/dts/intel/keembay-evm.dts
1975+
F: arch/arm64/boot/dts/intel/keembay-soc.dtsi
1976+
19691977
ARM/INTEL RESEARCH IMOTE/STARGATE 2 MACHINE SUPPORT
19701978
M: Jonathan Cameron <[email protected]>
19711979
L: [email protected] (moderated for non-subscribers)
@@ -2123,12 +2131,32 @@ X: drivers/net/wireless/atmel/
21232131
N: at91
21242132
N: atmel
21252133

2134+
ARM/Microchip Sparx5 SoC support
2135+
M: Lars Povlsen <[email protected]>
2136+
M: Steen Hegelund <[email protected]>
2137+
M: Microchip Linux Driver Support <[email protected]>
2138+
L: [email protected] (moderated for non-subscribers)
2139+
S: Supported
2140+
F: arch/arm64/boot/dts/microchip/
2141+
N: sparx5
2142+
21262143
ARM/MIOA701 MACHINE SUPPORT
21272144
M: Robert Jarzmik <[email protected]>
21282145
L: [email protected] (moderated for non-subscribers)
21292146
S: Maintained
21302147
F: arch/arm/mach-pxa/mioa701.c
21312148

2149+
ARM/MStar/Sigmastar Armv7 SoC support
2150+
M: Daniel Palmer <[email protected]>
2151+
L: [email protected] (moderated for non-subscribers)
2152+
S: Maintained
2153+
W: http://linux-chenxing.org/
2154+
F: Documentation/devicetree/bindings/arm/mstar/*
2155+
F: arch/arm/boot/dts/infinity*.dtsi
2156+
F: arch/arm/boot/dts/mercury*.dtsi
2157+
F: arch/arm/boot/dts/mstar-v7.dtsi
2158+
F: arch/arm/mach-mstar/
2159+
21322160
ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT
21332161
M: Michael Petchkovsky <[email protected]>
21342162
S: Maintained

arch/arm/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -668,6 +668,8 @@ source "arch/arm/mach-mmp/Kconfig"
668668

669669
source "arch/arm/mach-moxart/Kconfig"
670670

671+
source "arch/arm/mach-mstar/Kconfig"
672+
671673
source "arch/arm/mach-mv78xx0/Kconfig"
672674

673675
source "arch/arm/mach-mvebu/Kconfig"

arch/arm/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ machine-$(CONFIG_ARCH_MXC) += imx
197197
machine-$(CONFIG_ARCH_MEDIATEK) += mediatek
198198
machine-$(CONFIG_ARCH_MILBEAUT) += milbeaut
199199
machine-$(CONFIG_ARCH_MXS) += mxs
200+
machine-$(CONFIG_ARCH_MSTARV7) += mstar
200201
machine-$(CONFIG_ARCH_NOMADIK) += nomadik
201202
machine-$(CONFIG_ARCH_NPCM) += npcm
202203
machine-$(CONFIG_ARCH_NSPIRE) += nspire

0 commit comments

Comments
 (0)