Commit Graph

130822 Commits

Author SHA1 Message Date
Tao Huang
2030cda396 rk: ARM: Fix build problem with O=
mkkrnlimg/resource_tool is build from source, don't use $(srctree)
on Makefile.
make modules when $(srctree) == $(objtree) otherwise build will
fail.

Change-Id: I7824d0e9cb60ca40925c4047a203242c6e50505d
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-08-28 18:27:24 +08:00
Tao Huang
197ccb6188 rk: arm64: Fix build problem with O=
mkkrnlimg/resource_tool is build from source, don't use $(srctree)
on Makefile.
make modules when $(srctree) == $(objtree) otherwise build will
fail.

Change-Id: If8461a30d450aef089ae7db5f5851d4837e7c303
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-08-28 17:35:57 +08:00
Jianqun Xu
9b864e79dc arm64: dts: rockchip: fix grf/pmugrf address
1. Correct grf/pmugrf mapping address.
2. Add xin32k node
3. Remove pmucru
4. Modify mapping address length of cru to 0x50000
5. Add sclk for gpio controllers
6. Add clock for sdmmc & emmc

Change-Id: I8d57f569edfd05559fe1719b7cc3d8d16f8b09c2
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-08-28 14:47:10 +08:00
Elaine Zhang
2e5468ac45 arm64: dts: rockchip: Improve the aclk_perilp0 frequency for rk3399
To improve the performance of dual USB transmission.

Change-Id: Ie20d17029e54d299cddadc7a286d9bf6c96b0fbb
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-08-28 11:07:05 +08:00
Zhangbin Tong
b8f16e1421 arm: dts: rk3128x: Change cpu opp-microvolt form one entry to three
Single entry is for target voltage and three entries are for
<target min max> voltages. Change cpu opp-microvolt form one entry to
three entries and set maximum acceptable voltage to a high value so that
regulator device can supply multiple consumers at the same time.

Change-Id: Id74c570afe702e879504a597a3d9fb3754125f2f
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2018-08-28 10:22:22 +08:00
Lin Jinhan
ed18e5b57c arm: dts: rk3308-voice-module-v10-aarch32: Enable rng
Change-Id: I7623a0fa6df690cd03e019bd12052e8a7f96599d
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2018-08-28 10:12:43 +08:00
Lin Jinhan
97e17475d2 arm64: dts: rockchip: rk3308-evb-*: enable rng
Change-Id: I2800fa3b5de0bc1e02172bbcad848cf78d320142
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2018-08-28 10:12:25 +08:00
Lin Jinhan
0f9840082f arm64: dts: rockchip: rk3308: add rng node for crypto v2 hwrng
Change-Id: I66432ed414a47dc9f7ff1145564cd696cd93805b
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2018-08-28 10:01:34 +08:00
Jianqun Xu
6e00cbcba1 arm64: dts: rockchip: rk1808 add iomux
Change-Id: I4b84dc830cc65792445d0d05f139025878df634c
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-08-28 09:45:19 +08:00
Finley Xiao
1b3dc6cdf9 Revert "Revert "arm64: dts: rockchip: rk3308-evb-v10: Add regulator-early-min-microvolt for core""
This reverts commit 46d3be8026.

This patch add a new 'regulator-early-min-microvolt' property to limit
the minimal voltage of regulator during kernel startup.

Change-Id: I580f0cceda280b9168e7f489f39785830cd28a28
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-08-28 09:43:26 +08:00
Lin Jinhan
0001ceeba7 arm32: rk3308_linux_aarch32_defconfig: enable HW_RANDOM and HW_RANDOM_ROCKCHIP
Change-Id: Ic6545b6a780958659c947bb2c7319af2223e6469
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2018-08-27 20:12:13 +08:00
Lin Jinhan
3f8333a3b0 arm32: rk3308_linux_aarch32_debug_defconfig: enable HW_RANDOM and HW_RANDOM_ROCKCHIP
Change-Id: Ibc6f559f022ba299d378ec9fc2fb206a095157d6
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2018-08-27 20:12:08 +08:00
Lin Jinhan
75636c57a5 arm64: rk3308_linux_defconfig: enable HW_RANDOM and HW_RANDOM_ROCKCHIP
Change-Id: I05623888fb932e8c93f26888019328bebadf4369
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2018-08-27 20:11:58 +08:00
Wu Liangqing
5e89a41104 arm: dts: rockchip: rk312x: remove PLL_CPLL set in cru
cpll just for display no need to init. init will result in dispaly error
in next-dev uboot

