Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rockchip64-6.6/6.12/6.13: rk3308b: add vop and internal rgb lcdc output #7866

Merged
merged 5 commits into from
Feb 23, 2025
Merged

rockchip64-6.6/6.12/6.13: rk3308b: add vop and internal rgb lcdc output #7866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
55d89c5
rockchip64: rk3308: add vop and internal rgb lcdc output support
TheSnowfield Feb 22, 2025
cc81852
sakurapi-rk3308b: use full rk blobs instead
TheSnowfield Feb 22, 2025
07a0892
sakurapi-rk3308b: enable vop and display output
TheSnowfield Feb 22, 2025
0568f7c
sakurapi-rk3308b: enable rockchip drm driver
TheSnowfield Feb 22, 2025
c423826
sakurapi-rk3308b: bump dts and vop patches to kernel 6.13
TheSnowfield Feb 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions config/boards/sakurapi-rk3308b.csc
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,13 @@ MODULES_LEGACY="g_serial"
SERIALCON="ttyS0"
KERNEL_TARGET="current"
BOOT_FDT_FILE="rockchip/rk3308-sakurapi-rk3308b.dtb"
MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost"
MODULES_BLACKLIST="analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost"
HAS_VIDEO_OUTPUT="no"
BOOTBRANCH_BOARD="tag:v2022.04"
BOOTPATCHDIR="u-boot-rockchip64-v2022.04"
IMAGE_PARTITION_TABLE="gpt"
BOOT_SCENARIO="spl-blobs"

BOOT_SCENARIO="only-blobs"
BL31_BLOB="rk33/rk3308_bl31_v2.26.elf"
DDR_BLOB="rk33/rk3308_ddr_589MHz_uart2_m1_v1.30.bin"
MINILOADER_BLOB="rk33/rk3308_miniloader_sd_nand_v1.13.bin"
93 changes: 90 additions & 3 deletions patch/kernel/archive/rockchip64-6.12/dt/rk3308-sakurapi-rk3308b.dts
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*
* Copyright (c) 2019 Akash Gajjar <[email protected]>
* Copyright (c) 2019 Jagan Teki <[email protected]>
* Copyright (C) 2024 Chiyuki Akatsuki
* Copyright (C) 2024 TheSnowfield
*/

/dts-v1/;
Expand Down Expand Up @@ -108,6 +108,65 @@
pinctrl-0 = <&otg_vbus_drv>;
vin-supply = <&vcc5v0_sys>;
};

backlight: backlight {
status = "okay";
compatible = "pwm-backlight";
pwms = <&pwm1 0 25000 0>;
brightness-levels = <
0 1 2 3 4 5 6 7
8 9 10 11 12 13 14 15
16 17 18 19 20 21 22 23
24 25 26 27 28 29 30 31
32 33 34 35 36 37 38 39
40 41 42 43 44 45 46 47
48 49 50 51 52 53 54 55
56 57 58 59 60 61 62 63
64 65 66 67 68 69 70 71
72 73 74 75 76 77 78 79
80 81 82 83 84 85 86 87
88 89 90 91 92 93 94 95
96 97 98 99 100 101 102 103
104 105 106 107 108 109 110 111
112 113 114 115 116 117 118 119
120 121 122 123 124 125 126 127
128 129 130 131 132 133 134 135
136 137 138 139 140 141 142 143
144 145 146 147 148 149 150 151
152 153 154 155 156 157 158 159
160 161 162 163 164 165 166 167
168 169 170 171 172 173 174 175
176 177 178 179 180 181 182 183
184 185 186 187 188 189 190 191
192 193 194 195 196 197 198 199
200 201 202 203 204 205 206 207
208 209 210 211 212 213 214 215
216 217 218 219 220 221 222 223
224 225 226 227 228 229 230 231
232 233 234 235 236 237 238 239
240 241 242 243 244 245 246 247
248 249 250 251 252 253 254 255>;
default-brightness-level = <200>;
};

display: panel {
compatible = "olimex,lcd-olinuxino-43-ts";
backlight = <&backlight>;
enable-gpios = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>;
enable-delay-ms = <20>;
status = "okay";

panel_in: port {
#address-cells = <1>;
#size-cells = <0>;

panel_in_rgb: endpoint {
reg = <0>;
remote-endpoint = <&vop_out_rgb>;
};
};
};

};

&cpu0 {
Expand Down Expand Up @@ -156,7 +215,14 @@
};
};

&spi2 {
/* SPI0 for external gpio pin */
&spi0 {
status = "okay";
max-freq = <10000000>;
};

/* SPI1 for ws2812*/
&spi1 {
status = "okay";
max-freq = <10000000>;
};
Expand Down Expand Up @@ -194,6 +260,28 @@
status = "okay";
};

&vop {
status = "okay";

vop_out: port {
#address-cells = <1>;
#size-cells = <0>;

vop_out_rgb: endpoint@0 {
reg = <0>;
remote-endpoint = <&panel_in_rgb>;
};
};
};

&pwm1 {
status = "okay";
};

&display_subsystem {
status = "okay";
};

&uart2 {
pinctrl-names = "default";
pinctrl-0 = <&uart2m0_xfer>;
Expand Down Expand Up @@ -223,4 +311,3 @@
&usb_host_ohci{
status = "okay";
};

42 changes: 42 additions & 0 deletions patch/kernel/archive/rockchip64-6.12/rk3308-internal-rgb-lcdc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: TheSnowfield <[email protected]>
Date: Sat, 22 Feb 2025 01:09:54 +0000
Subject: rk3308: set pinmux for internal RGB output

Signed-off-by: TheSnowfield <[email protected]>
---
drivers/gpu/drm/rockchip/rockchip_rgb.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/rockchip/rockchip_rgb.c b/drivers/gpu/drm/rockchip/rockchip_rgb.c
index c677b71ae516..43e9120bbad4 100644
--- a/drivers/gpu/drm/rockchip/rockchip_rgb.c
+++ b/drivers/gpu/drm/rockchip/rockchip_rgb.c
@@ -6,10 +6,11 @@
*/

#include <linux/component.h>
#include <linux/media-bus-format.h>
#include <linux/of_graph.h>
+#include <linux/pinctrl/consumer.h>

#include <drm/display/drm_dp_helper.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_bridge.h>
#include <drm/drm_bridge_connector.h>
@@ -167,10 +168,12 @@ struct rockchip_rgb *rockchip_rgb_init(struct device *dev,
DRM_DEV_ERROR(drm_dev->dev,
"failed to attach encoder: %d\n", ret);
goto err_free_connector;
}

+ pinctrl_pm_select_default_state(dev);
+
return rgb;

err_free_connector:
drm_connector_cleanup(connector);
err_free_encoder:
--
Created with Armbian build tools https://github.com/armbian/build

Loading
Loading