Skip to content

Commit 7097d52

Browse files
arndbarndb
committed
Merge tag 'amlogic-arm64-dt-for-v6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into soc/dt
Amlogic ARM64 DT for v6.17: - Align wifi node name with bindings - Add pinctrl nodes for Amlogic S7/S7D/S6 nodes - Enable the NPU nodes on Alta & VIM3 - New boards: - Ugoos AM3 * tag 'amlogic-arm64-dt-for-v6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux: arm64: dts: amlogic: Enable the npu node for Alta and VIM3 dts: arm64: amlogic: add S6 pinctrl node dts: arm64: amlogic: add S7D pinctrl node dts: arm64: amlogic: add S7 pinctrl node arm64: dts: amlogic: Add Ugoos AM3 dt-bindings: arm: amlogic: Add Ugoos AM3 arm64: dts: amlogic: Align wifi node name with bindings Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 7723866 + 587c1c0 commit 7097d52

File tree

10 files changed

+371
-2
lines changed

10 files changed

+371
-2
lines changed

‎Documentation/devicetree/bindings/arm/amlogic.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ properties:
135135
- minix,neo-u9h
136136
- nexbox,a1
137137
- tronsmart,vega-s96
138+
- ugoos,am3
138139
- videostrong,gxm-kiii-pro
139140
- wetek,core2
140141
- const: amlogic,s912

‎arch/arm64/boot/dts/amlogic/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb
8080
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb
8181
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb
8282
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-s912-libretech-pc.dtb
83+
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-ugoos-am3.dtb
8384
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb
8485
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-wetek-core2.dtb
8586
dtb-$(CONFIG_ARCH_MESON) += meson-s4-s805x2-aq222.dtb

‎arch/arm64/boot/dts/amlogic/amlogic-s6.dtsi

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <dt-bindings/interrupt-controller/irq.h>
77
#include <dt-bindings/interrupt-controller/arm-gic.h>
88
#include <dt-bindings/gpio/gpio.h>
9+
#include <dt-bindings/pinctrl/amlogic,pinctrl.h>
910
/ {
1011
cpus {
1112
#address-cells = <2>;
@@ -92,6 +93,102 @@
9293
clock-names = "xtal", "pclk", "baud";
9394
status = "disabled";
9495
};
96+
97+
periphs_pinctrl: pinctrl@4000 {
98+
compatible = "amlogic,pinctrl-s6";
99+
#address-cells = <2>;
100+
#size-cells = <2>;
101+
ranges = <0x0 0x0 0x0 0x4000 0x0 0x340>;
102+
103+
gpioz: gpio@c0 {
104+
reg = <0 0xc0 0 0x20>, <0 0x18 0 0x8>;
105+
reg-names = "gpio", "mux";
106+
gpio-controller;
107+
#gpio-cells = <2>;
108+
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_Z<<8) 16>;
109+
};
110+
111+
gpiox: gpio@100 {
112+
reg = <0 0x100 0 0x30>, <0 0xc 0 0x8>;
113+
reg-names = "gpio", "mux";
114+
gpio-controller;
115+
#gpio-cells = <2>;
116+
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_X<<8) 20>;
117+
};
118+
119+
gpioh: gpio@140 {
120+
reg = <0 0x140 0 0x20>, <0 0x2c 0 0x8>;
121+
reg-names = "gpio", "mux";
122+
gpio-controller;
123+
#gpio-cells = <2>;
124+
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_H<<8) 9>;
125+
};
126+
127+
gpiod: gpio@180 {
128+
reg = <0 0x180 0 0x20>, <0 0x8 0 0x4>;
129+
reg-names = "gpio", "mux";
130+
gpio-controller;
131+
#gpio-cells = <2>;
132+
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_D<<8) 7>;
133+
};
134+
135+
gpiof: gpio@1a0 {
136+
reg = <0 0x1a0 0 0x20>, <0 0x20 0 0x4>;
137+
reg-names = "gpio", "mux";
138+
gpio-controller;
139+
#gpio-cells = <2>;
140+
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_F<<8) 5>;
141+
};
142+
143+
gpioe: gpio@1c0 {
144+
reg = <0 0x1c0 0 0x20>, <0 0x48 0 0x4>;
145+
reg-names = "gpio", "mux";
146+
gpio-controller;
147+
#gpio-cells = <2>;
148+
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_E<<8) 3>;
149+
};
150+
151+
gpioc: gpio@200 {
152+
reg = <0 0x200 0 0x20>, <0 0x24 0 0x4>;
153+
reg-names = "gpio", "mux";
154+
gpio-controller;
155+
#gpio-cells = <2>;
156+
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_C<<8) 8>;
157+
};
158+
159+
gpiob: gpio@240 {
160+
reg = <0 0x240 0 0x20>, <0 0x0 0 0x8>;
161+
reg-names = "gpio", "mux";
162+
gpio-controller;
163+
#gpio-cells = <2>;
164+
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_B<<8) 14>;
165+
};
166+
167+
gpioa: gpio@280 {
168+
reg = <0 0x280 0 0x20>, <0 0x40 0 0x8>;
169+
reg-names = "gpio", "mux";
170+
gpio-controller;
171+
#gpio-cells = <2>;
172+
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_A<<8) 16>;
173+
};
174+
175+
test_n: gpio@2c0 {
176+
reg = <0 0x2c0 0 0x20>;
177+
reg-names = "gpio";
178+
gpio-controller;
179+
#gpio-cells = <2>;
180+
gpio-ranges =
181+
<&periphs_pinctrl 0 (AMLOGIC_GPIO_TEST_N<<8) 1>;
182+
};
183+
184+
gpiocc: gpio@300 {
185+
reg = <0 0x300 0 0x20>, <0 0x14 0 0x4>;
186+
reg-names = "gpio", "mux";
187+
gpio-controller;
188+
#gpio-cells = <2>;
189+
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_CC<<8) 2>;
190+
};
191+
};
95192
};
96193
};
97194
};

