Commit Graph

608119 Commits

Author SHA1 Message Date
Sandy Huang
c212130a7c arm64: dts: rockchip: rk3308: update lcdc pinctl to fun1
Change-Id: Id4c5fcc94fe383d216aac67826d593a9f9c71884
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-03-24 11:45:03 +08:00
Sandy Huang
f54d446d3b arm64: dts: rockchip: add support spi screen for rk3308-evb-ext board
Change-Id: I7095276a186f301e8913bad7abd2cc87e6228bcf
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-03-23 21:26:28 +08:00
Ziyuan Xu
3cf1fb840f arm64: dts: rockchip: add backlight for rk3308-evb-ext board
Change-Id: If76cc0d143e9dff950b0c5d662541a385239f668
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
2018-03-23 21:26:28 +08:00
Finley Xiao
f45930cdbc clk: rockchip: rk3308: Fix clk_uart_src parent clock
Change-Id: I147051b08ef67a80778b352424f36057a74fc5d0
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-03-23 21:06:36 +08:00
Andy Yan
888a13c66f arm64: dts: rockchip: add syscon-reboot-mode for rk3308
Add syscon reboot mode dt node for RK3308 SOC.

Change-Id: Ia9583bf8436b53caf160ce31d34c82230832c04d
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2018-03-23 21:05:26 +08:00
Finley Xiao
d5e8f70d5f clk: rockchip: rk3308: Add pclk_wdt
Change-Id: I1946b3550c11d6fde424c8493eaf925ff2dcfce4
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-03-23 20:39:26 +08:00
Finley Xiao
699150fe82 arm64: dts: rockchip: rk3308: Assign emmc, sdio, sdmmc clocks to DIV50
Change-Id: Ie8b84b655b9ee0db6ae7013b8bc7d496badd5dd4
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-03-23 20:39:26 +08:00
Tony Xie
78df9ac64e arm64: dts: rockchip: rk3308-evb-v10: add some pwm property
1. config pwm to 200k
2. add regulator-settling-time-up-us

Change-Id: Ifabbd68524ad7012459a0202d2b2982701040f68
Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
2018-03-23 20:33:13 +08:00
XiaoDong Huang
fd769fde5b arm64: dts: px30: support cpu/cluster idle
Change-Id: I41b08eb568471dcf1537cb7afa637bdf6a7df2c8
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2018-03-23 18:58:26 +08:00
Algea Cao
dd37ccac7f drm/bridge: synopsys: dw-hdmi: Update criteria to determine whether uboot logo is on
If hdmi plug in when kernel starting, hdmi may be without output.
Because the old criteria that to determine whether uboot logo is
on is hdmi phy pll locked and hdmi is connected. But in some
platform(such as rk3229), hdmi phy pll is locked even hdmi phy
is power down. In this case, the old criteria is unreliable.

So we add a new criteria that check Frame Composer register.If
the register value is not 0, we think that uboot logo is on,
hdmi has been setup.

Change-Id: Ifaa27030e5f5d551bec8f971694ff5d9c34a7c1d
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2018-03-23 18:09:12 +08:00
Liang Chen
b2849bcc8d video: rockchip: vpu: Add devfreq feature for rk322x
Change-Id: Ic1de49c79b7447cdecbff0cf1cf49c2c594193df
Signed-off-by: Liang Chen <cl@rock-chips.com>
2018-03-23 17:24:32 +08:00
Liang Chen
0817d18169 arm: dts: configure opp-table and cooling-device of vpu for rk322x
Change-Id: I5604126c329b4488b9e262ef1b08d526df715543
Signed-off-by: Liang Chen <cl@rock-chips.com>
2018-03-23 17:23:55 +08:00
Huang jianzhi
7695831137 ARM: dts: rk322x: Modify dmc SYS_STATUS_VIDEO_4K frequency from 600M to 666M
Change-Id: I0c7f934d1baff23e2e450975069fd753c398d673
Signed-off-by: Huang jianzhi <jesse.huang@rock-chips.com>
2018-03-23 17:23:24 +08:00
Tony Xie
3e9d497c92 ARM: dts: rockchip: rk3229-evb-android: add regulator-settling-time-up-us for pwm regulator.
Change-Id: I838fd14fb3ffcdd0147892a1b2e06ecfde5430e2
Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
2018-03-23 17:18:56 +08:00
Tao Huang
ef92d723e3 arm64: rk3308_linux_defconfig: disable CPU_IDLE_GOV_LADDER
Ladder governor is for periodic timer tick, we use menu governor.

