From 0b1e5016540e0feb0f250129235045a08989488d Mon Sep 17 00:00:00 2001 From: Jon Lin Date: Fri, 8 Nov 2024 15:01:08 +0800 Subject: [PATCH 1/3] mtd: spinand: Zbit: Support new device ZB35Q04BYIG Change-Id: I5312eca70a3ec9baf41c39016eee38f036e9dbd2 Signed-off-by: Jon Lin --- drivers/mtd/nand/spi/zbit.c | 9 +++++++++ 1 file changed, 9 insertions(+) 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 = { From 11a8c1d021c6eb15bce22fcc7015a18528bdd47e Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Fri, 11 Oct 2024 16:15:31 +0800 Subject: [PATCH 2/3] drm/rockchip: vop: fix line_bw_mbyte init value error Signed-off-by: Sandy Huang Change-Id: I62b374ebdf9f468fca50ee9662c487adc9d1fc2f --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From 2cf096b707117b9cba7268f2ac94c20db50bcc89 Mon Sep 17 00:00:00 2001 From: Shengfei Xu Date: Fri, 8 Nov 2024 15:47:16 +0800 Subject: [PATCH 3/3] arm64: dts: rockchip: rk3576-rk806/tablet: Fix the shutdown sequence for rk806 Change-Id: I609c5e6e2929ba57aa1587d28765ff556d7f28ed Signed-off-by: Shengfei Xu --- arch/arm64/boot/dts/rockchip/rk3576-rk806.dtsi | 8 ++++---- arch/arm64/boot/dts/rockchip/rk3576-tablet.dtsi | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) 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;