Skip to content

Commit 52d38cf

Browse files
arndbarndb
committed
Merge tag 'sunxi-dt-for-6.5-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into soc/dt
- fix DCLK clock names - new board ICnova A20 ADB4006 - add D1 SPI node - add bluetooth node for chip board - add extra mmc2 pinmux to sun5i - add axp209 iio-hwmon node * tag 'sunxi-dt-for-6.5-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: ARM: dts: axp209: Add iio-hwmon node for internal temperature ARM: dts: sun5i: Add port E pinmux settings for mmc2 ARM: dts: sun5i: chip: Enable bluetooth riscv: dts: allwinner: d1: Add SPI controllers node arm: dts: sunxi: Add ICnova A20 ADB4006 board dt-bindings: arm: sunxi: add ICnova A20 ADB4006 binding ARM: dts: sunxi: rename tcon's clock output Link: https://lore.kernel.org/r/20230609210452.GA17638@jernej-laptop Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents a9c7f8d + 09d199b commit 52d38cf

12 files changed

Lines changed: 270 additions & 5 deletions

File tree

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,12 @@ properties:
305305
- const: allwinner,i12-tvbox
306306
- const: allwinner,sun7i-a20
307307

308+
- description: ICnova A20 ADB4006
309+
items:
310+
- const: incircuit,icnova-a20-adb4006
311+
- const: incircuit,icnova-a20
312+
- const: allwinner,sun7i-a20
313+
308314
- description: ICNova A20 SWAC
309315
items:
310316
- const: incircuit,icnova-a20-swac

‎arch/arm/boot/dts/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1337,6 +1337,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \
13371337
sun7i-a20-hummingbird.dtb \
13381338
sun7i-a20-itead-ibox.dtb \
13391339
sun7i-a20-i12-tvbox.dtb \
1340+
sun7i-a20-icnova-a20-adb4006.dtb \
13401341
sun7i-a20-icnova-swac.dtb \
13411342
sun7i-a20-lamobo-r1.dtb \
13421343
sun7i-a20-linutronix-testbox-v2.dtb \

‎arch/arm/boot/dts/axp209.dtsi‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,13 @@
4848
* http://dl.linux-sunxi.org/AXP/AXP209%20Datasheet%20v1.0_cn.pdf
4949
*/
5050

51+
/ {
52+
pmic-temp {
53+
compatible = "iio-hwmon";
54+
io-channels = <&axp_adc 4>; /* Internal temperature */
55+
};
56+
};
57+
5158
&axp209 {
5259
compatible = "x-powers,axp209";
5360
interrupt-controller;

‎arch/arm/boot/dts/sun5i-r8-chip.dts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,12 @@
255255
pinctrl-0 = <&uart3_pg_pins>,
256256
<&uart3_cts_rts_pg_pins>;
257257
status = "okay";
258+
259+
bluetooth {
260+
compatible = "realtek,rtl8723bs-bt";
261+
device-wake-gpios = <&axp_gpio 3 GPIO_ACTIVE_HIGH>;
262+
host-wake-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */
263+
};
258264
};
259265

260266
&usb_otg {

‎arch/arm/boot/dts/sun5i.dtsi‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@
286286
clock-names = "ahb",
287287
"tcon-ch0",
288288
"tcon-ch1";
289-
clock-output-names = "tcon-pixel-clock";
289+
clock-output-names = "tcon-data-clock";
290290
#clock-cells = <0>;
291291
status = "disabled";
292292

@@ -517,6 +517,15 @@
517517
bias-pull-up;
518518
};
519519

