History

Merge tag 'sunxi-dt-for-7.3' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into soc/dt

Allwinner device tree changes for 7.3 Some changes for old chips/devices and some for recent ones. - A10 PMU interrupt number fixed - A100/A133 gained LRADC - enabled overlay support for sun8i-h2-plus pi boards - A523 family gained consumer IR receiver - H728-based X96QPRO+ gained SPDIF audio output - PinePhone's mpu6050 mount orientation fixed - style fixes New board added: - Baijie Helper A133 - NetCube Systems OpenNMC (dobermann) * tag 'sunxi-dt-for-7.3' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: arm64: dts: allwinner: Correct white-space style ARM: dts: allwinner: Correct white-space style arm64: dts: allwinner: a523: Enable SPDIF on X96QPRO+ arm64: dts: allwinner: a523: Add SPDIF output PH pin mux option arm64: dts: allwinner: sun50i-a64-pinephone: Fix mpu6050 mount matrix arm64: dts: allwinner: a523: enable IR on the Avaota A1 arm64: dts: allwinner: a523: enable IR receiver on the X96Q Pro+ arm64: dts: allwinner: a523: add IR receiver nodes media: dt-bindings: allwinner,sun4i-a10-ir: add A523 compatible ARM: dts: allwinner: a10: Fix PMU interrupt ARM: dts: allwinner: enable overlay support for sun8i-h2-plus pi boards ARM: dts: allwinner: add support for NetCube Systems OpenNMC (dobermann) riscv: dts: allwinner: d1s-t113: Add uart4 pinctrl required by NetCube Systems OpenNMC dt-bindings: arm: sunxi: Add NetCube Systems OpenNMC (dobermann) ARM: dts: allwinner: sun8i-h3: Correct indentation arm64: dts: allwinner: A133: add support for Baijie Helper A133 board arm64: dts: allwinner: a100: Add LRADC node dt-bindings: input: sun4i-lradc-keys: Add A100/A133 compatible dt-bindings: arm: sunxi: Add Baijie HelperBoard A133 compatible dt-bindings: vendor-prefixes: Add Shenzhen Baijie Technology Co., Ltd.

Alexandre Belloni committed 3 months ago

Commit ff1d40d2 parents 52b1700 be1454827 files · +627 −20Browse files

Showing the changes to arch/arm (7 of 27 files). Show all

Unified · Split

7 files
  1. arch/arm/boot/dts/allwinner/Makefile +5 −0
  2. arch/arm/boot/dts/allwinner/sun4i-a10-gemei-g9.dts +1 −1
  3. arch/arm/boot/dts/allwinner/sun4i-a10-inet1.dts +2 −2
  4. arch/arm/boot/dts/allwinner/sun4i-a10.dtsi +1 −1
  5. arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-duo2.dts +2 −2
  6. arch/arm/boot/dts/allwinner/sun8i-t113s-netcube-dobermann.dts +149 −0
  7. arch/arm/boot/dts/allwinner/sun8i-t113s-netcube-nagami.dtsi +1 −1
