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 2 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
6 changes: 5 additions & 1 deletion config/boards/sakurapi-rk3308b.csc
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,8 @@ 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"
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