Commit Graph

41 Commits

Author SHA1 Message Date
Tao Huang
d4ae9d6ea7 Merge commit '40fac1a66ccf61bdf3afb70c18a5db7791410b22'
* commit '40fac1a66ccf61bdf3afb70c18a5db7791410b22': (220 commits)
  Revert "tee: optee: interrupt an RPC when supplicant has been killed"
  Revert "tee: optee: interrupt an RPC depend on shutdown flag"
  arm64: dts: rockchip: rv1126bp-evb-v14: Adjust the matching voltage
  media: rockchip: aiisp: delete one temp buffer to reduce memory
  media: rockchip: isp: mp output buf notice to aiisp
  media: rockchip: aiisp: modify for aiynr algo
  rtc: rockchip: add ready flag for rtc setting time
  soc: rockchip: cpuinfo: export chip unique id to userspace
  media: rockchip: vpss: offline mode support auto unite output
  drm/rockchip: vop2: Add "DIMMING_DATA" property for local dimming
  media: rockchip: isp: aiisp switch for offline mode
  media: rockchip: isp: aiisp switch for isp35
  media: rockchip: isp: support aiisp yuv mode
  input: touchscreen: gt1x: prefix global variables and functions with "gt1x_"
  MALI: valhall: add gpu mem sysfs entry
  drm/rockchip: Make the DRM panel as part of Rockchip DRM sub devices for panel loader protect
  drm/rockchip: Pass struct rockchip_drm_sub_dev for &rockchip_drm_sub_dev.loader_protect()
  pwm: rockchip: Add &rockchip_pwm_chip.oneshot_valid to indicate validity of configurations
  pwm: rockchip: Add comments for why to add delay before disabling the dclk for PWM v4
  input: touchscreen: hyn: reduce logs
  ...

Change-Id: I1b562efca0842173010b2506231d7200a5116e5a
2025-07-29 17:16:09 +08:00
Tao Huang
96ba0fabb7 arm64: dts: rockchip: rfkill switch to use gpiod
sed -i \
-e 's/uart_rts_gpios/uart_rts-gpios/' \
-e 's/BT,power_gpio/BT,power-gpios/' \
-e 's/BT,reset_gpio/BT,reset-gpios/' \
-e 's/BT,wake_gpio/BT,wake-gpios/' \
-e 's/BT,wake_host_irq/BT,wake_host-gpios/' \
-e 's/WIFI,poweren_gpio/WIFI,poweren-gpios/' \
-e 's/WIFI,vbat_gpio/WIFI,vbat-gpios/' \
-e 's/WIFI,reset_gpio/WIFI,reset-gpios/' \
-e 's/WIFI,host_wake_irq/WIFI,host_wake-gpios/' \
(git ls-files arch/arm64/boot/dts/rockchip/)

Change-Id: I8d5b76f4a666ecbeaacd5d3257521bcc4860e81c
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2025-07-25 12:22:53 +08:00
Zhibin Huang
4f3c5c6bc7 arm64: dts: rockchip: Add hyn touchscreen support
Type: Function
Redmine ID: #N/A
Associated modifications: I649a447919003574d907b83b10ba3fd7496ad492
Test: N/A

Signed-off-by: Zhibin Huang <zhibin.huang@rock-chips.com>
Change-Id: I310e7bf9f743accd3bc9b1f26c30a6b4fc3cd3c7
2025-06-27 01:26:16 +00:00
Jon Lin
2586765a7c arm64: dts: rockchip: rk356x boards: Fix to regulator to unique name
Change-Id: I113c8f14c8386bd16d81775459b9ca4b51e47f68
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2024-02-29 17:10:41 +08:00
Zou Dengming
0d1ab9be85 arm64: dts: rockchip: rk356x boards: prepare bt sco settings
we don't directly enable all evb board to support bt-sco cards
because it may take some i2s/pcm, which may use dma,
but dmas may limit.

so we just prepare this settings, then if any one who want to
support bt-sco, he/she can just add dts in board-level dts.

now, we just enable rk3568-evb1 and rk3566-evb1 just for example.
Diff in "rk3568-evb1-ddr4-v10.dts" is like this:

+&bt_sco {
+	status = "okay";
+};
+
+&bt_sound {
+	status = "okay";
+};
+
+&i2s3_2ch {
+	status = "okay";
+};

The default pcm/i2s setting is:
Format: PCM, dsp_a, MSB first, short sync, rising edge and delay 1 bclk.
rockchip soc: master; Bt controller: slave

