Commit Graph

608140 Commits

Author SHA1 Message Date
Sugar Zhang
ea2d29073a ASoC: rockchip: add support for multicodecs sound
Change-Id: I77d3e9c10d03c2b8809c6d82b5268dba279ee6f0
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-03-26 11:41:36 +08:00
Sugar Zhang
ecf08a4208 ASoC: codec: add dummy codec for rockchip
Change-Id: I86cb74994d49178525e15b61b5056fd3995e904d
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-03-26 11:41:36 +08:00
Sugar Zhang
4519e31162 arm64: dts: rockchip: add i2s, pdm for rk3308
Change-Id: I9fdc000223ad2f5dbf69e31d67a5bc7b3bc4467d
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-03-26 11:41:36 +08:00
Sugar Zhang
ee0c8242d3 arm64: configs: enable i2s/tdm for rockchip defconfig
Change-Id: If8b4935dab761330693e11d24fb8197acbe97b08
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-03-26 11:41:36 +08:00
Sugar Zhang
018d1c86c1 ASoC: rockchip: add support for rockchip i2s/tdm controller
This patch is add for rockchip i2s/tdm controller.

Change-Id: I428e311402220ff14441c48e13fa51356ced46e8
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-03-26 11:41:36 +08:00
Finley Xiao
0e8e8a0af4 arm64: dts: rockchip: rk3308: Add pvtm node
Change-Id: I8d31a58478281b7e16a7de2016e65ba4b8701c72
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-03-26 11:35:49 +08:00
Finley Xiao
9717a092c0 soc: rockchip: pvtm: Add support for RK3308 SoCs
This adds the necessary data for handling pvtm on the rk3308.

Change-Id: I54860da4aeea2c4c05fec717d73152a69d30a24f
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-03-26 11:35:49 +08:00
Shawn Lin
29b6b16557 BACKPORT: FROMLIST: clk: rockchip: Fix wrong parent for SDMMC phase clock for rk3228
commit c420c1e4db ("clk: rockchip: Prevent calculating mmc phase
if clock rate is zero") catches one gremlin again for clk-rk3228.c
that the parent of SDMMC phase clock should be sclk_sdmmc0, but not
sclk_sdmmc. However, I don't like the name of sclk_sdmmc0, so I now
rename it to be sclk_sdmmc.

Change-Id: I1cf16aa1c639ce4776347b40a36bde241c800c03
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
(cherry-picked from https://patchwork.kernel.org/patch/10298427/)
2018-03-26 11:28:19 +08:00
Shawn Lin
a4b0a0f6bf BACKPORT: FROMLIST: clk: rockchip: Fix wrong parents for MMC phase clock for rk3328
commit c420c1e4db ("clk: rockchip: Prevent calculating mmc phase if clock rate is zero")
catches some gremlins for clk-rk3328.c that the parents of MMC phase
clock should be clk_{sdmmc, sdio, emmc}, but not sclk_{sdmmc, sdio,
emmc}.

Change-Id: I714d031e33dcbed120bd5c9c514f7a1d65446c18
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
(cherry-picked from https://patchwork.kernel.org/patch/10298425/)
2018-03-26 11:28:08 +08:00
Tao Huang
22b4d8d8a3 arm64: rk3308_linux_defconfig: remove px30 support
remove RK817/MIPI/CPU_PX30

Change-Id: I0ca1f705f9f5ce3ea5128728fb487f6aead9a905
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-03-24 17:20:33 +08:00
Tao Huang
9db9be8132 arm64: dts: rockchip: fix rktimer irq for px30
Fixes: fd769fde5b ("arm64: dts: px30: support cpu/cluster idle")
Change-Id: I1e95e21fa0304fe87ef7adba238e41294c5429cb
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-03-24 17:06:32 +08:00
Ziyuan Xu
35c7123582 arm64: dts: rockchip: fixup bluetooth configuration
The clk_rtc_32k is used as crystal input for wifi & bt device on
rk3308-evb-v10 board, and it should be always enabled.

Reivse the "BT,reset-gpio" to "BT,power-gpio" which the original is not
correspond to BT_REG_ON.

Change-Id: I210e5386d93fdd3004f483ab877e590f42e7ef83
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
2018-03-24 17:04:33 +08:00
Huibin Hong
0428676935 arm64: dts: rockchip: reference fiq debugger for rk3308-evb-rev1 board
Change-Id: I665233589518a2640777303c71189e3f376d3b1f
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2018-03-24 16:56:02 +08:00
Huibin Hong
67afe18758 arm64: dts: rockchip: reference fiq debugger node for rk3308 fpga
Change-Id: Ib6fd9d2af2839e0806c6039da964ffc235d4ac9b
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2018-03-24 16:54:30 +08:00
Huibin Hong
1fa1133991 arm64: dts: rockchip: Add fiq debugger node for rk3308
Change-Id: Ie64336bd0046c1a5619e243775ed6807b0568118
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2018-03-24 16:52:14 +08:00
Huibin Hong
157f450809 arm64: dts: rockchip: fix dmac interrupts config for rk3308
Change-Id: I31efa00bbfd231720893b12cb1c2404714a1d1af
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2018-03-24 16:51:03 +08:00
Tao Huang
ed4c28dc89 drm/panel: simple: Fix compile error when !DRM_MIPI_DSI
Change-Id: I962f7d3f004242fe5197979a84dcf3c27a944ece
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-03-24 16:37:42 +08:00
David Wu
af77467329 arm64: dts: rockchip: Add rtc_32k support for rk3308-evb
Change-Id: Ia8bfa8fae701bdd6a90bcc108959cdd49d122b76
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-03-24 15:31:31 +08:00
David Wu
8261df3812 pinctrl: rockchip: Add rtc 32k io route data for rk3308
If rtc_32k pin iomux is enabled, the grf_rtc_32k_ioe
needs to be enabled also.

Change-Id: I24d04c09b1190aa0cd323231c2f2e27ae900d200
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-03-24 15:31:26 +08:00
Finley Xiao
ea09cfaa51 arm64: dts: rockchip: rk3308: Assign clk_rtc32k to 32768Hz
Change-Id: I2d6e06cc8e397dc9da5037458aa518dadc11fe01
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-03-24 15:31:14 +08:00
Sandy Huang
c3e45ba34c drm/rockchip: rgb: add support output_mode config
Change-Id: If2c44545a7a54bb680d1025ab2793167cd24109c
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-03-24 11:45:46 +08:00
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