Commit Graph

602417 Commits

Author SHA1 Message Date
Binyuan Lan
438fc222c2 arm64: rockchip_linux_defconfig: add chinese display support
Change-Id: I31002a63a38fa46fb0f170222b0ddceeaf27427c
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
2017-07-21 17:44:02 +08:00
WeiYong Bi
e42c6403c8 arm64: dts: rockchip: rk3366: Add hdmi node
Change-Id: I99b95a9fd3e70c70b6066729dd4213f8beb33e19
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
2017-07-21 17:04:24 +08:00
zhoupeng
2a3c9f8fb2 arm64: dts: rk3399-sapphire-excavator-linux: add camera node
dts: support tc358749xbg for HDMI IN

Change-Id: I5a5874d08ea13c27cac7b3507a46bb1f2288e3f4
Signed-off-by: zhoupeng <benjo.zhou@rock-chips.com>
2017-07-21 17:02:15 +08:00
zhoupeng
5e8201e371 media: soc_camera: add tc358749xgb sensor driver
Change-Id: I66ccb856cb2689bf26a8a12069b29c7ec6dae6f0
Signed-off-by: zhoupeng <benjo.zhou@rock-chips.com>
2017-07-21 16:22:06 +08:00
chenzhen
56659dcda3 MALI: utgard: fix the too small "max_job_runtime" in platform information
The original setting of "max_job_runtime" is too small
that jobs are too easy to timeout and be killed.

Change-Id: I5316c2b594d94dd0b844ef9a297baa7b226c4665
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2017-07-21 16:18:16 +08:00
Jianqun Xu
5d8b659ad0 ARM: dts: rockchip: rk3368-sheep add vsel gpio for syr827
Add vsel gpio for syr827, which is PMIC_SLEEP in hardware pcb.

The driver will parse the gpio and use it to indicate the chip
work status, as the following codes:

static int fan53555_is_enabled ()
	if defined vsel_gpio
		gpiod_get_raw_value
	else
		regmap_read

Before the patch, the log shows:
	CPU4: update cpu_capacity 1024
	CPU4: Booted secondary processor [410fd033]
	  cache: parent cpu4 should not be sleeping
	rk3x-i2c ff650000.i2c: timeout, ipd: 0x10, state: 1

Since cpu4 is the base core for cluster1, which need to initialize
cpufreq during boot up, finally call fan53555_is_enabled. But the
i2c is suspended at that time, can't get interrupt until timeout.

Change-Id: I301e95be3b60d2faa456759d88c06cf64c2019ca
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-07-21 16:18:15 +08:00
Jianqun Xu
b9b75d8083 ARM: dts: rockchip: rk3368-p9: add vsel gpio for syr827
Change-Id: I847334e0588659e5950b01a4e40bf0a24f5646bf
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-07-21 16:18:15 +08:00
Mark Yao
7f1f1ef3ba drm/rockchip: vop: don't force enable post scale
Vop would always report post buf empty error if enable
post scale config with non-scale factor

Change-Id: Ibc3f27c674195e6467471069488f14471927f709
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-07-21 16:18:00 +08:00
Mark Yao
1dc3517d2f drm/rockchip: vop: add error irq handle
Change-Id: I84a3bc5c9798bbd4e0b11bc499f4df5ca1907cb7
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-07-21 14:16:31 +08:00
Mark Yao
9589a39989 drm/rockchip: support backlight device
Change-Id: Ib793b0dec8fe62027ca8e3085089d2e431b59eb5
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-07-21 12:52:08 +08:00
William Wu
4f519feed0 phy: rockchip-inno-usb2: delay suspending phy if plug out device
The otg_sm_work will suspend the usb2 phy immediately
if it detects disconnection from host. However, the usb2
controller(e.g. DWC2) may need to reinit registers and
reset usb core after usb disconnect, and it needs to
keep the usb2 phy stay in power on state to get utmi clk
for these usb controller operation. We don't have a good
synchronization mechanism to operate usb2 phy between
usb2 phy driver and usb2 controller driver, so we delay
4s to suspend phy if detect otg device disconnect from
host, this can make sure that usb2 controller completes
reinitialization before suspend usb2 phy.