Change-Id: Ie63c8d44aa6b54fb81abfb3a32d71995b8426c7d
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2018-08-27 19:40:36 +08:00
Leo Wen
2d1723bd9b arm: dts: rockchip: rk3288-evb-rk808-linux: config dvp regulator to be 1v8
Change-Id: Ie0e04b957cd5b4bffba2a8a964bed0d76e138079
Signed-off-by: Leo Wen <leo.wen@rock-chips.com>
2018-08-27 10:08:45 +08:00
Zhangbin Tong
0f59a24e43 arm64: dts: rockchip: rk3328: Add kpti=0 to kernel bootargs
Change-Id: I1be893667fec0d9bf8edd7c29150aa2084b72000
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2018-08-24 18:18:47 +08:00
Bian Jin chen
4ea55de3a8 arm: dts: rk312x: rk3126-bnd-d708: Separate android fireware.
Split DT source files to separate out android fireware for Android Pip & Oreo

Change-Id: I6fe9ad626ea05d2f5ae29ff2e8ee314d9833bbca
Signed-off-by: Bian Jin chen <kenjc.bian@rock-chips.com>
Signed-off-by: Hao Xiaowei <hxw@rock-chips.com>
2018-08-24 15:29:48 +08:00
Zhangbin Tong
dcf8989b7d arm64: dts: rockchip: rk3328: Add swiotlb=1 to kernel bootargs
Change-Id: I18dbb6730dbb9e639b6827c5653afcdcc5b52661
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2018-08-24 15:00:16 +08:00
Sugar Zhang
f6af151bc0 arm64: dts: rockchip: rk3308-evb-amic-*: enable vad card default
Change-Id: I71958666fdb860952f33e68ab247b014b0b3a9f1
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-08-24 14:55:33 +08:00
Wyon Bi
c9a3672fe3 arm64: dts: rockchip: rk3308-evb-ext-v10: remove unused properties from panel node
Change-Id: I33b97b8edf9c0a3b8ce7f113cbba172a95374e95
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-08-24 10:59:21 +08:00
Cherry Chen
8fcb9b0c04 arm64: dts: rockchip: Put the order of aloop card backwards for rk3308 board
For keep other sounds card order, the aloop card index set 7.

Change-Id: I7336ac17dfeba67fc0c5c52429d9a74e9856e7e9
Signed-off-by: Cherry Chen <cherry.chen@rock-chips.com>
2018-08-24 09:33:00 +08:00
Cherry Chen
cf60428f8c ARM: dts: rockchip: Put the order of aloop card backwards for rk3308 board
For keep other sounds card order, the aloop card index set 7.

Change-Id: Id54369abdd6c4e48679647fe50d84cfe5bcd061b
Signed-off-by: Cherry Chen <cherry.chen@rock-chips.com>
2018-08-24 09:32:19 +08:00
Jeffy Chen
dc790d7bc7 arm: rk3308_linux_aarch32[_debug]_defconfig: enable RTC_DRV_RK_TIMER
Change-Id: Ibfe9105c8785a66745d928f60e54fcbedd200f30
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2018-08-23 17:53:20 +08:00
Jeffy Chen
cb14cbd0e5 arm: dts: rk3308-voice-module-v10-aarch32: Enable rk-timer-rtc
Change-Id: I03aa02ef32171d7619f3a1da10bbc952b7d31083
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2018-08-23 17:52:42 +08:00
Jeffy Chen
1bea09430b arm64: dts: rk3308: Add rk-timer-rtc
Change-Id: Icc2b598936b3daa2a2b8138315b0cc8f71c91733
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2018-08-23 17:52:08 +08:00
Jeffy Chen
3206a9bfb7 arm: dts: rk3308-voice-module-v10-aarch32: Enable timer wakeup
Allow waking up by timer irq.

Change-Id: I7ef35d317c8d039421e6484f92a8265b949d505c
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2018-08-23 17:49:50 +08:00
Wang Panzhenzhuan
6518f8c230 arm64: dts: rockchip: rk3326-863-lp3-v10: add rkisp1 and gc0312/gc2145
Change-Id: I013f735174a081310c5f6cb771fcb59f74df6f3c
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
2018-08-23 11:27:45 +08:00
Guochun Huang
0c3cedfe0f arm64: dts: rockchip: rk3399-tve1030g: prevent some lp4 scale frequency
lpddr4 scale frequency when display on, cause the display shake and
vop POST_BUF_EMPTY

Change-Id: Idff6fe039e93a6a938e05524d7dd5ce0d9c72dee
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2018-08-23 11:26:06 +08:00
cherry.chen
b130c529c5 arm64: configs: rk3308_linux_defconfig: enable aloop driver
Because of resample, some speaker processing(such as EQ/DRC)
cannot be done after dmix in alsa. Enable aloop driver make them
can be handled between virtual hardware to the real hardware.