Change-Id: I6668bfbb87e4b0ea71a661bbcf8248cbde77974e
Signed-off-by: Zou Dengming <marsow.zou@rock-chips.com>
2023-06-19 10:41:30 +08:00
Jiajian Wu
0f5197b688 arm64: dts: rockchip: rk809 compatible to rockchip,multicodecs-card
Signed-off-by: Jiajian Wu <jair.wu@rock-chips.com>
Change-Id: I72dd4bb6e7c24c364e65dfd0e70dc0b14b78bef2
2022-09-19 20:11:52 +08:00
Jianqun Xu
17e9559f67 arm64: dts: rockchip: rk356x-evb: fix pcie supply to regulator-fixed
The pcie supply design is (rk3566 evb2 example)
DC12V
  -> VCC12V_PCIE(controlled by GPIO0_C2_H)
  -> VCC3V3_PCIE(controlled by GPIO0_C2_H)
  -> VCC5V0_SYS
       -> VCC3V3_PI6C(controlled by GPIO0_C2_H)

The pci phy driver only want to enable or disable the VCC3V3_PCIE power.

Suggested from pcie owner to ignore the VCC12V_PCIE and VCC3V3_PI6C, so
the dts only need to add regulator node for VCC3V3_PCIE.

Most of time we keep the regulator name same as the hardware design, so
the dts node is
    vcc3v3_pcie: gpio-regulator {
        compatible = "regulator-fixed";
        regulator-name = "vcc3v3_pcie";
        regulator-min-microvolt = <3300000>;
        regulator-max-microvolt = <3300000>;
        enable-active-high;
        gpio = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
        vin-supply = <&dc_12v>;
    };

The regulator type is "regulator-fixed" since its voltage always be
3.3v, min and max should be 3300000 make the regulator has a voltage
value.

The regulator can be enabled or disabled by regulator_enable or
regulator_disable function, so make the GPIO0_B7 as "ena_pin" for the
regulator.

The regulator is supplied by DCIN_12V, so add the vin-supply.

Some boards need a delay before enabling trainning for power to be
stable from the measurement.

By measurement, 5ms is enough for power and refclk to be stable.

Change-Id: Iaf70abe9c9e06504af067dc0e3d60b775557c026
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-11-02 14:43:52 +08:00
Wu Liangqing
eca54de333 arm64: dts: rockchip: rk356x-evb enabled work led
Change-Id: Id5ab430ae0b417646e416ee894929ee4e45f05f5
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2021-07-06 19:23:38 +08:00
Guochun Huang
0f20a27adc arm64: dts: rockchip: rk3568: rename mipi_dphy to video_phy
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: Ie019c9d27e06328d45920d41c0a065f8bc47588f
2021-07-06 16:53:47 +08:00
Shawn Lin
78f9ac0daa treewide: Migrate rockchip dts file to use new host type tags
supports-* stuff were used for rockchip platforms to speed up booting
if we know what exactly the host was used for. As we have upstreamed all
these with some very similar ways, now it's the time we migrate our dts
files to use new properties.

They were converted by:

sed -i "s/supports-emmc;/no-sdio;\n\tno-sd;/g" `grep supports-emmc -rl arch/*`
sed -i "s/supports-sd;/no-sdio;\n\tno-mmc;/g" `grep supports-sd -rl arch/*`
sed -i "s/supports-sdio;/no-sd;\n\tno-mmc;/g" `grep supports-sdio -rl arch/*`

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I33e5317ee5c7305803cf18ff4a370658abf555b0
2021-04-13 14:40:36 +08:00
Shunqing Chen
ba901481e0 arm64: dts: rockchip: rk356x: evb: add hdmi phy-table
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I7314c505028f2e69698b693a036da8162c4842d8
2021-03-16 10:03:01 +08:00
Shawn Lin
3677e0f619 arm64: dts: rockchip: rk356x: correct gpio regulator usage
Should not be zero ahead, otherwise the min voltage is interpreted
as a wrong value by regulator code.

