Commit Graph

607181 Commits

Author SHA1 Message Date
William Wu
a1ca1be8f6 phy: rockchip-inno-usb2: use fixed-regulator for vbus power
This patch uses a fixed-regulator instead of GPIO pin for
usb vbus power. It doesn't fix any issue, but it makes more
sense to convert the GPIO code into a fixed-regulator.

Change-Id: I7196a9cd592dbb3fab3ef8b9e99babc613a42869
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-02-26 17:18:29 +08:00
Liang Chen
da8675c309 arm64: dts: rockchip: adjust cpu and gpu opp table for px30
Change-Id: I8951348731463a7614ac6f320af16222cd7fe212
Signed-off-by: Liang Chen <cl@rock-chips.com>
2018-02-26 17:14:26 +08:00
Shawn Lin
7d65765bf3 arm64: dts: rockchip: Enable SD/SDIO 3.0 for PX30/RK3326 boards
This patch enables SD(IO) 3.0 for all boards by adding correct
vccq and vcc power supplies, as well as properities required by
UHS-I mode.

Change-Id: Iec11e1d1abe7ef9fc17ba08eece3440d7dcaea0b
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2018-02-26 17:13:46 +08:00
Wyon Bi
c57523a0d6 arm64: dts: rockchip: rk3326-evb-lp3-v10: enable logo display
Change-Id: I89d777a8c11d94f8bdd79d67258bf54388bd9e9a
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-02-26 17:12:34 +08:00
Finley Xiao
882c5c7dc7 clk: rockchip: px30: Add support to set parent rate for vopb dclk
Change-Id: I3160abc500be473c6cf4893bd26fd22b3ec95a85
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-02-26 17:08:53 +08:00
Finley Xiao
9dd92a3120 arm64: dts: rockchip: px30: Add nvmem-cells property for cpu
Change-Id: I0f23f780fb6fc42b7599d38e1d1213e1ab116210
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-02-26 12:04:13 +08:00
Finley Xiao
faf7b4d7a9 arm64: dts: rockchip: px30: Add otp node
Change-Id: I5a1ed87e9fef7346e2f268fc9a2a33cd6d192c69
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-02-26 12:03:55 +08:00
Finley Xiao
52298dfe38 arm64: configs: rockchip_defconfig: Enable CONFIG_ROCKCHIP_OTP
Change-Id: Ia2510f2ec1bdfc875dfbab325a616eb1a45ef76b
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-02-26 12:03:02 +08:00
Finley Xiao
33e182dbf4 nvmem: rockchip-otp: Add Rockchip OTP driver
Add simple read only driver for the OTP (One Time Programmable)
memory found on Rockchip SoCs.

Change-Id: I01c63dcacaf471ed7d06e0e8263a14e29af7fb0e
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-02-26 12:02:36 +08:00
Finley Xiao
bb88c004d1 dt-bindings: add binding document for Rockchip otp
This patch documents the Rockchip otp device tree binding.

Change-Id: I90dc6110c386bd0fab3b9531d857514b300c81df
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-02-26 12:02:10 +08:00
Shawn Lin
ef6433360d soc: rockchip: grf: disable jtag switching for PX30 Soc
PX30_GRF_SOC_CON5 is intended for postponing the auto switch
of pinmux from SDMMC to JTAG after removing the SD cards.
However, the default value is too small to meet the actual
requirement. Increase this value to 5 seconds currently.

Change-Id: I18fafe07822b81d9cd448ab71c1f0e49a75db357
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2018-02-26 11:55:20 +08:00
Zhong Yichong
9a80d74064 camera: rockchip: camsys_drv: Fix the isp soft reset failure for rk3326.
Reset on too high aclk rate will result in bus dead, so we reduce the aclk
before reset and then recover it after reset.

