forked from armbian/build
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
rockchip-rk3588-edge: rewrite kernel patches against v6.8-rc6, no cha…
…nges
- Loading branch information
1 parent
d496b2a
commit 92d7991
Showing
4 changed files
with
41 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2248,7 +2248,7 @@ Signed-off-by: Sebastian Reichel <[email protected]> | |
| 1 file changed, 143 insertions(+) | ||
|
|
||
| diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts | ||
| index ac7c677b0fb9..0e82dbb4c5ff 100644 | ||
| index de30c2632b8e..c3746d3a9b1d 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 @@ | ||
|
|
@@ -2352,7 +2352,7 @@ index ac7c677b0fb9..0e82dbb4c5ff 100644 | |
| }; | ||
|
|
||
| &pwm2 { | ||
| @@ -1040,6 +1113,22 @@ &sata0 { | ||
| @@ -1041,6 +1114,22 @@ &sata0 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
|
|
@@ -2375,7 +2375,7 @@ index ac7c677b0fb9..0e82dbb4c5ff 100644 | |
| &u2phy2 { | ||
| status = "okay"; | ||
| }; | ||
| @@ -1078,3 +1167,57 @@ &usb_host1_ehci { | ||
| @@ -1079,3 +1168,57 @@ &usb_host1_ehci { | ||
| &usb_host1_ohci { | ||
| status = "okay"; | ||
| }; | ||
|
|
@@ -2465,10 +2465,10 @@ Signed-off-by: Sebastian Reichel <[email protected]> | |
| 1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c | ||
| index 5945e3a2b0f7..99991cb666a8 100644 | ||
| index 66e532edcece..31933278df77 100644 | ||
| --- a/drivers/usb/typec/tcpm/tcpm.c | ||
| +++ b/drivers/usb/typec/tcpm/tcpm.c | ||
| @@ -6831,9 +6831,9 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc) | ||
| @@ -6828,9 +6828,9 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc) | ||
|
|
||
| port->partner_desc.identity = &port->partner_ident; | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1294,7 +1294,7 @@ Signed-off-by: Sebastian Reichel <[email protected]> | |
| 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 0e82dbb4c5ff..ecbbd553a31e 100644 | ||
| index c3746d3a9b1d..62c05bc68042 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 { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,7 @@ Signed-off-by: Andy Yan <[email protected]> | |
| 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 | ||
| index 85b3b4871a1d..e91e0c092002 100644 | ||
| index fdd768bbd487..892b8ab02cc3 100644 | ||
| --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | ||
| +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | ||
| @@ -169,6 +169,7 @@ struct vop2_video_port { | ||
|
|
@@ -20,7 +20,7 @@ index 85b3b4871a1d..e91e0c092002 100644 | |
| struct drm_pending_vblank_event *event; | ||
|
|
||
| unsigned int nlayers; | ||
| @@ -2681,12 +2682,63 @@ static struct vop2_video_port *find_vp_without_primary(struct vop2 *vop2) | ||
| @@ -2683,12 +2684,63 @@ static struct vop2_video_port *find_vp_without_primary(struct vop2 *vop2) | ||
| return NULL; | ||
| } | ||
|
|
||
|
|
@@ -85,7 +85,7 @@ index 85b3b4871a1d..e91e0c092002 100644 | |
| struct device_node *port; | ||
| struct vop2_video_port *vp; | ||
| int i, nvp, nvps = 0; | ||
| @@ -2727,6 +2779,8 @@ static int vop2_create_crtcs(struct vop2 *vop2) | ||
| @@ -2729,6 +2781,8 @@ static int vop2_create_crtcs(struct vop2 *vop2) | ||
| nvps++; | ||
| } | ||
|
|
||
|
|
@@ -94,7 +94,7 @@ index 85b3b4871a1d..e91e0c092002 100644 | |
| nvp = 0; | ||
| for (i = 0; i < vop2->registered_num_wins; i++) { | ||
| struct vop2_win *win = &vop2->win[i]; | ||
| @@ -2758,6 +2812,18 @@ static int vop2_create_crtcs(struct vop2 *vop2) | ||
| @@ -2760,6 +2814,18 @@ static int vop2_create_crtcs(struct vop2 *vop2) | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -113,7 +113,7 @@ index 85b3b4871a1d..e91e0c092002 100644 | |
| if (win->type == DRM_PLANE_TYPE_OVERLAY) | ||
| possible_crtcs = (1 << nvps) - 1; | ||
|
|
||
| @@ -2775,9 +2841,13 @@ static int vop2_create_crtcs(struct vop2 *vop2) | ||
| @@ -2777,9 +2843,13 @@ static int vop2_create_crtcs(struct vop2 *vop2) | ||
| if (!vp->crtc.port) | ||
| continue; | ||
|
|
||
|
|
@@ -129,7 +129,7 @@ index 85b3b4871a1d..e91e0c092002 100644 | |
| &vop2_crtc_funcs, | ||
| "video_port%d", vp->id); | ||
| if (ret) { | ||
| @@ -2790,18 +2860,6 @@ static int vop2_create_crtcs(struct vop2 *vop2) | ||
| @@ -2792,18 +2862,6 @@ static int vop2_create_crtcs(struct vop2 *vop2) | ||
| init_completion(&vp->dsp_hold_completion); | ||
| } | ||
|
|
||
|
|
@@ -162,10 +162,10 @@ Signed-off-by: Andy Yan <[email protected]> | |
| 1 file changed, 4 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | ||
| index e91e0c092002..3d39f0634816 100644 | ||
| index 892b8ab02cc3..ae755ecb991e 100644 | ||
| --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | ||
| +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | ||
| @@ -2638,8 +2638,11 @@ static int vop2_plane_init(struct vop2 *vop2, struct vop2_win *win, | ||
| @@ -2640,8 +2640,11 @@ static int vop2_plane_init(struct vop2 *vop2, struct vop2_win *win, | ||
| unsigned int blend_caps = BIT(DRM_MODE_BLEND_PIXEL_NONE) | | ||
| BIT(DRM_MODE_BLEND_PREMULTI) | | ||
| BIT(DRM_MODE_BLEND_COVERAGE); | ||
|
|
@@ -177,7 +177,7 @@ index e91e0c092002..3d39f0634816 100644 | |
| ret = drm_universal_plane_init(vop2->drm, &win->base, possible_crtcs, | ||
| &vop2_plane_funcs, win_data->formats, | ||
| win_data->nformats, | ||
| @@ -2658,7 +2661,7 @@ static int vop2_plane_init(struct vop2 *vop2, struct vop2_win *win, | ||
| @@ -2660,7 +2663,7 @@ static int vop2_plane_init(struct vop2 *vop2, struct vop2_win *win, | ||
| win->data->supported_rotations); | ||
| drm_plane_create_alpha_property(&win->base); | ||
| drm_plane_create_blend_mode_property(&win->base, blend_caps); | ||
|
|
@@ -205,7 +205,7 @@ Signed-off-by: Andy Yan <[email protected]> | |
| 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 | ||
| index 3d39f0634816..d3d71ffa6c55 100644 | ||
| index ae755ecb991e..c4e588f234c6 100644 | ||
| --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | ||
| +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | ||
| @@ -27,6 +27,7 @@ | ||
|
|
@@ -269,7 +269,7 @@ index 3d39f0634816..d3d71ffa6c55 100644 | |
| static const struct regmap_config vop2_regmap_config; | ||
|
|
||
| static struct vop2_video_port *to_vop2_video_port(struct drm_crtc *crtc) | ||
| @@ -2510,6 +2550,362 @@ static const struct drm_crtc_helper_funcs vop2_crtc_helper_funcs = { | ||
| @@ -2512,6 +2552,362 @@ static const struct drm_crtc_helper_funcs vop2_crtc_helper_funcs = { | ||
| .atomic_disable = vop2_crtc_atomic_disable, | ||
| }; | ||
|
|
||
|
|
@@ -632,15 +632,15 @@ index 3d39f0634816..d3d71ffa6c55 100644 | |
| static struct drm_crtc_state *vop2_crtc_duplicate_state(struct drm_crtc *crtc) | ||
| { | ||
| struct rockchip_crtc_state *vcstate; | ||
| @@ -2559,6 +2955,7 @@ static const struct drm_crtc_funcs vop2_crtc_funcs = { | ||
| @@ -2561,6 +2957,7 @@ static const struct drm_crtc_funcs vop2_crtc_funcs = { | ||
| .atomic_destroy_state = vop2_crtc_destroy_state, | ||
| .enable_vblank = vop2_crtc_enable_vblank, | ||
| .disable_vblank = vop2_crtc_disable_vblank, | ||
| + .late_register = vop2_crtc_late_register, | ||
| }; | ||
|
|
||
| static irqreturn_t vop2_isr(int irq, void *data) | ||
| @@ -3163,6 +3560,7 @@ static int vop2_bind(struct device *dev, struct device *master, void *data) | ||
| @@ -3165,6 +3562,7 @@ static int vop2_bind(struct device *dev, struct device *master, void *data) | ||
| return -EINVAL; | ||
| } | ||
|
|
||
|
|
@@ -663,7 +663,7 @@ Signed-off-by: Andy Yan <[email protected]> | |
| 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 ecbbd553a31e..89c8f8f0bbd7 100644 | ||
| index 62c05bc68042..e1f801bdf2dd 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 @@ | ||
|
|
||