Commit Graph

611107 Commits

Author SHA1 Message Date
Finley Xiao
c11c980229 video: rockchip: vpu: Fix core and cabac rate error when high temperature
Fixes: 5bc582df48 ("video: rockchip: vpu: Add devfreq feature")
Change-Id: I0af1c64f778059a5f42e88ad9316f65f4c554fb9
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-08-24 09:34:15 +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
76f2837b6e rtc: Add an RTC driver for rk-timer
This driver uses Rockchip timer to simulate RTC functions.

Change-Id: I49eed6ecbb4c55527696c63b0d479afe837502d5
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2018-08-23 17:51:33 +08:00
Jeffy Chen
b22c44f4f4 dt-bindings: rtc: Add rk-timer-rtc
Add documentation for DT binding of Rockchip timer RTC driver.

Change-Id: I066312219d9ed9e7a3e943bf8a60d072d8c9fa36
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2018-08-23 17:50:04 +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
Benjamin Herrenschmidt
80d62ecfaa UPSTREAM: devres: Add devm_of_iomap()
There are still quite a few cases where a device might want
to get to a different node of the device-tree, obtain the
resources and map them.

We have of_iomap() and of_io_request_and_map() but they both
have shortcomings, such as not returning the size of the
resource found (which can be useful) and not being "managed".

This adds a devm_of_iomap() that provides all of these and
should probably replace uses of the above in most drivers.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Joel Stanley <joel@jms.id.au>
(cherry picked from commit d5e838275c)

Change-Id: I5d68c3e23637c5e83e5f2bed3a1aa2c654d7d6a1
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2018-08-23 17:48:43 +08:00
Hu Kejun
f553a8641c media: rockchip: isp1: change needed min buffers of stream to 0
change needed min buffers of stream to 0, because we allocate dummy
buffer in advance.

Change-Id: Ib7647983b495c11dc18151b3c1f8856c49496c3a
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2018-08-23 17:46:25 +08:00
Hu Kejun
d961e44af2 media: i2c: gc2145: change sensor setting from 20fps to 30fps in svga size
Change-Id: I3af9061d2a4d90c0ec3bc9ec193af51edb2aa2cf
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2018-08-23 17:45:53 +08:00
Hu Kejun
0cc3fd0986 media: i2c: gc0312: change sensor setting from 20fps to 30fps in vga size
Change-Id: I5c9f0df26af6597c4fa16199ecb40b9e6bf9bf1c
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2018-08-23 17:45:20 +08:00
Tao Huang
6ba3b099d0 rk: rm scripts/mkkrnlimg and scripts/resource_tool
build from source.

Change-Id: I0ece374fa01e6891f63aae89b84bb1e7b94bff21
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-08-23 17:25:52 +08:00
Tao Huang
6c84d248d5 rk: kbuild: support build mkkrnlimg and resource_tool
Change-Id: I7b55a5644d3818efac296a16b4009bf10becec97
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-08-23 17:25:52 +08:00
Tao Huang
244a65d35f rk: add scripts/mkkrnlimg.c
From V20111117. Fixes for 64bit.

Change-Id: I31b0e9a7bd7dae1afec923409e8fc845c21a45c2
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-08-23 17:25:52 +08:00
Tao Huang
cb7b8c10f2 rk: add scripts/resource_tool.c
From u-boot d1463f4aaddc ("tools: resource_tool: Use not stripped version").
Merge all C files to one resource_tool.c

Change-Id: I25fffb9a817c9e4e5260db3afca644cb8ba06a18
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-08-23 17:25:52 +08:00
Wyon Bi
8f873910de drm/bridge: analogix_dp: support video BIST generation
The video BIST function of the DP_TX generates arbitrary video formats
internally according to the specified format configuration and selection.
These BIST video formats simplify DP_TX debugging.

Change-Id: Ia019c8f40fdd4ebea3e5250be8e2c15540481a6c
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-08-23 16:37:45 +08:00
Sugar Zhang
93787d1406 ASoC: rockchip: vad: refine buffer time
This patch fix hw_params fail if the buffer time is too large,
anyway, we use the smaller one between vad->buffer_time and
the max buffer time.

Change-Id: I111bb835f281d717d0b5a4be7bc6b321387f31d5
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-08-23 16:24:09 +08:00
Huibin Hong
a990c87249 spi: rockchip: init rxconf and txconf to 0
Dmac pl330 adds src_interlace_size of dma_slave_config rxconf.
If rxconf is local variable, src_interlace_size may be non zero,
which causes wrong process.

Fixes: ddd2e87ad4 ("dmaengine: pl330: add support for interlace size config")
Change-Id: Ib301c7ca4a1175bafd0631cb4deea4baa60eebc7
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2018-08-23 16:17:00 +08:00
Xing Zheng
452fc74bfc ASoC: rk3308_codec: Fix the starting glitches during ADCs enabled always
We need to skip resetting the digital part of ADCs during
keepping the ADCs enabled always.

