Commit Graph

615047 Commits

Author SHA1 Message Date
Chen Lei
6aacd99ecf clk: rockchip: rk322x: fix wrong mmc phase shift for rk3228
mmc sample shift should be 1 for rk3228, or it will fail
if we enable mmc tuning for rk3228.

Change-Id: I301c2a7d33de8d519d7c288aef03a82531016373
Signed-off-by: Chen Lei <lei.chen@rock-chips.com>
2018-12-26 18:38:02 +08:00
Wenlong Zhuang
a1ed5f4f10 arm64: dts: rockchip: rk1808-evb-x4: enable virtual camera, cif and mipi-dphy-rx
Init resolution 3840x720 and bus format MEDIA_BUS_FMT_SBGGR8_1X8
for virtual camera.

Change-Id: Id45f7deb3896ca230cfd3fc44238c0d62d79416a
Signed-off-by: Wenlong Zhuang <daisen.zhuang@rock-chips.com>
2018-12-26 18:35:22 +08:00
Wenlong Zhuang
652f8e51be arm64: rk1808_linux_defconfig: enable VIDEO_VIRT_CAMERA
Change-Id: Idff2d10c0851bb60288ba1ddd0830855b1b29770
Signed-off-by: Wenlong Zhuang <daisen.zhuang@rock-chips.com>
2018-12-26 18:34:27 +08:00
Wenlong Zhuang
4eea0e08c1 media: i2c: add support for virtual camera
This patch adds a virtual camera to simulate a actual sensor,
in order to power up CIF and MIPI CSI DPHY without connecting
a actual sensor.
The virtual camera include following feature:
- Format: SBGGR8_1X8,SGBRG8_1X8,SGRBG8_1X8,SRGGB8_1X8,
	  SBGGR10_1X10,SGBRG10_1X10,SGRBG10_1X10,SRGGB10_1X10,
	  RGB888_1X24
- Resolution: 1280x720,1920x1080,3840x720,3840x2160,5120x2880
- Link-frequency: 100000000,150000000,200000000,250000000,
		  300000000,350000000,400000000,500000000,
		  600000000,700000000,800000000,900000000,
		  1000000000

Change-Id: I81c9a1ba0271800e38a8f51c9a08e8076ef94d0d
Signed-off-by: Wenlong Zhuang <daisen.zhuang@rock-chips.com>
2018-12-26 18:34:27 +08:00
Wenlong Zhuang
60c62dc23c dt-bindings: media: add bindings for Rockchip virtual camera.
Change-Id: I0933fdb858d7f6fef344279093af8d6f4d41b7e8
Signed-off-by: Wenlong Zhuang <daisen.zhuang@rock-chips.com>
2018-12-26 18:34:27 +08:00
Shunqing Chen
b4a8810527 power: rk81x: fix suspend time error
the time get from do_gettimeofday and rtc_read_time
is different, and more than 80000 seconds.
so after resume the battery level jump down a lot.

Change-Id: Ica616240ce03dff73a65e6f724c28910e1786c81
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
2018-12-26 18:02:11 +08:00
William Wu
9c66895461 phy: rockchip-inno-combphy: fix error codes in rockchip_combphy_xlate
Return ERR_PTR(-ENODEV) if rockchip_combphy_xlate fails to
set phy type. This fixes the usb dwc3 controller probe fail
if the phy type has been set to PCIe. With this patch, the
rk1808 can support PCIe and USB 2.0 at the same time.

Change-Id: I1cd58f720cb361e606f5e2ac761b9ca71ddaa67e
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-12-26 15:22:53 +08:00
Nickey Yang
a894b97af8 ARM: dts: rockchip: rk3288-evb-rk808-linux: add cec pinctrl
tested on rk3288-evb-rk808-linux.

The resistance R1036 maybe NC on RK_EVB_RK3288_LPDDR3_V1x
Please check it if you want use the hdmi cec function.

Change-Id: I2533351ea5741b501b25c4c0485dc9246adf11bb
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
2018-12-26 15:21:21 +08:00
Nickey Yang
99721fd7b5 ARM: dts: rk3288: add clock and pinctl for hdmi cec.
Change-Id: I6de8283516f01093213ea16f0792bcd10fb1af2b
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
2018-12-26 15:20:49 +08:00
Nickey Yang
7d4444f71c arm64: dts: rockchip: rk3399: don't enable edp_hpd pin by default on soc dtsi
Not all the rk3399 boards use gpio4_c7 pin for edp_hpd.
So this pin should be specified in the board dts.
Without this patch we see below pin conflict when hdmi-cec and edp enabled.

