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 3ffad468cf1d9825b425733941bdad0d8d20e795)
2018-03-22 11:14:38 +08:00