Merge using ours merge strategy.
* commit 'a4ed886f15adaf1dcdc47c89b6f65408eb48026e':
drm/rockchip: lvds: using readable connector name when dual lvds enabled
Change-Id: Ie7cfb06bc1db68503ba9a75650e9cba3d01f9bf4
When we enable Dual LVDS, there will be the following
output in the VOP summary node:
$ cat /sys/kernel/debug/dri/0/summary
...
Video Port1: ACTIVE
Connector: LVDS-1
...
The connector information here is not clear enough. When Dual LVDS is enabled,
both LVDS-0 and LVDS-1 will be enabled (but we will only expose one connector
to user space for operation, which can shield the underlying differences).
In addition, if only LVDS1 is enabled instead of using Dual LVDS,
"LVDS-1" will also be printed here.
In order to express this information more accurately, we will change
the corresponding connector name to "LVDS-DUAL" when using Dual LVDS:
$ cat /sys/kernel/debug/dri/0/summary
...
Video Port1: ACTIVE
Connector: LVDS-DUAL
...
Change-Id: I9621338c8bdec4b32772c3558d55b5b426d3ccc4
Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
when vp0 is disabled, the vop2->vps[0].rockchip_crtc.crtc.state is NULL.
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I93b3ea4f3ddc6076f2105ebcabf7317627b602a3
When we enable Dual LVDS, there will be the following
output in the VOP summary node:
$ cat /sys/kernel/debug/dri/0/summary
...
Video Port1: ACTIVE
Connector: LVDS-1
...
The connector information here is not clear enough. When Dual LVDS is enabled,
both LVDS-0 and LVDS-1 will be enabled (but we will only expose one connector
to user space for operation, which can shield the underlying differences).
In addition, if only LVDS1 is enabled instead of using Dual LVDS,
"LVDS-1" will also be printed here.
In order to express this information more accurately, we will change
the corresponding connector name to "LVDS-DUAL" when using Dual LVDS:
$ cat /sys/kernel/debug/dri/0/summary
...
Video Port1: ACTIVE
Connector: LVDS-DUAL
...
Change-Id: I9621338c8bdec4b32772c3558d55b5b426d3ccc4
Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
1. Add a way to trigger soft interrupts for rpmsg communication
soft irq refers to reserved irq in shared peripheral interrupt (SPI).
2. Rename rockchip_rpmsg.c to rockchip_rpmsg_mbox.c.
Change-Id: I8007f4b77ba669073db9074e9c19623c37c27fb6
Signed-off-by: Hongming Zou <hongming.zou@rock-chips.com>
The mmc_idmac run at the address [512KB ~ (2M - 8KB)] which is SPL's
Stack and Heap.
SPL'mmc_idmac use malloc and Kernel reserve this memory.
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I267759d6acd1137a19e0e5d534c481b8f579b1ee
Avoid the *clk_emmc* are disabled by *unused_off* when the ramdisk is
too large.
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I38b6f33ab55fbb65781ee266237382c977848e68
Fixes: 5577e94f30 ("Mali: midgard: Use new APIs for devfreq")
Change-Id: I55e2e037b5d1ef338abfc863d5d7d03534806cc0
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Some product scenarios would like the rtos's memory space always been
exclusive.
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Ib71da6b355995ab5b12ddfdf346bbce8e1852745
1. update rockchip tiled modifier format define;
2. add rockchip rfbc modifier format define, rfbc is rockchip
framebuffer compression format, it's will supported by rockchip
video decoder, RGA and VOP modules, and the superblocks size is 64x4.
Fixes: f727d3ad8e ("drm/fourcc: Add definitions for Rockchip vendor and VPU tiled format")
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ice06eda4819254ba670a7231836cabe46bc38137
Merge using ours merge strategy.
* commit '534dc2d08b251dc7d13aa005626ed3b6fddf389f':
media: rockchip: vicap support capture raw online with only one buffer
Change-Id: Ia0f1bd6381a643d251b09f5af2a51759d036063b
* commit 'af37f2152d1bdc8e2859810c51bc441bf67e780d':
media: rockchip: vicap fixes suspend/resume
phy: rockchip: mipi csidphy fixed register of write/read out of range
Mali: bifrost: log: Add task_comm of contexts in OOM notification log
Mali: bifrost: log: Add pid and task_comm of contexts in the info read from node "gpu_memory"
arm64: configs: px30_linux_defconfig: enable CONFIG_DRM_IGNORE_IOTCL_PERMIT
phy: rockchip: mipi-dcphy: fix null point cause reboot issue
BACKPORT: pinctrl: rockchip: fix reading pull type on rk3568
ASoC: rockchip: sai: Use DMC-DVFS-SCENE for HBR audio
ASoC: rockchip: i2s: Use DMC-DVFS-SCENE for HBR audio
Change-Id: Ibecb4b81024dfd6ad6df341784ca637b2b0c270a
* commit 'adb52b660051c9ff11d4509a807035f9d952a27a':
ASoC: rockchip: i2s-tdm: Use DMC-DVFS-SCENE for HBR audio
ASoC: rockchip: Introduce rockchip utils common API
mtd: spinand: xtx: Support new device XT26G0xDWSIGA
PM / devfreq: rockchip_dmc: support get dmcfreq stall time
Change-Id: I16ba5a625b339e3dbcd8628a2b48266c783ae68f
Conflicts:
sound/soc/rockchip/rockchip_i2s_tdm.c
* commit '059a18f32f1db89e019885d2c9786dfe9b65ca3c':
misc: rockchip: pcie-rkep: Support clear id for pcie_rkep_release
misc: rockchip: pcie-rkep: Support raising ep elbi int by ioctl
misc: rockchip: pcie-rkep: Support adding virtual id by ioctl
serial: 8250_dma: fix bug when tx dma is enable
arm64: dts: rockchip: rk3588-vehicle-evb: improve lcd init of serdes display
mfd: display-serdes: add soft reset and delay control support
ARM: configs: rockchip: update rv1106-wakeup.config
ARM: dts: rockchip: update rv1106g-evb2-v12-wakeup
Change-Id: I5c1687d7bab6e49ad160245f40df571090d7e0ed
Set input direction to avoid FLAG_IS_OUT in gpiochip_lock_as_irq
Fixes: adc8b4bf2a ("gpio: rockchip: lock GPIOs used as interrupts")
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: Ib5bb752b410894cd0fd9694f332f902d07ca9701