[    0.969331] rockchip-pinctrl pinctrl: pin gpio4-23 already requested by
ff940000.hdmi; cannot claim for ff970000.edp
[    0.969350] rockchip-pinctrl pinctrl: pin-151 (ff970000.edp) status -22
[    0.969361] rockchip-pinctrl pinctrl: could not request pin 151 (gpio4-23)
from group edp-hpd on device rockchip-pinctrl

Change-Id: I324f28ea9f995ee4b84869ac369ab63e0c141cfa
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
2018-12-26 15:10:36 +08:00
Nickey Yang
7cebf964db arm64: dts: rockchip: rk3399-sapphire-excavator-linux: add cec pinctrl
GPIO4_C7 is used for hdmi-cec since rk3399-sapphire-excavator-v12.

Change-Id: I8c26debdcb1827e067b7a95acf6151160b61e03d
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
2018-12-26 15:10:31 +08:00
Nickey Yang
117b31c362 BACKPORT: media: cec: move compat_ioctl handling to cec-api.c
All the CEC ioctls are compatible, and they are only implemented
in one driver, so we can simply let this driver handle them
natively.

Change-Id: I04136c171777d5ab23760e20162f0a6197090ca8
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
(cherry picked from commit e6c8320648)
2018-12-26 15:00:12 +08:00
Nickey Yang
6db570b2f5 arm64: config: rockchip_linux: add dw-hdmi cec support.
tested on rk3399-sapphire-excavator-v13.

Change-Id: Ia447dab6941a623a8b6348e25bed3e10a7900fb5
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
2018-12-26 14:53:49 +08:00
Nickey Yang
0a4bc46c34 ARM: config: rockchip_linux: add dw-hdmi cec support.
this enables dw-hdmi cec support.

tested on rk3288-debian.
  apt-get install v4l-utils
  cec-ctl --playback -o Rockchip -V 0xaabbcc -M -T --cec-version-1.4

Change-Id: I2fb991410c96fe6f9a0d8a9739d89cc3084c23e8
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
2018-12-26 14:45:44 +08:00
Lin Huang
93508a73d5 arm64: config: add rk1808_x4_linux_defconfig
Change-Id: I64f839fa95ab8a4fac77f1b6a9b0527971b60403
Signed-off-by: Lin Huang <hl@rock-chips.com>
2018-12-26 14:42:33 +08:00
Shunqing Chen
55488fb85a power: cw201x: add POWER_SUPPLY_PROP_CHARGE_FULL for CTS
Change-Id: I6697fdc5615705a32a4eeb411fc92b737be73d9e
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
2018-12-26 09:44:11 +08:00
Leo Wen
024f04a5d7 drivers: Remove excess 'rk_nand' config in Makefile
Change-Id: Ifee81d59fd39e6467fc841f12f5a87c81db829d3
Signed-off-by: Leo Wen <leo.wen@rock-chips.com>
2018-12-26 09:41:48 +08:00
David.Wu
b94ecddd31 pinctrl: rockchip: Add gpio3b4 io function recalculated select for RK3308B
Accroding to the datasheet, the pin of gpio3b4 needs to be
recalculated for iomux selecting.

Change-Id: I62cc16cae96fe2f9624d9c5940f9c34b304eaed7
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-12-25 17:59:10 +08:00
Finley Xiao
d772326b50 arm64: dts: rockchip: rk3308: Add PID constant for rk3308k
Change-Id: I073579a65a877b95e99daf00ce1815c04e11081a
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-12-25 17:58:26 +08:00
Finley Xiao
f6ec026aa9 thermal: power_allocator: Add support to get PID constant from dt
Change-Id: Ibabdad4ba2df6df26d75483dd35b6c51572befe8
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-12-25 17:58:26 +08:00
Elaine Zhang
d2f238a541 clk: rockchip: rk322x: fix up the gate con description error
Change-Id: I439314c590a7144fab6e33d1fb4f325530669842
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-12-25 15:00:41 +08:00
Fei Zeng
557cbe628d arm64: dts: rockchip: enabled rga for rk1808-evb-x4
Change-Id: Id5c90b5ebcc0c4ae989488846ff7682c81bf1901
Signed-off-by: Fei Zeng <felix.zeng@rock-chips.com>
2018-12-25 11:26:42 +08:00
Simon Xue
832fad953d arm64: dts: rockchip: rk1808: add power-domains reference for PCIe
RK1808 PCIe share pd with others, add pd reference in case being
turned off by others

