Commit Graph

608022 Commits

Author SHA1 Message Date
XiaoDong Huang
7490a94de2 arm: dts: rockchip: rk322x: add virtual-poweroff
Change-Id: I730cf886ee20a16f638c7e5d74ee6927c0f3022b
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2018-03-16 09:23:25 +08:00
Zheng Yang
595ad3137e phy: rockchip: inno-hdmi: fix 322x hdmi tmdsclk 27M PLL setting
On some chip, HDMI post PLL is not stable when it's vco is 1080M,
but it work ok when vco is 270M. We use a efuse bit to distinguish
these chip.

Change-Id: I143363d67e60747ee52d405edace3ec611de3e6e
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2018-03-15 19:09:47 +08:00
Zheng Yang
b3de8bee89 ARM: dts: rk322x: hdmi phy support get efuse flag
Efuse byte 29 bit 1 is used for HDMI PHY.

Change-Id: Ic6d38b43660a89b898d3a3ceb848847e95409c3d
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2018-03-15 19:09:47 +08:00
Chris Zhong
07b7c37ca5 arm64: rockchip_linux_config: enable LEDS_IS31FL32XX
LEDS_IS31FL32XX is a led driver IC used by rk3308 evb.

Change-Id: I77c8dcd379e72bd85bffcad5f0ec51bbaf876274
Signed-off-by: Chris Zhong <zyw@rock-chips.com>
2018-03-15 18:51:42 +08:00
Sandy Huang
cbedcd2f9c ARM: dts: rk322x: Fix vop iommu interrupt config error
Change-Id: Iee6034335a3d2f9a5a974be5119d87170a6c3480
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-03-15 14:27:32 +08:00
Zheng Yang
dcd0e2c2b5 phy: rockchip: inno-hdmi: manual power down RK3228 post-PLL with no uboot logo
Inno hdmi phy post pll is enabled by default on rk3228, it's need to
manual power down post pll if uboot logo is not shown.

Change-Id: I7ed4de2eae2d723f390dae44281281b9e81f4e1d
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2018-03-15 14:26:43 +08:00
Nickey Yang
8b4430021f arm64: dts: rockchip: add rk3399-videostrong board support
Change-Id: I0b24ee2f926f3be4bc8d93064c2f5f8e51ffe2de
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
2018-03-15 14:25:46 +08:00
Algea Cao
f27ca618fc phy: rockchip: inno-hdmi: Add rk3228 phy pll recalculate rate
Change-Id: Ifad3edda80e86dff39e8decd75d51a5670c12871
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2018-03-15 14:25:14 +08:00
Shawn Lin
865523b715 BACKPORT: FROMLIST: clk: rockchip: Restore the clock phase after the rate was changed
There are many factors affecting the clock phase, including clock
rate, temperature, logic voltage and silicon process, etc. But clock
rate is the most significant one here, and the driver should be aware
of the change of the clock rate. As mmc controller need a fixed phase
after tuning was completed, at least before explicitly doing re-tune,
so this patch try to restore the clock phase by monitoring the event
of rate change.