Change-Id: I075d605b48a9216a84c7269ebff32f1f150ec5de
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2018-08-23 14:34:13 +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
Andy Yan
86b17a821c soc: rockchip: cpuinfo: init soc id for rk3308/rk3308b
RK3308B is a enhanced variant of RK3308 with more flexible
iomux and peripherals(for example, RK3308B has 12 pwms, but
RK3308 has 4).

The CHIP_ID is stored in GRF_CHIP_ID:

RK3308:  0xcea (3306 in decimal)
RK3308B: 0x3308

Change-Id: I8f675656c012bdedb43043f5dbeea8bd11ea4ded
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2018-08-22 20:53:01 +08:00
Chris Zhong
ce1a9c72c5 drm/rockchip: cdn_dp: support audio info frame
Change-Id: I867b79dce73aa7c82dd06e6ed6e2963e118f1129
Signed-off-by: Chris Zhong <zyw@rock-chips.com>
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-08-22 17:42:53 +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
bb1005b17c clk: rockchip: px30: Add support to set parent rate for vopl dclk
Change-Id: I208471f938b1795273c4f33ac35b82d667a2b312
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-08-22 09:31:20 +08:00
Finley Xiao
c9ff227e0b clk: rockchip: px30: Let npll only provide clock for vopl and gpu
As npll rate may be changed according to vopl dclk rate on px30.

Change-Id: I4abc042b49ee06436ba5d69dc8adfa9460da37f7
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-08-22 09:31:20 +08:00
Finley Xiao
1dbe048eb5 clk: rockchip: px30: Remove npll from gpu parent clock on px30
NPLL should provide clock for vopl dclk on px30, and its rate will be
changed according to vopl dclk rate, so GPU can't use npll as parent
on px30.

Change-Id: Ib2c8c57020405bcd14070dcd7bc71cbfe18230e3
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-08-22 09:31:20 +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
ab350b549a rk: init/main.c: support print long kernel command line
With features AVB / dm-verity enabled, cmdline content is about to
exceed previous maximum 2048 bytes. printk can not support long line
exceed LOG_LINE_MAX which less than 1024. So loop printk until all
content are printed in init/main.c.

Change-Id: I4c40b5302d82122b93161fe30082f5abcfcad069
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-08-21 15:59:56 +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
Hu Kejun
00b52e7e42 media: rockchip: isp1: update isp clock adjustment table
Change-Id: I5c799d0e1dc62819d2f77f0287904a2c7c1d4c1d
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2018-08-21 10:21:09 +08:00
Hu Kejun
4f7ee87b6c media: rockchip: isp1: support dvp camera
Change-Id: If04dce4118f8b2ec90168c9286e8357619712820
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2018-08-21 10:20:59 +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
Randy Li
5930efdc03 video: rockchip: vpu: adjust the register buffer table
make me more easily to check the mapping.
Also fix some compiler warnings.

Change-Id: Ic28f6ce54b4dcd0c4a9d9543939c5f5e013136fc
Signed-off-by: Randy Li <randy.li@rock-chips.com>
2018-08-20 11:47:31 +08:00
Randy Li
9def402f50 rockchip/mpp_service: use the same ioctl as vpu_service
It make all kernel version use the same ioctl defines.
The compat ioctl doesn't support the customer ioctl of the
mpp device.

Change-Id: I018ec2eb48cd2ca4e211da7137781771b33bda15
Signed-off-by: Randy Li <randy.li@rock-chips.com>
2018-08-20 11:46:40 +08:00
Dingqiang Lin
057b63a64f drivers: rkflash: add rkflash proc info
Change-Id: I7316c628d79cdee8fb513e144b6c365a142d4ecb
Signed-off-by: Dingqiang Lin <jon.lin@rock-chips.com>
2018-08-20 11:18:34 +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
Tao Huang
78e281aabc ANDROID: rk: kbuild: dtc generation of symbols
For support device tree overlay.

Change-Id: I05e3ca42ae987f3e269c9c891a7b3e276b813231
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-08-20 10:11:23 +08:00
Rob Herring
67b58136b7 UPSTREAM: kbuild: Allow using host dtc instead of kernel's copy
Development of dtc happens in its own upstream repository, but testing
dtc changes against the kernel tree is useful. Change dtc to a variable
that users can override.

Change-Id: I8f1dccc79effccc9e8406c22efa3ca471f4d3504
Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Michal Marek <mmarek@suse.com>
Cc: linux-kbuild@vger.kernel.org
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit 6b22b3d161)
2018-08-17 19:14:31 +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