520+
/omit-if-no-ref/
521+
mmc2_4bit_pe_pins: mmc2-4bit-pe-pins {
522+
pins = "PE4", "PE5", "PE6", "PE7",
523+
"PE8", "PE9";
524+
function = "mmc2";
525+
drive-strength = <30>;
526+
bias-pull-up;
527+
};
528+
520529
mmc2_8bit_pins: mmc2-8bit-pins {
521530
pins = "PC6", "PC7", "PC8", "PC9",
522531
"PC10", "PC11", "PC12", "PC13",

‎arch/arm/boot/dts/sun7i-a20-icnova-a20-adb4006.dts‎

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
// SPDX-License-Identifier: (GPL-2.0 OR MIT)
2+
// Copyright (C) 2023 In-Circuit GmbH
3+
4+
/dts-v1/;
5+
6+
#include "sun7i-a20-icnova-a20.dtsi"
7+
8+
#include <dt-bindings/gpio/gpio.h>
9+
#include <dt-bindings/leds/common.h>
10+
11+
/ {
12+
model = "In-Circuit ICnova A20 ADB4006";
13+
compatible = "incircuit,icnova-a20-adb4006", "incircuit,icnova-a20",
14+
"allwinner,sun7i-a20";
15+
16+
aliases {
17+
serial0 = &uart0;
18+
};
19+
20+
chosen {
21+
stdout-path = "serial0:115200n8";
22+
};
23+
24+
hdmi-connector {
25+
compatible = "hdmi-connector";
26+
type = "a";
27+
28+
port {
29+
hdmi_con_in: endpoint {
30+
remote-endpoint = <&hdmi_out_con>;
31+
};
32+
};
33+
};
34+
35+
leds {
36+
compatible = "gpio-leds";
37+
38+
led-0 {
39+
function = LED_FUNCTION_POWER;
40+
color = <LED_COLOR_ID_YELLOW>;
41+
gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>; /* PH21 */
42+
default-state = "on";
43+
};
44+
45+
led-1 {
46+
function = LED_FUNCTION_HEARTBEAT;
47+
color = <LED_COLOR_ID_RED>;
48+
gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>; /* PH20 */
49+
linux,default-trigger = "heartbeat";
50+
};
51+
};
52+
};
53+
54+
&ahci {
55+
target-supply = <&reg_ahci_5v>;
56+
status = "okay";
57+
};
58+
59+
&codec {
60+
status = "okay";
61+
};
62+
63+
&de {
64+
status = "okay";
65+
};
66+
67+
&ehci0 {
68+
status = "okay";
69+
};
70+
71+
&ehci1 {
72+
status = "okay";
73+
};
74+
75+
&hdmi {
76+
status = "okay";
77+
};
78+
79+
&hdmi_out {
80+
hdmi_out_con: endpoint {
81+
remote-endpoint = <&hdmi_con_in>;
82+
};
83+
};
84+
85+
&mmc0 {
86+
vmmc-supply = <&reg_vcc3v3>;
87+
bus-width = <4>;
88+
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
89+
status = "okay";
90+
};
91+
92+
&ohci0 {
93+
status = "okay";
94+
};
95+
96+
&ohci1 {
97+
status = "okay";
98+
};
99+
100+
&otg_sram {
101+
status = "okay";
102+
};
103+
104+
&reg_ahci_5v {
105+
status = "okay";
106+
};
107+
108+
&ac_power_supply {
109+
status = "okay";
110+
};
111+
112+
&reg_usb1_vbus {
113+
status = "okay";
114+
};
115+
116+
&reg_usb2_vbus {
117+
status = "okay";
118+
};
119+
120+
&uart0 {
121+
pinctrl-names = "default";
122+
pinctrl-0 = <&uart0_pb_pins>;
123+
status = "okay";
124+
};
125+
126+
&usb_otg {
127+
dr_mode = "otg";
128+
status = "okay";
129+
};
130+
131+
&usbphy {
132+
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
133+
usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
134+
usb1_vbus-supply = <&reg_usb1_vbus>;
135+
usb2_vbus-supply = <&reg_usb2_vbus>;
136+
status = "okay";
137+
};

‎arch/arm/boot/dts/sun7i-a20-icnova-a20.dtsi‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
// SPDX-License-Identifier: (GPL-2.0 OR MIT)
2+
// Copyright (C) 2023 In-Circuit GmbH
3+
4+
#include "sun7i-a20.dtsi"
5+
#include "sunxi-common-regulators.dtsi"
6+
7+
#include <dt-bindings/interrupt-controller/irq.h>
8+
9+
&cpu0 {
10+
cpu-supply = <&reg_dcdc2>;
11+
};
12+
13+
&gmac {
14+
pinctrl-names = "default";
15+
pinctrl-0 = <&gmac_mii_pins>;
16+
phy-handle = <&phy1>;
17+
phy-mode = "mii";
18+
status = "okay";
19+
};
20+
21+
&i2c0 {
22+
status = "okay";
23+
24+
axp209: pmic@34 {
25+
reg = <0x34>;
26+
interrupt-parent = <&nmi_intc>;
27+
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
28+
};
29+
};
30+
31+
&gmac_mdio {
32+
phy1: ethernet-phy@1 {
33+
reg = <1>;
34+
};
35+
};
36+
37+
#include "axp209.dtsi"
38+
39+
&reg_dcdc2 {
40+
regulator-always-on;
41+
regulator-min-microvolt = <1000000>;
42+
regulator-max-microvolt = <1400000>;
43+
regulator-name = "vdd-cpu";
44+
};
45+
46+
&reg_dcdc3 {
47+
regulator-always-on;
48+
regulator-min-microvolt = <1000000>;
49+
regulator-max-microvolt = <1400000>;
50+
regulator-name = "vdd-int-dll";
51+
};
52+
53+
&reg_ldo1 {
54+
regulator-name = "vdd-rtc";
55+
};
56+
57+
&reg_ldo2 {
58+
regulator-always-on;
59+
regulator-min-microvolt = <3000000>;
60+
regulator-max-microvolt = <3000000>;
61+
regulator-name = "avcc";
62+
};

‎arch/arm/boot/dts/sun8i-a23-a33.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
clock-names = "ahb",
191191
"tcon-ch0",
192192
"lvds-alt";
193-
clock-output-names = "tcon-pixel-clock";
193+
clock-output-names = "tcon-data-clock";
194194
#clock-cells = <0>;
195195
resets = <&ccu RST_BUS_LCD>,
196196
<&ccu RST_BUS_LVDS>;

‎arch/arm/boot/dts/sun8i-a83t.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@
456456
interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
457457
clocks = <&ccu CLK_BUS_TCON0>, <&ccu CLK_TCON0>;
458458
clock-names = "ahb", "tcon-ch0";
459-
clock-output-names = "tcon-pixel-clock";
459+
clock-output-names = "tcon-data-clock";
460460
#clock-cells = <0>;
461461
resets = <&ccu RST_BUS_TCON0>, <&ccu RST_BUS_LVDS>;
462462
reset-names = "lcd", "lvds";

‎arch/arm/boot/dts/sun8i-v3s.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
<&ccu CLK_TCON0>;
192192
clock-names = "ahb",
193193
"tcon-ch0";
194-
clock-output-names = "tcon-pixel-clock";
194+
clock-output-names = "tcon-data-clock";
195195
#clock-cells = <0>;
196196
resets = <&ccu RST_BUS_TCON0>;
197197
reset-names = "lcd";

0 commit comments

Comments
 (0)