From 78b8ad184d3603634e1703fce20c512cc8f7382f Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Tue, 26 Dec 2023 13:06:19 +0100 Subject: [PATCH] rockchip-rk3588 edge 6.7-rc4: rewrite/rebase patches - in the process, `MAINTAINERS` file patches are dropped --- .../0010-fix-clk-divisions.patch | 22 ++- .../0011-irqchip-fix-its-timeout-issue.patch | 39 +++-- .../0020-USB3-Host-Support-For-Rock5.patch | 13 +- .../0021-RK3588-Add-USB3-DRD-Support.patch | 111 ++++++-------- .../0022-RK3588-Add-Cpufreq-Support.patch | 47 +++--- .../0024-RK3588-Add-Crypto-Support.patch | 90 ++++------- .../0025-RK3588-Add-HW-RNG-Support.patch | 20 ++- ...026-Add-missing-nodes-to-Orange-Pi-5.patch | 8 +- ...dd-missing-nodes-to-Orange-Pi-5-Plus.patch | 8 +- .../0028-Add-HDMI-QP-Support-for-RK3588.patch | 61 ++++---- .../0029-Add-VOP2-Support-for-RK3588.patch | 142 ++++++++---------- ...0-Add-HDMI-and-VOP2-to-Rock-5-series.patch | 10 +- 12 files changed, 242 insertions(+), 329 deletions(-) diff --git a/patch/kernel/rockchip-rk3588-edge/0010-fix-clk-divisions.patch b/patch/kernel/rockchip-rk3588-edge/0010-fix-clk-divisions.patch index 3c0f689028..d16187ede1 100644 --- a/patch/kernel/rockchip-rk3588-edge/0010-fix-clk-divisions.patch +++ b/patch/kernel/rockchip-rk3588-edge/0010-fix-clk-divisions.patch @@ -1,14 +1,14 @@ -From fab08a275f328e2e0a6fef73226e45eb1d4bb108 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Tue, 24 Oct 2023 16:09:35 +0200 -Subject: [PATCH 1/3] math.h: add DIV_ROUND_UP_NO_OVERFLOW +Subject: math.h: add DIV_ROUND_UP_NO_OVERFLOW Add a new DIV_ROUND_UP helper, which cannot overflow when big numbers are being used. Signed-off-by: Sebastian Reichel --- - include/linux/math.h | 11 +++++++++++ + include/linux/math.h | 11 ++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/linux/math.h b/include/linux/math.h @@ -34,13 +34,12 @@ index dd4152711de7..f80bfb375ab9 100644 ({ unsigned long long _tmp = (ll); do_div(_tmp, d); _tmp; }) -- -2.42.1 +Armbian - -From 967c218122840e468981031fd8888846727f5282 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Tue, 24 Oct 2023 16:13:50 +0200 -Subject: [PATCH 2/3] clk: divider: Fix divisor masking on 64 bit platforms +Subject: clk: divider: Fix divisor masking on 64 bit platforms The clock framework handles clock rates as "unsigned long", so u32 on 32-bit architectures and u64 on 64-bit architectures. @@ -99,13 +98,12 @@ index a2c2b5203b0a..94b4fb66a60f 100644 if (!_is_valid_div(table, div, flags)) return -EINVAL; -- -2.42.1 +Armbian - -From 5747896098cee178de4bed1eb0052893690eb40e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Tue, 24 Oct 2023 18:09:57 +0200 -Subject: [PATCH 3/3] clk: composite: replace open-coded abs_diff() +Subject: clk: composite: replace open-coded abs_diff() Replace the open coded abs_diff() with the existing helper function. @@ -140,5 +138,5 @@ index 66759fe28fad..478a4e594336 100644 if (!rate_diff || !req->best_parent_hw || best_rate_diff > rate_diff) { -- -2.42.1 +Armbian diff --git a/patch/kernel/rockchip-rk3588-edge/0011-irqchip-fix-its-timeout-issue.patch b/patch/kernel/rockchip-rk3588-edge/0011-irqchip-fix-its-timeout-issue.patch index 7b2d83c94f..c5bb9a12d1 100644 --- a/patch/kernel/rockchip-rk3588-edge/0011-irqchip-fix-its-timeout-issue.patch +++ b/patch/kernel/rockchip-rk3588-edge/0011-irqchip-fix-its-timeout-issue.patch @@ -1,18 +1,17 @@ -From d441305416aa91190df5865bbc0e3c684ec183b0 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Muhammed Efe Cetin Date: Fri, 11 Aug 2023 17:56:00 +0300 -Subject: [PATCH 1/1] irqchip/irq-gic-v3-its: fix its timeout issue for rk35xx - boards +Subject: irqchip/irq-gic-v3-its: fix its timeout issue for rk35xx boards --- - drivers/irqchip/irq-gic-v3-its.c | 79 +++++++++++++++++++++++++++++--- + drivers/irqchip/irq-gic-v3-its.c | 79 +++++++++- 1 file changed, 72 insertions(+), 7 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c -index e0c2b10d154d..eef86e179a52 100644 +index 9a7a74239eab..7f13b91513ac 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c -@@ -167,6 +167,7 @@ struct its_device { +@@ -163,6 +163,7 @@ struct its_device { struct its_node *its; struct event_lpi_map event_map; void *itt; @@ -20,7 +19,7 @@ index e0c2b10d154d..eef86e179a52 100644 u32 nr_ites; u32 device_id; bool shared; -@@ -2204,6 +2205,9 @@ static void gic_reset_prop_table(void *va) +@@ -2200,6 +2201,9 @@ static void gic_reset_prop_table(void *va) static struct page *its_allocate_prop_table(gfp_t gfp_flags) { struct page *prop_page; @@ -30,7 +29,7 @@ index e0c2b10d154d..eef86e179a52 100644 prop_page = alloc_pages(gfp_flags, get_order(LPI_PROPBASE_SZ)); if (!prop_page) -@@ -2328,6 +2332,7 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser, +@@ -2324,6 +2328,7 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser, u32 alloc_pages, psz; struct page *page; void *base; @@ -38,7 +37,7 @@ index e0c2b10d154d..eef86e179a52 100644 psz = baser->psz; alloc_pages = (PAGE_ORDER_TO_SIZE(order) / psz); -@@ -2339,7 +2344,11 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser, +@@ -2335,7 +2340,11 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser, order = get_order(GITS_BASER_PAGES_MAX * psz); } @@ -51,9 +50,9 @@ index e0c2b10d154d..eef86e179a52 100644 if (!page) return -ENOMEM; -@@ -2389,6 +2398,15 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser, - if (its->flags & ITS_FLAGS_FORCE_NON_SHAREABLE) - tmp &= ~GITS_BASER_SHAREABILITY_MASK; +@@ -2385,6 +2394,15 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser, + its_write_baser(its, baser, val); + tmp = baser->val; + if (of_machine_is_compatible("rockchip,rk3568") || + of_machine_is_compatible("rockchip,rk3566") || @@ -178,17 +177,17 @@ index e0c2b10d154d..eef86e179a52 100644 kfree(its_dev); } -@@ -5064,6 +5120,7 @@ static int __init its_probe_one(struct resource *res, +@@ -5077,6 +5133,7 @@ static int __init its_probe_one(struct its_node *its) struct page *page; u32 ctlr; int err; + gfp_t gfp_flags; - its_base = its_map_one(res, &err); - if (!its_base) -@@ -5117,7 +5174,10 @@ static int __init its_probe_one(struct resource *res, - - its->numa_node = numa_node; + if (is_v4(its)) { + if (!(its->typer & GITS_TYPER_VMOVP)) { +@@ -5108,7 +5165,10 @@ static int __init its_probe_one(struct its_node *its) + } + } - page = alloc_pages_node(its->numa_node, GFP_KERNEL | __GFP_ZERO, + gfp_flags = GFP_KERNEL | __GFP_ZERO; @@ -198,7 +197,7 @@ index e0c2b10d154d..eef86e179a52 100644 get_order(ITS_CMD_QUEUE_SZ)); if (!page) { err = -ENOMEM; -@@ -5151,6 +5211,11 @@ static int __init its_probe_one(struct resource *res, +@@ -5137,6 +5197,11 @@ static int __init its_probe_one(struct its_node *its) if (its->flags & ITS_FLAGS_FORCE_NON_SHAREABLE) tmp &= ~GITS_CBASER_SHAREABILITY_MASK; @@ -211,5 +210,5 @@ index e0c2b10d154d..eef86e179a52 100644 if (!(tmp & GITS_CBASER_SHAREABILITY_MASK)) { /* -- -2.41.0 +Armbian diff --git a/patch/kernel/rockchip-rk3588-edge/0020-USB3-Host-Support-For-Rock5.patch b/patch/kernel/rockchip-rk3588-edge/0020-USB3-Host-Support-For-Rock5.patch index 361632ee3a..7a154af086 100644 --- a/patch/kernel/rockchip-rk3588-edge/0020-USB3-Host-Support-For-Rock5.patch +++ b/patch/kernel/rockchip-rk3588-edge/0020-USB3-Host-Support-For-Rock5.patch @@ -1,7 +1,7 @@ -From a2439d839c103c029294042b5b3d4a065e5073d0 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Wed, 19 Jul 2023 15:56:42 +0200 -Subject: [PATCH 1/2] arm64: dts: rockchip: add USB3 host to rock-5b +Subject: arm64: dts: rockchip: add USB3 host to rock-5b Enable USB3 host controller for the Radxa ROCK 5 Model B. This adds USB3 for the upper USB3 port (the one further away from the PCB). @@ -38,13 +38,12 @@ index 741f631db345..61b937beca7f 100644 + status = "okay"; +}; -- -2.42.1 +Armbian - -From 292226fcc7af3e6d5e3b1587459146042fb8a2cf Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Fri, 21 Jul 2023 15:19:37 +0200 -Subject: [PATCH 2/2] arm64: dts: rockchip: add USB3 host to rock-5a +Subject: arm64: dts: rockchip: add USB3 host to rock-5a Enable USB3 host controller for the Radxa ROCK 5 Model A. This adds USB3 for the lower USB3 port (the one closer to the PCB). @@ -81,5 +80,5 @@ index 8347adcbd003..6fb03294576c 100644 + status = "okay"; +}; -- -2.42.1 +Armbian diff --git a/patch/kernel/rockchip-rk3588-edge/0021-RK3588-Add-USB3-DRD-Support.patch b/patch/kernel/rockchip-rk3588-edge/0021-RK3588-Add-USB3-DRD-Support.patch index 45c44f891b..65e015b326 100644 --- a/patch/kernel/rockchip-rk3588-edge/0021-RK3588-Add-USB3-DRD-Support.patch +++ b/patch/kernel/rockchip-rk3588-edge/0021-RK3588-Add-USB3-DRD-Support.patch @@ -1,7 +1,7 @@ -From d51dcd5c602d78fadc4cc8f83b851264c4ac18db Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Tue, 25 Apr 2023 17:38:57 +0200 -Subject: [PATCH 01/10] dt-bindings: phy: add rockchip usbdp combo phy document +Subject: dt-bindings: phy: add rockchip usbdp combo phy document Add device tree binding document for Rockchip USBDP Combo PHY with Samsung IP block. @@ -10,9 +10,8 @@ Co-developed-by: Frank Wang Signed-off-by: Frank Wang Signed-off-by: Sebastian Reichel --- - .../bindings/phy/phy-rockchip-usbdp.yaml | 166 ++++++++++++++++++ + Documentation/devicetree/bindings/phy/phy-rockchip-usbdp.yaml | 166 ++++++++++ 1 file changed, 166 insertions(+) - create mode 100644 Documentation/devicetree/bindings/phy/phy-rockchip-usbdp.yaml diff --git a/Documentation/devicetree/bindings/phy/phy-rockchip-usbdp.yaml b/Documentation/devicetree/bindings/phy/phy-rockchip-usbdp.yaml new file mode 100644 @@ -187,19 +186,18 @@ index 000000000000..dcca84d57e99 + status = "disabled"; + }; -- -2.42.1 +Armbian - -From b3b601dd3a6d35779385b716a898e43071f802e5 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Tue, 30 May 2023 18:49:48 +0200 -Subject: [PATCH 02/10] dt-bindings: soc: rockchip: add rk3588 USB3 syscon +Subject: dt-bindings: soc: rockchip: add rk3588 USB3 syscon RK3588 USB3 support requires the GRF for USB, USBDP PHY and VO. Signed-off-by: Sebastian Reichel --- - .../devicetree/bindings/soc/rockchip/grf.yaml | 22 +++++++++++++++++++ + Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 22 ++++++++++ 1 file changed, 22 insertions(+) diff --git a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml @@ -250,13 +248,12 @@ index e4fa6a07b4fa..ce1fd5b0d669 100644 - | #include -- -2.42.1 +Armbian - -From 5c34bb1e195fbbcaccf42a04f56e8d035d0864bb Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Frank Wang Date: Tue, 25 Apr 2023 15:55:54 +0200 -Subject: [PATCH 03/10] phy: rockchip: add usbdp combo phy driver +Subject: phy: rockchip: add usbdp combo phy driver This adds a new USBDP combo PHY with Samsung IP block driver. @@ -275,9 +272,8 @@ Signed-off-by: Sebastian Reichel --- drivers/phy/rockchip/Kconfig | 12 + drivers/phy/rockchip/Makefile | 1 + - drivers/phy/rockchip/phy-rockchip-usbdp.c | 1749 +++++++++++++++++++++ + drivers/phy/rockchip/phy-rockchip-usbdp.c | 1749 ++++++++++ 3 files changed, 1762 insertions(+) - create mode 100644 drivers/phy/rockchip/phy-rockchip-usbdp.c diff --git a/drivers/phy/rockchip/Kconfig b/drivers/phy/rockchip/Kconfig index 94360fc96a6f..d21b458c1d18 100644 @@ -2064,20 +2060,19 @@ index 000000000000..bb0beafb8578 +MODULE_DESCRIPTION("Rockchip USBDP Combo PHY driver"); +MODULE_LICENSE("GPL"); -- -2.42.1 +Armbian - -From 27a37c0495193fcfef1787086821c57f20b759bc Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Tue, 25 Apr 2023 17:49:04 +0200 -Subject: [PATCH 04/10] arm64: dts: rockchip: rk3588s: Add USBDP phy nodes +Subject: arm64: dts: rockchip: rk3588s: Add USBDP phy nodes Add both USB3-Displayport PHYs from RK3588. Signed-off-by: Sebastian Reichel --- - arch/arm64/boot/dts/rockchip/rk3588.dtsi | 62 +++++++++++++++++++ - arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 73 +++++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588.dtsi | 62 ++++++++ + arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 73 ++++++++++ 2 files changed, 135 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588.dtsi b/arch/arm64/boot/dts/rockchip/rk3588.dtsi @@ -2259,20 +2254,19 @@ index 7064c0e9179f..d75cf8cc6fb3 100644 compatible = "rockchip,rk3588-naneng-combphy"; reg = <0x0 0xfee00000 0x0 0x100>; -- -2.42.1 +Armbian - -From acb101c5f99c54d083427b2a07f8a9610a468bef Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Tue, 18 Jul 2023 19:05:38 +0200 -Subject: [PATCH 05/10] arm64: dts: rockchip: rk3588s: Add USB3 DRD controllers +Subject: arm64: dts: rockchip: rk3588s: Add USB3 DRD controllers Add both USB3 dual-role controllers to the RK3588 devicetree. Signed-off-by: Sebastian Reichel --- - arch/arm64/boot/dts/rockchip/rk3588.dtsi | 20 ++++++++++++++++++++ - arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 22 ++++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588.dtsi | 20 +++++++++ + arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 22 ++++++++++ 2 files changed, 42 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588.dtsi b/arch/arm64/boot/dts/rockchip/rk3588.dtsi @@ -2340,24 +2334,23 @@ index d75cf8cc6fb3..f3ddeb160557 100644 compatible = "rockchip,rk3588-ehci", "generic-ehci"; reg = <0x0 0xfc800000 0x0 0x40000>; -- -2.42.1 +Armbian - -From 479c1ae8a93f901a5898e2ed204b931c68de63fd Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Wed, 26 Apr 2023 21:18:43 +0200 -Subject: [PATCH 06/10] arm64: dts: rockchip: rk3588-evb1: add USB3 +Subject: arm64: dts: rockchip: rk3588-evb1: add USB3 Add support for the boards USB3 type A, as well as its Type-C connector. Signed-off-by: Sebastian Reichel --- - .../boot/dts/rockchip/rk3588-evb1-v10.dts | 144 ++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts | 144 ++++++++++ 1 file changed, 144 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts -index 3369065f897d..ee45b8a801ad 100644 +index b9d789d57862..4953d9310953 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts @@ -9,6 +9,7 @@ @@ -2368,7 +2361,7 @@ index 3369065f897d..ee45b8a801ad 100644 #include "rk3588.dtsi" / { -@@ -224,6 +225,18 @@ vcc5v0_usb: vcc5v0-usb-regulator { +@@ -167,6 +168,18 @@ vcc5v0_usb: vcc5v0-usb-regulator { regulator-max-microvolt = <5000000>; vin-supply = <&vcc5v0_usbdcin>; }; @@ -2387,7 +2380,7 @@ index 3369065f897d..ee45b8a801ad 100644 }; &combphy0_ps { -@@ -284,6 +297,56 @@ &gmac0_rgmii_clk +@@ -227,6 +240,56 @@ &gmac0_rgmii_clk &i2c2 { status = "okay"; @@ -2444,7 +2437,7 @@ index 3369065f897d..ee45b8a801ad 100644 hym8563: rtc@51 { compatible = "haoyu,hym8563"; reg = <0x51>; -@@ -410,6 +473,16 @@ vcc5v0_host_en: vcc5v0-host-en { +@@ -313,6 +376,16 @@ vcc5v0_host_en: vcc5v0-host-en { rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; }; }; @@ -2461,7 +2454,7 @@ index 3369065f897d..ee45b8a801ad 100644 }; &pwm2 { -@@ -1040,6 +1113,22 @@ &sata0 { +@@ -943,6 +1016,22 @@ &sata0 { status = "okay"; }; @@ -2484,7 +2477,7 @@ index 3369065f897d..ee45b8a801ad 100644 &u2phy2 { status = "okay"; }; -@@ -1078,3 +1167,58 @@ &usb_host1_ehci { +@@ -981,3 +1070,58 @@ &usb_host1_ehci { &usb_host1_ohci { status = "okay"; }; @@ -2544,13 +2537,12 @@ index 3369065f897d..ee45b8a801ad 100644 + status = "okay"; +}; -- -2.42.1 +Armbian - -From ddb788db4d8b352742a6efcc8559f4c32c38925c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Fri, 28 Jul 2023 16:43:16 +0200 -Subject: [PATCH 07/10] usb: typec: tcpm: avoid graph warning +Subject: usb: typec: tcpm: avoid graph warning When using a devicetree as described in commit d56de8c9a17d ("usb: typec: tcpm: try to get role switch from tcpc fwnode"), the kernel @@ -2576,10 +2568,10 @@ Signed-off-by: Sebastian Reichel 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c -index 058d5b853b57..a3ef7d70304e 100644 +index bfb6f9481e87..190c1edaad77 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c -@@ -6588,9 +6588,9 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc) +@@ -6598,9 +6598,9 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc) port->partner_desc.identity = &port->partner_ident; port->port_type = port->typec_caps.type; @@ -2592,21 +2584,19 @@ index 058d5b853b57..a3ef7d70304e 100644 err = PTR_ERR(port->role_sw); goto out_destroy_wq; -- -2.42.1 +Armbian - -From 0080918c3a50cad588fba468fb7934c80777aa07 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Tue, 25 Jul 2023 16:30:46 +0200 -Subject: [PATCH 08/10] arm64: dts: rockchip: rk3588s-rock5a: add upper USB3 - port +Subject: arm64: dts: rockchip: rk3588s-rock5a: add upper USB3 port Enable full support (XHCI, EHCI, OHCI) for the upper USB3 port from Radxa Rock 5 Model A. Signed-off-by: Sebastian Reichel --- - .../boot/dts/rockchip/rk3588s-rock-5a.dts | 22 +++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 22 ++++++++++ 1 file changed, 22 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts @@ -2657,21 +2647,19 @@ index 6fb03294576c..a6ec5e770e71 100644 status = "okay"; }; -- -2.42.1 +Armbian - -From 5afa85f867c29153afc1b801a31f55cd3021f3a6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Tue, 25 Jul 2023 17:18:17 +0200 -Subject: [PATCH 09/10] arm64: dts: rockchip: rk3588-rock5b: add lower USB3 - port +Subject: arm64: dts: rockchip: rk3588-rock5b: add lower USB3 port Enable full support (XHCI, EHCI, OHCI) for the lower USB3 port from Radxa Rock 5 Model B. Signed-off-by: Sebastian Reichel --- - .../boot/dts/rockchip/rk3588-rock-5b.dts | 20 +++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 20 ++++++++++ 1 file changed, 20 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -2720,20 +2708,19 @@ index 61b937beca7f..bd38c67b6c76 100644 status = "okay"; }; -- -2.42.1 +Armbian - -From 8f64d6bcf306fa5b5de66fdee2458cb584a78b2e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Tue, 25 Jul 2023 18:35:56 +0200 -Subject: [PATCH 10/10] arm64: dts: rockchip: rk3588-rock5b: add USB-C support +Subject: arm64: dts: rockchip: rk3588-rock5b: add USB-C support Add support for using the Radxa Rock 5 Model B USB-C port for USB in OHCI, EHCI or XHCI mode. Displayport AltMode is not yet supported. Signed-off-by: Sebastian Reichel --- - .../boot/dts/rockchip/rk3588-rock-5b.dts | 119 ++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 119 ++++++++++ 1 file changed, 119 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -2916,5 +2903,5 @@ index bd38c67b6c76..419d0202f7fc 100644 status = "okay"; }; -- -2.42.1 +Armbian diff --git a/patch/kernel/rockchip-rk3588-edge/0022-RK3588-Add-Cpufreq-Support.patch b/patch/kernel/rockchip-rk3588-edge/0022-RK3588-Add-Cpufreq-Support.patch index 7c064c4de4..60c69e4d94 100644 --- a/patch/kernel/rockchip-rk3588-edge/0022-RK3588-Add-Cpufreq-Support.patch +++ b/patch/kernel/rockchip-rk3588-edge/0022-RK3588-Add-Cpufreq-Support.patch @@ -1,7 +1,7 @@ -From 8baebef8be9691a28f8efa284dfce9a5b9395130 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Thu, 18 Aug 2022 14:21:30 +0200 -Subject: [PATCH 1/5] cpufreq: rockchip: Introduce driver for rk3588 +Subject: cpufreq: rockchip: Introduce driver for rk3588 This is a heavily modified port from the downstream driver. Downstream used it for multiple rockchip generations, while @@ -18,9 +18,8 @@ Signed-off-by: Sebastian Reichel drivers/cpufreq/Kconfig.arm | 10 + drivers/cpufreq/Makefile | 1 + drivers/cpufreq/cpufreq-dt-platdev.c | 2 + - drivers/cpufreq/rockchip-cpufreq.c | 645 +++++++++++++++++++++++++++ + drivers/cpufreq/rockchip-cpufreq.c | 645 ++++++++++ 4 files changed, 658 insertions(+) - create mode 100644 drivers/cpufreq/rockchip-cpufreq.c diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm index f911606897b8..1e255210851e 100644 @@ -720,14 +719,12 @@ index 000000000000..0bf57ac85e60 +MODULE_DESCRIPTION("Rockchip cpufreq driver"); +MODULE_LICENSE("GPL v2"); -- -2.42.1 +Armbian - -From f542d93ac2d5c4b6458599494f90bd4021d34b2c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Tue, 4 Apr 2023 17:30:46 +0200 -Subject: [PATCH 2/5] arm64: dts: rockchip: rk3588: add cpu frequency scaling - support +Subject: arm64: dts: rockchip: rk3588: add cpu frequency scaling support Add required bits for CPU frequency scaling to the Rockchip 3588 devicetree. This is missing the 2.4 GHz operating point for the @@ -737,11 +734,11 @@ frequencies based on (among other things) silicon quality. Signed-off-by: Sebastian Reichel --- - arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 452 ++++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 452 ++++++++++ 1 file changed, 452 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi -index be694aaef7d0..e7ebeda1c799 100644 +index f3ddeb160557..ebec8abdd4b7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi @@ -10,6 +10,7 @@ @@ -1281,14 +1278,12 @@ index be694aaef7d0..e7ebeda1c799 100644 compatible = "rockchip,rk3588-php-grf", "syscon"; reg = <0x0 0xfd5b0000 0x0 0x1000>; -- -2.42.1 +Armbian - -From e84f55d8a9d849eac51f73c47cdb90eb7dbac90f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Thu, 25 May 2023 19:48:49 +0200 -Subject: [PATCH 3/5] arm64: dts: rockchip: rk3588-evb1: add cpu mem regulator - info +Subject: arm64: dts: rockchip: rk3588-evb1: add cpu mem regulator info Add the second supply regulator for the CPU cores, which is used for supplying the memory interface. @@ -1299,10 +1294,10 @@ Signed-off-by: Sebastian Reichel 1 file changed, 8 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts -index ee45b8a801ad..cbee9e4b86da 100644 +index 4953d9310953..99ed48cd24a7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts -@@ -249,34 +249,42 @@ &combphy2_psu { +@@ -192,34 +192,42 @@ &combphy2_psu { &cpu_b0 { cpu-supply = <&vdd_cpu_big0_s0>; @@ -1346,13 +1341,12 @@ index ee45b8a801ad..cbee9e4b86da 100644 &gmac0 { -- -2.42.1 +Armbian - -From 643d555335b4c0dc228111a74cfa5189e17616df Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Mon, 24 Jul 2023 15:18:39 +0200 -Subject: [PATCH 4/5] arm64: dts: rockchip: rock5a: add cpu mem regulator info +Subject: arm64: dts: rockchip: rock5a: add cpu mem regulator info Add the second supply regulator for the CPU cores, which is used for supplying the memory interface. @@ -1410,13 +1404,12 @@ index a6ec5e770e71..58c58ec03a7f 100644 &i2c0 { -- -2.42.1 +Armbian - -From c8bd3a53671c48ccf642bbc6453fdb0274022bad Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Mon, 24 Jul 2023 15:07:49 +0200 -Subject: [PATCH 5/5] arm64: dts: rockchip: rock5b: add cpu mem regulator info +Subject: arm64: dts: rockchip: rock5b: add cpu mem regulator info Add the second supply regulator for the CPU cores, which is used for supplying the memory interface. @@ -1474,5 +1467,5 @@ index 419d0202f7fc..9ee415e6f498 100644 &i2c0 { -- -2.42.1 +Armbian diff --git a/patch/kernel/rockchip-rk3588-edge/0024-RK3588-Add-Crypto-Support.patch b/patch/kernel/rockchip-rk3588-edge/0024-RK3588-Add-Crypto-Support.patch index 6e164596e3..442b9e504e 100644 --- a/patch/kernel/rockchip-rk3588-edge/0024-RK3588-Add-Crypto-Support.patch +++ b/patch/kernel/rockchip-rk3588-edge/0024-RK3588-Add-Crypto-Support.patch @@ -1,17 +1,15 @@ -From 9877897c64b2b1666188878f1b27ec17341032af Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Corentin Labbe Date: Tue, 7 Nov 2023 15:55:27 +0000 -Subject: [PATCH 1/6] dt-bindings: crypto: add support for - rockchip,crypto-rk3588 +Subject: dt-bindings: crypto: add support for rockchip,crypto-rk3588 Add device tree binding documentation for the Rockchip cryptographic offloader V2. Signed-off-by: Corentin Labbe --- - .../crypto/rockchip,rk3588-crypto.yaml | 65 +++++++++++++++++++ + Documentation/devicetree/bindings/crypto/rockchip,rk3588-crypto.yaml | 65 ++++++++++ 1 file changed, 65 insertions(+) - create mode 100644 Documentation/devicetree/bindings/crypto/rockchip,rk3588-crypto.yaml diff --git a/Documentation/devicetree/bindings/crypto/rockchip,rk3588-crypto.yaml b/Documentation/devicetree/bindings/crypto/rockchip,rk3588-crypto.yaml new file mode 100644 @@ -85,55 +83,26 @@ index 000000000000..c01963413260 + reset-names = "core"; + }; -- -2.42.1 +Armbian - -From a44a7d8ca1eb437c8a1b28b09b564a56023a33ad Mon Sep 17 00:00:00 2001 -From: Corentin Labbe -Date: Tue, 7 Nov 2023 15:55:28 +0000 -Subject: [PATCH 2/6] MAINTAINERS: add new dt-binding doc to the right entry - -Rockchip crypto driver have a new file to be added. - -Signed-off-by: Corentin Labbe ---- - MAINTAINERS | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/MAINTAINERS b/MAINTAINERS -index 97f51d5ec1cf..0ae6a1709894 100644 ---- a/MAINTAINERS -+++ b/MAINTAINERS -@@ -18701,6 +18701,7 @@ M: Corentin Labbe - L: linux-crypto@vger.kernel.org - S: Maintained - F: Documentation/devicetree/bindings/crypto/rockchip,rk3288-crypto.yaml -+F: Documentation/devicetree/bindings/crypto/rockchip,rk3588-crypto.yaml - F: drivers/crypto/rockchip/ - - ROCKCHIP I2S TDM DRIVER --- -2.42.1 - - -From a5d149d6b0d4846582acf150493af5052d2b4c8c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Corentin Labbe Date: Tue, 7 Nov 2023 15:55:29 +0000 -Subject: [PATCH 3/6] ARM64: dts: rk3588: add crypto node +Subject: ARM64: dts: rk3588: add crypto node The rk3588 has a crypto IP handled by the rk3588 crypto driver so adds a node for it. Signed-off-by: Corentin Labbe --- - arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 12 ++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 12 ++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi -index 4481a2e578f8..a89577fb801e 100644 +index ebec8abdd4b7..30d3cedbc105 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi -@@ -2238,6 +2238,18 @@ sdhci: mmc@fe2e0000 { +@@ -2039,6 +2039,18 @@ sdhci: mmc@fe2e0000 { status = "disabled"; }; @@ -153,13 +122,12 @@ index 4481a2e578f8..a89577fb801e 100644 compatible = "rockchip,rk3588-i2s-tdm"; reg = <0x0 0xfe470000 0x0 0x1000>; -- -2.42.1 +Armbian - -From cde73c4a00f5e87c7ac4184a1480d4c5723f1ed7 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Corentin Labbe Date: Tue, 7 Nov 2023 15:55:30 +0000 -Subject: [PATCH 4/6] ARM64: dts: rk356x: add crypto node +Subject: ARM64: dts: rk356x: add crypto node Both RK3566 and RK3568 have a crypto IP handled by the rk3588 crypto driver so adds a node for it. @@ -167,7 +135,7 @@ node for it. Tested-by: Ricardo Pardini Signed-off-by: Corentin Labbe --- - arch/arm64/boot/dts/rockchip/rk356x.dtsi | 12 ++++++++++++ + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 12 ++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi @@ -194,13 +162,12 @@ index 0964761e3ce9..c94a1b535c32 100644 compatible = "rockchip,rk3568-i2s-tdm"; reg = <0x0 0xfe400000 0x0 0x1000>; -- -2.42.1 +Armbian - -From 4ef835dc26a22a8ccfac65eaf53eb1e51ad55970 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Corentin Labbe Date: Tue, 7 Nov 2023 15:55:31 +0000 -Subject: [PATCH 5/6] reset: rockchip: secure reset must be used by SCMI +Subject: reset: rockchip: secure reset must be used by SCMI While working on the rk3588 crypto driver, I loose lot of time understanding why resetting the IP failed. @@ -210,8 +177,8 @@ All resets in this block must be handled via SCMI call. Signed-off-by: Corentin Labbe --- - drivers/clk/rockchip/rst-rk3588.c | 42 ------------ - .../dt-bindings/reset/rockchip,rk3588-cru.h | 68 +++++++++---------- + drivers/clk/rockchip/rst-rk3588.c | 42 ------ + include/dt-bindings/reset/rockchip,rk3588-cru.h | 68 +++++----- 2 files changed, 34 insertions(+), 76 deletions(-) diff --git a/drivers/clk/rockchip/rst-rk3588.c b/drivers/clk/rockchip/rst-rk3588.c @@ -353,13 +320,12 @@ index d4264db2a07f..c0d08ae78cd5 100644 #endif -- -2.42.1 +Armbian - -From 00acde5de0c9014184c573c015bbc2d7655003e6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Corentin Labbe Date: Tue, 7 Nov 2023 15:55:32 +0000 -Subject: [PATCH 6/6] crypto: rockchip: add rk3588 driver +Subject: crypto: rockchip: add rk3588 driver RK3588 have a new crypto IP, this patch adds basic support for it. Only hashes and cipher are handled for the moment. @@ -368,15 +334,11 @@ Signed-off-by: Corentin Labbe --- drivers/crypto/Kconfig | 29 + drivers/crypto/rockchip/Makefile | 5 + - drivers/crypto/rockchip/rk2_crypto.c | 739 ++++++++++++++++++ - drivers/crypto/rockchip/rk2_crypto.h | 246 ++++++ - drivers/crypto/rockchip/rk2_crypto_ahash.c | 344 ++++++++ - drivers/crypto/rockchip/rk2_crypto_skcipher.c | 576 ++++++++++++++ + drivers/crypto/rockchip/rk2_crypto.c | 739 ++++++++++ + drivers/crypto/rockchip/rk2_crypto.h | 246 +++ + drivers/crypto/rockchip/rk2_crypto_ahash.c | 344 +++++ + drivers/crypto/rockchip/rk2_crypto_skcipher.c | 576 ++++++++ 6 files changed, 1939 insertions(+) - create mode 100644 drivers/crypto/rockchip/rk2_crypto.c - create mode 100644 drivers/crypto/rockchip/rk2_crypto.h - create mode 100644 drivers/crypto/rockchip/rk2_crypto_ahash.c - create mode 100644 drivers/crypto/rockchip/rk2_crypto_skcipher.c diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 79c3bb9c99c3..b6a2027b1f9a 100644 @@ -2361,5 +2323,5 @@ index 000000000000..3e8e44d84b47 + crypto_free_skcipher(ctx->fallback_tfm); +} -- -2.42.1 +Armbian diff --git a/patch/kernel/rockchip-rk3588-edge/0025-RK3588-Add-HW-RNG-Support.patch b/patch/kernel/rockchip-rk3588-edge/0025-RK3588-Add-HW-RNG-Support.patch index 084d70e691..b8e9f8b841 100644 --- a/patch/kernel/rockchip-rk3588-edge/0025-RK3588-Add-HW-RNG-Support.patch +++ b/patch/kernel/rockchip-rk3588-edge/0025-RK3588-Add-HW-RNG-Support.patch @@ -1,14 +1,13 @@ -From 2162fb12380c68ea4fa5300ef7475d6852196b89 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Muhammed Efe Cetin Date: Thu, 16 Nov 2023 17:49:42 +0300 -Subject: [PATCH 1/2] hwrng: rockchip: Add support for Rockchip HW RNG +Subject: hwrng: rockchip: Add support for Rockchip HW RNG --- drivers/char/hw_random/Kconfig | 13 + drivers/char/hw_random/Makefile | 1 + - drivers/char/hw_random/rockchip-rng.c | 574 ++++++++++++++++++++++++++ + drivers/char/hw_random/rockchip-rng.c | 574 ++++++++++ 3 files changed, 588 insertions(+) - create mode 100644 drivers/char/hw_random/rockchip-rng.c diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig index 442c40efb200..11063cac5b36 100644 @@ -627,23 +626,22 @@ index 000000000000..f7a3a7f52cca +MODULE_AUTHOR("Lin Jinhan "); +MODULE_LICENSE("GPL v2"); -- -2.42.1 +Armbian - -From 80c1c5fd75a0057d19c739c1fae76c63fd27c220 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Muhammed Efe Cetin Date: Thu, 16 Nov 2023 17:52:35 +0300 -Subject: [PATCH 2/2] arm64: dts: Add HW RNG support to RK3588S +Subject: arm64: dts: Add HW RNG support to RK3588S --- arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi -index a89577fb801e..ed6197dd9267 100644 +index 30d3cedbc105..3af20a829d5f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi -@@ -2250,6 +2250,16 @@ crypto: crypto@fe370000 { +@@ -2051,6 +2051,16 @@ crypto: crypto@fe370000 { status = "okay"; }; @@ -661,5 +659,5 @@ index a89577fb801e..ed6197dd9267 100644 compatible = "rockchip,rk3588-i2s-tdm"; reg = <0x0 0xfe470000 0x0 0x1000>; -- -2.42.1 +Armbian diff --git a/patch/kernel/rockchip-rk3588-edge/0026-Add-missing-nodes-to-Orange-Pi-5.patch b/patch/kernel/rockchip-rk3588-edge/0026-Add-missing-nodes-to-Orange-Pi-5.patch index 2e55bae758..34359c6ae0 100644 --- a/patch/kernel/rockchip-rk3588-edge/0026-Add-missing-nodes-to-Orange-Pi-5.patch +++ b/patch/kernel/rockchip-rk3588-edge/0026-Add-missing-nodes-to-Orange-Pi-5.patch @@ -1,10 +1,10 @@ -From ebb2c6d43396961abcadab85de3189de9b4a7497 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Muhammed Efe Cetin Date: Thu, 16 Nov 2023 18:09:07 +0300 -Subject: [PATCH 1/2] arm64: dts: Add missing nodes to Orange Pi 5 +Subject: arm64: dts: Add missing nodes to Orange Pi 5 --- - .../boot/dts/rockchip/rk3588s-orangepi-5.dts | 228 +++++++++++++++++- + arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts | 228 +++++++++- 1 file changed, 227 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts @@ -333,5 +333,5 @@ index 8f399c4317bd..8ccfbf25fbe2 100644 +}; \ No newline at end of file -- -2.43.0 +Armbian diff --git a/patch/kernel/rockchip-rk3588-edge/0027-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch b/patch/kernel/rockchip-rk3588-edge/0027-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch index 61c5fc323b..380fbc6f7e 100644 --- a/patch/kernel/rockchip-rk3588-edge/0027-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch +++ b/patch/kernel/rockchip-rk3588-edge/0027-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch @@ -1,10 +1,10 @@ -From c5520d54d57adf1ae59b65e1119e30d83f9836af Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Muhammed Efe Cetin Date: Thu, 16 Nov 2023 18:15:09 +0300 -Subject: [PATCH] arm64: dts: Add missing nodes to Orange Pi 5 Plus +Subject: arm64: dts: Add missing nodes to Orange Pi 5 Plus --- - .../dts/rockchip/rk3588-orangepi-5-plus.dts | 198 +++++++++++++++++- + arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts | 198 +++++++++- 1 file changed, 197 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts @@ -312,5 +312,5 @@ index 298c183d6f4f..87803e6e0fa7 100644 + }; +}; -- -2.42.1 +Armbian diff --git a/patch/kernel/rockchip-rk3588-edge/0028-Add-HDMI-QP-Support-for-RK3588.patch b/patch/kernel/rockchip-rk3588-edge/0028-Add-HDMI-QP-Support-for-RK3588.patch index d04d1efbe9..fb38f8b3ee 100644 --- a/patch/kernel/rockchip-rk3588-edge/0028-Add-HDMI-QP-Support-for-RK3588.patch +++ b/patch/kernel/rockchip-rk3588-edge/0028-Add-HDMI-QP-Support-for-RK3588.patch @@ -1,18 +1,17 @@ -From 986dad2023fa336cd9922398108467f3c62baf61 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Algea Cao Date: Tue, 12 Jul 2022 09:18:25 +0200 -Subject: [PATCH 1/2] phy/rockchip: Add the hdptx-hdmi driver +Subject: phy/rockchip: Add the hdptx-hdmi driver This is a phy driver for rk3588 hdmi. Signed-off-by: Algea Cao Signed-off-by: Andy Yan --- - drivers/phy/rockchip/Kconfig | 7 + - drivers/phy/rockchip/Makefile | 1 + - .../phy-rockchip-samsung-hdptx-hdmi.c | 2347 +++++++++++++++++ + drivers/phy/rockchip/Kconfig | 7 + + drivers/phy/rockchip/Makefile | 1 + + drivers/phy/rockchip/phy-rockchip-samsung-hdptx-hdmi.c | 2347 ++++++++++ 3 files changed, 2355 insertions(+) - create mode 100644 drivers/phy/rockchip/phy-rockchip-samsung-hdptx-hdmi.c diff --git a/drivers/phy/rockchip/Kconfig b/drivers/phy/rockchip/Kconfig index d21b458c1d18..62c18e25b8e0 100644 @@ -2398,13 +2397,12 @@ index 000000000000..036db08777cf +MODULE_DESCRIPTION("Samsung HDMI-DP Transmitter Combphy Driver"); +MODULE_LICENSE("GPL v2"); -- -2.42.1 +Armbian - -From 788535c1cba9e794c1c3eab98d3c7501e30fe04d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Tue, 12 Jul 2022 09:11:57 +0200 -Subject: [PATCH 2/2] drm/rockchip: dw hdmi qp support for rk3588 +Subject: drm/rockchip: dw hdmi qp support for rk3588 Cherry picked from panthor-v3-rk3588-evb1 tree and made some adjust to fit the upstream drm driver. @@ -2414,31 +2412,24 @@ Now we can get a 4KP60 output on rk3588 evb1 Signed-off-by: Algea Cao Signed-off-by: Andy Yan --- - drivers/gpu/drm/bridge/synopsys/Kconfig | 13 +- - drivers/gpu/drm/bridge/synopsys/Makefile | 7 +- - .../drm/bridge/synopsys/dw-hdmi-ahb-audio.c | 10 +- - .../gpu/drm/bridge/synopsys/dw-hdmi-audio.h | 4 +- - drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 9 +- - .../gpu/drm/bridge/synopsys/dw-hdmi-hdcp.h | 54 + - .../drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 11 +- - .../drm/bridge/synopsys/dw-hdmi-qp-audio.h | 29 + - .../gpu/drm/bridge/synopsys/dw-hdmi-qp-cec.c | 336 ++ - .../gpu/drm/bridge/synopsys/dw-hdmi-qp-cec.h | 25 + - .../bridge/synopsys/dw-hdmi-qp-i2s-audio.c | 251 ++ - drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 2985 ++++++++++++++++ - drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h | 831 +++++ - drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2009 ++++++++--- - drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 71 +- - drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 3108 +++++++++++++++-- - include/drm/bridge/dw_hdmi.h | 129 +- + drivers/gpu/drm/bridge/synopsys/Kconfig | 13 +- + drivers/gpu/drm/bridge/synopsys/Makefile | 7 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c | 10 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h | 4 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 9 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.h | 54 + + drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 11 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-audio.h | 29 + + drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-cec.c | 336 + + drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-cec.h | 25 + + drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-i2s-audio.c | 251 + + drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 2985 +++++++++ + drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h | 831 +++ + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2009 ++++-- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 71 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 3108 +++++++++- + include/drm/bridge/dw_hdmi.h | 129 +- 17 files changed, 9149 insertions(+), 733 deletions(-) - create mode 100644 drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.h - create mode 100644 drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-audio.h - create mode 100644 drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-cec.c - create mode 100644 drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-cec.h - create mode 100644 drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-i2s-audio.c - create mode 100644 drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c - create mode 100644 drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h diff --git a/drivers/gpu/drm/bridge/synopsys/Kconfig b/drivers/gpu/drm/bridge/synopsys/Kconfig index 15fc182d05ef..18ac9677dc93 100644 @@ -13708,5 +13699,5 @@ index 6a46baa0737c..67eb3c113cf2 100644 bool dw_hdmi_bus_fmt_is_420(struct dw_hdmi *hdmi); -- -2.42.1 +Armbian diff --git a/patch/kernel/rockchip-rk3588-edge/0029-Add-VOP2-Support-for-RK3588.patch b/patch/kernel/rockchip-rk3588-edge/0029-Add-VOP2-Support-for-RK3588.patch index c783d26878..9a4b5baaf4 100644 --- a/patch/kernel/rockchip-rk3588-edge/0029-Add-VOP2-Support-for-RK3588.patch +++ b/patch/kernel/rockchip-rk3588-edge/0029-Add-VOP2-Support-for-RK3588.patch @@ -1,11 +1,11 @@ -From c46e9d930f56d066985405ac3e6de2aea09c06e1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Sat, 4 Nov 2023 17:54:08 +0800 -Subject: [PATCH 01/14] drm/rockchip: vop2: Add cursor plane support +Subject: drm/rockchip: vop2: Add cursor plane support Signed-off-by: Andy Yan --- - drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 88 ++++++++++++++++---- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 88 ++++++++-- 1 file changed, 73 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -149,13 +149,12 @@ index 6862fb146ace..574eb75dec7c 100644 } -- -2.42.1 +Armbian - -From bafbfaea5f9bfea8857459633f2ea3cfc117344b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Fri, 10 Nov 2023 08:47:21 +0800 -Subject: [PATCH 02/14] drm/rockchip: vop2: A workaround for cursor plane zpos +Subject: drm/rockchip: vop2: A workaround for cursor plane zpos Signed-off-by: Andy Yan --- @@ -188,14 +187,13 @@ index 574eb75dec7c..bbca037acf67 100644 return 0; -- -2.42.1 +Armbian - -From d9b9a188cbbb88471ec4432123c17c6c4939171b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Thu, 26 Oct 2023 14:44:29 +0800 -Subject: [PATCH 03/14] drm/rockchip: move output interface releated definition - to rockchip_drm_drv.h +Subject: drm/rockchip: move output interface releated definition to + rockchip_drm_drv.h The output interface releated definition can shared between vop and vop2, move them to rockchip_drm_drv.h can avoid duplicated @@ -237,9 +235,9 @@ END drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 1 - drivers/gpu/drm/rockchip/inno_hdmi.c | 1 - drivers/gpu/drm/rockchip/rk3066_hdmi.c | 1 - - drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 17 +++++++++++++++++ - drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 12 +----------- - drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 16 +--------------- + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 17 ++++++++++ + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 12 +------ + drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 16 +-------- drivers/gpu/drm/rockchip/rockchip_lvds.c | 1 - drivers/gpu/drm/rockchip/rockchip_rgb.c | 1 - 11 files changed, 19 insertions(+), 34 deletions(-) @@ -428,13 +426,12 @@ index c677b71ae516..dbfbde24698e 100644 struct rockchip_rgb { -- -2.42.1 +Armbian - -From 9bb2bca182d9f9ccf849fa3700382bbd91892b23 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Thu, 2 Nov 2023 09:37:55 +0800 -Subject: [PATCH 04/14] Revert "drm/rockchip: vop2: Use regcache_sync() to fix +Subject: Revert "drm/rockchip: vop2: Use regcache_sync() to fix suspend/resume" This reverts commit b63a553e8f5aa6574eeb535a551817a93c426d8c. @@ -489,13 +486,12 @@ index bbca037acf67..125cef9dbc52 100644 clk_disable_unprepare(vop2->hclk); } -- -2.42.1 +Armbian - -From 2de183233ba52bfef799c8cf2d3ae0c0c294e41c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Wed, 25 Oct 2023 11:47:57 +0800 -Subject: [PATCH 05/14] drm/rockchip: vop2: set half_block_en bit in all mode +Subject: drm/rockchip: vop2: set half_block_en bit in all mode At first we thought the half_block_en bit in AFBCD_CTRL register only work in afbc mode. But the fact is that it control the line @@ -504,7 +500,7 @@ all case. Signed-off-by: Andy Yan --- - drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 25 ++++++++++++++------ + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 25 +++++++--- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -572,14 +568,13 @@ index 125cef9dbc52..0d4b22cf2d8c 100644 vop2_win_write(win, VOP2_WIN_AFBC_PIC_SIZE, act_info); vop2_win_write(win, VOP2_WIN_AFBC_TRANSFORM_OFFSET, transform_offset); -- -2.42.1 +Armbian - -From b7523583a44bdf67a1740eb98b005ebcdf32161a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Wed, 1 Nov 2023 19:13:38 +0800 -Subject: [PATCH 06/14] drm/rockchip: vop2: clear afbc en and transform bit for - cluster window at linear mode +Subject: drm/rockchip: vop2: clear afbc en and transform bit for cluster + window at linear mode The enable bit and transform offset of cluster windows should be cleared when it work at linear mode, or we may have a iommu fault @@ -607,13 +602,12 @@ index 0d4b22cf2d8c..c5fdb69497ed 100644 } -- -2.42.1 +Armbian - -From bf444a494d765990a9cd8cc815c26c4399850125 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Tue, 7 Nov 2023 18:14:17 +0800 -Subject: [PATCH 07/14] drm/rockchip: vop2: Set YUV/RGB overlay mode +Subject: drm/rockchip: vop2: Set YUV/RGB overlay mode Set overlay mode register according to the output mode is yuv or rgb. @@ -621,7 +615,7 @@ output mode is yuv or rgb. Signed-off-by: Andy Yan --- drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 1 + - drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 19 ++++++++++++++++--- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 19 ++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h @@ -701,13 +695,12 @@ index c5fdb69497ed..407653eee901 100644 static void vop2_setup_dly_for_windows(struct vop2 *vop2) -- -2.42.1 +Armbian - -From bf74f9c2d30d6f9527fde1d25141cd273deadcd6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Thu, 19 Oct 2023 19:31:32 +0800 -Subject: [PATCH 08/14] drm/rockchip: vop2: rename grf to sys_grf +Subject: drm/rockchip: vop2: rename grf to sys_grf The vop2 need to reference more grf(system grf, vop grf, vo0/1 grf,etc) in the upcoming rk3588. @@ -754,13 +747,12 @@ index 407653eee901..c49786bd538d 100644 vop2->hclk = devm_clk_get(vop2->dev, "hclk"); if (IS_ERR(vop2->hclk)) { -- -2.42.1 +Armbian - -From 17e5e7efc43df9de830013603c6055beff4189d1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Sat, 11 Nov 2023 09:27:56 +0800 -Subject: [PATCH 09/14] dt-bindings: soc: rockchip: add rk3588 vop/vo syscon +Subject: dt-bindings: soc: rockchip: add rk3588 vop/vo syscon Add VOP and VO GRF syscon compatibles for RK3588 @@ -782,13 +774,12 @@ index ce1fd5b0d669..656547bdb701 100644 - const: syscon - items: -- -2.42.1 +Armbian - -From a33bce427262645fda64095114706edb13756d58 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Sat, 11 Nov 2023 11:31:09 +0800 -Subject: [PATCH 10/14] dt-bindings: display: vop2: Add rk3588 support +Subject: dt-bindings: display: vop2: Add rk3588 support The vop2 on rk3588 is similar to which on rk356x but with 4 video outputs and need to reference @@ -796,7 +787,7 @@ more grf modules. Signed-off-by: Andy Yan --- - .../display/rockchip/rockchip-vop2.yaml | 25 +++++++++++++++++++ + Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml | 25 ++++++++++ 1 file changed, 25 insertions(+) diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml b/Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml @@ -863,13 +854,12 @@ index b60b90472d42..c333c651da1a 100644 maxItems: 1 -- -2.42.1 +Armbian - -From f349814bd2ceeb454516340afb5ca367f81ab2d9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Mon, 16 Oct 2023 20:24:00 +0800 -Subject: [PATCH 11/14] drm/rockchip: vop2: Add support for rk3588 +Subject: drm/rockchip: vop2: Add support for rk3588 VOP2 on rk3588: @@ -884,9 +874,9 @@ VP3 Max 2048x1080 Signed-off-by: Andy Yan --- - drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 321 ++++++++++++++++++- - drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 57 ++++ - drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 215 +++++++++++++ + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 321 +++++++++- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 57 ++ + drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 215 +++++++ include/dt-bindings/soc/rockchip,vop2.h | 4 + 4 files changed, 590 insertions(+), 7 deletions(-) @@ -1729,13 +1719,12 @@ index 6e66a802b96a..668f199df9f0 100644 #endif /* __DT_BINDINGS_ROCKCHIP_VOP2_H */ -- -2.42.1 +Armbian - -From d63cbf65cf2a0f228b6322f763cd6647383a16b7 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Tue, 7 Nov 2023 15:59:00 +0800 -Subject: [PATCH 12/14] drm/rockchip: vop2: Add debugfs support +Subject: drm/rockchip: vop2: Add debugfs support /sys/kernel/debug/dri/vop2/summary: dump vop display state /sys/kernel/debug/dri/vop2/regs: dump whole vop registers @@ -1744,7 +1733,7 @@ actived modules Signed-off-by: Andy Yan --- - drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 398 +++++++++++++++++++ + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 398 ++++++++++ 1 file changed, 398 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -2192,21 +2181,20 @@ index bf12b6af14cf..49904f19b7cd 100644 if (IS_ERR(vop2->regs)) return PTR_ERR(vop2->regs); -- -2.42.1 +Armbian - -From 2b4c9d7d3ecffcad3da10587af7dbbbff6734548 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Fri, 10 Nov 2023 18:55:02 +0800 -Subject: [PATCH 13/14] arm64: dts: rockchip: Add vop on rk3588 +Subject: arm64: dts: rockchip: Add vop on rk3588 Signed-off-by: Andy Yan --- - arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 96 +++++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 96 ++++++++++ 1 file changed, 96 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi -index e7ebeda1c799..36de1a517e7a 100644 +index 3af20a829d5f..73d81984a8d9 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi @@ -804,6 +804,11 @@ trip-point-2 { @@ -2327,23 +2315,21 @@ index e7ebeda1c799..36de1a517e7a 100644 compatible = "rockchip,rk3588-uart", "snps,dw-apb-uart"; reg = <0x0 0xfd890000 0x0 0x100>; -- -2.42.1 +Armbian - -From 7caf11d82bcbe993b779f8371da5975de306aacf Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Fri, 10 Nov 2023 19:01:37 +0800 -Subject: [PATCH 14/14] arm64: dts: rockchip: Enable hdmi display on - rk3588-evb1 +Subject: arm64: dts: rockchip: Enable hdmi display on rk3588-evb1 Signed-off-by: Andy Yan --- - .../boot/dts/rockchip/rk3588-evb1-v10.dts | 49 ++++++++++++ - arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 74 +++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts | 49 ++++++ + arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 74 ++++++++++ 2 files changed, 123 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts -index c0ea050371f9..ad14b3ff638e 100644 +index 99ed48cd24a7..50822c2def7d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts @@ -10,6 +10,7 @@ @@ -2354,7 +2340,7 @@ index c0ea050371f9..ad14b3ff638e 100644 #include "rk3588.dtsi" / { -@@ -169,6 +170,17 @@ pcie30_avdd1v8: pcie30-avdd1v8-regulator { +@@ -103,6 +104,17 @@ pcie30_avdd1v8: pcie30-avdd1v8-regulator { vin-supply = <&avcc_1v8_s0>; }; @@ -2372,7 +2358,7 @@ index c0ea050371f9..ad14b3ff638e 100644 vcc12v_dcin: vcc12v-dcin-regulator { compatible = "regulator-fixed"; regulator-name = "vcc12v_dcin"; -@@ -300,6 +312,43 @@ &cpu_l3 { +@@ -230,6 +242,43 @@ &cpu_l3 { mem-supply = <&vdd_cpu_lit_mem_s0>; }; @@ -2417,7 +2403,7 @@ index c0ea050371f9..ad14b3ff638e 100644 clock_in_out = "output"; phy-handle = <&rgmii_phy>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi -index 36de1a517e7a..fe69eb0f79fb 100644 +index 73d81984a8d9..081a690e8afb 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi @@ -953,6 +953,59 @@ bigcore1_grf: syscon@fd592000 { @@ -2480,7 +2466,7 @@ index 36de1a517e7a..fe69eb0f79fb 100644 vop_grf: syscon@fd5a4000 { compatible = "rockchip,rk3588-vop-grf", "syscon"; reg = <0x0 0xfd5a4000 0x0 0x2000>; -@@ -2887,6 +2940,27 @@ usbdp_phy0_u3: usb3-port { +@@ -2910,6 +2963,27 @@ usbdp_phy0_u3: usb3-port { }; }; @@ -2509,5 +2495,5 @@ index 36de1a517e7a..fe69eb0f79fb 100644 compatible = "rockchip,rk3588-naneng-combphy"; reg = <0x0 0xfee00000 0x0 0x100>; -- -2.42.1 +Armbian diff --git a/patch/kernel/rockchip-rk3588-edge/0030-Add-HDMI-and-VOP2-to-Rock-5-series.patch b/patch/kernel/rockchip-rk3588-edge/0030-Add-HDMI-and-VOP2-to-Rock-5-series.patch index a6a97d7ea4..de61442021 100644 --- a/patch/kernel/rockchip-rk3588-edge/0030-Add-HDMI-and-VOP2-to-Rock-5-series.patch +++ b/patch/kernel/rockchip-rk3588-edge/0030-Add-HDMI-and-VOP2-to-Rock-5-series.patch @@ -1,11 +1,11 @@ -From 1b9b1f115e406040222be6fbdeff3ca91dd9576e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Muhammed Efe Cetin Date: Sat, 2 Dec 2023 12:32:54 +0300 -Subject: [PATCH] Add HDMI and VOP2 to Rock 5 series +Subject: Add HDMI and VOP2 to Rock 5 series --- - .../boot/dts/rockchip/rk3588-rock-5b.dts | 49 +++++++++++++++++++ - .../boot/dts/rockchip/rk3588s-rock-5a.dts | 49 +++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 49 ++++++++++ + arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 49 ++++++++++ 2 files changed, 98 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -151,5 +151,5 @@ index 58c58ec03a7f..783a11493cd2 100644 + }; +}; -- -2.42.1 +Armbian