Commit Graph

615409 Commits

Author SHA1 Message Date
Hu Kejun
3ce97cd258 media: rockchip: isp1: change version to v0.1.1
Change-Id: I3b13c01a69ea07e15dcf4b2ef1d04d2f46fd1ea2
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-03-04 08:29:58 +08:00
Hu Kejun
17b4a53b9e media: rockchip: isp1: change readx_poll_timeout to readx_poll_timeout_atomic
rkisp1_isp_stop() is called in rkisp1_isp_isr() now,
so change readx_poll_timeout in rkisp1_isp_stop() to readx_poll_timeout_atomic

Change-Id: If4cb8628e38d2c774f30d7200b0804f22d4ccc4c
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-03-04 08:25:55 +08:00
Hu Kejun
506c7289af media: rockchip: isp1: use tasklet to get 3A states
Change-Id: I48b86cf19dd203bad32e7412c722056a6c917059
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-03-04 08:24:54 +08:00
Cai YiWei
3351f423d9 media: rockchip: isp1: raw patch with default sensor fmt&size
Change-Id: I057ee38a9369e8e3f26e5899113f9f88585b1e7a
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-03-01 19:47:09 +08:00
Cai YiWei
8f0bbf8ba8 media: rockchip: isp1: check for capture S_FMT
Change-Id: I10e75e18cd9f42ac02b4fd0f049851cdf96e8ccf
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-03-01 19:47:09 +08:00
Cai YiWei
b3e05022d0 media: rockchip: isp1: stop mipi with shutdown lane
isp_mipi_ctrl[8:11] control synopsys dphy's SHUTDOWNZ
and RSTZ. stop mipi and dphy together.

Change-Id: Ief50ab81f5f960e414a880e43b772ee47752742b
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-03-01 19:47:09 +08:00
Finley Xiao
2b56acf4ca arm64: dts: rockchip: rk3399pro-npu: Add pvtm table for npu
Change-Id: If02d1c82fe9126ba9ff3e24f5fb2cfd35e9c7249
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-03-01 15:59:20 +08:00
Finley Xiao
d3a174d011 arm64: rk3399pro_npu_defconfig: Enable CONFIG_ROCKCHIP_PVTM
Change-Id: I7be830c32c023a0cc838ce2d30748cfeebb2f899
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-03-01 15:59:20 +08:00
Finley Xiao
0ad8ee931a arm64: dts: rockchip: rk3399pro-npu: Add pvtm node
Change-Id: Ic3044fa2491a38ae8fcb6059b3796186eb15dfe5
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-03-01 15:59:20 +08:00
Shixiang Zheng
2d7faa6e11 video/rockchip: rga2: extend timeount err message
Change-Id: Ibf8698fa835ca28850d07b1cd66a4d1e6e0df3be
Signed-off-by: Shixiang Zheng <shixiang.zheng@rock-chips.com>
2019-03-01 15:57:35 +08:00
Tao Huang
81a128f835 soc: rockchip: cpu: rename menu prompt
From "CPU selection" to "Rockchip CPU selection".

Change-Id: I5d9368ca6eb9ba60cd4c33fdd703775a328e9da0
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-03-01 09:03:35 +08:00
Hu Kejun
e1c5e7d5da media: rockchip: isp1: stop isp when too many errors are reported
when use hdmi-in chip with isp, it needs to pull out/plug in hdmi cable
when stream is on.
many error logs are reported in interrupt function when pull out/plug in
hdmi cable, then the system will be dead.
so we stop isp when too many error logs are reported.

