diff --git a/arch/arm64/boot/dts/rockchip/rk3576-rk806.dtsi b/arch/arm64/boot/dts/rockchip/rk3576-rk806.dtsi
index 423b9d7fe310..705d77527536 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-rk806.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3576-rk806.dtsi
@@ -30,13 +30,13 @@
 		hotdie_temperture_threshold = <115>;
 		/* shutdown sequence */
 		shutdown-sequence = <2 2 2 0 2 0 2 1 1 2
-				     1 0 0 0 0 2
-				     2 2 2 2 2>;
+					2 2 2 2 2
+					1 0 0 0 0 2>;
 
 		/* low power forced shutdown sequence */
 		vb-shutdown-sequence = <2 2 2 0 2 0 2 0 0 2
-					0 0 0 0 0 2
-					2 2 2 2 2>;
+					2 2 2 2 2
+					0 0 0 0 0 2>;
 
 		/* 0: restart PMU;
 		 * 1: reset all the power off reset registers,
diff --git a/arch/arm64/boot/dts/rockchip/rk3576-tablet.dtsi b/arch/arm64/boot/dts/rockchip/rk3576-tablet.dtsi
index 5f0c49e537ee..f6e7fc2a19e6 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-tablet.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3576-tablet.dtsi
@@ -494,13 +494,13 @@
 		hotdie_temperture_threshold = <115>;
 		/* shutdown sequence */
 		shutdown-sequence = <2 2 2 0 2 0 2 1 1 2
-					1 0 0 0 0 2
-					2 2 2 2 2>;
+					2 2 2 2 2
+					1 0 0 0 0 2>;
 
 		/* low power forced shutdown sequence */
 		vb-shutdown-sequence = <2 2 2 0 2 0 2 0 0 2
-					0 0 0 0 0 2
-					2 2 2 2 2>;
+					2 2 2 2 2
+					0 0 0 0 0 2>;
 
 		/* PWRON_ON_TIME: 0:500mS; 1:20mS */
 		pwron-on-time-500ms;
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index bd70cfa3e5b4..f0d79e614aa4 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -3094,7 +3094,7 @@ static size_t vop_crtc_bandwidth(struct drm_crtc *crtc,
 
 	sort(pbandwidth, cnt, sizeof(pbandwidth[0]), vop_bandwidth_cmp, NULL);
 
-	vop_bw_info->line_bw_mbyte = vop_calc_max_bandwidth(pbandwidth, 0, cnt, vdisplay);
+	line_bw_mbyte = vop_calc_max_bandwidth(pbandwidth, 0, cnt, vdisplay);
 	kfree(pbandwidth);
 	/*
 	 * line_bandwidth(MB/s)
diff --git a/drivers/mtd/nand/spi/zbit.c b/drivers/mtd/nand/spi/zbit.c
index 466a67a467b0..170af8a03dbe 100644
--- a/drivers/mtd/nand/spi/zbit.c
+++ b/drivers/mtd/nand/spi/zbit.c
@@ -63,6 +63,15 @@ static const struct spinand_info zbit_spinand_table[] = {
 					      &update_cache_variants),
 		     0,
 		     SPINAND_ECCINFO(&zb35q01b_ooblayout, NULL)),
+	SPINAND_INFO("ZB35Q04BYIG",
+		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_ADDR, 0xA3),
+		     NAND_MEMORG(1, 2048, 128, 128, 2048, 40, 1, 1, 1),
+		     NAND_ECCREQ(8, 512),
+		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
+					      &write_cache_variants,
+					      &update_cache_variants),
+		     SPINAND_HAS_QE_BIT,
+		     SPINAND_ECCINFO(&zb35q01b_ooblayout, NULL)),
 };
 
 static const struct spinand_manufacturer_ops zbit_spinand_manuf_ops = {