Skip to content

Commit 750c986

Browse files
committed
mksklipad50: devicetree cleanups
1 parent 5bf962a commit 750c986

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

patch/kernel/archive/rockchip64-6.12/dt/rk3328-mksklipad50.dts

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
compatible = "mks,rk3328-mksklipad50", "mks,rk3328-mkspi", "rockchip,rk3328";
1515

1616
aliases {
17-
ethernet0 = "/ethernet@ff540000";
18-
ethernet1 = "/ethernet@ff550000";
17+
ethernet0 = &gmac2io;
18+
ethernet1 = &gmac2phy;
1919
mmc0 = &sdmmc;
2020
mmc1 = &emmc;
2121
};
@@ -314,7 +314,7 @@
314314
compatible = "rockchip,rk805";
315315
reg = <0x18>;
316316
interrupt-parent = <&gpio1>;
317-
interrupts = <RK_PD0 IRQ_TYPE_LEVEL_LOW>;
317+
interrupts = <24 IRQ_TYPE_LEVEL_LOW>;
318318
#clock-cells = <1>;
319319
clock-output-names = "xin32k", "rk805-clkout2";
320320
gpio-controller;
@@ -423,7 +423,7 @@
423423
};
424424

425425
&pwm3 {
426-
interrupts = <GIC_SPI SCLK_TIMER3 IRQ_TYPE_LEVEL_HIGH>;
426+
interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
427427
};
428428

429429
&io_domains {

patch/kernel/archive/rockchip64-6.14/dt/rk3328-mksklipad50.dts

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
compatible = "mks,rk3328-mksklipad50", "mks,rk3328-mkspi", "rockchip,rk3328";
1515

1616
aliases {
17-
ethernet0 = "/ethernet@ff540000";
18-
ethernet1 = "/ethernet@ff550000";
17+
ethernet0 = &gmac2io;
18+
ethernet1 = &gmac2phy;
1919
mmc0 = &sdmmc;
2020
mmc1 = &emmc;
2121
};
@@ -314,7 +314,7 @@
314314
compatible = "rockchip,rk805";
315315
reg = <0x18>;
316316
interrupt-parent = <&gpio1>;
317-
interrupts = <RK_PD0 IRQ_TYPE_LEVEL_LOW>;
317+
interrupts = <24 IRQ_TYPE_LEVEL_LOW>;
318318
#clock-cells = <1>;
319319
clock-output-names = "xin32k", "rk805-clkout2";
320320
gpio-controller;
@@ -423,7 +423,7 @@
423423
};
424424

425425
&pwm3 {
426-
interrupts = <GIC_SPI SCLK_TIMER3 IRQ_TYPE_LEVEL_HIGH>;
426+
interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
427427
};
428428

429429
&io_domains {

patch/u-boot/u-boot-rockchip64/board_mksklipad50/02-rk3328-mksklipad50-add-uboot-dts.patch

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: Thorsten Maerz <info@netztorte.de>
3-
Date: Fri, 31 Jan 2025 10:35:20 +0100
3+
Date: Thu, 06 Mar 2025 18:25:31 +0100
44
Subject: feat: Add u-boot dts for MKSKLIPAD50 board
55
---
66

77
diff --git a/arch/arm/dts/rk3328-mksklipad50.dts b/arch/arm/dts/rk3328-mksklipad50.dts
88
--- a/arch/arm/dts/rk3328-mksklipad50.dts 1970-01-01 01:00:00.000000000 +0100
9-
+++ b/arch/arm/dts/rk3328-mksklipad50.dts 2025-01-31 10:35:20.328782652 +0100
9+
+++ b/arch/arm/dts/rk3328-mksklipad50.dts 2025-03-06 18:25:31.937819640 +0100
1010
@@ -0,0 +1,569 @@
1111
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
1212
+/*
@@ -23,8 +23,8 @@ diff --git a/arch/arm/dts/rk3328-mksklipad50.dts b/arch/arm/dts/rk3328-mksklipad
2323
+ compatible = "mks,rk3328-mksklipad50", "mks,rk3328-mkspi", "rockchip,rk3328";
2424
+
2525
+ aliases {
26-
+ ethernet0 = "/ethernet@ff540000";
27-
+ ethernet1 = "/ethernet@ff550000";
26+
+ ethernet0 = &gmac2io;
27+
+ ethernet1 = &gmac2phy;
2828
+ mmc0 = &sdmmc;
2929
+ mmc1 = &emmc;
3030
+ };
@@ -286,7 +286,7 @@ diff --git a/arch/arm/dts/rk3328-mksklipad50.dts b/arch/arm/dts/rk3328-mksklipad
286286
+ compatible = "rockchip,rk805";
287287
+ reg = <0x18>;
288288
+ interrupt-parent = <&gpio1>;
289-
+ interrupts = <RK_PD0 IRQ_TYPE_LEVEL_LOW>;
289+
+ interrupts = <24 IRQ_TYPE_LEVEL_LOW>;
290290
+ #clock-cells = <1>;
291291
+ clock-output-names = "xin32k", "rk805-clkout2";
292292
+ gpio-controller;
@@ -395,7 +395,7 @@ diff --git a/arch/arm/dts/rk3328-mksklipad50.dts b/arch/arm/dts/rk3328-mksklipad
395395
+};
396396
+
397397
+&pwm3 {
398-
+ interrupts = <GIC_SPI SCLK_TIMER3 IRQ_TYPE_LEVEL_HIGH>;
398+
+ interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
399399
+};
400400
+
401401
+&io_domains {

0 commit comments

Comments
 (0)