mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '40fac1a66ccf61bdf3afb70c18a5db7791410b22'

Browse Source 
* 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
This commit is contained in:
Tao Huang
2025-07-28 16:41:15 +08:00
parent bfa6f2f019 40fac1a66c
commit d4ae9d6ea7
600 changed files with 65145 additions and 38612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
arch/arm64/boot/dts/rockchip/rk3562-dictpen-test3-v20.dts
View File

@@ -919,6 +919,26 @@
power-supply = <&vcc3v3_lcd>;
};
hynitron: hynitron@5a {
compatible = "hyn,3240";
reg = <0x5a>;
power-supply = <&vcc3v3_lcd>;
pinctrl-names = "ts_active","ts_suspend";
pinctrl-0 = <&ts_int_active &ts_reset_active>;
pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;
reset-gpios = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>;
irq-gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_LOW>;
max-touch-number = <5>;
display-coords = <0 0 1080 1920>;
pos-swap = <0>;
posx-reverse = <0>;
posy-reverse = <0>;
};
};
&i2c5 {
@@ -1012,6 +1032,22 @@
<0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_up>,
<0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
};
ts_int_active: ts_int_active {
rockchip,pins = <0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_up>;
};
ts_reset_active: ts_reset_active {
rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up>;
};
ts_int_suspend: ts_int_suspend {
rockchip,pins = <0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_down>;
};
ts_reset_suspend: ts_reset_suspend {
rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
sdio-pwrseq {