Skip to content

Commit de7519c

Browse files
retro98boyigorpecovnik
retro98boy
authored and
igorpecovnik
committed
SMART AM40: Update DT
1 parent df93556 commit de7519c

4 files changed

Lines changed: 34 additions & 26 deletions

File tree

‎patch/kernel/archive/rockchip64-6.12/dt/rk3399-am40.dts‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
rtc0 = &pt7c4563;
2323
/*
2424
* The rk808 circuit design on this board does not have the ability to maintain real-time time after a power outage.
25-
* Registering rk808 as rtc99 (most kernel configurations read time from rtc0) can prevent the kernel from reading the time (2013) from rk808 during startup.
25+
* Registering rk808 as rtc1 (most kernel configurations read time from rtc0) can prevent the kernel from reading the time (2013) from rk808 during startup.
2626
*/
27-
rtc99 = &rk808;
27+
rtc1 = &rk808;
2828
};
2929

3030
chosen {
@@ -184,7 +184,7 @@
184184
compatible = "linux,extcon-usbc-virtual-pd";
185185
pinctrl-names = "default";
186186
pinctrl-0 = <&dp_hpd>;
187-
det-gpios = <&gpio4 RK_PD1 GPIO_ACTIVE_LOW>;
187+
det-gpios = <&gpio4 RK_PD1 GPIO_ACTIVE_HIGH>;
188188
vpd-data-role = "display-port";
189189
vpd-super-speed;
190190
};
@@ -253,7 +253,7 @@
253253
#address-cells = <1>;
254254
#size-cells = <0>;
255255