Change-Id: I38b51c3b39329e2bc96b964e7575d06183d33fd0
Signed-off-by: Zhong Yichong <zyc@rock-chips.com>
2018-02-26 11:51:00 +08:00
Xiao Yao
69c33846bf arm64: dts: rockchip: add mmc-hs200-1_8v for all rk3328 boards
Change-Id: I74d04e9a047e7622870df42cc41d5c3c752f9207
Signed-off-by: Xiao Yao <xiaoyao@rock-chips.com>
2018-02-26 11:49:11 +08:00
Xiao Yao
20cf029d0e arm64: dts: rockchip: rk3328: add sample/drv clock for hs200 mode
Change-Id: I8522515920b37cbfb9ec24ba7e65aee4f276e4a7
Signed-off-by: Xiao Yao <xiaoyao@rock-chips.com>
2018-02-26 11:48:30 +08:00
Shawn Lin
a123f47b6c clk: rockchip: px30: correct the parent of sdmmc/sdio/emmc sample and drv clks
Phase calculation should be based on the clock rate of these clk,
which inherits the clock rate from their parents. If the parent
goes wrong, it would be orphan node leading all the clk rate to
be zero. This breaks the normal tuning process whilist probing
the card. Fix them!

Change-Id: I7b64748e90684f8ca9710b63f10205d50d24f6d0
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2018-02-25 19:47:51 +08:00
Shunqing Chen
1cd280a4c4 ARM: dts: rk3229-at-som: add hw_id for cw201x
Change-Id: I9f3417c2ead1373851bfea2f0c9b37f720900c3c
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
2018-02-25 19:36:01 +08:00
David Wu
526571a766 Revert "pinctrl: rockchip: Make the gpio base started from 1000"
This reverts commit 3b7424f332.

Change-Id: If7598862a116000b60d958918b3651c248b5aaf2
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-02-25 19:35:21 +08:00
David Wu
15840a4670 Revert "soc: rockchip: rockchip_pm_config: set the real pin number to ATF"
This reverts commit ef06da2890.

Change-Id: Ide586a9f1aa079b9d29568ed0c88235f58ccfe9a
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-02-25 19:34:52 +08:00
David Wu
3506ee9262 Revert "gpio: rockchip: Make the gpio base added at gpiolib"
This reverts commit 545abf2ec4.

Change-Id: Icb7a08f12e85a8757154356a6671b5bca88eb79a
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-02-25 19:34:31 +08:00
Shunqing Chen
c800d4456e power_supply: cw201x: add hw_id check for android things SOM
Change-Id: Ic51abf5ccf89d3106858d029812ba6450422f1f5
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
2018-02-25 19:33:19 +08:00
Liang Chen
810497ff78 clk: rockchip: Add adaptive frequency scaling for pll_rk3036
Change-Id: Ifd035967afc1852df81daa2b15afea764c5b851d
Signed-off-by: Liang Chen <cl@rock-chips.com>
2018-02-25 19:28:56 +08:00
Caesar Wang
bea847eadf arm64: rockchip_linux_config: enable the dmc for rk3399
Change-Id: I25c1524949cae7d3fef9e178548abadcc676f138
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2018-02-25 19:27:40 +08:00
Caesar Wang
68c494b9ea arm64: rockchip_linux_config: enable camera sensors used by dts
As rk3399's sapphire board have used 5 camera sensors on
rk3399-sapphire-excavator-linux.dts, enable configure to support these.

Change-Id: I0afe26ad40aeeba889a556b4024a4798feeaf08e
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2018-02-25 19:27:17 +08:00
Caesar Wang
739d1ab1c9 arm64: dts: rockchip: enable the dmc for rk3399 sapphire excavator
The rk3399 had supported the dmc, the sapphire excavator board should
supported it too.

Change-Id: Id462ca1957b8c4960564d0ca24f71e7811aaabfd
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2018-02-25 19:26:52 +08:00
Shunqing Chen
9f2ddf5a0c power: add universal charger driver support
1.This driver only report charging status.
2.Support usb and dc charging.
3.Applicable to all charger IC that the
  charging current is determined by hardware.