‎arch/arm64/boot/dts/amlogic/amlogic-s7.dtsi

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <dt-bindings/interrupt-controller/irq.h>
77
#include <dt-bindings/interrupt-controller/arm-gic.h>
88
#include <dt-bindings/gpio/gpio.h>
9+
#include <dt-bindings/pinctrl/amlogic,pinctrl.h>
910

1011
/ {
1112
cpus {
@@ -94,6 +95,86 @@
9495
clock-names = "xtal", "pclk", "baud";
9596
status = "disabled";
9697
};
98+
99+
periphs_pinctrl: pinctrl@4000 {
100+
compatible = "amlogic,pinctrl-s7";
101+
#address-cells = <2>;
102+
#size-cells = <2>;
103+
ranges = <0x0 0x0 0x0 0x4000 0x0 0x340>;
104+
105+
gpioz: gpio@c0 {
106+
reg = <0 0xc0 0 0x20>, <0 0x18 0 0x8>;
107+
reg-names = "gpio", "mux";
108+
gpio-controller;
109+
#gpio-cells = <2>;
110+
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_Z<<8) 13>;
111+
};
112+
113+
gpiox: gpio@100 {
114+
reg = <0 0x100 0 0x30>, <0 0xc 0 0x8>;
115+
reg-names = "gpio", "mux";
116+
gpio-controller;
117+
#gpio-cells = <2>;
118+
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_X<<8) 20>;
119+
};
120+
121+
gpioh: gpio@140 {
122+
reg = <0 0x140 0 0x20>, <0 0x2c 0 0x8>;
123+
reg-names = "gpio", "mux";
124+
gpio-controller;
125+
#gpio-cells = <2>;
126+
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_H<<8) 12>;
127+
};
128+
129+
gpiod: gpio@180 {
130+
reg = <0 0x180 0 0x20>, <0 0x40 0 0x8>;
131+
reg-names = "gpio", "mux";
132+
gpio-controller;
133+
#gpio-cells = <2>;
134+
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_D<<8) 12>;
135+
};
136+
137+
gpioe: gpio@1c0 {
138+
reg = <0 0x1c0 0 0x20>, <0 0x48 0 0x4>;
139+
reg-names = "gpio", "mux";
140+
gpio-controller;
141+
#gpio-cells = <2>;
142+
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_E<<8) 2>;
143+
};
144+
145+
gpioc: gpio@200 {
146+
reg = <0 0x200 0 0x20>, <0 0x24 0 0x4>;
147+
reg-names = "gpio", "mux";
148+
gpio-controller;
149+
#gpio-cells = <2>;
150+
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_C<<8) 8>;
151+
};
152+
153+
gpiob: gpio@240 {
154+
reg = <0 0x240 0 0x20>, <0 0x0 0 0x8>;
155+
reg-names = "gpio", "mux";
156+
gpio-controller;
157+
#gpio-cells = <2>;
158+
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_B<<8) 14>;
159+
};
160+
161+
test_n: gpio@2c0 {
162+
reg = <0 0x2c0 0 0x20>;
163+
reg-names = "gpio";
164+
gpio-controller;
165+
#gpio-cells = <2>;
166+
gpio-ranges =
167+
<&periphs_pinctrl 0 (AMLOGIC_GPIO_TEST_N<<8) 1>;
168+
};
169+
170+
gpiocc: gpio@300 {
171+
reg = <0 0x300 0 0x20>, <0 0x14 0 0x4>;
172+
reg-names = "gpio", "mux";
173+
gpio-controller;
174+
#gpio-cells = <2>;
175+
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_CC<<8) 2>;
176+
};
177+
};
97178
};
98179
};
99180
};

‎arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <dt-bindings/interrupt-controller/irq.h>
77
#include <dt-bindings/interrupt-controller/arm-gic.h>
88
#include <dt-bindings/gpio/gpio.h>
9+
#include <dt-bindings/pinctrl/amlogic,pinctrl.h>
910