Change-Id: I899eb7524ae9aaada3cc161a63434113a3a1768e
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2018-12-24 17:54:00 +08:00
Hu Kejun
1036bc2ca7 media: rockchip: isp1: fix demosaic is not bypass for grey sensor
Change-Id: I4c3200720cd0c2c54c56e298b55367404eca2f58
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2018-12-24 17:41:03 +08:00
Jianqun Xu
3bc4a9286e phy: rockchip: mipi-rx: include io.h for writel function
Change-Id: I2f401cbab9b3a407987745afd5c253a5b4960f25
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-12-24 17:39:58 +08:00
Jianqun Xu
e7fda39ffb media: v4l2: include mm.h for kvfree function
Change-Id: Idb925eb1ab23f89d0a8863c10156ac84e5e8ff6d
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-12-24 17:14:44 +08:00
Wyon Bi
331690a183 drm/rockchip: dsi: fix pll clock setting for synopsys phy
Change-Id: I4132fd04b1b0788d5a0db2f5c7b2831e204286c4
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-24 14:10:17 +08:00
Weixin Zhou
d22d4bb1be arm64: dts: rockchip: enabled i2s2 for hdmi for 3399pro v10/v11 evb
Change-Id: I3ed396d9f47da908fe4cb777ed604a3b0ffd46e2
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2018-12-21 18:08:51 +08:00
Weixin Zhou
d016e56778 arm64: dts: rockchip: add 809 poweroff after the hw reset for rk3399pro v10/v11
Change-Id: Ib01bb214311d61ec1bd889545c182097e968da98
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2018-12-21 18:05:12 +08:00
Lin Huang
f44d4153d2 arm64: dts: rockchip: improve rk1808-evb-x4.dts
Change-Id: Id3de9b9d57001513031c969e08911d1c8da9e13a
Signed-off-by: Lin Huang <hl@rock-chips.com>
2018-12-21 17:04:49 +08:00
Lin Huang
ef2f9b921c arm64: dts: rockchip: rk1808 move adc key label to specific board dts
different board have different key definition, so move adc key label
to specific board dts.

Change-Id: I71da316c639ca0fd063c1ec5c2e303f1a824ed71
Signed-off-by: Lin Huang <hl@rock-chips.com>
2018-12-21 17:03:35 +08:00
Sugar Zhang
d4d7e73829 ASoC: rockchip: spdif: fix some coding style issues
Change-Id: Ibe8edc413df2944464848ba81afdc447edbd405e
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-12-21 11:25:56 +08:00
Sugar Zhang
b255c8e1b2 ASoC: rockchip: spdif: Simplify the mclk calculation
This patch simplifies the mclk calculation to 128fs, which
is generally required in some receivers.

Change-Id: I2914ab57453ee5f764885fa8fa9dacd44a67e775
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-12-21 11:24:57 +08:00
David Wu
3c6e63c35b pinctrl: rockchip: Add slew rate support for px30
The usage of slew rate is needed to config it at DTS,
such as:
  fast speed: slew-rate = <1>;
  slew speed: slew-rate = <0>;

