92 lines
4.2 KiB
Diff
92 lines
4.2 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jianfeng Liu <liujianfeng1994@gmail.com>
|
||
|
|
Date: Sat, 28 May 2022 07:56:22 +0200
|
||
|
|
Subject: [ARCHEOLOGY] update rockchip64-edge to 5.18 (#3814)
|
||
|
|
|
||
|
|
> X-Git-Archeology: - Revision 597d2dac11f00d9070a4e49d6bad1b2244e36cb3: https://github.com/armbian/build/commit/597d2dac11f00d9070a4e49d6bad1b2244e36cb3
|
||
|
|
> X-Git-Archeology: Date: Sat, 28 May 2022 07:56:22 +0200
|
||
|
|
> X-Git-Archeology: From: Jianfeng Liu <liujianfeng1994@gmail.com>
|
||
|
|
> X-Git-Archeology: Subject: update rockchip64-edge to 5.18 (#3814)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision 8c6641e7b79f0d50acdc306d140e586a4e923cf0: https://github.com/armbian/build/commit/8c6641e7b79f0d50acdc306d140e586a4e923cf0
|
||
|
|
> X-Git-Archeology: Date: Wed, 03 Aug 2022 22:22:55 +0200
|
||
|
|
> X-Git-Archeology: From: Jianfeng Liu <liujianfeng1994@gmail.com>
|
||
|
|
> X-Git-Archeology: Subject: update rockchip64 edge to 5.19 (#4039)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision 6765f734cc4a22aeaa9f99a3ad28c8c322de26f6: https://github.com/armbian/build/commit/6765f734cc4a22aeaa9f99a3ad28c8c322de26f6
|
||
|
|
> X-Git-Archeology: Date: Tue, 25 Oct 2022 11:26:51 +0200
|
||
|
|
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
|
||
|
|
> X-Git-Archeology: Subject: Bump rockchip64 edge to 6.0.y (#4337)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision 92f1a22d76b987afa7ba555d5b509adc51d689e7: https://github.com/armbian/build/commit/92f1a22d76b987afa7ba555d5b509adc51d689e7
|
||
|
|
> X-Git-Archeology: Date: Fri, 16 Dec 2022 13:38:13 +0100
|
||
|
|
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
|
||
|
|
> X-Git-Archeology: Subject: Re-add rockchip64 6.0 patches (#4575)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision 34ae84fac5d0b66a1ab2d1e51534b7beb13ef245: https://github.com/armbian/build/commit/34ae84fac5d0b66a1ab2d1e51534b7beb13ef245
|
||
|
|
> X-Git-Archeology: Date: Fri, 05 May 2023 14:22:00 +0200
|
||
|
|
> X-Git-Archeology: From: amazingfate <liujianfeng1994@gmail.com>
|
||
|
|
> X-Git-Archeology: Subject: bump rockchip64 edge to v6.3
|
||
|
|
> X-Git-Archeology:
|
||
|
|
---
|
||
|
|
Documentation/devicetree/bindings/media/rockchip-rga.yaml | 2 ++
|
||
|
|
arch/arm64/boot/dts/rockchip/rk356x.dtsi | 11 ++++++++++
|
||
|
|
drivers/media/platform/rockchip/rga/rga.c | 3 +++
|
||
|
|
3 files changed, 16 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/Documentation/devicetree/bindings/media/rockchip-rga.yaml b/Documentation/devicetree/bindings/media/rockchip-rga.yaml
|
||
|
|
index dd645ddccb07..8adb18245187 100644
|
||
|
|
--- a/Documentation/devicetree/bindings/media/rockchip-rga.yaml
|
||
|
|
+++ b/Documentation/devicetree/bindings/media/rockchip-rga.yaml
|
||
|
|
@@ -20,9 +20,11 @@ properties:
|
||
|
|
oneOf:
|
||
|
|
- const: rockchip,rk3288-rga
|
||
|
|
- const: rockchip,rk3399-rga
|
||
|
|
+ - const: rockchip,rk356x-rga
|
||
|
|
- items:
|
||
|
|
- const: rockchip,rk3228-rga
|
||
|
|
- const: rockchip,rk3288-rga
|
||
|
|
+ - const: rockchip,rk356x-rga
|
||
|
|
|
||
|
|
reg:
|
||
|
|
maxItems: 1
|
||
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
|
||
|
|
index eed0059a68b8..43b49220b77d 100644
|
||
|
|
--- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
|
||
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
|
||
|
|
@@ -633,6 +633,17 @@ vepu_mmu: iommu@fdee0800 {
|
||
|
|
#iommu-cells = <0>;
|
||
|
|
};
|
||
|
|
|
||
|
|
+ rga: rga@fdeb0000 {
|
||
|
|
+ compatible = "rockchip,rk356x-rga";
|
||
|
|
+ reg = <0x0 0xfdeb0000 0x0 0x10000>;
|
||
|
|
+ interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH 0>;
|
||
|
|
+ clocks = <&cru ACLK_RGA>, <&cru HCLK_RGA>, <&cru CLK_RGA_CORE>;
|
||
|
|
+ clock-names = "aclk", "hclk", "sclk";
|
||
|
|
+ resets = <&cru SRST_RGA_CORE>, <&cru SRST_A_RGA>, <&cru SRST_H_RGA>;
|
||
|
|
+ reset-names = "core", "axi", "ahb";
|
||
|
|
+ power-domains = <&power RK3568_PD_RGA>;
|
||
|
|
+ };
|
||
|
|
+
|
||
|
|
sdmmc2: mmc@fe000000 {
|
||
|
|
compatible = "rockchip,rk3568-dw-mshc", "rockchip,rk3288-dw-mshc";
|
||
|
|
reg = <0x0 0xfe000000 0x0 0x4000>;
|
||
|
|
diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
|
||
|
|
index 61b25fcf826e..b14844105788 100644
|
||
|
|
--- a/drivers/media/platform/rockchip/rga/rga.c
|
||
|
|
+++ b/drivers/media/platform/rockchip/rga/rga.c
|
||
|
|
@@ -979,6 +979,9 @@ static const struct of_device_id rockchip_rga_match[] = {
|
||
|
|
{
|
||
|
|
.compatible = "rockchip,rk3399-rga",
|
||
|
|
},
|
||
|
|
+ {
|
||
|
|
+ .compatible = "rockchip,rk356x-rga",
|
||
|
|
+ },
|
||
|
|
{},
|
||
|
|
};
|
||
|
|
|
||
|
|
--
|
||
|
|
Armbian
|
||
|
|
|