Change-Id: Iffb797a801563f6745238a26b2582ea57d6ab0a5
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-03-23 14:22:14 +08:00
Tao Huang
85b2fa8c51 regulator: remove unused rk29-pwm-regulator
Change-Id: Ic16bc131ebd7efae66dea9098dc9c4516e60e0f1
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-03-23 12:13:36 +08:00
Tao Huang
0de0a2a416 net: rfkill: remove unused rfkill-rk
Change-Id: Ib91b06390453c8878108f0dc24e36261f04e82ee
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-03-23 11:45:47 +08:00
David Wu
e6f2796ef5 pwm: rockchip: Disable irq for pwm config
Add irq disabled protection at the PWM configuration, which can
speed up the PWM configuration and reduce the possibility of
interrupting the configuration.

Change-Id: I8ca3c4b9790b747c12804fa82b51456a0de7fb92
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-03-23 09:23:36 +08:00
Ziyuan Xu
b947e52a9d arm64: dts: rockchip: add bt & wifi support for rk3308-evb-v10 board
Change-Id: Id8e1f648cbecfa8d773baa9aa5803a8bffabff57
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
2018-03-22 18:18:10 +08:00
Ziyuan Xu
e8391a6474 arm64: configs: add led controller and gpio-rotary for rk3308_linux
Change-Id: I00000b44a10420d686aff6a96805ca5db613f6fb
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
2018-03-22 18:15:10 +08:00
Ziyuan Xu
462a710d60 arm64: dts: rockchip: rk3308-evb-v10: fix typo in bootargs
Change-Id: I410188058b329d1d8e8b2ad749850d7f147f0b2d
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
2018-03-22 18:14:13 +08:00
Tao Huang
984c3db82e rk: scripts: add mkbootimg
From AOSP 294eb9dac3c0 ("mkbootimg: use int for os_version and os_patch_level")

Change-Id: I5026049859df121d0a034085c2563cfc4ef98230
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-03-22 15:19:30 +08:00
Huibin Hong
547d67bebe arm64: dts: rockchip: add spi aliase for px30
Change-Id: I9b833d7d6a91d18a422bd2682bfc4ec4c4a9457c
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2018-03-22 15:10:45 +08:00
Tao Huang
e142070820 arm64: rk3308_linux_defconfig: enable SND_HRTIMER/LEDS_IS31FL32XX/ARM64_CRYPTO
Add LEDS_IS31FL32XX for rk3308-evb.
Add ARM64_CRYPTO for best performance, use 75KB.

Change-Id: Id2aafe02ccdb163af00d4bc19375a1fddca450a4
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-03-22 14:20:24 +08:00
Matthias Kaehlcke
411da4b351 UPSTREAM: regulator: Allow for asymmetric settling times
Some regulators have different settling times for voltage increases and
decreases. To avoid a time penalty on the faster transition allow for
different settings for up- and downward transitions.

Change-Id: Iab14df27c8275945a31a55630ce3c926acf5828d
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Acked-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit 3ffad468cf)
2018-03-22 11:14:38 +08:00
Matthias Kaehlcke
7f0ade1f1e UPSTREAM: regulator: DT: Add properties for asymmetric settling times
Some regulators have different settling times for voltage increases and
decreases. Add DT properties to define separate settling times for up-
and downward voltage changes.

Change-Id: Ie41615b15161608d1751685147702e451a205531
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Acked-by: Laxman Dewangan <ldewangan@nvidia.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit 543853de35)
2018-03-22 11:14:38 +08:00
Laxman Dewangan
2fbdff89ce UPSTREAM: regulator: Add settling time for non-linear voltage transition
Some regulators (some PWM regulators) have the voltage transition
non-linear i.e. exponentially. On such cases, the settling time
for voltage transition can not be presented in the voltage-ramp-delay.

Add new property for non-linear voltage transition and handle this
in getting the voltage settling time.

Change-Id: I3b3b8b173beaa3ecbc959b241c791d0816e5b7d2
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit d6c1dc3f52)
2018-03-22 11:14:38 +08:00
Laxman Dewangan
a21f433fab UPSTREAM: regulator: DT: Add settling time property for non-linear voltage change
Some regulators (some PWM regulators) have the voltage transition
exponentially. On such cases, the settling time for voltage change
is treated as constant time.