arch/arm/boot/dts/allwinner/Makefile+5−0
@@ -182,6 +182,9 @@ dtb-$(CONFIG_MACH_SUN7I) += \ · 181 unmodified lines
182 sun7i-a20-wits-pro-a20-dkt.dtb182 sun7i-a20-wits-pro-a20-dkt.dtb
183 183
184# Enables support for device-tree overlays for all pis184# Enables support for device-tree overlays for all pis
185DTC_FLAGS_sun8i-h2-plus-bananapi-m2-zero := -@
186DTC_FLAGS_sun8i-h2-plus-libretech-all-h3-cc := -@
187DTC_FLAGS_sun8i-h2-plus-orangepi-r1 := -@
185DTC_FLAGS_sun8i-h2-plus-orangepi-zero := -@188DTC_FLAGS_sun8i-h2-plus-orangepi-zero := -@
186DTC_FLAGS_sun8i-h3-orangepi-lite := -@189DTC_FLAGS_sun8i-h3-orangepi-lite := -@
187DTC_FLAGS_sun8i-h3-bananapi-m2-plus := -@190DTC_FLAGS_sun8i-h3-bananapi-m2-plus := -@
@@ -201,6 +204,7 @@ DTC_FLAGS_sun8i-h3-orangepi-pc := -@ · 13 unmodified lines
201DTC_FLAGS_sun8i-h3-bananapi-m2-plus-v1.2 := -@204DTC_FLAGS_sun8i-h3-bananapi-m2-plus-v1.2 := -@
202DTC_FLAGS_sun8i-h3-orangepi-pc-plus := -@205DTC_FLAGS_sun8i-h3-orangepi-pc-plus := -@
203DTC_FLAGS_sun8i-t113s-netcube-nagami-basic-carrier := -@206DTC_FLAGS_sun8i-t113s-netcube-nagami-basic-carrier := -@
207DTC_FLAGS_sun8i-t113s-netcube-dobermann := -@
204DTC_FLAGS_sun8i-v3s-netcube-kumquat := -@208DTC_FLAGS_sun8i-v3s-netcube-kumquat := -@
205dtb-$(CONFIG_MACH_SUN8I) += \209dtb-$(CONFIG_MACH_SUN8I) += \
206 sun8i-a23-evb.dtb \210 sun8i-a23-evb.dtb \
@@ -261,6 +265,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ · 54 unmodified lines
261 sun8i-s3-lichee-zero-plus.dtb \265 sun8i-s3-lichee-zero-plus.dtb \
262 sun8i-s3-pinecube.dtb \266 sun8i-s3-pinecube.dtb \
263 sun8i-t113s-mangopi-mq-r-t113.dtb \267 sun8i-t113s-mangopi-mq-r-t113.dtb \
268 sun8i-t113s-netcube-dobermann.dtb \
264 sun8i-t113s-netcube-nagami-basic-carrier.dtb \269 sun8i-t113s-netcube-nagami-basic-carrier.dtb \
265 sun8i-t113s-netcube-nagami-keypad-carrier.dtb \270 sun8i-t113s-netcube-nagami-keypad-carrier.dtb \
266 sun8i-t3-cqa3t-bv3.dtb \271 sun8i-t3-cqa3t-bv3.dtb \
arch/arm/boot/dts/allwinner/sun4i-a10-gemei-g9.dts+1−1
@@ -179,7 +179,7 @@ · 178 unmodified lines
179};179};
180 180
181 181
182&uart0 {182&uart0 {
183 pinctrl-names = "default";183 pinctrl-names = "default";
184 pinctrl-0 = <&uart0_pb_pins>;184 pinctrl-0 = <&uart0_pb_pins>;
185 status = "okay";185 status = "okay";
arch/arm/boot/dts/allwinner/sun4i-a10-inet1.dts+2−2
@@ -78,7 +78,7 @@ · 77 unmodified lines
78 cpu-supply = <&reg_dcdc2>;78 cpu-supply = <&reg_dcdc2>;
79};79};
80 80
81&ehci0 {81&ehci0 {
82 status = "okay";82 status = "okay";
83};83};
84 84
@@ -157,7 +157,7 @@ · 72 unmodified lines
157 status = "okay";157 status = "okay";
158};158};
159 159
160&ohci0 {160&ohci0 {
161 status = "okay";161 status = "okay";
162};162};
163 163
arch/arm/boot/dts/allwinner/sun4i-a10.dtsi+1−1
@@ -185,7 +185,7 @@ · 184 unmodified lines
185 185
186 pmu {186 pmu {
187 compatible = "arm,cortex-a8-pmu";187 compatible = "arm,cortex-a8-pmu";
188 interrupts = <3>;188 interrupts = <66>;
189 };189 };
190 190
191 reserved-memory {191 reserved-memory {
arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-duo2.dts+2−2
@@ -73,7 +73,7 @@ · 72 unmodified lines
73 enable-active-high;73 enable-active-high;
74 gpio = <&r_pio 0 9 GPIO_ACTIVE_HIGH>; /* PL9 */74 gpio = <&r_pio 0 9 GPIO_ACTIVE_HIGH>; /* PL9 */
75 vin-supply = <&reg_vcc5v0>;75 vin-supply = <&reg_vcc5v0>;
76 };76 };
77 77
78 reg_vdd_sys: vdd-sys {78 reg_vdd_sys: vdd-sys {
79 compatible = "regulator-fixed";79 compatible = "regulator-fixed";
@@ -85,7 +85,7 @@ · 5 unmodified lines
85 enable-active-high;85 enable-active-high;
86 gpio = <&r_pio 0 8 GPIO_ACTIVE_HIGH>; /* PL8 */86 gpio = <&r_pio 0 8 GPIO_ACTIVE_HIGH>; /* PL8 */
87 vin-supply = <&reg_vcc5v0>;87 vin-supply = <&reg_vcc5v0>;
88 };88 };
89 89
90 wifi_pwrseq: pwrseq {90 wifi_pwrseq: pwrseq {
91 compatible = "mmc-pwrseq-simple";91 compatible = "mmc-pwrseq-simple";
arch/arm/boot/dts/allwinner/sun8i-t113s-netcube-dobermann.dts+149−0
@@ -0,0 +1,149 @@
1// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2/*
3 * Copyright (C) 2026 Lukas Schmid <lukas.schmid@netcube.li>
4 */
5
6/dts-v1/;
7#include "sun8i-t113s-netcube-nagami.dtsi"
8
9#include <dt-bindings/leds/common.h>
10
11/ {
12 model = "NetCube Systems OpenNMC (dobermann)";
13 compatible = "netcube,dobermann", "netcube,nagami",
14 "allwinner,sun8i-t113s";
15
16 aliases {
17 serial2 = &uart4; // UART on SmartSlot
18 rtc0 = &ds3232;
19 rtc1 = &rtc; // not battery backed
20 };
21
22 leds {
23 compatible = "gpio-leds";
24
25 led_heartbeat_green: led-heartbeat-green {
26 gpios = <&pio 6 14 GPIO_ACTIVE_HIGH>; /* PG14 */
27 linux,default-trigger = "heartbeat";
28 color = <LED_COLOR_ID_GREEN>;
29 function = LED_FUNCTION_HEARTBEAT;
30 };
31 };
32};
33
34&ehci0 {
35 status = "okay";
36};
37
38&ehci1 {
39 status = "okay";
40};
41
42&i2c2 {
43 status = "okay";
44
45 tusb320: typec@60 {
46 compatible = "ti,tusb320";
47 reg = <0x60>;
48 interrupts-extended = <&pio 3 22 IRQ_TYPE_LEVEL_LOW>; /* PD22 */
49 };
50
51 ds3232: rtc@68 {
52 compatible = "dallas,ds3232";
53 reg = <0x68>;
54 };
55};
56
57/* microSD Card Slot on the board */
58&mmc0 {
59 vmmc-supply = <&reg_vcc3v3>;
60 disable-wp;
61 bus-width = <4>;
62 cd-gpios = <&pio 6 15 GPIO_ACTIVE_LOW>; /* PG15 */
63 status = "okay";
64};
65
66&ohci0 {
67 status = "okay";
68};
69
70&ohci1 {
71 status = "okay";
72};
73
74&pio {
75 gpio-line-names = "", "", "", "", // PA
76 "", "", "", "",
77 "", "", "", "",
78 "", "", "", "",
79 "", "", "", "",
80 "", "", "", "",
81 "", "", "", "",
82 "", "", "", "",
83 "", "", "SMART_TX", "SMART_RX", // PB
84 "EXT_IO3", "EXT_IO2", "CONSOLE_TX", "CONSOLE_RX",
85 "", "", "", "",
86 "", "", "", "",
87 "", "", "", "",
88 "", "", "", "",
89 "", "", "", "",
90 "", "", "", "",
91 "", "", "eMMC_CLK", "eMMC_CMD", // PC
92 "eMMC_D2", "eMMC_D1", "eMMC_D0", "eMMC_D3",
93 "", "", "", "",
94 "", "", "", "",
95 "", "", "", "",
96 "", "", "", "",
97 "", "", "", "",
98 "", "", "", "",
99 "", "", "", "", // PD
100 "", "", "", "",
101 "", "USB_SEC_EN", "EXT_SPI_nCS", "EXT_SPI_SCK",
102 "EXT_SPI_MOSI", "EXT_SPI_MISO", "EXT_IO5", "EXT_IO4",
103 "SMART_SEL", "", "", "",
104 "I2C2_SCL", "I2C2_SDA", "TUSB320_nINT", "",
105 "", "", "", "",
106 "", "", "", "",
107 "ETH_CRSDV", "ETH_RXD0", "ETH_RXD1", "ETH_TXCK", // PE
108 "ETH_TXD0", "ETH_TXD1", "ETH_TXEN", "",
109 "ETH_MDC", "ETH_MDIO", "I2C3_nINT", "",
110 "", "", "", "",
111 "", "", "", "",
112 "", "", "", "",
113 "", "", "", "",
114 "", "", "", "",
115 "uSD_D1", "uSD_D0", "uSD_CLK", "uSD_CMD", // PF
116 "uSD_D3", "uSD_D2", "TUSB320_ID", "",
117 "", "", "", "",
118 "", "", "", "",
119 "", "", "", "",
120 "", "", "", "",
121 "", "", "", "",
122 "", "", "", "",
123 "ESP_CLK", "ESP_CMD", "ESP_D0", "ESP_D1", // PG
124 "ESP_D2", "ESP_D3", "ESP_TXD", "ESP_RXD",
125 "ESP_nBOOT", "ESP_nRST", "I2C3_SCL", "I2C3_SDA",
126 "EXT_IO1", "EXT_IO0", "LED_HEARTBEAT", "SD_DETECT",
127 "", "", "", "",
128 "", "", "", "",
129 "", "", "", "",
130 "", "", "", "";
131};
132
133/* SmartSlot serial */
134&uart4 {
135 pinctrl-0 = <&uart4_pb_pins>;
136 pinctrl-names = "default";
137 status = "okay";
138};
139
140&usb_otg {
141 extcon = <&tusb320 0>;
142 dr_mode = "otg";
143 status = "okay";
144};
145
146&usbphy {
147 usb0_id_det-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */
148 status = "okay";
149};
arch/arm/boot/dts/allwinner/sun8i-t113s-netcube-nagami.dtsi+1−1
@@ -42,7 +42,7 @@ · 41 unmodified lines
42 };42 };
43 43
44 /* USB0 MUX to switch connect to Card-Edge only after BootROM */44 /* USB0 MUX to switch connect to Card-Edge only after BootROM */
45 usb0_sec_mux: mux-controller{45 usb0_sec_mux: mux-controller {
46 compatible = "gpio-mux";46 compatible = "gpio-mux";
47 #mux-control-cells = <0>;47 #mux-control-cells = <0>;
48 mux-gpios = <&pio 3 9 GPIO_ACTIVE_HIGH>; /* PD9 */48 mux-gpios = <&pio 3 9 GPIO_ACTIVE_HIGH>; /* PD9 */