Merge made by the 'ours' strategy.
* commit 'e0a6d5fa869c8ba0d109a415ca1bfa2d601d12df':
media: rockchip: isp: support 8k for isp32 lite
media: rockchip: isp: fix isp32 lite frame buffer data read
media: rockchip: isp: add ioctl to get bay3d buf
Change-Id: Ib2ecc6d25a106a71bb4239429da67ce8c6e4b1c1
The frequency of pvtpll may unstable when calibrate, if the step
is too small, it will stride a too big length and adjust back
again, that is bad.
Signed-off-by: Liang Chen <cl@rock-chips.com>
Change-Id: I96227b37cde45ae86df68777da8f32467f8926e6
With v2 hardware, an IRQ can be configured to trigger on both edges via
a bit in the int_bothedge register. Currently, the driver sets this bit
when changing the trigger type to IRQ_TYPE_EDGE_BOTH, but fails to reset
this bit if the trigger type is later changed to something else. This
causes spurious IRQs, and when using gpio-keys with wakeup-event-action
set to EV_ACT_(DE)ASSERTED, those IRQs translate into spurious wakeups.
Fixes: 3bcbd1a85b ("gpio/rockchip: support next version gpio controller")
Reported-by: Guillaume Savaton <guillaume@baierouge.fr>
Tested-by: Guillaume Savaton <guillaume@baierouge.fr>
Signed-off-by: Samuel Holland <samuel@sholland.org>
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
(cherry picked from commit 7920af5c82)
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I8b4645a81e553957a77cca84e4152f1e38dd1852
* 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