Change-Id: Ic19eddfc952954a11a176b91c16ce4c9b6372418
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-02-28 14:40:41 +08:00
Hu Kejun
ee9f5da734 media: spi: RK1608: add more config information
Change-Id: Ic68ef2dfdcf72a721dca3c4ad263f429144ed537
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-02-28 14:37:33 +08:00
Hu Kejun
97f8624ea2 media: i2c: add dummy sensor for preisp
Change-Id: Ifad0062a8fa01e9e005bda2b8b4e73d09b4de925
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-02-28 14:35:46 +08:00
Zhangbin Tong
5a3119b4d5 arm64: dts: rockchip: rk3399-box: Fix RC pinctrl error
The commit e38aa951c8 ("pwm: rockchip: Make pwm pinctrl setting after pwm
enabled") modified the pinctrl-names to "active".

Change-Id: I931707d194d7a5aa0c3e652933e8fae3ada20132
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2019-02-28 10:58:22 +08:00
Lin Huang
7d865d0f31 arm64: dts: rockchip: use imx327 on rk1808 evb board
use imx327 as default sensor on RK1808 EVB board.

Change-Id: I7883d7635be74b71ed0ccd74a0490b986d9a006d
Signed-off-by: Lin Huang <hl@rock-chips.com>
2019-02-28 10:23:57 +08:00
Lin Huang
9de8cdef2f arm64: rk1808_linux_defconfig: enable imx327 sensor
rk1808 evb board use imx327 as default sensor, so enable it.

Change-Id: I38c6cc77c1263593774b725abcd915559e37a49e
Signed-off-by: Lin Huang <hl@rock-chips.com>
2019-02-28 10:23:41 +08:00
Lin Huang
43dab7a382 arm64: dts: rockchip: disable gmac on rk1808 evb board
We want to default to enable mipi camera on rk1808 evb
board, but mipi mclk and rgmii clk use the same pin.
So we need to disable gmac to make sure mipi camera working
normally.

Change-Id: Ie39f1c41863f1bd18c4c9620f9e168b5cdfe9f33
Signed-off-by: Lin Huang <hl@rock-chips.com>
2019-02-28 10:23:34 +08:00
Hu Kejun
e3ba033f95 ARM: rockchip_linux_defconfig: enable CONFIG_VIDEO_VM149C
Change-Id: I0320e0b78d32d1e4080c207b6f169bff853cc248
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-02-28 10:22:38 +08:00
Hu Kejun
cdf806ff72 arm64: rockchip_linux_defconfig: enable CONFIG_VIDEO_VM149C
Change-Id: I18f683f8ac138314dc3d46cc6b1a4917741a6a7f
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-02-28 10:22:38 +08:00
Wu Jingchen
8998af222e arm64: dts: rockchip: px30-evb-ddr3-v10.dtsi: Adjust sensor direction
Change-Id: I13792b10239cc933438dce8d672a65d12859fd3a
Signed-off-by: Wu Jingchen <oven.wu@rock-chips.com>
2019-02-27 19:14:54 +08:00
Wyon Bi
84bd007de1 drm/rockchip/rk618: hdmi: support hotplug detect in clone mode
Change-Id: Icabc6d3f7b81efca99debf97445219999dabd556
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-02-27 09:15:14 +08:00
Wyon Bi
80168afb5d drm/rockchip/rk618: vif: disable sync mode by default
Change-Id: Ia48e5657b495e045ef4b594c08e43e8c494b957a
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-02-27 09:15:14 +08:00
Caesar Wang
ffb910a5f4 arm64: dts: rockchip: enable rga for rk3328 evb board
Change-Id: I2ba73ac52e1b4b3208c654342b6007110bc5c62b
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2019-02-26 15:00:56 +08:00
Caesar Wang
2f6cac6889 ARM: dts: rockchip: enable rga for rk3288 linux and px3se evb board
Change-Id: I7510334bd5b7a6bd4ced351d2eec56f81d5c6e61
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2019-02-26 15:00:47 +08:00
Chaoqing Xu
97fd4333a8 camera: rockchip: camsys_drv: fix clk_out can't be closed
Change-Id: I19ac05c11d2ffa61f686cef543af7417b877201c
Signed-off-by: Chaoqing Xu <shawn.xu@rock-chips.com>
2019-02-26 15:00:19 +08:00
Chaoqing Xu
7229af9d0c arm64: dts: rockchip: rk3399-android: fix clk_cif_pll use wrong clk
Change-Id: I66e04ede6b528a0b016171ab05363e8a74d9ec0b
Signed-off-by: Chaoqing Xu <shawn.xu@rock-chips.com>
2019-02-26 15:00:07 +08:00
Elaine Zhang
af40bf2604 clk: rockchip: rk1808: add cpll as critical clk
Change-Id: Ibf02b6ed9916e774d7a82f33ac7f96e3395e4e88
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-02-26 14:58:01 +08:00
Zorro Liu
b57087c149 arm64: dts: rockchip: improve ddr freq when video play for rk3368 xikp and p9 boards
Change-Id: I8418040dd9f7bc5f2720fbcbec7a927a80994fc7
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2019-02-26 14:57:41 +08:00
Hu Kejun
be821a9b71 arm: dts: rk3288-evb-rk808-linux: add vm149c for ov13850
Change-Id: Ib889d113860072480027a7490f4fb5408dd32f55
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-02-26 14:12:57 +08:00
Hu Kejun
3bc149e135 arm64: dts: rockchip: add vm149c for ov13850
Change-Id: I9ba3598533d6202490a927f5519da2386b7c2b13
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-02-26 14:12:57 +08:00
Hu Kejun
b8de508a98 media: i2c: vm149c: register v4l2 subdev asynchronously
Change-Id: I77ff7754182aca5391cc1a565aeb18e052faa270
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-02-26 14:12:57 +08:00
Hu Kejun
6003905842 media: spi: add module information
Change-Id: Ic7c56ba0179e30c34d5d714ab43106d0061fbab6
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-02-26 14:12:57 +08:00
Hu Kejun
2d54d69b34 arm: dts: rockchip: add module information
Change-Id: I61255f42d9926c91d6f2731d950de3174d45a2bf
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-02-26 14:12:57 +08:00
Hu Kejun
f36baf55ad arm64: dts: rockchip: add module information
Change-Id: I733735839208f27eefe3f6340b407ad6e8798acb
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-02-26 14:12:57 +08:00
Hu Kejun
93d46b0c1c media: i2c: add module information
Change-Id: If3de15e8d5d9ea4bb82934c01d780cb167f5dc6d
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-02-26 14:12:57 +08:00
Hu Kejun
832a59e8f8 media: i2c: ov8858: support get/set otp info
Change-Id: Iff05b663d4baaf758c5a05a5c98afe9de83a823c
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-02-26 14:12:57 +08:00
Hu Kejun
dcd128bc3a media: camera: add header for otp information
Change-Id: I903df1fb2ee26b5d771a3cfe2876e7afd837d1de
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-02-26 14:12:57 +08:00
Binyuan Lan
e30195cc6e ASoC: rockchip: rk817-codec: solve sound L/R channel conversion problem
There is playback's sound L/R channel conversion problem when recording is opened

Change-Id: Iae7160e25bdd834df9904fbd34fe964449c93560
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
2019-02-25 18:34:28 +08:00
Romain Perier
74e95498c4 UPSTREAM: drm: dw-hdmi: add specific I2S and AHB functions for stream handling
Currently, CTS+N is forced to zero as a workaround of the IP block for
i.MX platforms. This is requested in the datasheet of the corresponding
IP for AHB mode only. However, we have seen that it introduces glitches
or delays when playing a sound on HDMI for I2S mode. This proves that we
cannot keep the current functions for handling audio stream as-is if
these contain workaround that are specific to a mode.

This commit introduces two callbacks, one for each variant.
dw_hdmi_setup defines the right function depending on the detected
variant. Then, the exported functions dw_hdmi_audio_enable and
dw_hdmi_audio_disable calls the corresponding callbacks

Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Romain Perier <romain.perier@collabora.com>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20170414083113.4255-2-romain.perier@collabora.com
(cherry picked from commit a7d555d2f2)

Change-Id: Ie988cdd7ab54466fa01135ae940ce0d2c27431d2
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2019-02-25 17:21:12 +08:00
XiaoDong Huang
22e601b986 arm64: rk1808_linux_defconfig: enable ARM_ROCKCHIP_BUS_DEVFREQ
Change-Id: I07546f41f83151bf11e6c3c522c66c2d3d14e2cc
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2019-02-25 16:26:49 +08:00
XiaoDong Huang
47f108732a arm64: dts: rockchip: add soc_bus support for rk1808
Change-Id: Ia7c4ac877f2758ca3da4d41603d6e47c68a164e6
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2019-02-25 16:26:39 +08:00
XiaoDong Huang
48d4855d3a PM / devfreq: rockchip_bus: add support for rk1808
Change-Id: I2be704a4b72fc0c2b6c8c864e2fb605038271ce5
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2019-02-25 16:26:39 +08:00
Finley Xiao
9dcdd7df70 arm64: dts: rockchip: add voltage restriction for rk3308k
Change-Id: Ib531f0659fe87b11fc6d80527de2a65cdb4b1053
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-02-25 14:11:24 +08:00
Hu Kejun
e577dc0365 media: rockchip: isp1: add macro to switch between old mipi and new mipi
Change-Id: I878099d6a38f00a255a7b99ff9f2a3c5770226e5
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-02-25 10:33:05 +08:00
Hu Kejun
312701d219 phy: rockchip: mipi-rx: update sensor mbus when stream start
Change-Id: I5ced164e38b3869da0d3ec12ed180b75ccd924a3
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-02-25 10:25:08 +08:00
Hu Kejun
78ea11541f media: rockchip: isp1: check first iq param is set or not
Change-Id: I334874c58f7788e7ea4309cbf2eee4f400a41cd7
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-02-25 10:13:14 +08:00
Hu Kejun
da97a12cb1 media: rockchip: isp1: support iesharp/demosaiclp/wdr
Change-Id: Id27d87c15d455d00ff8bfe09b470929c5746d511
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-02-25 10:13:14 +08:00
Sandy Huang
82b24cee15 arm64: dts: rockchip: enable rga for rk3399-linux.dtsi
Change-Id: I55389b59f54ba4195e9532d00d9a1f54a767f2fd
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-02-22 14:42:23 +08:00
Cai YiWei
ca2856326a phy: rockchip: mipi-dphy-rx: csi_mipidphy add stream off
Change-Id: Ifee3d6fb80425fc505ed716cbcbe6cc48a9e02bb
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-02-22 11:56:41 +08:00