Commit Graph

611085 Commits

Author SHA1 Message Date
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
Jianqun Xu
12db436a63 pinctrl: rockchip: add rk1808 mux route
Add rk1808 iomux route, also fix some error codes.

Change-Id: I2a079cdc8ad1491df653cd6c05226ff3d16beb1a
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-08-17 17:50:23 +08:00
Weiguo Hu
557686e70b net: wireless: rockchip_wlan: ssv6051 remove cp fw
Change-Id: Ice43fadd3e91a233cd19093422fadd697ef520dc
Signed-off-by: Weiguo Hu <hwg@rock-chips.com>
2018-08-17 16:10:48 +08:00
Hu Kejun
2629173c88 media: i2c: add gc2145/gc0312 driver for rkisp1
Change-Id: I3d4bae2e45a6fd40cf7bf6b53900abcbfacba2d7
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2018-08-17 11:22:08 +08:00
Theodore Ts'o
5bad8861ed UPSTREAM: ext4: fix check to prevent initializing reserved inodes
commit 5012284700 upstream.

Commit 8844618d8a: "ext4: only look at the bg_flags field if it is
valid" will complain if block group zero does not have the
EXT4_BG_INODE_ZEROED flag set.  Unfortunately, this is not correct,
since a freshly created file system has this flag cleared.  It gets
almost immediately after the file system is mounted read-write --- but
the following somewhat unlikely sequence will end up triggering a
false positive report of a corrupted file system:

   mkfs.ext4 /dev/vdc
   mount -o ro /dev/vdc /vdc
   mount -o remount,rw /dev/vdc

Instead, when initializing the inode table for block group zero, test
to make sure that itable_unused count is not too large, since that is
the case that will result in some or all of the reserved inodes
getting cleared.

This fixes the failures reported by Eric Whiteney when running
generic/230 and generic/231 in the the nojournal test case.

Change-Id: I799bfafa4712e2dd29268c7481b539b23e2cf475
Fixes: 8844618d8a ("ext4: only look at the bg_flags field if it is valid")
Reported-by: Eric Whitney <enwlinux@gmail.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit 7736fcede7)
2018-08-17 10:34:02 +08:00
Hu Kejun
15b41be882 media: rockchip: isp1: fix two dvp sensor can't connect to rkisp1 sink pad
when two dvp sensor connect to rkisp1, only one sensor can connect to sink
pad, another sensor connect to sink params pad.

Change-Id: I6cc9e6db3ad074c82c15a9cc642330ece6997d09
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2018-08-17 10:16:02 +08:00
Jeffy Chen
77e938e49d fiq_debugger: Sanity check state in fiq_tty_proc_show
The fiq_tty_proc_show can be called even when fiq is not enabled in dts,
which would cause crash.

Add sanity check to avoid that.

Change-Id: I69d34718f91813aed14c542901060e4fd68b818b
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2018-08-17 10:14:42 +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
Lin Jianhua
75900472b3 ASoC: rk3308_codec: add support 'pa-drv-gpios'&'rockchip,delay-pa-drv-ms' properties
Change-Id: Id9a65d40c3985dd780ea0458c2169c6088c76084
Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
2018-08-16 18:32:02 +08:00
Lin Jianhua
c2676257b7 ASoC: rk3308_codec: add 'pa-drv-gpios'&'rockchip,delay-pa-drv-ms' properties
Change-Id: I02873c309453213e1357ffa9375a3bd2a161d7ed
Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
2018-08-16 18:30:36 +08:00
Wyon Bi
363e47c6aa phy/rockchip: typec: improved handling of typec_dp_phy_config()
Change-Id: I61ca43ffe7fe85e041fb3ed66ba1d59f515770d9
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-08-16 18:13:54 +08:00
Wyon Bi
08aea10ffd phy/rockchip: typec: PLL1 settings improvements
When I tested DP function on excavator, I found that commit 1bf7191033de
("BACKPORT: FROMLIST: phy: rockchip-typec: support variable phy config value"),
which change pll settings, but it does not work as expected on excavator board.
With this patch series, DP works well on excavator and roc.

Change-Id: I48fe0c51e322369d1aff352f4ebaf1096f264834
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-08-16 18:13:48 +08:00
Dingqiang Lin
f0f004d826 drivers: rkflash: adjusting the vendor interface provided to the kernel
Change-Id: I9c939c774601f866b8c29270740aaab41c08a194
Signed-off-by: Dingqiang Lin <jon.lin@rock-chips.com>
2018-08-16 18:00:34 +08:00
Xing Zheng
1320789ec6 ASoC: rk3308_codec: increase ADC_STABLE_MS to 200ms
It looks that switching BIST mode to normal mode, we need
to increase the ADC_STABLE_MS delay (> ~150ms) to avoid
glitches.

Change-Id: Ied7b283cd4a2fa8c2702a655dab464a7f90f63c4
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2018-08-16 17:59:08 +08:00
Xing Zheng
7f755d9a6a ASoC: rk3308_codec: fix the incorrect grp with 'rockchip,en-always-grps'
There is some broken mapped grps when we use the property
'rockchip,en-always-grps', let's fix it.

Change-Id: I1f668138be4133ee06988756917220621758d2de
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2018-08-16 14:08:27 +08:00
Sandy Huang
b0ae63a095 drm/rockchip: csi: Add support RK1808
Change-Id: Ia908f1a8c0a4f72b61bacf98ab6e4ed9a3e3ebed
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-08-15 18:47:25 +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
Wyon Bi
a8c0f12f4e phy/rockchip: mipi_dphy: Add support for RK1808
The innoslicon GF22FDX MIPI D-PHY integrates a MIPI 1.2
compatible PHY that supports up to 2.5Gbps high speed data
transmitter, plus a MIPI low-power low speed transceiver
that support data transfer in the bi-directional mode.
The IP supports the full specifications described in the
D-PHY spec 1.2. The D-PHY is built in with a standard
digital interface to talk to any third party host controller.

Change-Id: Iad7b9dc8fedaa1a5741830e9c02a593f544c2423
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-08-15 17:39:45 +08:00
Wyon Bi
2ba3dad0f8 phy/rockchip: mipi_dphy: registers clean up and fix some typos
Change-Id: Ibdb8c3a4c83df7be8c4f83cb556a0769efc01139
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-08-15 17:39:02 +08:00
Wyon Bi
15c03fc985 drm/rockchip: dsi: Add support for RK1808
Change-Id: Icb02137a3c5f0636cbe01163de2135d28ea14c49
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-08-15 17:38:42 +08:00
Sandy Huang
5babaa7e5f drm/rockchip: vop: add support rk1808 vop
rk1808 have vop lite and vop raw:
1. vop lite: support win1 for display, vop->dsi tx->dphy->lcd.
2. vop raw: transfer data from ddr to csi tx.

Change-Id: I11229b5e61e66e72e4228e7e0ac966f1f85cb49f
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-08-15 17:38:03 +08:00
Wyon Bi
eafd8e2fb2 drm/rockchip: rgb: Add support for RK1808
Change-Id: I60d99dea417b2708ffb2c784a0d26313e7d20fdb
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-08-15 17:35:48 +08:00