Change-Id: I79288b8c7b141bb16e6d96d80cfee75f7558d2c0
Signed-off-by: William Wu <william.wu@rock-chips.com>
2017-07-21 11:16:24 +08:00
xubilv
0d01d2234a drm/rockchip: dw-mipi-dsi: don't enable PHY PLL until it's configured
Change-Id: Id28702ac62030b112dc57e4c3fc5b91cd1421a3f
Signed-off-by: xubilv <xbl@rock-chips.com>
2017-07-20 19:32:06 +08:00
xubilv
7cb48d54da drm/rockchip: dw-mipi-dsi: use positive check for N{H, V}SYNC
This matches other drivers.

Change-Id: I1e5773b926c274e99ea117a2a0fdc5ab096c49aa
Signed-off-by: xubilv <xbl@rock-chips.com>
2017-07-20 19:19:55 +08:00
xubilv
0734b0f474 drm/rockchip: dw-mipi-dsi: fix escape clock rate
Use the same calculation as the vendor kernel to derive the escape clock
speed.

Change-Id: I7aff4dc7fa9598df164148eaf44304caad704f23
Signed-off-by: xubilv <xbl@rock-chips.com>
2017-07-20 19:19:33 +08:00
xubilv
6d82179b6f drm/rockchip: dw-mipi-dsi: only request HS clock when required
Requesting the HS clock from the PHY before we initialize it causes an
invalid signal to be sent out since the input clock is not yet
configured.  The PHY databook suggests only asserting this signal when
performing HS transfers, so let's do that.

Change-Id: I7006f81d8c620dc84e84f99383c7b5414d6ac12d
Signed-off-by: xubilv <xbl@rock-chips.com>
2017-07-20 19:19:15 +08:00
xubilv
f797759ff5 drm/rockchip: dw-mipi-dsi: organize dw_mipi_dsi_get_hcomponent_lbcc function
Use the common interface to calculate

Change-Id: I21836061d1442048efaba3b2930811b8a0aab0aa
Signed-off-by: xubilv <xbl@rock-chips.com>
2017-07-20 19:18:51 +08:00
xubilv
a96eb422ed drm/rockchip: dw-mipi-dsi: support read lane-rate from dts
It is convenient for the client to manually adjust
the value of lane rate.

Change-Id: Ic6d8c4d235eacc8cb7540d172bd69c29c2b277dd
Signed-off-by: xubilv <xbl@rock-chips.com>
2017-07-20 19:18:31 +08:00
xubilv
d6dfcd07b7 drm/rockchip: dw-mipi-dsi: analyze the platform parameters in the probe function
The analysis of platform parameters Only need to do it once,
if this in bind function, when return -EPROBE_DEFER,
it will be executed more than once.

Change-Id: I508021f930d39e1b79e1421c4262b9e7ab501b6c
Signed-off-by: xubilv <xbl@rock-chips.com>
2017-07-20 19:17:09 +08:00
xubilv
52053e1edc drm/rockchip: dw-mipi-dsi: organize dw_mipi_dsi_video_mode_config function
Change-Id: Id11053734b1c35dc77028f2ac537bd39c096da7d
Signed-off-by: xubilv <xbl@rock-chips.com>
2017-07-20 19:11:39 +08:00
xubilv
e22192940c drm/rockchip: dw-mipi-dsi: add mode_flags as a judgment condition
This flag is used as a condition for the register configuration