Add DT property for providing the settling time for any level of
voltage change for non-linear voltage change.

signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Change-Id: Ia88df848c62aecb0e03838a00398655a44dc220f
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit cfd2cedb48)
2018-03-22 11:14:38 +08:00
H. Nikolaus Schaller
3c27fb4c51 UPSTREAM: regulator: core: silence warning: "VDD1: ramp_delay not set"
commit 73e705bf81 ("regulator: core: Add set_voltage_time op")

introduced a new rdev_warn() if the ramp_delay is 0.

Apparently, on omap3/twl4030 platforms with dynamic voltage
management this results in non-ending spurious messages like

[  511.143066] VDD1: ramp_delay not set
[  511.662322] VDD1: ramp_delay not set
[  513.903625] VDD1: ramp_delay not set
[  514.222198] VDD1: ramp_delay not set
[  517.062835] VDD1: ramp_delay not set
[  517.382568] VDD1: ramp_delay not set
[  520.142791] VDD1: ramp_delay not set
[  520.502593] VDD1: ramp_delay not set
[  523.062896] VDD1: ramp_delay not set
[  523.362701] VDD1: ramp_delay not set
[  526.143035] VDD1: ramp_delay not set

I have observed this on GTA04 while it is reported to occur on
N900 as well: https://bugzilla.kernel.org/show_bug.cgi?id=178371

This patch makes the warning appear only in debugging mode.

Change-Id: I29b9fcc6f5507bd9763d26d076d72e8ccb0e25ec
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit ba14fa1a57)
2018-03-22 11:14:38 +08:00
Matthias Kaehlcke
7256fb26c9 UPSTREAM: regulator: core: Add set_voltage_time op
The new op is analogous to set_voltage_time_sel. It can be used by
regulators which don't have a table of discrete voltages. The function
returns the time for the regulator output voltage to stabilize after
being set to a new value, in microseconds. If the op is not set a
default implementation is used to calculate the delay.

This change also removes the ramp_delay calculation in the PWM
regulator, since the driver now uses the core code for the calculation
of the delay.

Change-Id: I401ace81648be8e8eab2e4bd3a0f41ed9766fae1
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit 73e705bf81)
2018-03-22 11:14:38 +08:00
Matthias Kaehlcke
d8b6c0af69 UPSTREAM: regulator: core: Don't skip set_voltage_time when ramp delay disabled
The current code assumes that only the ramp_delay is used to determine
the time needed for the voltage to stabilize. This may be true for the
calculation done by regulator_set_voltage_time_sel(), however regulators
can implement their own set_voltage_time_sel() op which would be skipped
if no ramp delay is specified. Remove the check in
_regulator_do_set_voltage(), the functions calculating the ramp delay
return 0 anyway when the ramp delay is not configured.

Change-Id: Ia15f06f27b5dfa230cd8c7f548965a8fa283c263
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit d89564efe7)
2018-03-22 11:14:38 +08:00
Matthias Kaehlcke
8681485ecb UPSTREAM: regulator: core: Simplify error flow in _regulator_do_set_voltage()
If the voltage can not be set jump to the end of the function. This
avoids having to check for an error multiple times and eliminates one
level of nesting in a follow-up change.

