rockchip: remove useless evb patches

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

target/linux/rockchip/patches-6.6/033-07-v6.7-drm-rockchip-remove-unused-struct-in-vop2.patch

@@ -25,7 +25,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231013122036.1594090-1-and
  	const struct vop2_video_port_data *data;
  
  	struct completion dsp_hold_completion;
-@@ -2273,7 +2272,6 @@ static int vop2_create_crtcs(struct vop2
+@@ -2275,7 +2274,6 @@ static int vop2_create_crtcs(struct vop2
  		vp = &vop2->vps[i];
  		vp->vop2 = vop2;
  		vp->id = vp_data->id;

target/linux/rockchip/patches-6.6/033-08-v6.7-drm-rockchip-remove-NR_LAYERS-macro-on-vop2.patch

@@ -16,7 +16,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231013122051.1594164-1-and
 
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-@@ -2250,8 +2250,6 @@ static struct vop2_video_port *find_vp_w
+@@ -2252,8 +2252,6 @@ static struct vop2_video_port *find_vp_w
  	return NULL;
  }
  
@@ -25,7 +25,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231013122051.1594164-1-and
  static int vop2_create_crtcs(struct vop2 *vop2)
  {
  	const struct vop2_data *vop2_data = vop2->data;
-@@ -2370,7 +2368,7 @@ static int vop2_create_crtcs(struct vop2
+@@ -2372,7 +2370,7 @@ static int vop2_create_crtcs(struct vop2
  		struct vop2_video_port *vp = &vop2->vps[i];
  
  		if (vp->crtc.port)

target/linux/rockchip/patches-6.6/033-09-v6.7-drm-rockchip-vop-fix-format-bpp-calculation.patch

@@ -46,7 +46,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231018094210.2475771-1-and
  	u32 vir_width = (fb->pitches[0] << 3) / bpp;
  	u32 width = drm_rect_width(src) >> 16;
  	u32 height = drm_rect_height(src) >> 16;
-@@ -1080,7 +1094,7 @@ static void vop2_plane_atomic_update(str
+@@ -1082,7 +1096,7 @@ static void vop2_plane_atomic_update(str
  	struct drm_display_mode *adjusted_mode = &crtc->state->adjusted_mode;
  	struct vop2 *vop2 = win->vop2;
  	struct drm_framebuffer *fb = pstate->fb;

target/linux/rockchip/patches-6.6/033-10-v6.7-drm-rockchip-vop2-remove-the-unsupported-format-of-cluste.patch

@@ -59,7 +59,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231018094239.2475851-1-and
  }
  
  static bool vop2_win_uv_swap(u32 format)
-@@ -1232,7 +1212,6 @@ static void vop2_plane_atomic_update(str
+@@ -1234,7 +1214,6 @@ static void vop2_plane_atomic_update(str
  			drm_err(vop2->drm, "vp%d %s stride[%d] not 64 pixel aligned\n",
  				vp->id, win->data->name, stride);
  
@@ -67,7 +67,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231018094239.2475851-1-and
  		uv_swap = vop2_afbc_uv_swap(fb->format->format);
  		/*
  		 * This is a workaround for crazy IC design, Cluster
-@@ -1249,7 +1228,6 @@ static void vop2_plane_atomic_update(str
+@@ -1251,7 +1230,6 @@ static void vop2_plane_atomic_update(str
  		if (vop2_cluster_window(win))
  			vop2_win_write(win, VOP2_WIN_AFBC_ENABLE, 1);
  		vop2_win_write(win, VOP2_WIN_AFBC_FORMAT, afbc_format);

target/linux/rockchip/patches-6.6/033-20-v6.8-Revert-drm-rockchip-vop2-Use-regcache_sync-to-fix.patch

@@ -36,7 +36,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115719.1784834-1-and
  static struct vop2_video_port *to_vop2_video_port(struct drm_crtc *crtc)
  {
  	return container_of(crtc, struct vop2_video_port, crtc);
-@@ -883,7 +885,11 @@ static void vop2_enable(struct vop2 *vop
+@@ -885,7 +887,11 @@ static void vop2_enable(struct vop2 *vop
  		return;
  	}
  
@@ -49,7 +49,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115719.1784834-1-and
  
  	if (vop2->data->soc_id == 3566)
  		vop2_writel(vop2, RK3568_OTP_WIN_EN, 1);
-@@ -913,8 +919,6 @@ static void vop2_disable(struct vop2 *vo
+@@ -915,8 +921,6 @@ static void vop2_disable(struct vop2 *vo
  
  	pm_runtime_put_sync(vop2->dev);
  

target/linux/rockchip/patches-6.6/033-21-v6.8-drm-rockchip-vop2-set-half_block_en-bit-in-all-mode.patch

@@ -40,7 +40,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115730.1784893-1-and
  static u32 vop2_afbc_transform_offset(struct drm_plane_state *pstate,
  				      bool afbc_half_block_en)
  {
-@@ -1144,6 +1156,7 @@ static void vop2_plane_atomic_update(str
+@@ -1146,6 +1158,7 @@ static void vop2_plane_atomic_update(str
  	bool rotate_90 = pstate->rotation & DRM_MODE_ROTATE_90;
  	struct rockchip_gem_object *rk_obj;
  	unsigned long offset;
@@ -48,7 +48,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115730.1784893-1-and
  	bool afbc_en;
  	dma_addr_t yrgb_mst;
  	dma_addr_t uv_mst;
-@@ -1236,6 +1249,7 @@ static void vop2_plane_atomic_update(str
+@@ -1238,6 +1251,7 @@ static void vop2_plane_atomic_update(str
  	dsp_info = (dsp_h - 1) << 16 | ((dsp_w - 1) & 0xffff);
  
  	format = vop2_convert_format(fb->format->format);
@@ -56,7 +56,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115730.1784893-1-and
  
  	drm_dbg(vop2->drm, "vp%d update %s[%dx%d->%dx%d@%dx%d] fmt[%p4cc_%s] addr[%pad]\n",
  		vp->id, win->data->name, actual_w, actual_h, dsp_w, dsp_h,
-@@ -1243,6 +1257,9 @@ static void vop2_plane_atomic_update(str
+@@ -1245,6 +1259,9 @@ static void vop2_plane_atomic_update(str
  		&fb->format->format,
  		afbc_en ? "AFBC" : "", &yrgb_mst);
  
@@ -66,7 +66,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115730.1784893-1-and
  	if (afbc_en) {
  		u32 stride;
  
-@@ -1283,13 +1300,7 @@ static void vop2_plane_atomic_update(str
+@@ -1285,13 +1302,7 @@ static void vop2_plane_atomic_update(str
  		vop2_win_write(win, VOP2_WIN_AFBC_UV_SWAP, uv_swap);
  		vop2_win_write(win, VOP2_WIN_AFBC_AUTO_GATING_EN, 0);
  		vop2_win_write(win, VOP2_WIN_AFBC_BLOCK_SPLIT_EN, 0);

target/linux/rockchip/patches-6.6/033-22-v6.8-drm-rockchip-vop2-clear-afbc-en-and-transform-bit-for.patch

@@ -22,7 +22,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115741.1784954-1-and
 
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-@@ -1312,6 +1312,11 @@ static void vop2_plane_atomic_update(str
+@@ -1314,6 +1314,11 @@ static void vop2_plane_atomic_update(str
  		vop2_win_write(win, VOP2_WIN_AFBC_ROTATE_270, rotate_270);
  		vop2_win_write(win, VOP2_WIN_AFBC_ROTATE_90, rotate_90);
  	} else {

target/linux/rockchip/patches-6.6/033-24-v6.8-drm-rockchip-vop2-Set-YUV-RGB-overlay-mode.patch

@@ -27,7 +27,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115805.1785073-1-and
  	int color_space;
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-@@ -1623,6 +1623,8 @@ static void vop2_crtc_atomic_enable(stru
+@@ -1625,6 +1625,8 @@ static void vop2_crtc_atomic_enable(stru
  
  	vop2->enable_count++;
  
@@ -36,7 +36,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115805.1785073-1-and
  	vop2_crtc_enable_irq(vp, VP_INT_POST_BUF_EMPTY);
  
  	polflags = 0;
-@@ -1650,7 +1652,7 @@ static void vop2_crtc_atomic_enable(stru
+@@ -1652,7 +1654,7 @@ static void vop2_crtc_atomic_enable(stru
  	if (vop2_output_uv_swap(vcstate->bus_format, vcstate->output_mode))
  		dsp_ctrl |= RK3568_VP_DSP_CTRL__DSP_RB_SWAP;
  
@@ -45,7 +45,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115805.1785073-1-and
  		dsp_ctrl |= RK3568_VP_DSP_CTRL__POST_DSP_OUT_R2Y;
  
  	vop2_dither_setup(crtc, &dsp_ctrl);
-@@ -1959,10 +1961,12 @@ static void vop2_setup_layer_mixer(struc
+@@ -1961,10 +1963,12 @@ static void vop2_setup_layer_mixer(struc
  	u16 hdisplay;
  	u32 bg_dly;
  	u32 pre_scan_dly;
@@ -58,7 +58,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115805.1785073-1-and
  
  	adjusted_mode = &vp->crtc.state->adjusted_mode;
  	hsync_len = adjusted_mode->crtc_hsync_end - adjusted_mode->crtc_hsync_start;
-@@ -1975,7 +1979,15 @@ static void vop2_setup_layer_mixer(struc
+@@ -1977,7 +1981,15 @@ static void vop2_setup_layer_mixer(struc
  	pre_scan_dly = ((bg_dly + (hdisplay >> 1) - 1) << 16) | hsync_len;
  	vop2_vp_write(vp, RK3568_VP_PRE_SCAN_HTIMING, pre_scan_dly);
  
@@ -75,7 +75,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115805.1785073-1-and
  	port_sel = vop2_readl(vop2, RK3568_OVL_PORT_SEL);
  	port_sel &= RK3568_OVL_PORT_SEL__SEL_PORT;
  
-@@ -2049,7 +2061,6 @@ static void vop2_setup_layer_mixer(struc
+@@ -2051,7 +2063,6 @@ static void vop2_setup_layer_mixer(struc
  
  	vop2_writel(vop2, RK3568_OVL_LAYER_SEL, layer_sel);
  	vop2_writel(vop2, RK3568_OVL_PORT_SEL, port_sel);

target/linux/rockchip/patches-6.6/033-25-v6.8-drm-rockchip-vop2-set-bg-dly-and-prescan-dly-at.patch

@@ -19,7 +19,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115815.1785131-1-and
 
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-@@ -1460,8 +1460,18 @@ static void vop2_post_config(struct drm_
+@@ -1462,8 +1462,18 @@ static void vop2_post_config(struct drm_
  	u32 top_margin = 100, bottom_margin = 100;
  	u16 hsize = hdisplay * (left_margin + right_margin) / 200;
  	u16 vsize = vdisplay * (top_margin + bottom_margin) / 200;
@@ -38,7 +38,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115815.1785131-1-and
  
  	vsize = rounddown(vsize, 2);
  	hsize = rounddown(hsize, 2);
-@@ -1956,11 +1966,6 @@ static void vop2_setup_layer_mixer(struc
+@@ -1958,11 +1968,6 @@ static void vop2_setup_layer_mixer(struc
  	u32 layer_sel = 0;
  	u32 port_sel;
  	unsigned int nlayer, ofs;
@@ -50,7 +50,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115815.1785131-1-and
  	u32 ovl_ctrl;
  	int i;
  	struct vop2_video_port *vp0 = &vop2->vps[0];
-@@ -1968,17 +1973,6 @@ static void vop2_setup_layer_mixer(struc
+@@ -1970,17 +1975,6 @@ static void vop2_setup_layer_mixer(struc
  	struct vop2_video_port *vp2 = &vop2->vps[2];
  	struct rockchip_crtc_state *vcstate = to_rockchip_crtc_state(vp->crtc.state);
  

target/linux/rockchip/patches-6.6/033-26-v6.8-drm-rockchip-vop2-rename-grf-to-sys_grf.patch

@@ -27,7 +27,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115826.1785190-1-and
  
  	/* physical map length of vop2 register */
  	u32 len;
-@@ -1524,9 +1524,9 @@ static void rk3568_set_intf_mux(struct v
+@@ -1526,9 +1526,9 @@ static void rk3568_set_intf_mux(struct v
  		dip &= ~RK3568_DSP_IF_POL__RGB_LVDS_PIN_POL;
  		dip |= FIELD_PREP(RK3568_DSP_IF_POL__RGB_LVDS_PIN_POL, polflags);
  		if (polflags & POLFLAG_DCLK_INV)
@@ -39,7 +39,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115826.1785190-1-and
  		break;
  	case ROCKCHIP_VOP2_EP_HDMI0:
  		die &= ~RK3568_SYS_DSP_INFACE_EN_HDMI_MUX;
-@@ -2767,7 +2767,7 @@ static int vop2_bind(struct device *dev,
+@@ -2769,7 +2769,7 @@ static int vop2_bind(struct device *dev,
  			return PTR_ERR(vop2->lut_regs);
  	}
  

target/linux/rockchip/patches-6.6/033-28-v6.8-drm-rockchip-vop2-Add-support-for-rk3588.patch

@@ -86,7 +86,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  static bool is_yuv_output(u32 bus_format)
  {
  	switch (bus_format) {
-@@ -879,13 +911,32 @@ static int vop2_core_clks_prepare_enable
+@@ -881,13 +913,32 @@ static int vop2_core_clks_prepare_enable
  		goto err;
  	}
  
@@ -119,7 +119,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  static void vop2_enable(struct vop2 *vop2)
  {
  	int ret;
-@@ -917,6 +968,9 @@ static void vop2_enable(struct vop2 *vop
+@@ -919,6 +970,9 @@ static void vop2_enable(struct vop2 *vop
  	if (vop2->data->soc_id == 3566)
  		vop2_writel(vop2, RK3568_OTP_WIN_EN, 1);
  
@@ -129,7 +129,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  	vop2_writel(vop2, RK3568_REG_CFG_DONE, RK3568_REG_CFG_DONE__GLB_CFG_DONE_EN);
  
  	/*
-@@ -942,6 +996,7 @@ static void vop2_disable(struct vop2 *vo
+@@ -944,6 +998,7 @@ static void vop2_disable(struct vop2 *vo
  
  	pm_runtime_put_sync(vop2->dev);
  
@@ -137,7 +137,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  	clk_disable_unprepare(vop2->aclk);
  	clk_disable_unprepare(vop2->hclk);
  }
-@@ -1309,7 +1364,19 @@ static void vop2_plane_atomic_update(str
+@@ -1311,7 +1366,19 @@ static void vop2_plane_atomic_update(str
  			vop2_win_write(win, VOP2_WIN_AFBC_ENABLE, 1);
  		vop2_win_write(win, VOP2_WIN_AFBC_FORMAT, afbc_format);
  		vop2_win_write(win, VOP2_WIN_AFBC_UV_SWAP, uv_swap);
@@ -158,7 +158,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  		vop2_win_write(win, VOP2_WIN_AFBC_BLOCK_SPLIT_EN, 0);
  		transform_offset = vop2_afbc_transform_offset(pstate, half_block_en);
  		vop2_win_write(win, VOP2_WIN_AFBC_HDR_PTR, yrgb_mst);
-@@ -1507,10 +1574,10 @@ static void vop2_post_config(struct drm_
+@@ -1509,10 +1576,10 @@ static void vop2_post_config(struct drm_
  	vop2_vp_write(vp, RK3568_VP_DSP_BG, 0);
  }
  
@@ -171,7 +171,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  	u32 die, dip;
  
  	die = vop2_readl(vop2, RK3568_DSP_IF_EN);
-@@ -1572,13 +1639,281 @@ static void rk3568_set_intf_mux(struct v
+@@ -1574,13 +1641,281 @@ static void rk3568_set_intf_mux(struct v
  		break;
  	default:
  		drm_err(vop2->drm, "Invalid interface id %d on vp%d\n", id, vp->id);
@@ -454,7 +454,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  }
  
  static int us_to_vertical_line(struct drm_display_mode *mode, int us)
-@@ -1648,9 +1983,17 @@ static void vop2_crtc_atomic_enable(stru
+@@ -1650,9 +1985,17 @@ static void vop2_crtc_atomic_enable(stru
  	drm_for_each_encoder_mask(encoder, crtc->dev, crtc_state->encoder_mask) {
  		struct rockchip_encoder *rkencoder = to_rockchip_encoder(encoder);
  
@@ -473,7 +473,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  	if (vcstate->output_mode == ROCKCHIP_OUT_MODE_AAAA &&
  	    !(vp_data->feature & VOP_FEATURE_OUTPUT_10BIT))
  		out_mode = ROCKCHIP_OUT_MODE_P888;
-@@ -1661,6 +2004,8 @@ static void vop2_crtc_atomic_enable(stru
+@@ -1663,6 +2006,8 @@ static void vop2_crtc_atomic_enable(stru
  
  	if (vop2_output_uv_swap(vcstate->bus_format, vcstate->output_mode))
  		dsp_ctrl |= RK3568_VP_DSP_CTRL__DSP_RB_SWAP;
@@ -482,7 +482,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  
  	if (vcstate->yuv_overlay)
  		dsp_ctrl |= RK3568_VP_DSP_CTRL__POST_DSP_OUT_R2Y;
-@@ -2022,6 +2367,14 @@ static void vop2_setup_layer_mixer(struc
+@@ -2024,6 +2369,14 @@ static void vop2_setup_layer_mixer(struc
  			port_sel &= ~RK3568_OVL_PORT_SEL__CLUSTER1;
  			port_sel |= FIELD_PREP(RK3568_OVL_PORT_SEL__CLUSTER1, vp->id);
  			break;
@@ -497,7 +497,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  		case ROCKCHIP_VOP2_ESMART0:
  			port_sel &= ~RK3568_OVL_PORT_SEL__ESMART0;
  			port_sel |= FIELD_PREP(RK3568_OVL_PORT_SEL__ESMART0, vp->id);
-@@ -2030,6 +2383,14 @@ static void vop2_setup_layer_mixer(struc
+@@ -2032,6 +2385,14 @@ static void vop2_setup_layer_mixer(struc
  			port_sel &= ~RK3568_OVL_PORT_SEL__ESMART1;
  			port_sel |= FIELD_PREP(RK3568_OVL_PORT_SEL__ESMART1, vp->id);
  			break;
@@ -512,7 +512,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  		case ROCKCHIP_VOP2_SMART0:
  			port_sel &= ~RK3568_OVL_PORT_SEL__SMART0;
  			port_sel |= FIELD_PREP(RK3568_OVL_PORT_SEL__SMART0, vp->id);
-@@ -2766,8 +3127,29 @@ static int vop2_bind(struct device *dev,
+@@ -2768,8 +3129,29 @@ static int vop2_bind(struct device *dev,
  		if (IS_ERR(vop2->lut_regs))
  			return PTR_ERR(vop2->lut_regs);
  	}
@@ -543,7 +543,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  
  	vop2->hclk = devm_clk_get(vop2->dev, "hclk");
  	if (IS_ERR(vop2->hclk)) {
-@@ -2781,6 +3163,12 @@ static int vop2_bind(struct device *dev,
+@@ -2783,6 +3165,12 @@ static int vop2_bind(struct device *dev,
  		return PTR_ERR(vop2->aclk);
  	}
  

target/linux/rockchip/patches-6.6/033-29-v6.8-drm-rockchip-vop2-rename-VOP_FEATURE_OUTPUT_10BIT-to.patch

@@ -20,7 +20,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115931.1785495-1-and
 
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-@@ -1995,7 +1995,7 @@ static void vop2_crtc_atomic_enable(stru
+@@ -1997,7 +1997,7 @@ static void vop2_crtc_atomic_enable(stru
  		return;
  
  	if (vcstate->output_mode == ROCKCHIP_OUT_MODE_AAAA &&

target/linux/rockchip/patches-6.6/033-30-v6.8-drm-rockchip-vop2-Avoid-use-regmap_reinit_cache-at-runtim.patch

@@ -35,7 +35,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231217084415.2373043-1-and
 
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-@@ -959,12 +959,6 @@ static void vop2_enable(struct vop2 *vop
+@@ -961,12 +961,6 @@ static void vop2_enable(struct vop2 *vop
  		return;
  	}
  
@@ -48,7 +48,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231217084415.2373043-1-and
  	if (vop2->data->soc_id == 3566)
  		vop2_writel(vop2, RK3568_OTP_WIN_EN, 1);
  
-@@ -996,6 +990,8 @@ static void vop2_disable(struct vop2 *vo
+@@ -998,6 +992,8 @@ static void vop2_disable(struct vop2 *vo
  
  	pm_runtime_put_sync(vop2->dev);
  

target/linux/rockchip/patches-6.6/033-31-v6.8-drm-rockchip-vop2-clean-up-some-inconsistent-indenting.patch

@@ -18,7 +18,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231219062635.100718-1-jiap
 
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-@@ -1701,8 +1701,8 @@ static unsigned long rk3588_calc_cru_cfg
+@@ -1703,8 +1703,8 @@ static unsigned long rk3588_calc_cru_cfg
  		 * *if_pixclk_div = dclk_rate / if_pixclk_rate;
  		 * *if_dclk_div = dclk_rate / if_dclk_rate;
  		 */

target/linux/rockchip/patches-6.6/033-33-v6.8-drm-rockchip-vop2-Drop-unused-if_dclk_rate-variable.patch

@@ -27,7 +27,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20240105174007.98054-1-crist
 
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-@@ -1680,7 +1680,6 @@ static unsigned long rk3588_calc_cru_cfg
+@@ -1682,7 +1682,6 @@ static unsigned long rk3588_calc_cru_cfg
  	unsigned long dclk_core_rate = v_pixclk >> 2;
  	unsigned long dclk_rate = v_pixclk;
  	unsigned long dclk_out_rate;
@@ -35,7 +35,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20240105174007.98054-1-crist
  	unsigned long if_pixclk_rate;
  	int K = 1;
  
-@@ -1695,8 +1694,8 @@ static unsigned long rk3588_calc_cru_cfg
+@@ -1697,8 +1696,8 @@ static unsigned long rk3588_calc_cru_cfg
  		}
  
  		if_pixclk_rate = (dclk_core_rate << 1) / K;

target/linux/rockchip/patches-6.6/033-34-v6.8-drm-rockchip-vop2-add-a-missing-unlock-in.patch

@@ -17,7 +17,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20240119190841.1619443-1-har
 
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-@@ -1985,8 +1985,10 @@ static void vop2_crtc_atomic_enable(stru
+@@ -1987,8 +1987,10 @@ static void vop2_crtc_atomic_enable(stru
  		clock = vop2_set_intf_mux(vp, rkencoder->crtc_endpoint_id, polflags);
  	}
  

target/linux/rockchip/patches-6.6/034-15-v6.8-drm-nouveau-use-GPUVM-common-infrastructure.patch

@@ -25,7 +25,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231113221202.7203-1-dakr@r
 
 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c
 +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
-@@ -1062,17 +1062,18 @@ nouveau_bo_move(struct ttm_buffer_object
+@@ -1056,17 +1056,18 @@ nouveau_bo_move(struct ttm_buffer_object
  {
  	struct nouveau_drm *drm = nouveau_bdev(bo->bdev);
  	struct nouveau_bo *nvbo = nouveau_bo(bo);
@@ -45,7 +45,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231113221202.7203-1-dakr@r
  	nouveau_bo_move_ntfy(bo, new_reg);
  	ret = ttm_bo_wait_ctx(bo, ctx);
  	if (ret)
-@@ -1137,6 +1138,7 @@ out:
+@@ -1131,6 +1132,7 @@ out:
  out_ntfy:
  	if (ret) {
  		nouveau_bo_move_ntfy(bo, bo->resource);

target/linux/rockchip/patches-6.6/034-20-v6.7-drm-sched-Convert-the-GPU-scheduler-to-variable-number-of.patch

@@ -63,7 +63,7 @@ Link: https://lore.kernel.org/r/20231023032251.164775-1-luben.tuikov@amd.com
  				   ring->sched_score, ring->name,
 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
 +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
-@@ -325,8 +325,8 @@ void amdgpu_job_stop_all_jobs_on_sched(s
+@@ -328,8 +328,8 @@ void amdgpu_job_stop_all_jobs_on_sched(s
  	int i;
  
  	/* Signal all jobs not yet scheduled */

target/linux/rockchip/patches-6.6/035-v6.7-usb-dwc3-add-optional-PHY-interface-clocks.patch

@@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/drivers/usb/dwc3/core.c
 +++ b/drivers/usb/dwc3/core.c
-@@ -817,8 +817,20 @@ static int dwc3_clk_enable(struct dwc3 *
+@@ -818,8 +818,20 @@ static int dwc3_clk_enable(struct dwc3 *
  	if (ret)
  		goto disable_ref_clk;
  
@@ -39,7 +39,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  disable_ref_clk:
  	clk_disable_unprepare(dwc->ref_clk);
  disable_bus_clk:
-@@ -828,6 +840,8 @@ disable_bus_clk:
+@@ -829,6 +841,8 @@ disable_bus_clk:
  
  static void dwc3_clk_disable(struct dwc3 *dwc)
  {
@@ -48,7 +48,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	clk_disable_unprepare(dwc->susp_clk);
  	clk_disable_unprepare(dwc->ref_clk);
  	clk_disable_unprepare(dwc->bus_clk);
-@@ -1838,6 +1852,20 @@ static int dwc3_get_clocks(struct dwc3 *
+@@ -1824,6 +1838,20 @@ static int dwc3_get_clocks(struct dwc3 *
  		}
  	}
  

target/linux/rockchip/patches-6.6/051-01-v6.7-arm64-dts-rockchip-add-PCIe2-network-controller-to.patch

@@ -1,90 +0,0 @@
-From 86a2024d95e259c4309ced53242c0db6d993320b Mon Sep 17 00:00:00 2001
-From: Sebastian Reichel <sebastian.reichel@collabora.com>
-Date: Mon, 18 Sep 2023 16:13:26 +0200
-Subject: [PATCH] arm64: dts: rockchip: add PCIe2 network controller to
- rk3588-evb1
-
-The RK3588 EVB1 has a second network card, which is connected
-via PCIe2. This adds support for that.
-
-Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
-Link: https://lore.kernel.org/r/20230918141327.131108-2-sebastian.reichel@collabora.com
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
----
- .../boot/dts/rockchip/rk3588-evb1-v10.dts     | 43 +++++++++++++++++++
- 1 file changed, 43 insertions(+)
-
---- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
-@@ -28,6 +28,26 @@
- 		pwms = <&pwm2 0 25000 0>;
- 	};
- 
-+	pcie20_avdd0v85: pcie20-avdd0v85-regulator {
-+		compatible = "regulator-fixed";
-+		regulator-name = "pcie20_avdd0v85";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <850000>;
-+		regulator-max-microvolt = <850000>;
-+		vin-supply = <&avdd_0v85_s0>;
-+	};
-+
-+	pcie20_avdd1v8: pcie20-avdd1v8-regulator {
-+		compatible = "regulator-fixed";
-+		regulator-name = "pcie20_avdd1v8";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <1800000>;
-+		regulator-max-microvolt = <1800000>;
-+		vin-supply = <&avcc_1v8_s0>;
-+	};
-+
- 	vcc12v_dcin: vcc12v-dcin-regulator {
- 		compatible = "regulator-fixed";
- 		regulator-name = "vcc12v_dcin";
-@@ -86,6 +106,10 @@
- 	status = "okay";
- };
- 
-+&combphy2_psu {
-+	status = "okay";
-+};
-+
- &cpu_b0 {
- 	cpu-supply = <&vdd_cpu_big0_s0>;
- };
-@@ -162,7 +186,20 @@
- 	};
- };
- 
-+&pcie2x1l1 {
-+	reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pcie2_1_rst>, <&rtl8111_isolate>;
-+	status = "okay";
-+};
-+
- &pinctrl {
-+	rtl8111 {
-+		rtl8111_isolate: rtl8111-isolate {
-+			rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
-+		};
-+	};
-+
- 	rtl8211f {
- 		rtl8211f_rst: rtl8211f-rst {
- 			rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
-@@ -176,6 +213,12 @@
- 		};
- 	};
- 
-+	pcie2 {
-+		pcie2_1_rst: pcie2-1-rst {
-+			rockchip,pins = <4 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
- 	usb {
- 		vcc5v0_host_en: vcc5v0-host-en {
- 			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;

target/linux/rockchip/patches-6.6/051-02-v6.7-arm64-dts-rockchip-add-PCIe3-bus-to-rk3588-evb1.patch

@@ -1,99 +0,0 @@
-From 46bb398ea1d81302e3735087ceb4b5763d5afc29 Mon Sep 17 00:00:00 2001
-From: Sebastian Reichel <sebastian.reichel@collabora.com>
-Date: Mon, 18 Sep 2023 16:13:27 +0200
-Subject: [PATCH] arm64: dts: rockchip: add PCIe3 bus to rk3588-evb1
-
-Enable PCIe3 support, which is exposed via a PCIe3 connector.
-
-Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
-Link: https://lore.kernel.org/r/20230918141327.131108-3-sebastian.reichel@collabora.com
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
----
- .../boot/dts/rockchip/rk3588-evb1-v10.dts     | 55 +++++++++++++++++++
- 1 file changed, 55 insertions(+)
-
---- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
-@@ -48,6 +48,26 @@
- 		vin-supply = <&avcc_1v8_s0>;
- 	};
- 
-+	pcie30_avdd0v75: pcie30-avdd0v75-regulator {
-+		compatible = "regulator-fixed";
-+		regulator-name = "pcie30_avdd0v75";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <750000>;
-+		regulator-max-microvolt = <750000>;
-+		vin-supply = <&avdd_0v75_s0>;
-+	};
-+
-+	pcie30_avdd1v8: pcie30-avdd1v8-regulator {
-+		compatible = "regulator-fixed";
-+		regulator-name = "pcie30_avdd1v8";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <1800000>;
-+		regulator-max-microvolt = <1800000>;
-+		vin-supply = <&avcc_1v8_s0>;
-+	};
-+
- 	vcc12v_dcin: vcc12v-dcin-regulator {
- 		compatible = "regulator-fixed";
- 		regulator-name = "vcc12v_dcin";
-@@ -57,6 +77,19 @@
- 		regulator-max-microvolt = <12000000>;
- 	};
- 
-+	vcc3v3_pcie30: vcc3v3-pcie30-regulator {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc3v3_pcie30";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		enable-active-high;
-+		gpios = <&gpio3 RK_PC3 GPIO_ACTIVE_HIGH>;
-+		startup-delay-us = <5000>;
-+		vin-supply = <&vcc12v_dcin>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&vcc3v3_pcie30_en>;
-+	};
-+
- 	vcc5v0_host: vcc5v0-host-regulator {
- 		compatible = "regulator-fixed";
- 		regulator-name = "vcc5v0_host";
-@@ -193,6 +226,18 @@
- 	status = "okay";
- };
- 
-+&pcie30phy {
-+	status = "okay";
-+};
-+
-+&pcie3x4 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pcie3_reset>;
-+	reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;
-+	vpcie3v3-supply = <&vcc3v3_pcie30>;
-+	status = "okay";
-+};
-+
- &pinctrl {
- 	rtl8111 {
- 		rtl8111_isolate: rtl8111-isolate {
-@@ -219,6 +264,16 @@
- 		};
- 	};
- 
-+	pcie3 {
-+		pcie3_reset: pcie3-reset {
-+			rockchip,pins = <4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+
-+		vcc3v3_pcie30_en: vcc3v3-pcie30-en {
-+			rockchip,pins = <3 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
- 	usb {
- 		vcc5v0_host_en: vcc5v0-host-en {
- 			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;

target/linux/rockchip/patches-6.6/051-03-v6.8-arm64-dts-rockchip-add-ADC-buttons-to-rk3588-evb1.patch

@@ -1,76 +0,0 @@
-From afa933c208e5ea9ddf8adb460e273b2b1aba85e5 Mon Sep 17 00:00:00 2001
-From: Sebastian Reichel <sebastian.reichel@collabora.com>
-Date: Thu, 5 Oct 2023 15:43:57 +0200
-Subject: [PATCH] arm64: dts: rockchip: add ADC buttons to rk3588-evb1
-
-The Rockchip EVB1 has a couple of buttons connected via an ADC
-line. Let's add them to its devicetree.
-
-Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
-Link: https://lore.kernel.org/r/20231005134357.37171-1-sebastian.reichel@collabora.com
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
----
- .../boot/dts/rockchip/rk3588-evb1-v10.dts     | 38 +++++++++++++++++++
- 1 file changed, 38 insertions(+)
-
---- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
-@@ -7,6 +7,7 @@
- /dts-v1/;
- 
- #include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/input.h>
- #include <dt-bindings/pinctrl/rockchip.h>
- #include "rk3588.dtsi"
- 
-@@ -22,6 +23,38 @@
- 		stdout-path = "serial2:1500000n8";
- 	};
- 
-+	adc-keys {
-+		compatible = "adc-keys";
-+		io-channels = <&saradc 1>;
-+		io-channel-names = "buttons";
-+		keyup-threshold-microvolt = <1800000>;
-+		poll-interval = <100>;
-+
-+		button-vol-up {
-+			label = "Volume Up";
-+			linux,code = <KEY_VOLUMEUP>;
-+			press-threshold-microvolt = <17000>;
-+		};
-+
-+		button-vol-down {
-+			label = "Volume Down";
-+			linux,code = <KEY_VOLUMEDOWN>;
-+			press-threshold-microvolt = <417000>;
-+		};
-+
-+		button-menu {
-+			label = "Menu";
-+			linux,code = <KEY_MENU>;
-+			press-threshold-microvolt = <890000>;
-+		};
-+
-+		button-escape {
-+			label = "Escape";
-+			linux,code = <KEY_ESC>;
-+			press-threshold-microvolt = <1235000>;
-+		};
-+	};
-+
- 	backlight: backlight {
- 		compatible = "pwm-backlight";
- 		power-supply = <&vcc12v_dcin>;
-@@ -285,6 +318,11 @@
- 	status = "okay";
- };
- 
-+&saradc {
-+	vref-supply = <&vcc_1v8_s0>;
-+	status = "okay";
-+};
-+
- &sdhci {
- 	bus-width = <8>;
- 	no-sdio;

target/linux/rockchip/patches-6.6/051-04-v6.8-arm64-dts-rockchip-mark-system-power-controller-on-rk3588.patch

@@ -1,25 +0,0 @@
-From fc4657971be31ae679e2bbeee2fb8e93a7a063eb Mon Sep 17 00:00:00 2001
-From: Sebastian Reichel <sebastian.reichel@collabora.com>
-Date: Wed, 17 Jan 2024 20:14:48 +0100
-Subject: [PATCH] arm64: dts: rockchip: mark system power controller on rk3588-evb1
-
-Mark the primary PMIC as system-power-controller, so that the
-system properly shuts down on poweroff.
-
-Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
-Link: https://lore.kernel.org/r/20240117191555.86138-1-sebastian.reichel@collabora.com
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
----
- arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
-@@ -654,6 +654,7 @@
- 			    <&rk806_slave_dvs3_null>;
- 		pinctrl-names = "default";
- 		spi-max-frequency = <1000000>;
-+		system-power-controller;
- 
- 		vcc1-supply = <&vcc5v0_sys>;
- 		vcc2-supply = <&vcc5v0_sys>;

target/linux/rockchip/patches-6.6/051-05-v6.10-arm64-dts-rockchip-Enable-GPU-on-rk3588-evb1.patch

@@ -1,74 +0,0 @@
-From 75a287219a782951e671026ed4fbe611e4629c83 Mon Sep 17 00:00:00 2001
-From: Boris Brezillon <boris.brezillon@collabora.com>
-Date: Tue, 26 Mar 2024 17:52:08 +0100
-Subject: [PATCH] arm64: dts: rockchip: Enable GPU on rk3588-evb1
-
-Enable the Mali GPU in the RK3588 EVB1.
-
-This marks the GPU regulators as always-on, because the generic
-coupler regulator logic from the kernel can only handle them
-when they are marked as always-on. Technically it's okay to
-disable the regulators, when the GPU is not used.
-
-Considering the RK3588 EVB1 is not battery powered, the slightly
-increased power consumption for keeping the regulator always
-enabled is not a big deal. Thus it's better to enable GPU support
-than wait for a better solution.
-
-Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
-Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
-Link: https://lore.kernel.org/r/20240326165232.73585-5-sebastian.reichel@collabora.com
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
----
- arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
---- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
-@@ -223,6 +223,12 @@
- 	status = "okay";
- };
- 
-+&gpu {
-+	mali-supply = <&vdd_gpu_s0>;
-+	sram-supply = <&vdd_gpu_mem_s0>;
-+	status = "okay";
-+};
-+
- &i2c2 {
- 	status = "okay";
- 
-@@ -386,12 +392,16 @@
- 
- 		regulators {
- 			vdd_gpu_s0: dcdc-reg1 {
-+				/* regulator coupling requires always-on */
-+				regulator-always-on;
- 				regulator-boot-on;
- 				regulator-min-microvolt = <550000>;
- 				regulator-max-microvolt = <950000>;
- 				regulator-ramp-delay = <12500>;
- 				regulator-name = "vdd_gpu_s0";
- 				regulator-enable-ramp-delay = <400>;
-+				regulator-coupled-with = <&vdd_gpu_mem_s0>;
-+				regulator-coupled-max-spread = <10000>;
- 				regulator-state-mem {
- 					regulator-off-in-suspend;
- 				};
-@@ -436,12 +446,16 @@
- 			};
- 
- 			vdd_gpu_mem_s0: dcdc-reg5 {
-+				/* regulator coupling requires always-on */
-+				regulator-always-on;
- 				regulator-boot-on;
- 				regulator-min-microvolt = <675000>;
- 				regulator-max-microvolt = <950000>;
- 				regulator-ramp-delay = <12500>;
- 				regulator-enable-ramp-delay = <400>;
- 				regulator-name = "vdd_gpu_mem_s0";
-+				regulator-coupled-with = <&vdd_gpu_s0>;
-+				regulator-coupled-max-spread = <10000>;
- 				regulator-state-mem {
- 					regulator-off-in-suspend;
- 				};

target/linux/rockchip/patches-6.6/051-06-v6.10-arm64-dts-rockchip-add-USB3-to-rk3588-evb1.patch

@@ -1,203 +0,0 @@
-From b37146b5a555dd871cb0805446826ab2fc8d285a Mon Sep 17 00:00:00 2001
-From: Sebastian Reichel <sebastian.reichel@collabora.com>
-Date: Tue, 9 Apr 2024 00:50:35 +0200
-Subject: [PATCH] arm64: dts: rockchip: add USB3 to rk3588-evb1
-
-Add support for the board's USB3 connectors. It has 1x USB Type-A
-and 1x USB Type-C.
-
-Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
-Link: https://lore.kernel.org/r/20240408225109.128953-9-sebastian.reichel@collabora.com
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
----
- .../boot/dts/rockchip/rk3588-evb1-v10.dts     | 147 ++++++++++++++++++
- 1 file changed, 147 insertions(+)
-
---- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
-@@ -9,6 +9,7 @@
- #include <dt-bindings/gpio/gpio.h>
- #include <dt-bindings/input/input.h>
- #include <dt-bindings/pinctrl/rockchip.h>
-+#include <dt-bindings/usb/pd.h>
- #include "rk3588.dtsi"
- 
- / {
-@@ -101,6 +102,18 @@
- 		vin-supply = <&avcc_1v8_s0>;
- 	};
- 
-+	vbus5v0_typec: vbus5v0-typec-regulator {
-+		compatible = "regulator-fixed";
-+		enable-active-high;
-+		gpio = <&gpio4 RK_PD0 GPIO_ACTIVE_HIGH>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&typec5v_pwren>;
-+		regulator-name = "vbus5v0_typec";
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+		vin-supply = <&vcc5v0_usb>;
-+	};
-+
- 	vcc12v_dcin: vcc12v-dcin-regulator {
- 		compatible = "regulator-fixed";
- 		regulator-name = "vcc12v_dcin";
-@@ -232,6 +245,59 @@
- &i2c2 {
- 	status = "okay";
- 
-+	usbc0: usb-typec@22 {
-+		compatible = "fcs,fusb302";
-+		reg = <0x22>;
-+		interrupt-parent = <&gpio3>;
-+		interrupts = <RK_PB4 IRQ_TYPE_LEVEL_LOW>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&usbc0_int>;
-+		vbus-supply = <&vbus5v0_typec>;
-+		status = "okay";
-+
-+		usb_con: connector {
-+			compatible = "usb-c-connector";
-+			label = "USB-C";
-+			data-role = "dual";
-+			op-sink-microwatt = <1000000>;
-+			power-role = "dual";
-+			sink-pdos =
-+				<PDO_FIXED(5000, 1000, PDO_FIXED_USB_COMM)>;
-+			source-pdos =
-+				<PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
-+			try-power-role = "source";
-+
-+			ports {
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+
-+				port@0 {
-+					reg = <0>;
-+
-+					usbc0_orien_sw: endpoint {
-+						remote-endpoint = <&usbdp_phy0_orientation_switch>;
-+					};
-+				};
-+
-+				port@1 {
-+					reg = <1>;
-+
-+					usbc0_role_sw: endpoint {
-+						remote-endpoint = <&dwc3_0_role_switch>;
-+					};
-+				};
-+
-+				port@2 {
-+					reg = <2>;
-+
-+					dp_altmode_mux: endpoint {
-+						remote-endpoint = <&usbdp_phy0_dp_altmode_mux>;
-+					};
-+				};
-+			};
-+		};
-+	};
-+
- 	hym8563: rtc@51 {
- 		compatible = "haoyu,hym8563";
- 		reg = <0x51>;
-@@ -318,6 +384,16 @@
- 			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
- 		};
- 	};
-+
-+	usb-typec {
-+		typec5v_pwren: typec5v-pwren {
-+			rockchip,pins = <4 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+
-+		usbc0_int: usbc0-int {
-+			rockchip,pins = <3 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up>;
-+		};
-+	};
- };
- 
- &pwm2 {
-@@ -958,6 +1034,22 @@
- 	status = "okay";
- };
- 
-+&u2phy0 {
-+	status = "okay";
-+};
-+
-+&u2phy0_otg {
-+	status = "okay";
-+};
-+
-+&u2phy1 {
-+	status = "okay";
-+};
-+
-+&u2phy1_otg {
-+	status = "okay";
-+};
-+
- &u2phy2 {
- 	status = "okay";
- };
-@@ -996,3 +1088,58 @@
- &usb_host1_ohci {
- 	status = "okay";
- };
-+
-+&usbdp_phy0 {
-+	mode-switch;
-+	orientation-switch;
-+	sbu1-dc-gpios = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>;
-+	sbu2-dc-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>;
-+	status = "okay";
-+
-+	port {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		usbdp_phy0_orientation_switch: endpoint@0 {
-+			reg = <0>;
-+			remote-endpoint = <&usbc0_orien_sw>;
-+		};
-+
-+		usbdp_phy0_dp_altmode_mux: endpoint@1 {
-+			reg = <1>;
-+			remote-endpoint = <&dp_altmode_mux>;
-+		};
-+	};
-+};
-+
-+&usbdp_phy1 {
-+	/*
-+	 * USBDP PHY1 is wired to a female USB3 Type-A connector. Additionally
-+	 * the differential pairs 2+3 and the aux channel are wired to a RTD2166,
-+	 * which converts the DP signal into VGA. This is exposed on the
-+	 * board via a female VGA connector.
-+	 */
-+	rockchip,dp-lane-mux = <2 3>;
-+	status = "okay";
-+};
-+
-+&usb_host0_xhci {
-+	dr_mode = "otg";
-+	usb-role-switch;
-+	status = "okay";
-+
-+	port {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		dwc3_0_role_switch: endpoint@0 {
-+			reg = <0>;
-+			remote-endpoint = <&usbc0_role_sw>;
-+		};
-+	};
-+};
-+
-+&usb_host1_xhci {
-+	dr_mode = "host";
-+	status = "okay";
-+};

target/linux/rockchip/patches-6.6/121-01-arm64-dts-rockchip-rk3588-evb1-add-cpu-regulator-info.patch

@@ -13,7 +13,7 @@ Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
 
 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
-@@ -221,6 +221,21 @@
+@@ -118,6 +118,21 @@
  	cpu-supply = <&vdd_cpu_lit_s0>;
  };
  
@@ -35,7 +35,7 @@ Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
  &gmac0 {
  	clock_in_out = "output";
  	phy-handle = <&rgmii_phy>;
-@@ -1068,6 +1083,10 @@
+@@ -825,6 +840,10 @@
  	status = "okay";
  };
  

target/linux/rockchip/patches-6.6/301-arm64-dts-rockchip-rk3568-Add-otp-device-node.patch

@@ -11,7 +11,7 @@ Change-Id: I4ec51ba8d4e1381f787c0137cb475a21e546789d
 
 --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
-@@ -840,6 +840,47 @@
+@@ -881,6 +881,47 @@
  		};
  	};
  

target/linux/rockchip/patches-6.6/304-03-arm64-dts-rockchip-add-cpuinfo-node-for-rk3568.patch

@@ -11,7 +11,7 @@ Signed-off-by: Liang Chen <cl@rock-chips.com>
 
 --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
-@@ -129,6 +129,12 @@
+@@ -170,6 +170,12 @@
  		};
  	};
  

target/linux/rockchip/patches-6.6/602-net-ethernet-r8169-add-devname-configuration-from-OF.patch

@@ -8,7 +8,7 @@
  #include <linux/tcp.h>
  #include <linux/interrupt.h>
  #include <linux/dma-mapping.h>
-@@ -5240,6 +5241,7 @@ static int rtl_init_one(struct pci_dev *
+@@ -5413,6 +5414,7 @@ static int rtl_init_one(struct pci_dev *
  	int jumbo_max, region, rc;
  	enum mac_version chipset;
  	struct net_device *dev;
@@ -16,7 +16,7 @@
  	u32 txconfig;
  	u16 xid;
  
-@@ -5247,6 +5249,9 @@ static int rtl_init_one(struct pci_dev *
+@@ -5420,6 +5422,9 @@ static int rtl_init_one(struct pci_dev *
  	if (!dev)
  		return -ENOMEM;
  

target/linux/rockchip/patches-6.6/701-apply-rockchip-3588001-erratum-workaround-to-rk356x-as-we.patch

@@ -1,6 +1,6 @@
 --- a/drivers/irqchip/irq-gic-v3-its.c
 +++ b/drivers/irqchip/irq-gic-v3-its.c
-@@ -4756,7 +4756,9 @@ static bool __maybe_unused its_enable_rk
+@@ -4736,7 +4736,9 @@ static bool __maybe_unused its_enable_rk
  {
  	struct its_node *its = data;
  

target/linux/rockchip/patches-6.6/703-arm64-rk3568-update-gicv3-its-and-pci-msi-map.patch

@@ -38,7 +38,7 @@
  		phy-names = "pcie-phy";
 --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
-@@ -321,14 +321,21 @@
+@@ -362,14 +362,21 @@
  
  	gic: interrupt-controller@fd400000 {
  		compatible = "arm,gic-v3";
@@ -66,7 +66,7 @@
  	};
  
  	usb_host0_ehci: usb@fd800000 {
-@@ -1036,7 +1043,7 @@
+@@ -1077,7 +1084,7 @@
  		num-ib-windows = <6>;
  		num-ob-windows = <2>;
  		max-link-speed = <2>;

target/linux/rockchip/patches-6.6/711-arm64-dts-rockchip-rk3568-Add-xpcs-support.patch

@@ -12,7 +12,7 @@ Signed-off-by: David Wu <david.wu@rock-chips.com>
 
 --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
-@@ -228,6 +228,13 @@
+@@ -269,6 +269,13 @@
  		arm,no-tick-in-suspend;
  	};
  
@@ -26,7 +26,7 @@ Signed-off-by: David Wu <david.wu@rock-chips.com>
  	xin24m: xin24m {
  		compatible = "fixed-clock";
  		clock-frequency = <24000000>;
-@@ -382,6 +389,12 @@
+@@ -423,6 +430,12 @@
  		status = "disabled";
  	};
  
@@ -39,7 +39,7 @@ Signed-off-by: David Wu <david.wu@rock-chips.com>
  	pmugrf: syscon@fdc20000 {
  		compatible = "rockchip,rk3568-pmugrf", "syscon", "simple-mfd";
  		reg = <0x0 0xfdc20000 0x0 0x10000>;
-@@ -681,11 +694,13 @@
+@@ -722,11 +735,13 @@
  		clocks = <&cru SCLK_GMAC1>, <&cru SCLK_GMAC1_RX_TX>,
  			 <&cru SCLK_GMAC1_RX_TX>, <&cru CLK_MAC1_REFOUT>,
  			 <&cru ACLK_GMAC1>, <&cru PCLK_GMAC1>,

target/linux/rockchip/patches-6.6/801-04-arm64-dts-rockchip-rk356x-add-rng-node.patch

@@ -11,7 +11,7 @@ Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
 
 --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
-@@ -1081,6 +1081,15 @@
+@@ -1122,6 +1122,15 @@
  		};
  	};