Skip to content

Commit dceb366

Browse files
committed
Merge branch 'newsoc/axiado' into soc/newsoc
Support for the AX3000 SoC, from Harshit Shah <[email protected]>: The AX3000 is a multi-core system-on-chip featuring four ARM Cortex-A53 cores, secure vault, hardware firewall, and AI acceleration engines. This initial support enables basic bring-up of the SoC and evaluation platform with CPU, timer, UART, and I3C functionality. The series begins by adding the "axiado" vendor prefix and compatible strings for the SoC and board. It then introduces the device tree files and minimal ARCH_AXIADO platform support in arm64. * newsoc/axiado: MAINTAINERS: Add entry for Axiado arm64: defconfig: enable the Axiado family arm64: dts: axiado: Add initial support for AX3000 SoC and eval board arm64: add Axiado SoC family dt-bindings: i3c: cdns: add Axiado AX3000 I3C controller dt-bindings: serial: cdns: add Axiado AX3000 UART controller dt-bindings: gpio: cdns: add Axiado AX3000 GPIO variant dt-bindings: gpio: cdns: convert to YAML dt-bindings: arm: axiado: add AX3000 EVK compatible strings dt-bindings: vendor-prefixes: Add Axiado Corporation
2 parents c5b9bff + a6beb2b commit dceb366

File tree

13 files changed

+736
-47
lines changed

13 files changed

+736
-47
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/arm/axiado.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Axiado Platforms
8+
9+
maintainers:
10+
- Harshit Shah <[email protected]>
11+
12+
properties:
13+
$nodename:
14+
const: '/'
15+
compatible:
16+
oneOf:
17+
- description: AX3000 based boards
18+
items:
19+
- enum:
20+
- axiado,ax3000-evk # Axiado AX3000 Evaluation Board
21+
- const: axiado,ax3000 # Axiado AX3000 SoC
22+
23+
additionalProperties: true

Documentation/devicetree/bindings/gpio/cdns,gpio.txt

Lines changed: 0 additions & 43 deletions
This file was deleted.
Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/gpio/cdns,gpio.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Cadence GPIO Controller
8+
9+
maintainers:
10+
- Jan Kotas <[email protected]>
11+
12+
properties:
13+
compatible:
14+
oneOf:
15+
- const: cdns,gpio-r1p02
16+
- items:
17+
- enum:
18+
- axiado,ax3000-gpio
19+
- const: cdns,gpio-r1p02
20+
21+
reg:
22+
maxItems: 1
23+
24+
clocks:
25+
maxItems: 1
26+
27+
ngpios:
28+
minimum: 1
29+
maximum: 32
30+
31+
gpio-controller: true
32+
33+
"#gpio-cells":
34+
const: 2
35+
description: |
36+
- First cell is the GPIO line number.
37+
- Second cell is flags as defined in <dt-bindings/gpio/gpio.h>,
38+
only GPIO_ACTIVE_HIGH and GPIO_ACTIVE_LOW supported.
39+
40+
interrupt-controller: true
41+
42+
"#interrupt-cells":
43+
const: 2
44+
description: |
45+
- First cell is the GPIO line number used as IRQ.
46+
- Second cell is the trigger type, as defined in
47+
<dt-bindings/interrupt-controller/irq.h>.
48+
49+
interrupts:
50+
maxItems: 1
51+
52+
required:
53+
- compatible
54+
- reg
55+
- clocks
56+
- gpio-controller
57+
- "#gpio-cells"
58+
59+
if:
60+
required: [interrupt-controller]
61+
then:
62+
required:
63+
- interrupts
64+
65+
additionalProperties: false
66+
67+
examples:
68+
- |
69+
#include <dt-bindings/interrupt-controller/arm-gic.h>
70+
#include <dt-bindings/interrupt-controller/irq.h>
71+
gpio0: gpio-controller@fd060000 {
72+
compatible = "cdns,gpio-r1p02";
73+
reg = <0xfd060000 0x1000>;
74+
clocks = <&gpio_clk>;
75+
76+
interrupt-parent = <&gic>;
77+
interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
78+
79+
gpio-controller;
80+
#gpio-cells = <2>;
81+
82+
interrupt-controller;
83+
#interrupt-cells = <2>;
84+
};

Documentation/devicetree/bindings/i3c/cdns,i3c-master.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,12 @@ allOf:
1414

1515
properties:
1616
compatible:
17-
const: cdns,i3c-master
17+
oneOf:
18+
- const: cdns,i3c-master
19+
- items:
20+
- enum:
21+
- axiado,ax3000-i3c
22+
- const: cdns,i3c-master
1823

1924
reg:
2025
maxItems: 1

Documentation/devicetree/bindings/serial/cdns,uart.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ properties:
1616
items:
1717
- const: xlnx,xuartps
1818
- const: cdns,uart-r1p8
19-
- description: UART controller for Zynq Ultrascale+ MPSoC
20-
items:
21-
- const: xlnx,zynqmp-uart
19+
- items:
20+
- enum:
21+
- axiado,ax3000-uart
22+
- xlnx,zynqmp-uart
2223
- const: cdns,uart-r1p12
2324

2425
reg:

Documentation/devicetree/bindings/vendor-prefixes.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,8 @@ patternProperties:
200200
description: Shanghai Awinic Technology Co., Ltd.
201201
"^axentia,.*":
202202
description: Axentia Technologies AB
203+
"^axiado,.*":
204+
description: Axiado Corporation
203205
"^axis,.*":
204206
description: Axis Communications AB
205207
"^azoteq,.*":

MAINTAINERS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2413,6 +2413,14 @@ F: arch/arm/boot/dts/aspeed/
24132413
F: arch/arm/mach-aspeed/
24142414
N: aspeed
24152415

2416+
ARM/AXIADO ARCHITECTURE
2417+
M: Harshit Shah <[email protected]>
2418+
L: [email protected] (moderated for non-subscribers)
2419+
S: Maintained
2420+
F: Documentation/devicetree/bindings/arm/axiado.yaml
2421+
F: arch/arm64/boot/dts/axiado/
2422+
N: axiado
2423+
24162424
ARM/AXM LSI SOC
24172425
M: Krzysztof Kozlowski <[email protected]>
24182426
L: [email protected] (moderated for non-subscribers)

arch/arm64/Kconfig.platforms

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ config ARCH_APPLE
4040
This enables support for Apple's in-house ARM SoC family, such
4141
as the Apple M1.
4242

43+
config ARCH_AXIADO
44+
bool "Axiado SoC Family"
45+
select GPIOLIB
46+
help
47+
This enables support for Axiado SoC family like AX3000
48+
4349
menuconfig ARCH_BCM
4450
bool "Broadcom SoC Support"
4551

arch/arm64/boot/dts/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ subdir-y += amlogic
99
subdir-y += apm
1010
subdir-y += apple
1111
subdir-y += arm
12+
subdir-y += axiado
1213
subdir-y += bitmain
1314
subdir-y += blaize
1415
subdir-y += broadcom

arch/arm64/boot/dts/axiado/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
dtb-$(CONFIG_ARCH_AXIADO) += ax3000-evk.dtb

0 commit comments

Comments
 (0)