256-
rtl8211f: rtl8211f@0 {
256+
rtl8211f: ethernet-phy@0 {
257257
reg = <0>;
258258
reset-assert-us = <10000>;
259259
reset-deassert-us = <30000>;
@@ -503,6 +503,8 @@
503503
};
504504

505505
&i2c3 {
506+
i2c-scl-falling-time-ns = <15>;
507+
i2c-scl-rising-time-ns = <450>;
506508
status = "okay";
507509
};
508510

@@ -538,7 +540,7 @@
538540

539541
&pcie0 {
540542
ep-gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
541-
num-lanes = <4>;
543+
num-lanes = <2>;
542544
pinctrl-0 = <&pcie_clkreqn>;
543545
pinctrl-names = "default";
544546
vpcie3v3-supply = <&vcc3v3_pcie>;
@@ -558,7 +560,7 @@
558560

559561
display {
560562
dp_hpd: dp-hpd {
561-
rockchip,pins = <4 RK_PD1 RK_FUNC_GPIO &pcfg_input_pull_up>;
563+
rockchip,pins = <4 RK_PD1 RK_FUNC_GPIO &pcfg_input_enable>;
562564
};
563565

564566
front_hdmi_5v_en: front-hdmi-5v-en {

‎patch/kernel/archive/rockchip64-6.18/dt/rk3399-am40.dts‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
rtc0 = &pt7c4563;
2323
/*
2424
* The rk808 circuit design on this board does not have the ability to maintain real-time time after a power outage.
25-
* Registering rk808 as rtc99 (most kernel configurations read time from rtc0) can prevent the kernel from reading the time (2013) from rk808 during startup.
25+
* Registering rk808 as rtc1 (most kernel configurations read time from rtc0) can prevent the kernel from reading the time (2013) from rk808 during startup.
2626
*/
27-
rtc99 = &rk808;
27+
rtc1 = &rk808;
2828
};
2929

3030
chosen {
@@ -184,7 +184,7 @@
184184
compatible = "linux,extcon-usbc-virtual-pd";
185185
pinctrl-names = "default";
186186
pinctrl-0 = <&dp_hpd>;
187-
det-gpios = <&gpio4 RK_PD1 GPIO_ACTIVE_LOW>;
187+
det-gpios = <&gpio4 RK_PD1 GPIO_ACTIVE_HIGH>;
188188
vpd-data-role = "display-port";
189189
vpd-super-speed;
190190
};
@@ -253,7 +253,7 @@
253253
#address-cells = <1>;
254254
#size-cells = <0>;
255255

256-
rtl8211f: rtl8211f@0 {
256+
rtl8211f: ethernet-phy@0 {
257257
reg = <0>;
258258
reset-assert-us = <10000>;
259259
reset-deassert-us = <30000>;
@@ -503,6 +503,8 @@
503503
};
504504

505505
&i2c3 {
506+
i2c-scl-falling-time-ns = <15>;
507+
i2c-scl-rising-time-ns = <450>;
506508
status = "okay";
507509
};
508510

@@ -538,7 +540,7 @@
538540

539541
&pcie0 {
540542
ep-gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
541-
num-lanes = <4>;
543+
num-lanes = <2>;
542544
pinctrl-0 = <&pcie_clkreqn>;
543545
pinctrl-names = "default";
544546
vpcie3v3-supply = <&vcc3v3_pcie>;
@@ -558,7 +560,7 @@
558560

559561
display {
560562
dp_hpd: dp-hpd {
561-
rockchip,pins = <4 RK_PD1 RK_FUNC_GPIO &pcfg_input_pull_up>;
563+
rockchip,pins = <4 RK_PD1 RK_FUNC_GPIO &pcfg_input_enable>;
562564
};
563565

564566
front_hdmi_5v_en: front-hdmi-5v-en {

‎patch/kernel/archive/rockchip64-7.0/dt/rk3399-am40.dts‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
rtc0 = &pt7c4563;
2323
/*
2424
* The rk808 circuit design on this board does not have the ability to maintain real-time time after a power outage.
25-
* Registering rk808 as rtc99 (most kernel configurations read time from rtc0) can prevent the kernel from reading the time (2013) from rk808 during startup.
25+
* Registering rk808 as rtc1 (most kernel configurations read time from rtc0) can prevent the kernel from reading the time (2013) from rk808 during startup.
2626
*/
27-
rtc99 = &rk808;
27+
rtc1 = &rk808;
2828
};
2929

3030
chosen {
@@ -184,7 +184,7 @@
184184
compatible = "linux,extcon-usbc-virtual-pd";
185185
pinctrl-names = "default";
186186
pinctrl-0 = <&dp_hpd>;
187-
det-gpios = <&gpio4 RK_PD1 GPIO_ACTIVE_LOW>;
187+
det-gpios = <&gpio4 RK_PD1 GPIO_ACTIVE_HIGH>;
188188
vpd-data-role = "display-port";
189189
vpd-super-speed;
190190
};
@@ -253,7 +253,7 @@
253253
#address-cells = <1>;
254254
#size-cells = <0>;
255255

256-
rtl8211f: rtl8211f@0 {
256+
rtl8211f: ethernet-phy@0 {
257257
reg = <0>;
258258
reset-assert-us = <10000>;
259259
reset-deassert-us = <30000>;
@@ -503,6 +503,8 @@
503503
};
504504

505505
&i2c3 {
506+
i2c-scl-falling-time-ns = <15>;
507+
i2c-scl-rising-time-ns = <450>;
506508
status = "okay";
507509
};
508510

@@ -538,7 +540,7 @@
538540

539541
&pcie0 {
540542
ep-gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
541-
num-lanes = <4>;
543+
num-lanes = <2>;
542544
pinctrl-0 = <&pcie_clkreqn>;
543545
pinctrl-names = "default";
544546
vpcie3v3-supply = <&vcc3v3_pcie>;
@@ -558,7 +560,7 @@
558560

559561
display {
560562
dp_hpd: dp-hpd {
561-
rockchip,pins = <4 RK_PD1 RK_FUNC_GPIO &pcfg_input_pull_up>;
563+
rockchip,pins = <4 RK_PD1 RK_FUNC_GPIO &pcfg_input_enable>;
562564
};
563565

564566
front_hdmi_5v_en: front-hdmi-5v-en {

‎patch/u-boot/v2026.01/board_smart-am40/add-board-smart-am40.patch‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ index 00000000..739b8ae5
9292
+CONFIG_ERRNO_STR=y
9393
diff --git a/dts/upstream/src/arm64/rockchip/rk3399-am40.dts b/dts/upstream/src/arm64/rockchip/rk3399-am40.dts
9494
new file mode 100644
95-
index 00000000..4a718e5a
95+
index 00000000..8ed789f8
9696
--- /dev/null
9797
+++ b/dts/upstream/src/arm64/rockchip/rk3399-am40.dts
98-
@@ -0,0 +1,792 @@
98+
@@ -0,0 +1,794 @@
9999
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
100100
+/*
101101
+ * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd.
@@ -120,9 +120,9 @@ index 00000000..4a718e5a
120120
+ rtc0 = &pt7c4563;
121121
+ /*
122122
+ * The rk808 circuit design on this board does not have the ability to maintain real-time time after a power outage.
123-
+ * Registering rk808 as rtc99 (most kernel configurations read time from rtc0) can prevent the kernel from reading the time (2013) from rk808 during startup.
123+
+ * Registering rk808 as rtc1 (most kernel configurations read time from rtc0) can prevent the kernel from reading the time (2013) from rk808 during startup.
124124
+ */
125-
+ rtc99 = &rk808;
125+
+ rtc1 = &rk808;
126126
+ };
127127
+
128128
+ chosen {
@@ -282,7 +282,7 @@ index 00000000..4a718e5a
282282
+ compatible = "linux,extcon-usbc-virtual-pd";
283283
+ pinctrl-names = "default";
284284
+ pinctrl-0 = <&dp_hpd>;
285-
+ det-gpios = <&gpio4 RK_PD1 GPIO_ACTIVE_LOW>;
285+
+ det-gpios = <&gpio4 RK_PD1 GPIO_ACTIVE_HIGH>;
286286
+ vpd-data-role = "display-port";
287287
+ vpd-super-speed;
288288
+ };
@@ -351,7 +351,7 @@ index 00000000..4a718e5a
351351
+ #address-cells = <1>;
352352
+ #size-cells = <0>;
353353
+
354-
+ rtl8211f: rtl8211f@0 {
354+
+ rtl8211f: ethernet-phy@0 {
355355
+ reg = <0>;
356356
+ reset-assert-us = <10000>;
357357
+ reset-deassert-us = <30000>;
@@ -601,6 +601,8 @@ index 00000000..4a718e5a
601601
+};
602602
+
603603
+&i2c3 {
604+
+ i2c-scl-falling-time-ns = <15>;
605+
+ i2c-scl-rising-time-ns = <450>;
604606
+ status = "okay";
605607
+};
606608
+
@@ -636,7 +638,7 @@ index 00000000..4a718e5a
636638
+
637639
+&pcie0 {
638640
+ ep-gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
639-
+ num-lanes = <4>;
641+
+ num-lanes = <2>;
640642
+ pinctrl-0 = <&pcie_clkreqn>;
641643
+ pinctrl-names = "default";
642644
+ vpcie3v3-supply = <&vcc3v3_pcie>;
@@ -656,7 +658,7 @@ index 00000000..4a718e5a
656658
+
657659
+ display {
658660
+ dp_hpd: dp-hpd {
659-
+ rockchip,pins = <4 RK_PD1 RK_FUNC_GPIO &pcfg_input_pull_up>;
661+
+ rockchip,pins = <4 RK_PD1 RK_FUNC_GPIO &pcfg_input_enable>;
660662
+ };
661663
+
662664
+ front_hdmi_5v_en: front-hdmi-5v-en {

0 commit comments

Comments
 (0)