Change-Id: Id1ccdfd2e8d4e2eb9f6a1923b3813138dbaf99f7
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
(cherry picked from https://patchwork.kernel.org/patch/10269525/)
2018-03-15 11:31:58 +08:00
Tony Xie
adc3c2caca arm64: configs: rockchip_defconfig: enable CONFIG_PINCTRL_RK805
Change-Id: I57099822c273822aaf857f3d92a94fd4fcf03703
Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
2018-03-15 11:29:25 +08:00
lei.chen
a8201d063a ARM: dts: rockchip: add mmc-hs200-1_8v for rk322x-android
Change-Id: I035f5b4f3bc60f5a6086728fe29a7c07b8159e62
Signed-off-by: lei.chen <lei.chen@rock-chips.com>
2018-03-15 09:37:11 +08:00
Finley Xiao
0e7eba3141 clk: rockchip: rk3308: Rename gmac to mac
Change-Id: I31e9fddcffde824c2b41bd3eddccf3a995cfb913
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-03-14 14:42:20 +08:00
Finley Xiao
ec51d82bdc clk: rockchip: rk3308: Add CLK_IGNORE_UNUSED for clocks with div50
Change-Id: I3b01a93741af7e66f57b5c93c33746d8cbe21bfe
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-03-14 14:05:04 +08:00
Jason Song
6655b96cd3 ARM: dts: rockchip: rk3288: fix uart4 pinctrl error.
Change-Id: Ia1d5af0a3fadf9f8649df664aef2e6f3d862d778
Signed-off-by: Jason Song <sxj@rock-chips.com>
2018-03-14 09:11:18 +08:00
Tao Huang
5b30e653ca clk: rockchip: build depends on CPU config
Change-Id: Ia35e7bba3eb7bd37f8f291d7501681a6ccea421f
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-03-13 18:38:21 +08:00
Tao Huang
a5c23986ad media: soc_camera/rockchip: Fix compile warning
aptina/imx/ov_camera_module.c:
Fix this warning: this if clause does not guard... [-Wmisleading-indentation]

Change-Id: I788d4d4d04dd2b0b7c41e1a041e9084c62b1975c
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-03-13 18:37:19 +08:00
Binyuan Lan
686662c6f1 ASoC: rockchip: i2s: protect I2S_XFER_TXS/I2S_XFER_RXS with mutex
fix bug error log: "rockchip-i2s ff070000.i2s: fail to clear".
When the TX/RX have started, can not do 'clear operation'.

Change-Id: I83c2ac29412a37a5de02ed9d4be62716fe46678a
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
2018-03-13 18:32:51 +08:00
Zhang Zhijie
603bf24744 OP-TEE: add configure uart port function
When kernel change print log uart port, optee should keep the same
with it. Kernel driver will tell optee the uart port id when
tee-supplicant starts up.
If fiq-debugger node is disabled, then id is set as 0xffffffff,
optee uart print is disabled.

Change-Id: Id0bc5428d244896fa95eb6a9c2f36bd3ff1248b7
Signed-off-by: Zhang Zhijie <zhangzj@rock-chips.com>
2018-03-13 18:32:09 +08:00
Sandy Huang
dc6a552956 arm64: rockchip_defconfig: enable CONFIG_ROCKCHIP_RGB
For RK3326/RK3308

Change-Id: I4a82988cdd9b72844b65d2ff35a56e4f10886d74
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-03-13 18:20:18 +08:00
shengfei Xu
a6625d7dbb power: rk817: fix the display soc jump from 0 to 100
Change-Id: If930ed4804e502aaa4f6b18a51e671517784ff0b
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
2018-03-13 14:52:25 +08:00
Huibin Hong
f654b33256 arm64: dts: rockchip: Add spi node for rk3308
Change-Id: I5212c378e74da0159247a4dcf4bf66bb5b671f80
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2018-03-13 14:48:21 +08:00
Huibin Hong
2ed3cd686e arm64: dts: rockchip: Add uart node for rk3308
Change-Id: I3d3bacf0801154d2cd354e39dc2a6440fa616930
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2018-03-13 14:47:09 +08:00
Huibin Hong
a657105990 arm64: dts: rockchip: Add dma node for rk3308
Change-Id: I7337d230ae8d73805b478b4e7280cdf33c48a1fb
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2018-03-13 14:43:20 +08:00
Huibin Hong
a9e533b076 arm64: dts: rockchip: Add watch dog node for rk3308
Change-Id: I735a84dc5be18da47131c08cfdb2f66f698648b3
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2018-03-13 14:41:27 +08:00
Finley Xiao
d65b1d2ec8 clk: rockchip: rk3308: Add dmac clocks
Change-Id: I63e30bb23f6bc61f1dcc189e3bc43a6f1bb57f3f
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-03-13 13:56:09 +08:00
Zhen Chen
4a1507af5a MALI: rockchip: upgrade bifrost DDK to r10p0-01rel0
in addition,
resolve all the conflicts;
rename all the configs and macros that have a same name in midgard/;
fix a compiling error.

Change-Id: I5abc8c925049e087c59b66da57c82aac3092be71
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2018-03-13 13:55:01 +08:00
Zhen Chen
25c5dc5a92 MALI: midgard: rk: fix a memory leak in platform specific code
Change-Id: I31ecc394c8ac971ed915b18b08d5b5cba5d440e2
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2018-03-13 10:40:59 +08:00
Zhen Chen
1ffc1d8044 MALI: bifrost: rk: fix a memory leak in platform specific code
Change-Id: I88a8614742b9663454349d09b84e63998f0aeb66
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2018-03-13 10:40:25 +08:00
XiaoDong Huang
b3bbd99a3f arm64: dts: rockchip: enable rockchip_suspend node for px30/rk3326 board
Change-Id: Ic0abae2f3c474e2d6f03bda3ae4a99d05cc53c30
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2018-03-12 19:55:55 +08:00
XiaoDong Huang
8e0f9d6184 arm64: dts: rockchip: px30: add rockchip-suspend node
Change-Id: Iac7fdbcf6ede75d8a987c8c618bce4ebc4f536cc
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2018-03-12 19:54:55 +08:00
XiaoDong Huang
209bb1d4ac soc: rockchip: support px30 pm config
Change-Id: Ia1f48c904cf9711f1c6601e50eccd4d2026cffe6
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2018-03-12 16:26:08 +08:00
Wyon Bi
b8a66c99b7 phy/rockchip: mipi-dphy: optimized power on/off sequences
we can power off the bandgap to reduce power consumption.

Change-Id: I7959e6f1d38a6abca70d6d904264668a19ace920
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-03-12 11:48:52 +08:00
Algea Cao
e18e74beb7 arm: rockchip_defconfig: Support hdmi cec
Change-Id: I4772bff4d05ebe85a8ccc781788fc7e1fe9bcea1
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2018-03-10 11:23:13 +08:00
Tao Huang
195d03b6cb rockchip: cpu: cpu_is_xxx depends on CPU config
Change-Id: I8c84af7b41da306b20a6d3653deaeee6ce49ea31
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-03-09 20:34:27 +08:00
Tao Huang
e3ffa5e5db soc: rockchip: add CPU_XXX config
For build kernel only support the given CPU.

Change-Id: I3d4790779d0ad0ecff6661ffb0b70e2df287fd5a
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-03-09 20:10:52 +08:00
Tao Huang
3430c68a33 Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux-linaro-stable.git
* linux-linaro-lsk-v4.4-android: (660 commits)
  ANDROID: keychord: Check for write data size
  ANDROID: sdcardfs: Set num in extension_details during make_item
  ANDROID: sdcardfs: Hold i_mutex for i_size_write
  BACKPORT, FROMGIT: crypto: speck - add test vectors for Speck64-XTS
  BACKPORT, FROMGIT: crypto: speck - add test vectors for Speck128-XTS
  BACKPORT, FROMGIT: crypto: arm/speck - add NEON-accelerated implementation of Speck-XTS
  FROMGIT: crypto: speck - export common helpers
  BACKPORT, FROMGIT: crypto: speck - add support for the Speck block cipher
  UPSTREAM: ANDROID: binder: synchronize_rcu() when using POLLFREE.
  f2fs: updates on v4.16-rc1
  BACKPORT: tee: shm: Potential NULL dereference calling tee_shm_register()
  BACKPORT: tee: shm: don't put_page on null shm->pages
  BACKPORT: tee: shm: make function __tee_shm_alloc static
  BACKPORT: tee: optee: check type of registered shared memory
  BACKPORT: tee: add start argument to shm_register callback
  BACKPORT: tee: optee: fix header dependencies
  BACKPORT: tee: shm: inline tee_shm_get_id()
  BACKPORT: tee: use reference counting for tee_context
  BACKPORT: tee: optee: enable dynamic SHM support
  BACKPORT: tee: optee: add optee-specific shared pool implementation
  ...

Conflicts:
	drivers/irqchip/Kconfig
	drivers/media/i2c/tc35874x.c
	drivers/media/v4l2-core/v4l2-compat-ioctl32.c
	drivers/usb/gadget/function/f_fs.c
	fs/f2fs/node.c

Change-Id: Icecd73a515821b536fa3d81ea91b63d9b3699916
2018-03-09 19:10:14 +08:00
Rocky Hao
b8856eb8db arm64: dts: rockchip: rk3308: add tsadc node and basic thermal config
Change-Id: I483802c7c3e0e46f085eb3ef802ccdd9bdb89096
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2018-03-09 18:46:58 +08:00
Rocky Hao
a231e9c68e thermal: rockchip: add tsadc support for rk3308
Change-Id: Ibf1782ca471c8ad4b14d6fd64eeb123181903adc
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2018-03-09 18:43:57 +08:00
Frank Wang
c687abf750 ARM64: dts: rockchip: add usb related nodes for rk3308
This change adds usb otg/host controllers and related phy nodes
on rk3308 SoC.

Change-Id: I5fd3acc44614cc3fcb58eb269c2e559ea24ab0f1
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2018-03-09 18:42:48 +08:00
Frank Wang
bdeb719242 phy: rockchip-inno-usb2: add usb-phy support for rk3308
This change adds usb-phy support for rk3308 SoC and amend related
phy Documentation.

Change-Id: I953af94fb4d55d79ae1cba624a04fb4b84e019f6
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2018-03-09 18:42:23 +08:00
William Wu
e6f2f6d63e usb: dwc2: power on/off phy for otg mode
The commit dc71e51944 ("usb: dwc2: make otg manage lowlevel
hw on its own") aimed to control the clk and phy power for
otg mode, but it also introduced lost of new problems, so we
revert it.

This patch only controls phy power for otg mode, it can fix
the dwc2 udc start fail issue with the following error log:

dwc2_hsotg_init_fifo: timeout flushing fifos (GRSTCTL=80000430)
dwc2_core_reset() HANG! Soft Reset GRSTCTL=80000001
bound driver configfs-gadget
dwc2_core_reset() HANG! Soft Reset GRSTCTL=80000001

Change-Id: Id6996aecab7f0aaaf12530b7a377144e23ef1667
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-03-09 18:41:31 +08:00
William Wu
1d7b6657a5 Revert "usb: dwc2: make otg manage lowlevel hw on its own"
This reverts commit dc71e51944.

We found that this commit will cause at least three issue:
1. On RK3126C Tablet, plug in OTG cable and U disk first,
   then power on the Tablet, the system will hang because
   of dwc2 interrupt storm.

2. On RK3328-EVB, connect usb to PC first, then power on
   the board, the system will hang because of dwc2 interrup
   store.

3. On Linux system, the OTG Host mode can't detect U disk.

The root cause is that this patch will diable the controller
clk at the end of probe if OTG work as OTG mode, and only
enable the clk again in dwc2_hsotg_udc_start(). However,
the dwc2 interrupt is enabled in dwc2_hcd_init() during probe,
so the dwc2 interrupt maybe triggered but the interrupt pending
state can't be cleared because that the clk has been disabled.
This cause dwc2 interrupt storm problem.

On the other hand, for Linux system, it may config OTG work
as OTG mode, but it never calls dwc2_hsotg_udc_start() to
enable the controller clk becasue there is no gadget application.
So the clk never be enabled, and casue OTG Host mode fail
to detect the U disk.

Change-Id: Id3463225e0232de7078de1e9d39470a6d5e2cea4
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-03-09 18:41:31 +08:00
Rocky Hao
0af992ee2e hwmon: gpio-fan: add thermal control
add devfreq and devfreq_cooling feature for gpio-fan and then
it can be used as thermal cooling device to support IPA thermal
policy.

Change-Id: I376faa485625ac41276df9bbac8188ea8d664b36
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2018-03-09 17:54:34 +08:00
Sandy Huang
df5cbcb5db arm64: dts: rockchip: rk3308: add display node
add display node: vop, rgb node.

Change-Id: I495079cb18170bd2437670fd6d6e3c7e22438895
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-03-09 17:50:43 +08:00
Sandy Huang
637d06bb3e drm/rockchip: rgb: add support rk3308 rgb
add support for rgb panel or rgb covert to other interface panel.

Change-Id: I190ce6e08d38f794ecabb863e0def5e74890f75a
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-03-09 17:48:58 +08:00
Sandy Huang
b0c948421f drm/rockchip: vop: add support rk3308
rk3308 vop support win0 and win1:
win0: yuv/rgb and scale;
win1: rgb

Change-Id: Ie95128187f92047794c47273923d231da0ab9e93
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-03-09 17:48:03 +08:00
Wyon Bi
25f2631acc arm64: dts: rockchip: px30: set default driver strength for lcdc pins
Change-Id: I9b2b158576d43f4674922555ce7426bd6f3a82fd
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-03-09 17:45:20 +08:00
Finley Xiao
e0b38fccd1 clk: rockchip: Fix armclk parent error
There are two clocks between armclk and pll_apll on px30,
but there may be only one clock on some Socs, so it will
get a error pll clock.

Change-Id: I34116a1ec824b884d3745082f3546cd9ab4c0d21
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-03-09 16:47:58 +08:00
Tao Huang
cc0a17adb1 usb: dwc3: rockchip: use __maybe_unused to hide pm functions
Change-Id: I00df5df23de851275bf1fd96b246b8da6f0e44c7
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-03-09 14:57:43 +08:00
Tao Huang
cdb20a9b84 power/rk817_charger: fix compile warning when !PM_SLEEP
Change-Id: I673cf160c6cb3ae37b9b01d9d38fd4da13d76aa2
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-03-09 14:43:59 +08:00