Change-Id: Ia141583f411a54bf26cb88b3992687539f29fec8
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2021-03-15 17:10:59 +08:00
Guochun Huang
4c48b468d0 arm64: dts: rockchip: rk356x evb: dsi0 is mounted on vp1 by default
Change-Id: I4a1d2c8842dcd4880380962c952a6ba13ad8919d
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2021-02-17 19:57:03 +08:00
Wu Liangqing
efe597fbcd arm64: dts: rockchip: rk3566-evb1: enable mipi camera ov5695
Change-Id: I953dac7da0b10da8e547c7454d3e97cc919c047c
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2021-02-04 10:46:22 +08:00
Allon Huang
26e6c34da6 arm64: dts: rockchip: rk3568: add csi2 dphy for dual mode
replace csi_dphy with csi2_dphy0, csi2_dphy1 and csi2_dphy2
for rk356x csi2 dphy dual mode

Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I53f5edcf36bcf3cdf84174d44cb6c99703940ea3
2021-01-28 10:40:54 +08:00
Jianhui Wang
259ea199e5 arm64: rockchip: dts: enable pcie for rk356x evb
Signed-off-by: Jianhui Wang <wjh@rock-chips.com>
Change-Id: I31906f667315e67f633e2cd98d832731540e8131
2021-01-22 20:12:59 +08:00
Alex Zhao
a6107c8add Revert "arm64: dts: rockchip: change the wifi power-on method for rk356x evb"
This reverts commit e37604f00f.

Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I90a96482445710b6089acd5b6ad19264462b35f7
2021-01-05 17:53:47 +08:00
Liang Chen
f6773f97c2 arm64: dts: rockchip: correct root compatible for rk3566 board
Change-Id: I57b9e45b4b5b02e8e0511d1d90a0a57c8f139749
Signed-off-by: Liang Chen <cl@rock-chips.com>
2020-12-29 18:05:01 +08:00
Wu Liangqing
1a514e6425 arm64: dts: rockchip: rk3368-evb1: i2c2 pinctrl set to i2c2m1_xfer
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Change-Id: If5cb0f90a0a47b94f67f3f9f39a41ffd0a5633ce
2020-12-25 17:26:57 +08:00
Allon Huang
e8fba342ae arm64: dts: rockchip: rk3566-evb1-ddr4-v10: links ov02k10 with vicap by mipi split mode
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I8547af9aa5d956b2105390bb5cbb962fa9552f7a
2020-12-24 17:17:25 +08:00
Wu Liangqing
f33ac42bfe arm64: dts: rockchip: enable dsi uboot logo display for rk356x evb
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Change-Id: Iac2bc0eef65262798dd3c6b61ffc9711bee58597
2020-12-24 14:59:26 +08:00
Alex Zhao
e37604f00f arm64: dts: rockchip: change the wifi power-on method for rk356x evb
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I2859c7e701ae7f023894e19a2e9fd96f6f5df9db
2020-12-18 10:31:57 +08:00
Wyon Bi
a3a274057c arm64: dts: rockchip: rk3566-evb1-ddr4-v10: Add edp2vga bridge support
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I9d61c86972027431aa7a043887e0a28df6a86370
2020-12-07 14:25:42 +08:00
Liang Chen
caeb5624bb arm64: dts: rockchip: adjust include file for rk356x board
Change-Id: I74ff7ae2017bd8e016cbbaec2a51d50412d3090c
Signed-off-by: Liang Chen <cl@rock-chips.com>
2020-12-05 14:36:55 +08:00
Algea Cao
d0192bd84e arm64: dts: rockchip: rk3566-evb1-ddr4-v10: Add hdmi phy config table
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I5b97019b930de26eb38851ada6aaab47446cd75b
2020-11-30 11:09:17 +08:00
Tao Huang
64be1e46bd arm64: dts: rockchip: rk3566-evb1-ddr4-v10: Sort the nodes alphabetically
And clean up.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I8eafbbd9f2356ffaa5a849a8a1d80c4ccd753530
2020-11-30 10:44:46 +08:00
Jianqun Xu
1c085731f3 arm64: dts: rockchip: re-generate rk3568-pinctrl.dtsi by tool
This patch to generate the rk3568-pinctrl.dtsi again by pin2dts tool
which has been updated with some bugs fixed, such as lack of comment
for some nodes.

Now the pin2dts can generate the auto part of pinctrl file absolutely,
changes including:

* file header

/SPDX-License head
/#include <something>
&pinctrl {

};

* full rules

make the auto part can be generated by rules without any handly modify
special case: pwm4 which may be matched as pw-m4, that means the module
is pw and its mux mode is m4.