Change-Id: I1c125580248cc1ba770b3c22f0b8dc3c21b980e0
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
2018-02-25 19:26:34 +08:00
Bin Yang
6181b2bd44 ARM: dts: add rk3229 3nod full function board
In the 3nod full function board, there are some pins is multiplexed
(such as: PWM0/2, SDMMC, IR and SPDIF). So we need create two DT files
rk3229-at-3nod.dts and rk3229-at-3nod-func.dts. In the rk3229-at-3nod,
these pins be iomux to gpio. In the rk3229-at-3nod-func, these pins be
iomux to function pins.

Change-Id: I369dabc4dceb25023ab97b74e12cfef058e522d1
Signed-off-by: Bin Yang <yangbin@rock-chips.com>
2018-02-25 19:25:58 +08:00
Xinhuang Li
18ede3402d ARM: dts: rk3229-evb-android: add internal sound card
Change-Id: I3a22ac73ef11f4b468bb43ffb1a69d1fcdf3bed1
Signed-off-by: Xinhuang Li <buluess.li@rock-chips.com>
2018-02-25 19:24:50 +08:00
Zhou weixin
131944685d arm64: dts: rockchip: adjust backlight brightness levels for rk3326-863-lp3-v10
Change-Id: Ib0064c1ef0411a06b92f1490a350d8b7060522b1
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2018-02-25 19:24:16 +08:00
William Wu
87ae93e451 arm64: rockchip_defconfig: enable usbmon
Enable usbmon driver to collect traces of I/O on the USB bus.

Change-Id: Idc4b0afa6bb2f2dc8c8af10d28c05e4a169bcd62
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-02-25 19:23:15 +08:00
William Wu
cf334a7d66 arm64: rockchip_cros_defconfig: enable usbmon
Enable usbmon driver to collect traces of I/O on the USB bus.

Change-Id: I7314a2fb01f9ce852e4172aad62ef13fabbd3fd9
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-02-25 19:23:01 +08:00
William Wu
37e93a5968 ARM: rockchip_defconfig: enable usbmon
Enable usbmon driver to collect traces of I/O on the USB bus.

Change-Id: Ie15f6184ccffb85d440549419a5c5f129d90c7b4
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-02-25 19:22:45 +08:00
Zhang Yunlong
23e1e57ae5 Revert commit "camera: rockchip: camsys_drv v0.0x22.5"
Change-Id: I08774bc7d7edc9e9ca38da7415b8e3a976afe394
Signed-off-by: Zhang Yunlong <dalon.zhang@rock-chips.com>
2018-02-25 19:16:27 +08:00
Finley Xiao
9775a70bc8 clk: rockchip: px30 Add CLK_SET_RATE_NO_REPARENT for clk_sdmmc
Change-Id: Id97acec017f2fb2e1363733200a683b1a3ad9dac
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-02-25 19:15:47 +08:00
Shawn Lin
2e7ca8f18b arm64: dts: rockchip: add cap-sd-highspeed for sdmmc for all px30/rk3326 boards
Change-Id: I6db6411000d869439a8deb27ccec6bd4593bce26
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2018-02-25 19:14:44 +08:00
Zhou weixin
2fa09bb0e2 arm64: dts: rockchip: set vcc_3v0 on and vcc1v8_dvp off in sleep mode for rk3326-863-lp3-v10
vcc_3v0: supply for wifi bt module, should keep enable in sleep mode.
vcc1v8_dvp: supply for camera, should be off in sleep mode, otherwise,
increase current consumption.

Change-Id: Idfd10f7b8f6fca6db1760e429acc9b215a8cf595
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2018-02-25 15:05:20 +08:00
Liang Chen
8dab90fc1b soc: rockchip: opp_select: make scale sel do not depend on leakage
When get leakage failed, we assume the leakage is zero.

