* commit '5fe35955d774cc30268c13ee4d8b7a5709505269':
input: rockchip_pwm_remotectl: add pwm v4 support
misc: rk628: optimize input and output mode information
ARM: dts: rockchip: rk3036-evb1-ddr3-v10: unify the rk628 node name of interface in dts
arm64: dts: rockchip: rk3568-evb-rk628: unify the node name of interface in dts
misc: rk628: unify the node name of interface in dts
Change-Id: I9890cae140709f25f67aa4a607e357ad88492cce
Merge made by the 'ours' strategy.
* commit 'bed6817b766a80ed9d49bbad3b5e3c6935778907':
video: rockchip: mpp: fix get drv data type err
Change-Id: I6684d33e761119b4767bdb1ce083ff9c9bcea12a
* commit '079fa67494942657b96ed069c0dba21a5d57b88e':
soc: rockchip: ipa: Avoid NULL pointer when get static power
media: rockchip: vicap update frame buffer with real frame phase when work with multi_dev combine to one
Change-Id: I2f6e8db6084394f128feea501323cb26984535a4
Fix issue that he drvdata obtained through dev_get_drvdata
does not match the converted type.
Change-Id: I4f5835c2fed609714ac6cb94197ca84a489a3d23
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
1. Fixed the issue where the log displays input and output mode
information abnormally in some scenarios.
2. The input and output mode information of log and summary are
obtained from the same function to facilitate later maintenance.
Type: Fix
Redmine ID: N/A
Associated modifications: N/A
Test: dmesg | grep "rk628.*input_mode.*output_mode"
cat /sys/kernel/debug/rk628/2-0050/summary
Signed-off-by: Zhibin Huang <zhibin.huang@rock-chips.com>
Change-Id: I9c4549d1673417701dc929432b96fa802632e63c
Fix issue that he drvdata obtained through dev_get_drvdata
does not match the converted type.
Change-Id: I4f5835c2fed609714ac6cb94197ca84a489a3d23
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
When echo userspace > /sys/class/devfreq/ffbb0000.rkvenc/governor,the
devfreq->data will be reassign to userspace data.
So cannot get struct rkvenc_dev *enc by devfreq->data.
[<b040f41c>] (rockchip_ipa_get_static_power) from [<b078fbdc>] (devfreq_cooling_get_requested_power+0x140/0x150)
[<b078fbdc>] (devfreq_cooling_get_requested_power) from [<b078e578>] (power_allocator_throttle+0x224/0x8b0)
[<b078e578>] (power_allocator_throttle) from [<b078a5ac>] (handle_thermal_trip+0xb0/0x1c8)
[<b078a5ac>] (handle_thermal_trip) from [<b078a738>] (thermal_zone_device_update.part.3+0x70/0xc4)
[<b078a738>] (thermal_zone_device_update.part.3) from [<b013d2b4>] (process_one_work+0x1f0/0x408)
[<b013d2b4>] (process_one_work) from [<b013df8c>] (worker_thread+0x30/0x564)
[<b013df8c>] (worker_thread) from [<b0142f04>] (kthread+0x160/0x190)
[<b0142f04>] (kthread) from [<b01010d8>] (ret_from_fork+0x14/0x3c)
Change-Id: I46977c8dd23d2fc286afa0ae8b87aea1cb0be0d7
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
1. Do not freeze pvtpll_calibrate_work when calibration is processing,
otherwise the rate of pvtpll maybe wrong.
2. Set the delay to 300ms.
Signed-off-by: Liang Chen <cl@rock-chips.com>
Change-Id: I67bef5663d4cc5bf838f5db0d02b643105d25be6
The IT6621 is a transmitter designed for HDMI2.1 Enhanced Audio
Return Channel (eARC) and it is also backward compatible to the
HDMI1.4 Audio Return Channel (ARC). When operating in eARC mode,
the Differential Mode Audio Channel (DMAC) bandwidth, i.e. 98.304Mbps,
allows HDMI Sink to transmit 8-channel 192K audio to the HDMI Source.
No video stream and CEC function is required when eARC link is active.
The IT6621 adopts eight I2S and one SPDIF signals for the audio
input interface. Eight I2S signals are used to transmit multi-channel
L-PCM audio and the maximum 16-channel audio is supported by the IT6621.
Change-Id: I50d969a3e08c89a65581671a43b7ae2132ca79ec
Signed-off-by: Jason Zhang <jason.zhang@rock-chips.com>
The ROCKCHIP_BO_CACHABLE flag first introduced at the following commit:
commit 4d89a73831 ("drm/rockchip: support cpu cache for drm memory")
After the follwing commit, the vm_page_prot init be moved to rockchip drm gem driver:
commit f8b5307074 ("drm/rockchip: Implement mmap as GEM object function")
so add this commit to adapt this change.
issues info:
https://github.com/JeffyCN/mirrors/issues/18
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ic7ae1279c157d02a1ae4758b45934a8506741f67
1. vop2_power_domain_off_by_disabled_vp() error: buffer overflow'vop2->vps' 4 <= 7 subtract
2. warning: Access to field 'regsbak' results in a dereference of a null pointer
3. warning: Access to field 'regs' results in a dereference of a null pointer
4. rockchip_drm_vop2.c:4302:17: warning: ‘strncpy’ specified bound 32 equals destination size
5. rockchip_drm_vop2.c:10073:51: warning: Dereference of undefined pointer value
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ie9946a129ca73ca71c581b221f926084d6795995
One eDP panel module, which named 7.86'' Mercury, supports
1536x2048p60 with 4 lanes.
Change-Id: I2e46d5dce2f18d7be905ba35549132a086587109
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
HDMI-IN app require up to 5 buffers, about 118M.
The system may borrows some CMA memory cause errors.
Add more CMA memory to avoid problems.
Change-Id: Ifa03edef13604fc8ca1d26cd00f7fe4fce81b6da
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
rk_tsadcv2_temp_to_code rounds down, so the temperature that triggers the
high temperature interrupt may be lower than the temperature we configured
in dts. Therefore, it may not be possible to update the trip when the high
temperature interrupt occurs, resulting in continuous interruptions.
Signed-off-by: Ye Zhang <ye.zhang@rock-chips.com>
Change-Id: I84511a612421b42a130c938b4573bddb6156dff6
Only HASH multithreading is restricted by the hardware. Therefore,
cipher removes the restriction on multithreading.
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: I8ec0cb31cd51e6acfa5582cd7778d6482674f1de
Missing akcipher_request_set_callback will cause a process exception
when rsa works in asynchronous mode.
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: I99d3ffde471269528f42869d052004a25a6c14b0