Change-Id: I6741063b106ae00f4f1a690abde79d76bc529e95
Signed-off-by: xubilv <xbl@rock-chips.com>
2017-07-20 19:11:20 +08:00
xubilv
47aef81e62 drm/rockchip: dw-mipi-dsi: organize dw_mipi_dsi_set_mode function
Change-Id: I4ba2a1519c1e5ac485a4d7416c0066ad8ce6527a
Signed-off-by: xubilv <xbl@rock-chips.com>
2017-07-20 19:10:56 +08:00
xubilv
83ae1328af drm/rockchip: dw-mipi-dsi: organize dw_mipi_dsi_encoder_disable function
Change-Id: I4c5ba54748bd1965a9f2cdea924efa6d449677a1
Signed-off-by: xubilv <xbl@rock-chips.com>
2017-07-20 19:10:16 +08:00
xubilv
5e338ed711 drm/rockchip: dw-mipi-dsi: organize dw_mipi_dsi_host_transfer function
Change-Id: I2a9bf2f21950f9fffc89d244308d6270663d5ef2
Signed-off-by: xubilv <xbl@rock-chips.com>
2017-07-20 19:10:03 +08:00
xubilv
dc8edeade9 drm/rockchip: dw-mipi-dsi: add delay for panel power on
Change-Id: Ife1a3c421dd192fc76b1ff6c84dbfe4afb1b0a54
Signed-off-by: xubilv <xbl@rock-chips.com>
2017-07-20 19:09:36 +08:00
xubilv
98aa9ed9a0 ARM: dts: rk3288: add delay for panel power on
Change-Id: I132ee50b9b3e0d8a3641135c94723d0a23bb5c40
Signed-off-by: xubilv <xbl@rock-chips.com>
2017-07-20 19:08:57 +08:00
xubilv
749f334599 drm/panel: simple: move panel_simple_dsi_send_cmds from enable to prepare
Change-Id: I9fdd1192523bc5bd99ca2fdc37fdf2f4b06cbb8a
Signed-off-by: xubilv <xbl@rock-chips.com>
2017-07-20 19:08:41 +08:00
xubilv
39d1c0c4a3 drm/rockchip: dw-mipi-dsi: organize dw_mipi_dsi_encoder_enable function
Change-Id: I9d3f43f9d320cc33026bce2ce173a0baf3008ce0
Signed-off-by: xubilv <xbl@rock-chips.com>
2017-07-20 19:08:07 +08:00
Jianqun Xu
3c5e401f78 ARM64: rockchip_defconfig: select CONFIG_TOUCHSCREEN_GSLX680_PAD
Change-Id: I48bf260eedbabcd0ac8cdf827b4f5f629582e936
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-07-20 19:07:45 +08:00
Jianqun Xu
3f997d38d0 arm64: dts: rockchip: rk3399 firefly android dts file
Add dts file for firefly rk3399 board to run android os.
Support soc sub-system, vop, edp, rga, audio, wifi and
so on.

Change-Id: Ia921769b81d4a74784bb3e638b2cb01111c621c9
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-07-20 18:30:13 +08:00
Mark Yao
b307b1cc48 arm: dts: rockchip: add names for vop register
Change-Id: I463cc2dc92f233b5b4b6f91b71cf78af92d4a2c1
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-07-20 14:48:16 +08:00
WeiYong Bi
925e706521 drm/rockchip: hdmi: Add support for rk3366
Change-Id: I086533ed5c94110f913ab88f4760d452beaf12d1
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
2017-07-20 14:38:47 +08:00
WeiYong Bi
b2b7438b82 ARM64: dts: rockchip: rename mipi to dsi for rk3368
Change-Id: Ied02b4d521ad3c49ce7b7a591a3d3f8544182e12
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
2017-07-20 14:37:24 +08:00
WeiYong Bi
bae7eaad9f ARM64: dts: rockchip: rename mipi to dsi for rk3366
Change-Id: I677f4554bdc0d6df9cfdffa86eebe0fa4e1759dd
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
2017-07-20 14:36:28 +08:00
WeiYong Bi
e289a149fb drm/rockchip: lvds: add loader protect
Change-Id: Ia0866cb9125a98ffb4ce99be26be9e0ccd665765
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
2017-07-20 14:34:43 +08:00
Jacob Chen
1908837527 ARM: dts: sync tinker board dts
Sync our kernel with asus to reduce rebase work.

origin:
https://github.com/TinkerBoard/debian_kernel/blob/linux4.4-rk3288/arch/arm/boot/dts/rk3288-miniarm.dts
with dmc and camera nodes deleted

Change-Id: I7e699ca57465c03f41acb4ae47e5e70794118489
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2017-07-20 14:10:54 +08:00
Huang Jiachai
a9aba6a5ec arm64: dts: rockchip: rk3288: add dts file for lvds panel
Change-Id: I5991d0301935b5bdf51aead7719f84b6aa9264c5
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
2017-07-20 14:03:49 +08:00
Zheng Yang
6d20589677 phy: rockchip-inno-hdmi-phy: update 3328 phy pixclock in the recalc_rate
If default phy pre-pll output pixclock is same to the requested rate,
the set_rate function is not called, inno->pixclock is zero and
make phy work not ok. This patch update inno->pixclock both in the
recalc_rate and set_rate, make pixclock be the real value.