Change-Id: I86242f67d89fb38361a7f8d6d8cf4294cdaba685
Signed-off-by: Cherry Chen <cherry.chen@rock-chips.com>
2018-08-22 09:36:20 +08:00
cherry.chen
6faf01a897 arm: configs: enable aloop driver for rk3308 aarch32
Because of resample, some speaker processing(such as EQ/DRC)
cannot be done after dmix in alsa. Enable aloop driver make them
can be handled between virtual hardware to the real hardware.

Change-Id: I05b92632359fabd5c1dd8b051295ad4d17dddc8c
Signed-off-by: Cherry Chen <cherry.chen@rock-chips.com>
2018-08-22 09:34:30 +08:00
Finley Xiao
509ef2785d arm64: dts: rockchip: rk3308: Add pvtm configure for cpu
Change-Id: I5d109f8718756fd2388147e44bf1c7af87212d7e
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-08-22 09:32:52 +08:00
Finley Xiao
79cf34e732 arm64: dts: rockchip: Remove initial rate of npll for px30
As npll rate may be changed when enable vopl in uboot, so we can't
change npll rate in kernel on px30.

Change-Id: If62da5bb77cdd411a550b2dc6250d654134474e3
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-08-22 09:31:20 +08:00
Tao Huang
1d39cfca2c ANDROID: ARM: setup: Increase COMMAND_LINE_SIZE to 4096 bytes
With features AVB / dm-verity enabled, cmdline content is about to
exceed previous maximum 2048 bytes. Increase the cmdline buffer size
(COMMAND_LINE_SIZE) to 4096 bytes for other features to use.

Change-Id: I73baf92e5dce1a341d523b1a976d387e794b3998
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-08-21 15:50:46 +08:00
Woody Lin
2516bb8dc8 ANDROID: arm64: setup: Increase COMMAND_LINE_SIZE to 4096 bytes
With features AVB / dm-verity enabled, cmdline content is about to
exceed previous maximum 2048 bytes. Increase the cmdline buffer size
(COMMAND_LINE_SIZE) to 4096 bytes for other features to use.

Bug: 62188243
Bug: 36339395
Change-Id: Ib0ad43b1d4596cfd965a659ffc7953f4ef221aec
Signed-off-by: Woody Lin <woody_lin@htc.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from https://android.googlesource.com/kernel/msm
 commit 532fc475a103cc9968827c1cba851fe2b3100aba)
2018-08-21 15:50:39 +08:00
Wyon Bi
09b45c852d arm64: dts: rockchip: rk3399: don't enable hdmi_cec pin by default at soc dtsi
Fix pin conflicts when gpio4c7 is used for hdmi_cec and edp_hpd. CEC is an
optional function for HDMI. Thus the hdmi_cec pin should be specified
in the board .dts.

Without this patch we see below pin conflict when both hdmi and edp enabled.

[    0.969331] rockchip-pinctrl pinctrl: pin gpio4-23 already requested by
ff940000.hdmi; cannot claim for ff970000.edp
[    0.969350] rockchip-pinctrl pinctrl: pin-151 (ff970000.edp) status -22
[    0.969361] rockchip-pinctrl pinctrl: could not request pin 151 (gpio4-23)
from group edp-hpd on device rockchip-pinctrl
[    0.969371] rockchip-dp ff970000.edp: Error applying setting,
reverse things back

Change-Id: Id3e9d7fadb6a4cfd65827be9c4b55336406995f7
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-08-21 15:49:59 +08:00
Algea Cao
e951fcc3f7 arm64: dts: rockchip: rk3399-box: Add cec pinctrl
Only box enable cec function by default.

Change-Id: Iec1c67a3570b123feb60ba12fdcee6336e791357
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2018-08-21 11:34:39 +08:00
Lei Chen
e94efec6aa arm: dts: rk3128h-box-avb: add sdmmc_det for sdmmc pinctrl
This modification is to solve the problem that the SD card
is inserted after starting up, and the hot plug fails because
the det pin is initialized to GPIO