Change-Id: Iefa9c15a35c6c1e94f716f5d6dd7e30d20a7293f
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-12-21 11:23:24 +08:00
Elaine Zhang
6fd905892e clk: rockchip: px30: add FRAC_MAX_PRATE limit for uart0
Change-Id: Id4ec1995a8c406a1eb71da05a04699aa869f52b5
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-12-21 11:19:55 +08:00
Elaine Zhang
ea5569ffc7 clk: rockchip: rk3399: add FRAC_MAX_PRATE limit for spdif/uart/i2s/vop/wifi
Change-Id: Ie92bf9d130ec92326df722b13de5f11e9658e3a3
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-12-21 11:16:34 +08:00
Elaine Zhang
b2f84f6111 clk: rockchip: rk3368: add FRAC_MAX_PRATE limit for spdif/uart/i2s
Change-Id: I24d365f5cb97da8974a0f718b5b56b6ffdaae27b
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-12-21 11:15:42 +08:00
Elaine Zhang
2521529422 clk: rockchip: rk3366: add FRAC_MAX_PRATE limit for spdif/uart/i2s
Change-Id: I9bcc2431708398d07ba9b29a41f1c50b29fcf8e7
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-12-21 11:14:49 +08:00
Elaine Zhang
c763aad16c clk: rockchip: rk3328: add FRAC_MAX_PRATE limit for spdif/uart
Change-Id: I2728481b16f588c9d9afb3415077444a888a7f7e
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-12-21 11:13:15 +08:00
Elaine Zhang
47a0654f27 clk: rockchip: rk3288: add FRAC_MAX_PRATE limit for spdif/uart/i2s
Change-Id: I7ab976f8e5187e62e470643fb68e83d8c375326c
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-12-21 11:12:25 +08:00
Elaine Zhang
d24ea079f0 clk: rockchip: rk3188: add FRAC_MAX_PRATE limit for spdif/uart/i2s/hsadc
Change-Id: I32d2d1868674c0067bc32ae3a2ece0de7c71fe93
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-12-21 11:11:21 +08:00
Elaine Zhang
c6875bc418 clk: rockchip: rk312x: add FRAC_MAX_PRATE limit for spdif/uart/i2s
Change-Id: I39ffb7b30f1de0b051a542077296ea0141f9ad13
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-12-21 11:10:03 +08:00
Elaine Zhang
b379402c3d clk: rockchip: rk3036: add FRAC_MAX_PRATE limit for spdif/uart/i2s
Change-Id: I7a82ac645bc1ff0e277104c9441068990440533b
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-12-21 11:09:22 +08:00
Jianqun Xu
5fcaeef039 arm64: dts: rockchip: disable usbdrd3 if using pcie0 on rk1808 evb
Change-Id: I2d96df86bfe7c51417b1438c5b71cfbec7544ddc
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-12-21 09:18:33 +08:00
Zorro Liu
2c4256a61e arm64: dts: rockchip: modify audio card name for rk3368-p9 and rk3368-xikp boards
Change-Id: I1e4354e7b3fca568fb14a7806b2f6f3734b9333b
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2018-12-20 17:52:55 +08:00
Zorro Liu
d12eb53097 arm64: dts: rockchip: enable uboot charge for rk3368-xikp and rk3368-p9 board
Change-Id: I87b870be072176cd8ba397e63c006bccf3baae80
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2018-12-20 17:52:55 +08:00
Guochun Huang
52e34a6328 arm64: dts: rockchip: rk3399: avb: fsmgr_flags = "wait,avb" for vendor partition
Change-Id: I99b6bc92ae769479af6c96fd11948c03f27fc467
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2018-12-20 14:42:40 +08:00
jon.lin
a89b7ef061 drivers: rkflash: add new spi nand devices
1.FS35ND01G-S1 FS35ND02G-S2, EM73C044SNC-G, EM73D044SNB-G

Change-Id: If362a0a0cd7789b027c8b7d2ca176ba95ddea8b4
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2018-12-19 22:24:04 -08:00
ywj
9251396b88 video: rockchip: vpu: play video happen panic
When the video sesion is in use, the same video sesion is released,
causing a crash, and add locking control

Change-Id: I699493d64870cb1b63b1b036c4eee506f7a204bd
Signed-off-by: Wenjie Yang <ywj@rock-chips.com>
2018-12-20 11:34:33 +08:00
Tao Huang
04026c23c8 Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux-linaro-stable.git
* linux-linaro-lsk-v4.4-android: (812 commits)
  Linux 4.4.167
  mac80211: ignore NullFunc frames in the duplicate detection
  mac80211: fix reordering of buffered broadcast packets
  mac80211: ignore tx status for PS stations in ieee80211_tx_status_ext
  mac80211: Clear beacon_int in ieee80211_do_stop
  mac80211_hwsim: Timer should be initialized before device registered
  kgdboc: fix KASAN global-out-of-bounds bug in param_set_kgdboc_var()
  tty: serial: 8250_mtk: always resume the device in probe.
  cifs: Fix separator when building path from dentry
  Staging: lustre: remove two build warnings
  xhci: Prevent U1/U2 link pm states if exit latency is too long
  SUNRPC: Fix leak of krb5p encode pages
  virtio/s390: fix race in ccw_io_helper()
  virtio/s390: avoid race on vcdev->config
  ALSA: pcm: Fix interval evaluation with openmin/max
  ALSA: pcm: Call snd_pcm_unlink() conditionally at closing
  ALSA: pcm: Fix starvation on down_write_nonblock()
  ALSA: hda: Add support for AMD Stoney Ridge
  ALSA: usb-audio: Fix UAF decrement if card has no live interfaces in card.c
  USB: check usb_get_extra_descriptor for proper size
  ...

Conflicts:
	drivers/gpu/drm/rockchip/rockchip_drm_drv.c
	drivers/usb/host/xhci-ring.c

Change-Id: I4304b0875908403a7d88a0d77da52cea04563c11
2018-12-19 18:46:58 +08:00