Change-Id: Ifd4e145c499c2e82f96918ca62235627bf326734
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2017-07-20 10:41:02 +08:00
Mark Yao
cb4f52e156 drm/panel: support drm_find_panel_by_connector
Change-Id: Iee970e013ff8b1558a060f334c700dea36c38d0f
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-07-19 14:49:25 +08:00
Mark Yao
64bc07d5dc drm/rockchip: vop: add rk3399 cabc registers
Change-Id: Ia7929e4c62ac031453fdb50ed4dcb20d11faee95
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-07-19 14:34:00 +08:00
Mark Yao
ea5e704026 drm/rockchip: add cabc support
CABC(Content Adaptive Backlight Control) is used to
increase the contrast of such LCD-screens the backlight
can be (globally) dimmed when the image to be displayed
is dark (i.e. not comprising high intensity image data)
while the image data is numerically corrected and adapted
to the reduced backlight intensity.

Change-Id: I0bd84375264675943f1b601f0cac8b843567087d
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-07-19 14:34:00 +08:00
Finley Xiao
b7bf509807 arm64: dts: rockchip: rk3399: add 528MHz and 600MHz for dmc
Only 200MHz, 300MHz, 400MHz, 528MHz, 600MHz, 666MHz, 732MHz and
800MHz are available at present.

Change-Id: I3a376b389fe6b06b3b32f0c695de2cbde05dfeea
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-07-19 14:33:59 +08:00
Huang Jiachai
b4bf2fa8d7 drm/rockchip: lvds: set correct step to power off lvds
Change-Id: I6ce0fea548a0bc66c231ac184b45b74fd9acaf1f
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
2017-07-19 14:33:59 +08:00
WeiYong Bi
56640e72df arm64: dts: rockchip: rk3368: fix compatible string for lvds node
Replace "rockchip,rk33xx-lvds" with "rockchip,rk3368-lvds"

Change-Id: I065de5d994f167129591025e4251944478fa43e7
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
2017-07-19 14:33:58 +08:00
WeiYong Bi
d86682da2c drm/rockchip: lvds: Add support for rk3366
Change-Id: Iaf54c4667042b0b24a9083cb7ca931c1b0603804
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
2017-07-19 14:33:58 +08:00
WeiYong Bi
7604d9498f arm64: rockchip_defconfig: remove CONFIG_RK31XX_LVDS
Change-Id: Ie7716e38dd68876ab037cc3ed6072dba4118a798
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
2017-07-19 14:33:57 +08:00
Zhangbin Tong
4408897c1f arm64: dts: rockchip: rk3368-r88: Select xin32k from pwm1 out
Change-Id: Iff675d47600cd7bf1d30564ca82697ce3b1fd9f4
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2017-07-19 14:33:57 +08:00
Zhangbin Tong
9c36f71bb9 arm64: rockchip_defconfig: enable CONFIG_COMMON_CLK_PWM
Change-Id: Ie8c076e6d4c1a0a81c90f7dcd5653bef424b27e2
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2017-07-19 14:33:56 +08:00
Stephen Boyd
10fa811640 UPSTREAM: clk: pwm: Use pwm_get_args() where appropriate
The PWM framework has clarified the concept of reference PWM config (the
platform dependent config retrieved from the DT or the PWM lookup table)
and real PWM state.

Use pwm_get_args() when the PWM user wants to retrieve this reference
config and not the current state.

This is part of the rework allowing the PWM framework to support
hardware readout and expose real PWM state even when the PWM has just
been requested (before the user calls pwm_config/enable/disable()).

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
(cherry picked from commit dd0b38b7ca)

Change-Id: I54c4b3853359b5fa41f8f949b504f82c6f069034
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2017-07-19 14:33:56 +08:00
Huang Jiachai
6724059ae5 drm/rockchip: lvds: if port is null return -EINVAL
Change-Id: I9503b4f2d317a12d91ce136213d8d2e629b72823
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
2017-07-19 14:33:56 +08:00
xubilv
2d1c413b96 ARM: dts: rk3288: rename mipi to dsi
Change-Id: I35d348068df3720608fc9cd22f97be0264a03f67
Signed-off-by: xubilv <xbl@rock-chips.com>
2017-07-19 14:33:55 +08:00