Commit Graph

615031 Commits

Author SHA1 Message Date
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
Jianqun Xu
8f3cd5ef83 arm64: dts: rockchip: add board dt file for rk1808 x4 evb
RK1808 x4 evb is a board with 4 rk1808 running on independent.
And it's designed with 32MB sfc norflash.

Change-Id: I809e9cf1c217d84e4dd9b79213db317751838ade
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-12-19 18:36:03 +08:00
Shixiang Zheng
eda78bd723 video/rockchip: rga: fix the memory issue of put dmabuf impropriety
Since commit 5b498b994 put dma buf while rga engine just do this work.
When user reuse a buffer while rga engine is just doing a work
with this bufer it may cause memory issue.

Fixes: 5b498b9947 ("video/rockchip:rga: fix unsupported to scaling less than 1/2")
Change-Id: I5f19f5f3a175bbda78538e7747aa6626af17145e
Signed-off-by: Shixiang Zheng <shixiang.zheng@rock-chips.com>
2018-12-19 18:35:31 +08:00
Wyon Bi
d62f2b0035 arm64: dts: rockchip: enable logo on PX30 AD-R35-MB boards
Change-Id: I3cd825d60c41e079c97ca3d468d1c9ea97044415
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-19 16:19:09 +08:00
Jianqun Xu
ba3e8d4157 arm64: dts: rockchip: rk1808 add sfc node
Change-Id: I123947fe6247837f080bcc0487484f66e4906de4
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-12-19 16:16:45 +08:00
Wyon Bi
41fe258907 arm64: dts: rockchip: Add support for PX30 AD-D6 board
Change-Id: I07a31291337cd5ab983725323d65eb8dba36398f
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-19 10:45:20 +08:00
Wyon Bi
c8f3ab90c0 drm/rockchip: rgb: Allow to configure data sync from DT
Change-Id: Id49839dc8885f632287879ec9a86420dc6dcd4de
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-19 10:45:19 +08:00
Wyon Bi
08d71ab565 drm/bridge/analogix: anx6345: Add support for rockchip logo
Change-Id: I97c1f8a3cc69fb689b0598b76d5defdccfb010e2
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-19 10:45:18 +08:00
Wyon Bi
6295827995 drm/bridge/analogix: anx6345: Fix active polarity of reset gpio
Change-Id: I44e32c1b477acb57c2937c441305ef1c55326315
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-19 10:45:17 +08:00
Wyon Bi
126d216d71 drm/bridge/analogix: anx6345: Fix color depth configuration
Change-Id: Ifa805c62c5d6003f6b2c1a243c0f6e2c8274c681
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-19 10:45:16 +08:00
Wyon Bi
e3f58e3158 arm64: rockchip_defconfig: enable CONFIG_DRM_ANALOGIX_ANX6345
Change-Id: Ib6e337f8ba6eae0b33fe814e3e99c9b9a0e1bc8a
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-19 10:45:15 +08:00
Wyon Bi
078fbfe5b5 drm/bridge/anxlogix: anx6345: backported to current tree
Change-Id: Ia083b6e02731b1b6f50894e24fd0575a180db14a
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-19 10:45:13 +08:00
Wyon Bi
9714281f0c drm/bridge/analogix: anx6345: Remove invalid kfree of devm allocated data
Change-Id: Iafa0005562d013e960ef84855a3494225f409c4a
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-19 10:45:12 +08:00
Icenowy Zheng
8bc019c58d FROMLIST: drm/bridge: Add Analogix anx6345 support
The ANX6345 is an ultra-low power DisplayPower/eDP transmitter designed
for portable devices. This driver adds initial support for RGB to eDP
mode, without HPD and interrupts, but with possibility to inject EDID.
This is a configuration usually seen in eDP applications.

Change-Id: I8c0e55e18c5f9645251e8dbc2d85a3b6cbae1f3b
Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181018073327.64942-6-icenowy@aosc.io
2018-12-18 19:08:27 +08:00
Icenowy Zheng
e8e18442ff FROMLIST: dt-bindings: Add ANX6345 DP/eDP transmitter binding
The ANX6345 is an ultra-low power DisplayPort/eDP transmitter designed
for portable devices.

Add a binding document for it.

Change-Id: Ie4200b390c6c0b6f19abdcb3eb2aca8a8314e82b
Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181018073327.64942-5-icenowy@aosc.io
2018-12-18 19:08:26 +08:00
Icenowy Zheng
4956a85e36 FROMLIST: drm/bridge: extract some Analogix I2C DP common code
Some code can be shared within different DP bridges by Analogix.

Extract them to a new module.

Change-Id: I0a23391f94a8a66f6722193e0f81381bba817833
Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181018073327.64942-4-icenowy@aosc.io
2018-12-18 19:08:26 +08:00
Icenowy Zheng
4c0585fcaf FROMLIST: drm/bridge: split some definitions of ANX78xx to dedicated headers
Some definitions currently in analogix-anx78xx.h are not restricted to
the ANX78xx series, but also applicable to other DisplayPort
transmitters by Analogix.

Split out them to dedicated headers, and make analogix-anx78xx.h include
them.

Change-Id: Ibcacea3a20857b5929b0b73c42fbf95433667799
Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181018073327.64942-3-icenowy@aosc.io
2018-12-18 19:08:25 +08:00