Change-Id: I7731eaaa6dc31620d0210c1c9138631b8890be8d
Signed-off-by: Liang Chen <cl@rock-chips.com>
2018-02-25 14:51:21 +08:00
Jung Zhao
b2e3763fc2 arm: dts: rockchip: rk3229-evb-android: enable vpu & rkvdec
Change-Id: I39b2bdb214c1ffd966cb1235176d91c59e5149ea
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
2018-02-25 08:54:20 +08:00
Jung Zhao
ae7114666c arm: dts: rockchip: rk322x: fix reset name of rkvdec
Change-Id: Id447cd3caaf146dd094b63053cf11d54e3a8e1a3
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
2018-02-25 08:53:51 +08:00
Rocky Hao
dbc7eeb8ee arm64: dts: rockchip: add cpu's and gpu's thermal config for px30
add power model for gpu and also add cpu thermal config

Change-Id: Iab5ef69b50c792b35c9ae5ffa863cc106d2c4292
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2018-02-24 18:49:36 +08:00
Jung Zhao
3d8eff0a21 video: rockchip: vpu: fix wrong freq assigned
since only rk3288 can run on 600MHz, and sometimes other socs
will step into the 600MHz branch when its 3th register value can
meet the condition, it will cause rkvdec crash.

Change-Id: I3668aa22a3d82af6af2c87ca970028685b8b1960
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
2018-02-24 18:08:41 +08:00
Finley Xiao
1410747656 soc: rockchip: power-domain: Fix restore error qos value
Change-Id: I74692018652ed2aa45b666f1598662146beec92e
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-02-24 18:07:47 +08:00
Andy Yan
a0aa90a0d7 arm64: dts: rockchip: add basic dts for RK3308 FPGA platform
The FPGA platform is used for rk3308 validation, which has
one cortex-a35 cpu and uart/timer peripherals.

Change-Id: I3a78cc5afec04d954f4d2715b6a6066400a1c513
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2018-02-24 17:59:28 +08:00
Andy Yan
883e5d536c arm64: dts: rockchip: add core dtsi for RK3308 Soc
RK3308 is a Soc from Rockchip, which embedded with quad
ARM Cortex-A35 and highly integrated audio interfaces.

This patch add basic support for it, with arm cpu core
timer/gic/uart/pinctrl enabled.

Change-Id: I924827146fab30bf636440ce3cc7e48c74bc0eaf
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2018-02-24 17:59:00 +08:00
Huibin Hong
10581b7f5a arm64: dts: rockchip: enable uart rx pull up for px30
Change-Id: I533b18babbc1c153b1b61afdbbcd510eb9286dc1
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2018-02-24 17:52:59 +08:00
Sandy Huang
5570802cb7 drm/rockchip: px30 vop: fix axi channel error
Change-Id: Ic1af7e43f4d4b842ac5a10d1f9c6ea42cd6c2a17
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-02-24 16:17:51 +08:00
Sandy Huang
28d50f0fd8 drm/rockchip: px30 vop: add outstanding config
Change-Id: I81d5e8412e01c57ac7ede292a55b3d59941a507f
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-02-24 16:08:45 +08:00
Sandy Huang
613b6b6a10 drm/rockchip: px30 vop: update afbdc format for color transform
Change-Id: Ic551f0b7de22bd9154535a64daba2ca51fd79f37
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-02-24 16:06:27 +08:00
Tao Huang
7ae77dea79 Revert "ARM: rockchip_defconfig: remove CONFIG_ANDROID_LOW_MEMORY_KILLER"
This reverts commit aa349fbf38.

Failed to pass vintf compatibility test.

Change-Id: I002feeb65cc2d7d679c0a00a984b149eef068be1
2018-02-24 16:01:31 +08:00
Tao Huang
2057215f36 Revert "arm64: rockchip_defconfig: remove CONFIG_ANDROID_LOW_MEMORY_KILLER"
This reverts commit 7adc50bef2.

Failed to pass vintf compatibility test.

Change-Id: Ia8f3d3be1b65b194cea68dc495a2718f7b2efbfc
2018-02-24 16:01:23 +08:00
Tao Huang
4025e85574 Revert "ARM: rockchip_defconfig: remove CONFIG_PM_AUTOSLEEP"
This reverts commit e868d4ecb9.

Failed to pass vintf compatibility test.

Change-Id: Iba9ee00c8bab3d917d155aeab82e7926d44387d9
2018-02-24 16:01:08 +08:00