Change-Id: Id0d88259f7b30a75c07d7c2980563fc0d4148449
Signed-off-by: Lei Chen <lei.chen@rock-chips.com>
2018-08-20 19:46:14 +08:00
Sun ChuanHu
6b002c60f2 ARM: dts: rockchip: rk3308-voice-module-amic-mainboard-v10-aarch32 change always open mic group to 5-8 from 3-6
Change-Id: Iad70296828ddfd271c9bc1879a1269d555f490d9
Signed-off-by: Sun ChuanHu <aaron.sun@rock-chips.com>
2018-08-20 19:45:24 +08:00
Lin Jianhua
c435bdc22c arm: dts: rockchip: add dot rk816 v10 dts for rk3308
Change-Id: I976950bc059d23ffc1f581b8821da47afa8079f5
Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
2018-08-20 14:53:09 +08:00
Lin Jianhua
a2c1f6f7a7 arm: rk3308_linux_aarch32_debug_defconfig: support pmic rk816
Change-Id: Ieaf268347b3a406daaea9514bbb409796261c272
Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
2018-08-20 14:52:56 +08:00
Xinhuang Li
9d39940c43 arm: dts: rockchip: rk3128h-box.dtsi: rename codec for vts
fix the vts error like this:
Failed to parse! Parsing error at token LexToken(COMMA,',',1,48) in line 1;
explain:
the vts will parsing the codec'name after android P, the comma is not allow
in the codec'name

Change-Id: I6fc9953dfaa7b056cd96f3b82c7cc3cd49eced21
Signed-off-by: Xinhuang Li <buluess.li@rock-chips.com>
2018-08-20 11:11:53 +08:00
Jianqun Xu
9cda00b248 arm64: dts: rockchip: rk1808 fix error codes
Change-Id: Iaaa17772f6641d582b36e749a028349b9dbbc34c
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-08-17 17:50:45 +08:00
Zhangbin Tong
0f7a971a79 ARM: rockchip_defconfig: Enable CONFIG_DEBUG_SET_MODULE_RONX
Android P CDD document chapter "9.7. Security Features"

Kernel integrity and self-protection features are integral to Android 
security. Device implementations:
[C-0-8] MUST implement strict kernel memory protections where executable
code is readonly, read-only data is non-executable and non-writable, and
writable data is nonexecutable (e.g. CONFIG_DEBUG_RODATA or CONFIG_STRICT_KERNEL_RWX ).

Change-Id: Id4deb57242b55c8b5de2ad7de8a48f49ffa3c3e3
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2018-08-16 18:33:24 +08:00
Bian Jin chen
7ebf2503f7 arm64: dts: rockchip: Add new dts file for rk3326-863-lp3-v10 avb.
Change-Id: I94d292a11bb1f309fb6bf864b47f968df8333f1f
Signed-off-by: Bian Jin chen <kenjc.bian@rock-chips.com>
2018-08-15 18:36:34 +08:00
Bian Jin chen
fbbf92cb6f arm64: dts: rockchip: rk3326/px30: Separate android fireware
- Split DT source files to separate out android fireware specific DT
bindings.
- Add an alias for firmware_android && chosen in px30-android.dtsi.

Change-Id: I63da786d8f70c72497b3def47309efcd8399c171
Signed-off-by: Bian Jin chen <kenjc.bian@rock-chips.com>
2018-08-15 18:36:08 +08:00
Eddie Cai
29242abe21 arm64: dts: rockchip: add rock960 board support
rock960 board is the first rockchip SoC based 96board, so we should
support this board in our SDK. grab this dts from below url.

the initial author is Jack Ma <jack@vamrs.com>
https://raw.githubusercontent.com/96rocks/kernel/rock960-4.4-dev/
arch/arm64/boot/dts/rockchip/rock960-model-ab-linux.dts

Change-Id: I823d7a4b129716c1df4d0a6795118abfaf7120f0
Signed-offf-by: Jack Ma <jack@vamrs.com>
Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>
2018-08-15 17:31:13 +08:00
Xiaotan Luo
3518fdd3aa arm64: dts: rk3308-evb-v11: add tas5731 sound
Change-Id: Iaae192f89119875885e2bf649365ad8bac0972e8
Signed-off-by: Xiaotan Luo <lxt@rock-chips.com>
2018-08-15 16:57:20 +08:00
Xiaotan Luo
398d1956b7 arm64: rk3308_linux_defconfig: add tas5731
Change-Id: I260673444024ad3d7f250bcb4be0e88106594ba5
Signed-off-by: Xiaotan Luo <lxt@rock-chips.com>
2018-08-15 16:57:20 +08:00
Dingqiang Lin
6853e9bdab arm64: dts: rockchip: rk3308: set sfc clock frequency by assigned-clocks
Change-Id: I2165b06002ca837db19ccb60b5b9d704c6f1f996
Signed-off-by: Dingqiang Lin <jon.lin@rock-chips.com>
2018-08-15 11:41:16 +08:00
Zhangbin Tong
6bced2db6d ARM: dts: add new dts file for rk3128h box avb
Change-Id: If2cb3260823b67398451fd1221f165262d104187
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2018-08-14 14:20:29 +08:00