Change-Id: Ia92668ab938c1c05dfe430cf67b6f73bafaa31c3
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-11-26 15:32:07 +08:00
Sugar Zhang
192c2fd5c5 arm64: dts: rockchip: rk3566-evb1-ddr4-v10: Remove unused property for i2s3
Change-Id: Ic4482f337e22b7ee633212c3008cac3373fb5423
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2020-11-20 10:06:01 +08:00
William Wu
2495fa0c05 arm64: dts: rockchip: fix usb nodes for rk356x boards
This patch adds phy property for usb on various rk356x boards.
3566 EVB1 1 x USB2.0 OTG(Micro USB2.0) + 1 x USB3.0 HOST + 2 x USB2.0 HOST
3566 EVB2 1 x USB2.0 OTG(Micro USB2.0) + 1 x USB3.0 HOST + 2 x USB2.0 HOST
3566 EVB3 1 x USB2.0 OTG(Micro USB2.0) + 1 x USB3.0 HOST(mux with SATA, default for SATA) + 2 x USB2.0 HOST
3568 EVB1 1 x USB3.0 OTG(Type-A USB3.0 + Micro USB2.0)+ 1 x USB3.0 HOST + 2 x USB2.0 HOST
3568 EVB6 1 x USB3.0 OTG(Type-A USB3.0 + Micro USB2.0)+ 3 x USB2.0 HOST

Change-Id: If1e2cdb03e50e770337648f59f0375034b7062cd
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-11-19 20:50:25 +08:00
Sugar Zhang
1b8e5ce927 arm64: dts: rockchip: rk3568: Move property '#sound-dai-cells" into dtsi
Change-Id: Ia4a24f5730c8e985e7ec59d5f9174a7ce3d0e2f8
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2020-11-17 10:56:47 +08:00
Shunqing Chen
6d3df02fea arm64: dts: rockchip: enable hdmi in rk3568-evb
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I6cf09d56bfd81c855d1b7226bad7e2ae54e2f231
2020-11-16 10:43:57 +08:00
Shawn Lin
4d3d4ee8b4 arm64: dts: rockchip: Move PCIe2x1 from rk3568-evb1-ddr4-v10 to rk3566-evb1-ddr4-v10
Change-Id: Ia795bb888c8cda5d0c400e358adafc4e70142489
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-11-12 19:10:55 +08:00
Shunqing Chen
f701ad8fcf arm64: dts: rockchip: rk3566-evb1-ddr4-v10: enable hdmi
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: Id8da4262ffa855c70a1ec5b71ea74236c681fe17
2020-11-12 17:03:16 +08:00
Sugar Zhang
b52bf64a33 arm64: dts: rockchip: rk3566-evb1-ddr4-v10: Add audiopwmout differential
Change-Id: I5e3631b9d39cb6c213e6d6994b05a66b1ef4bc94
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2020-11-12 12:17:43 +08:00
Sandy Huang
05d15d5e4a arm64: dts: rockchip: rk356x-evb: move dsi config position
Change-Id: I01f64a949638c66972fbe57895a5488e0dbc2d59
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-11-12 11:26:01 +08:00
Alex Zhao
209bad83d1 arm64: dts: rockchip: rk3566-evb1-ddr4-v10: fix for wifi/bt
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I5beeb417f237e9cf306aa75743e02dc529690aa5
2020-11-11 11:28:04 +08:00
Guochun Huang
14586d46dd arm64: dts: rockchip: rk3568-evb: add dsi1
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I83b937aab46a9e4f28fb3540506dfb2305572e85
2020-11-11 11:21:57 +08:00
William Wu
c90049e2ed arm64: dts: rockchip: rk3566-evb1-ddr4-v10: enable combphy1 for usb3 host
Change-Id: I6d76fe988714803fbab91d9a6ae4236b617dadae
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-11-11 10:51:31 +08:00
David Wu
20357c5158 arm64: dts: rockchip: rk356x: Change the rgmii delayline for rk3566-evb1
Change-Id: I95ce22b63785b5caf2abad5a4fd944b79ca51e33
Signed-off-by: David Wu <david.wu@rock-chips.com>
2020-11-11 09:36:47 +08:00
Sugar Zhang
137ae27cb6 arm64: dts: rockchip: rk3566-evb1-ddr4-v10: Add pdm mic array
Change-Id: Ie89eca219d5b9d6cdb79588991122e86638ddcac
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2020-11-10 18:15:17 +08:00
Tao Huang
0773b58497 arm64: dts: rockchip: Add rk3566-evb1-ddr4-v10.dtsi
Prepare to add rk3566-evb1-ddr4-v10-linux.dts.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I305555c38dd36947cff654bf708720332037707e
2020-11-10 14:35:47 +08:00