From 6ee64dc3c149c2fe549f7a0677123684bd614d9c Mon Sep 17 00:00:00 2001 From: Damon Ding Date: Mon, 17 Jul 2023 18:00:49 +0800 Subject: [PATCH] ARM: dts: rockchip: fix frame rate of mcu panel to 60Hz for rv1103/rv1106 evb Signed-off-by: Damon Ding Change-Id: I32dab30576fca3df53138beb468090340c8cb1e1 --- .../boot/dts/rv1103g-evb-mcu-display-v11.dts | 36 +++++++++++++------ arch/arm/boot/dts/rv1106-evb-ext-mcu-v10.dtsi | 36 +++++++++++++------ 2 files changed, 52 insertions(+), 20 deletions(-) diff --git a/arch/arm/boot/dts/rv1103g-evb-mcu-display-v11.dts b/arch/arm/boot/dts/rv1103g-evb-mcu-display-v11.dts index 5d1c51bb86a1..5368752334bb 100644 --- a/arch/arm/boot/dts/rv1103g-evb-mcu-display-v11.dts +++ b/arch/arm/boot/dts/rv1103g-evb-mcu-display-v11.dts @@ -161,20 +161,23 @@ 00 00 01 36 01 00 01 48 - 00 00 01 3a //interface mode control - 01 00 01 77 //spi rgb:66(r1 r4 r5) mcu parallel: 55(r2 r3 r6) - // mcu serial: 77(r1 r3 r6) + 00 00 01 3a //interface pixel format + 01 00 01 77 // bpp cfg + // 3 11 + // 16 55 + // 18 66 + // 24 77 00 00 01 b0 //interface mode control 01 00 01 00 - 00 00 01 b1 //frame rate 70hz - 01 00 01 b0 + 00 00 01 b1 //frame rate 60hz + 01 00 01 a0 01 00 01 11 00 00 01 b4 01 00 01 02 - 00 00 01 B6 //RGB/MCU Interface Control - 01 00 01 02 //02 mcu, 32 rgb + 00 00 01 B6 + 01 00 01 02 01 00 01 02 00 00 01 b7 @@ -208,7 +211,7 @@ native-mode = <&kd050fwfba002_timing>; kd050fwfba002_timing: timing0 { - clock-frequency = <20000000>; + clock-frequency = <73174500>; hactive = <320>; vactive = <480>; hback-porch = <10>; @@ -267,10 +270,23 @@ &vop { status = "okay"; + /* + * Default config is as follows: + * + * mcu-pix-total = <9>; + * mcu-cs-pst = <1>; + * mcu-cs-pend = <8>; + * mcu-rw-pst = <2>; + * mcu-rw-pend = <5>; + * mcu-hold-mode = <0>; // default set to 0 + * + * Ruduce all parameters because the max vop dclk + * is 74.25M in rv1106. + */ mcu-timing { - mcu-pix-total = <9>; + mcu-pix-total = <7>; mcu-cs-pst = <1>; - mcu-cs-pend = <8>; + mcu-cs-pend = <6>; mcu-rw-pst = <2>; mcu-rw-pend = <5>; diff --git a/arch/arm/boot/dts/rv1106-evb-ext-mcu-v10.dtsi b/arch/arm/boot/dts/rv1106-evb-ext-mcu-v10.dtsi index cbc2e6ac6a16..d862112e99dd 100644 --- a/arch/arm/boot/dts/rv1106-evb-ext-mcu-v10.dtsi +++ b/arch/arm/boot/dts/rv1106-evb-ext-mcu-v10.dtsi @@ -155,20 +155,23 @@ 00 00 01 36 01 00 01 48 - 00 00 01 3a //interface mode control - 01 00 01 55 //spi rgb:66(r1 r4 r5) mcu parallel: 55(r2 r3 r6) - // mcu serial: 77(r1 r3 r6) + 00 00 01 3a //interface pixel format + 01 00 01 55 // bpp cfg + // 3 11 + // 16 55 + // 18 66 + // 24 77 00 00 01 b0 //interface mode control 01 00 01 00 - 00 00 01 b1 //frame rate 70hz - 01 00 01 b0 + 00 00 01 b1 //frame rate 60hz + 01 00 01 a0 01 00 01 11 00 00 01 b4 01 00 01 02 - 00 00 01 B6 //RGB/MCU Interface Control - 01 00 01 02 //02 mcu, 32 rgb + 00 00 01 B6 + 01 00 01 02 01 00 01 02 00 00 01 b7 @@ -202,7 +205,7 @@ native-mode = <&kd050fwfba002_timing>; kd050fwfba002_timing: timing0 { - clock-frequency = <20000000>; + clock-frequency = <73174500>; hactive = <320>; vactive = <480>; hback-porch = <10>; @@ -261,10 +264,23 @@ &vop { status = "okay"; + /* + * Default config is as follows: + * + * mcu-pix-total = <9>; + * mcu-cs-pst = <1>; + * mcu-cs-pend = <8>; + * mcu-rw-pst = <2>; + * mcu-rw-pend = <5>; + * mcu-hold-mode = <0>; // default set to 0 + * + * Ruduce all parameters because the max vop dclk + * is 74.25M in rv1106. + */ mcu-timing { - mcu-pix-total = <9>; + mcu-pix-total = <7>; mcu-cs-pst = <1>; - mcu-cs-pend = <8>; + mcu-cs-pend = <6>; mcu-rw-pst = <2>; mcu-rw-pend = <5>;