Change-Id: Icead960f8403e2e962cd94fc516a5f633f5c3fc7
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit 31dfe686ed)
2018-03-22 11:14:38 +08:00
Matthias Kaehlcke
4091ac228d UPSTREAM: regulator: core: Use local ops variable in _regulator_do_set_voltage()
Change-Id: I3539bd69bedac7edcda55987b293f5588e749f3e
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit 57995a4860)
2018-03-22 11:14:38 +08:00
Wyon Bi
2ad329307f drm/rockchip: lvds: clean up pinctrl handling on px30
Change-Id: I2388110526b7e6e6a9839dfee1cbcb866c93dd27
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-03-22 11:13:52 +08:00
Wyon Bi
e4d312108f arm64: dts: rockchip: px30-android: add route_rgb node
Change-Id: Ic3b8763f5a01282a339fa4b1c15fa24fda256c76
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-03-22 11:13:52 +08:00
Wyon Bi
22f04ad334 arm64: dts: rockchip: px30: add rgb node
Change-Id: I3bc1bd408bd97dcd18293efc258635d1f68766b3
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-03-22 11:13:52 +08:00
Wyon Bi
9b9fea95bf drm/rockchip: rgb: Add support for PX30
Change-Id: I56f8edccdc1bca477c81c44a3bcaa7287c7dd7ba
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-03-22 11:13:52 +08:00
Xu Hongfei
ed107f0e86 camera: rockchip: change gc2415 fps to 20fps for the test of cts/vts
Change-Id: Ia70e9abb9a5e41e1e79267e8bfaa4dbbf4659977
Signed-off-by: Xu Hongfei <xuhf@rock-chips.com>
2018-03-22 09:52:21 +08:00
JinSen Chen
fd3618748b ARM: dts: rk3288-android: Add system/vendor partition nodes
Change-Id: Ibb6b1449a11c195a9316583270b82120b17f7cbb
Signed-off-by: JinSen Chen <kevin.chen@rock-chips.com>
2018-03-22 09:51:47 +08:00
Jerry Xu
244bfe93a4 ARM: dts: rk322x: add tsp support
Change-Id: I8fecbd1f5a792c3e2810b552b72873d1c4eed73c
Signed-off-by: Jerry Xu <xbl@rock-chips.com>
2018-03-21 21:09:13 +08:00
Jerry Xu
865806b7db arm64: dts: rockchip: add tsp support for rk3328
Change-Id: I981d8fb53b44d79bc1a425b93699a30de6982dff
Signed-off-by: Jerry Xu <xbl@rock-chips.com>
2018-03-21 20:56:17 +08:00
Jerry Xu
7af07167d8 Documentation: media: rockchip: Documentation for TSP
Change-Id: I65bb0821e882e842324dc7f23140174e6bc751ca
Signed-off-by: Jerry Xu <xbl@rock-chips.com>
2018-03-21 20:54:52 +08:00
Jerry Xu
6c5af216e1 media: rockchip-tsp: add tsp driver
Change-Id: I22ea801c6d5b21edd41149dc4dca897c544907c9
Signed-off-by: Jerry Xu <xbl@rock-chips.com>
2018-03-21 20:52:31 +08:00
Felipe Balbi
524ec9aad4 UPSTREAM: usb: gadget: u_ether: remove interrupt throttling
According to Dave Miller "the networking stack has a
hard requirement that all SKBs which are transmitted
must have their completion signalled in a fininte
amount of time. This is because, until the SKB is
freed by the driver, it holds onto socket,
netfilter, and other subsystem resources."

In summary, this means that using TX IRQ throttling
for the networking gadgets is, at least, complex and
we should avoid it for the time being.

Change-Id: Ice4107af47309054e67f1ab22cc7c2c6a393263d
Cc: <stable@vger.kernel.org>
Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Suggested-by: David Miller <davem@davemloft.net>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: William Wu <william.wu@rock-chips.com>
(cherry picked from commit fd9afd3cbe)
2018-03-21 20:50:12 +08:00
Zheng Yang
c8da07269b phy: rockchip: inno-hdmi: no need to or efuse phy flag shift
The phy flag shift offset is defined in dts file, there is
no need to or the shift in the phy driver.

Change-Id: I13a33a536dabea68adf07a73cc2d13439719c589
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2018-03-21 20:48:57 +08:00
Zheng Yang
d2e6be70ae ARM: dts: rk322x: rename phy_flag to hdmi_phy_flag
Change-Id: I911d1e65778126521a1842d5ee7d3effee18dc91
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2018-03-21 20:48:57 +08:00
Sandy Huang
8db42d7949 drm/rockchip: vop: add support mcu register config
For px30 and rk3308

Change-Id: Ic19bfb871207c778842531a170eb92792139e862
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-03-21 20:44:55 +08:00
Xing Zheng
4da6b9253e arm64: rockchip_linux_defconfig: enable rk3308 acodec
Change-Id: If14a78bec87aefdb2bcf0ed283a8a1e45c20b6e5
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2018-03-21 19:47:46 +08:00
Xing Zheng
103450b92e arm64: dts: rockchip: Add acodec node for rk3308
Change-Id: I76f4a877711d33620bdef295e9047bdba26d4da4
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2018-03-21 19:47:03 +08:00
Putin Lee
56961708dd ARM: dts: rockchip: enable rga device node for rk3229-evb-android
Change-Id: I6063f701e49d8bb862012028f3584b54be2c6aa7
Signed-off-by: Putin Lee <putin.li@rock-chips.com>
2018-03-21 19:43:46 +08:00