1011
/ {
1112
cpus {
@@ -94,6 +95,95 @@
9495
clock-names = "xtal", "pclk", "baud";
9596
status = "disabled";
9697
};
98+
99+
periphs_pinctrl: pinctrl@4000 {
100+
compatible = "amlogic,pinctrl-s7d",
101+
"amlogic,pinctrl-s7";
102+
#address-cells = <2>;
103+
#size-cells = <2>;
104+
ranges = <0x0 0x0 0x0 0x4000 0x0 0x340>;
105+
106+
gpioz: gpio@c0 {
107+
reg = <0 0xc0 0 0x20>, <0 0x18 0 0x8>;
108+
reg-names = "gpio", "mux";
109+
gpio-controller;
110+
#gpio-cells = <2>;
111+
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_Z<<8) 13>;
112+
};
113+
114+
gpiox: gpio@100 {
115+
reg = <0 0x100 0 0x30>, <0 0xc 0 0x8>;
116+
reg-names = "gpio", "mux";
117+
gpio-controller;
118+
#gpio-cells = <2>;
119+
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_X<<8) 20>;
120+
};
121+
122+
gpioh: gpio@140 {
123+
reg = <0 0x140 0 0x20>, <0 0x2c 0 0x8>;
124+
reg-names = "gpio", "mux";
125+
gpio-controller;
126+
#gpio-cells = <2>;
127+
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_H<<8) 12>;
128+
};
129+
130+
gpiod: gpio@180 {
131+
reg = <0 0x180 0 0x20>, <0 0x40 0 0x4>;
132+
reg-names = "gpio", "mux";
133+
gpio-controller;
134+
#gpio-cells = <2>;
135+
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_D<<8) 5>;
136+
};
137+
138+
gpioe: gpio@1c0 {
139+
reg = <0 0x1c0 0 0x20>, <0 0x48 0 0x4>;
140+
reg-names = "gpio", "mux";
141+
gpio-controller;
142+
#gpio-cells = <2>;
143+
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_E<<8) 2>;
144+
};
145+
146+
gpioc: gpio@200 {
147+
reg = <0 0x200 0 0x20>, <0 0x24 0 0x4>;
148+
reg-names = "gpio", "mux";
149+
gpio-controller;
150+
#gpio-cells = <2>;
151+
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_C<<8) 8>;
152+
};
153+
154+
gpiob: gpio@240 {
155+
reg = <0 0x240 0 0x20>, <0 0x0 0 0x8>;
156+
reg-names = "gpio", "mux";
157+
gpio-controller;
158+
#gpio-cells = <2>;
159+
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_B<<8) 14>;
160+
};
161+
162+
gpiodv: gpio@280 {
163+
reg = <0 0x280 0 0x20>, <0 0x8 0 0x4>;
164+
reg-names = "gpio", "mux";
165+
gpio-controller;
166+
#gpio-cells = <2>;
167+
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_DV<<8) 7>;
168+
};
169+
170+
test_n: gpio@2c0 {
171+
reg = <0 0x2c0 0 0x20>;
172+
reg-names = "gpio";
173+
gpio-controller;
174+
#gpio-cells = <2>;
175+
gpio-ranges =
176+
<&periphs_pinctrl 0 (AMLOGIC_GPIO_TEST_N<<8) 1>;
177+
};
178+
179+
gpiocc: gpio@300 {
180+
reg = <0 0x300 0 0x20>, <0 0x14 0 0x4>;
181+
reg-names = "gpio", "mux";
182+
gpio-controller;
183+
#gpio-cells = <2>;
184+
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_CC<<8) 2>;
185+
};
186+
};
97187
};
98188
};
99189
};

‎arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,7 @@
3939
phy-names = "usb2-phy0", "usb2-phy1";
4040
};
4141
*/
42+
43+
&npu {
44+
status = "okay";
45+
};

‎arch/arm64/boot/dts/amlogic/meson-g12b-a311d-libretech-cc.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,3 +111,7 @@
111111
&pwm_ab {
112112
pinctrl-0 = <&pwm_a_e_pins>, <&pwm_b_x7_pins>;
113113
};
114+
115+
&npu {
116+
status = "okay";
117+
};

‎arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
clock-names = "ext_clock";
9898
};
9999

100-
cvbs-connector {
100+
cvbs_connector: cvbs-connector {
101101
compatible = "composite-video-connector";
102102

103103
port {

‎arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@
217217
vmmc-supply = <&vddao_3v3>;
218218
vqmmc-supply = <&vddio_boot>;
219219

220-
brcmf: brcmf@1 {
220+
brcmf: wifi@1 {
221221
reg = <1>;
222222
compatible = "brcm,bcm4329-fmac";
223223
};

0 commit comments

Comments
 (0)