Commit Graph

847622 Commits

Author SHA1 Message Date
Wyon Bi
a80965f307 arm64: dts: rockchip: remove lvds bus format comment
Change-Id: I0693ef2a36222df0eca676837662e41972b9706b
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-12-09 19:55:49 +08:00
Liang Chen
3ea0090d9e ARM: dts: rockchip: add some rk3326 board dts files
Change-Id: I78911eeea0a65bf1effe84b1a44a9320420af41b
Signed-off-by: Liang Chen <cl@rock-chips.com>
2019-12-09 19:52:47 +08:00
Frank Wang
f9b2e63cff ARM: dts: amend rk322x-usb2phy to rk3228-usb2phy
Change-Id: If47746bf2bc1736c5c9e891829c1013c2449e1f4
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2019-12-09 19:51:00 +08:00
Kever Yang
09379f1bf2 ARM: dts: rockchip: add battery node for rk3128-fireprime
fireprime is using rk818, which need a battery node for fuel gauge,
or else the input current will be limit to 500mA.

Change-Id: Ie80dbc103d1ac57b704235a9b618b7e9db44c953
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-12-09 19:49:59 +08:00
Liang Chen
eb059d08e8 arm: dts: rk3128-fireprime: remove custom cma region@88000000
The address@88000000 is out of memory on rk3128-fireprime, so remove
the cma region@88000000, just delete the property <reg>, so that
system will alloc cma region automatically.

Change-Id: I2b9fdf1cd19d9fcecd59421fd551d709f9054cae
Signed-off-by: Liang Chen <cl@rock-chips.com>
2019-12-09 19:49:36 +08:00
Tao Huang
760f75fd0a ARM: dts: rockchip: disable uart2 for rk3229-at-som
ttyS2 and fiq debugger don't use the same uart2

Change-Id: Ibb9db5ff84d334d77787ea6f39a0802ba489781c
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-12-09 19:48:53 +08:00
Shunqian Zheng
21d09f643c ARM: dts: rk3128/px3se: enable video phy node for linux dts
Change-Id: I6a1e5139709c8d367e636c80533cc85ddb1e496e
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
2019-12-09 19:48:35 +08:00
Tao Huang
f502eda493 ARM: dts: rockchip: add build rk3126-bnd-d708-avb.dtb
Fixes: 4ea55de3a8 ("arm: dts: rk312x: rk3126-bnd-d708: Separate android fireware.")
Change-Id: I2545c3c694e11e2e15e1c8351f0fd2762fdbe391
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-12-09 19:48:35 +08:00
Finley Xiao
9ddbffdcaa arm64: dts: rockchip: rk1808: Add rk1808k dtsi for wide temperature chip
Change-Id: Icf3eebf09276a8cd8917f46cf921d60e7dd9c9ec
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-12-09 17:47:49 +08:00
Finley Xiao
daa058974f arm64: dts: rockchip: add voltage restriction for rk3308k
Change-Id: Ib531f0659fe87b11fc6d80527de2a65cdb4b1053
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-12-09 17:47:22 +08:00
Finley Xiao
7a25e76bee arm: dts: rockchip: rk3288: Assign npll to 1250MHz
In order to support 420MHz for gpu and 125MHz, 50MHz for gmac.

Change-Id: I2b0e3edbf08850555c5bd4bc1d063c8923d54bda
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-12-09 17:46:37 +08:00
Finley Xiao
62d27b2e26 arm: dts: rockchip: rk3288: Change 400MHz to 420Mhz for gpu
It doesn't support 400MHz, but support 420MHz.

Change-Id: Ife31469307912f83919b02b532acde91cc0f19ce
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-12-09 17:30:23 +08:00
Finley Xiao
6457c0aded arm: dts: rockchip: rk3288: Assigned i2s_src parent to GPLL
The default parent of i2s_src is 200MHz CPLL, it doesn't meet
the constraint of fractional divider that denominator must be
20 times larger than numerator.

Change-Id: I986525ca7a92cb5883facd1b6e89079398302856
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-12-09 17:30:09 +08:00
Finley Xiao
a274ea29d0 ARM: dts: rockchip: rk3288: Add nocp device node
Change-Id: I7432a68be8730718b1d6d22c7e97f83827d0eb75
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-12-09 17:30:09 +08:00
Finley Xiao
365fb41f32 ARM: dts: rk3288: add leakage nvmem-cells property for cpu
Change-Id: I0238f29b0c79daa683ffd8a2a1f09f51761a5358
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-12-09 17:30:09 +08:00
David Wu
30ffe9accd arm64: dts: rockchip: Fix otg function for rk3368 sheep
Enable otg to apply dwc2-controller and u2phy_otg driver.

Change-Id: I5d5b7623ff18b1bf14f8b6e91620bfb88770cd63
Signed-off-by: David Wu <david.wu@rock-chips.com>
2019-12-09 17:29:18 +08:00
David Wu
24992130f2 arm64: dts: rockchip: Add HCLK_USB_PERI for rk3368 otg
If this clock does not enable, the otg controller is
working abnormally.

Change-Id: Ic08043e19d3ef1ed8cfb35267828ff317fb438f6
Signed-off-by: David Wu <david.wu@rock-chips.com>
2019-12-09 17:29:18 +08:00
Jon Lin
96f6cb1cfa drivers: rkflash: support upgrade IDB loader which's size large than 128KB with Nandc V9
Change-Id: Ie62fffc0170623796ed6d39e78a6313a93d504d6
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2019-12-09 17:28:04 +08:00
Jon Lin
c568d24da7 drivers: rkflash: fix error in SPI Nand ECC refresh case
Change-Id: I4d4797631270ffc3fb6177dceae3009e63c5fa6a
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2019-12-09 17:28:04 +08:00
Jon Lin
71aba3f2bc drivers: rkflash: decrece reserved IDBlock from 16 to 8
1.Decrece reserved IDBlock from 16 to 8
2.Decrece print info

Change-Id: I69443b0f2381f061176d6f2cf32497f644564093
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2019-12-09 17:28:04 +08:00
Jon Lin
a0b7bf8e57 drivers: rkflash: fix SPI Nand bad block check strategy
Change-Id: Id1ee5c5a3d7442cf19de3ea5190268b395011a89
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2019-12-09 17:28:04 +08:00
Jon Lin
c222309ca5 drivers: rkflash: remove unuse struct define
Change-Id: Ia53cf4fb1bc7c5227fbb7d2e26ec9c580c46f478
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2019-12-09 17:28:04 +08:00
Jon Lin
3cb2d16219 drivers: rkflash: adjust the framework of rkflash
1.Extern all controller low layer driver APIs in rkflash_api.h
2.Register dev when controller node is probed;
3.APIs rkflash_dev_xxx for dev register in rkflash_blk.c, support:
    rkflash_blk: SLC Nand blk dev;
    rkflash_blk: SPI Nand blk dev;
    rkflash_blk: SPI Nor mtd dev;
    spi_nand_mtd: SPI Nand mtd dev;
    spi_nor_mtd: SPI Nor mtd dev;

Change-Id: I5423fead6b6343d1ab94303d30d486dea74b166c
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2019-12-09 17:28:04 +08:00
Jon Lin
0bc7afc683 drivers: rkflash: add SPI Nand flash mtd support
Change-Id: I7dcabc096680cc902316031363fb82a9ea856dbe
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2019-12-09 17:28:04 +08:00
Elaine Zhang
2d64f3c03b clk: rockchip: rk3288: add the condition of the call register_syscore_ops
The pwm clk parent is GPLL,PWM clk not allowed to change freq,
so the GPLL not allowed change mode and freq  when pwm is used.
If have trust is need't rk3288_clk_suspend and rk3288_clk_resume.

Change-Id: I4845fda89d7ae7713e8c0e94747c3f4dfd140c6a
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-12-09 17:25:56 +08:00
Finley Xiao
2c55a33bc8 clk: rockchip: rk3128: Fix aclk_peri_src parent
Change-Id: Id679e7235f78635233dc4d6bd59c75ce05dfc99e
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-12-09 17:25:56 +08:00
Shunqian Zheng
6e6bfa2b29 media: i2c: jx_h65: fix gain > 4x flicker
Fix bad timing and write the regs all in one including the 0x12(mode
control) when starting up in .s_power().

To avoid bad mipi signal during mipi dphy enabling, let jx_h65
enter sleep mode right after .s_power().

Change-Id: Ib72e790093297d99fc8db385fb8bd8493e4fe52b
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
2019-12-09 17:24:57 +08:00
Guochun Huang
8121857ba4 drm/rockchip: lvds: Add support for MEDIA_BUS_FMT_RGB101010_1X7X5_SPWG/JEIDA bus format
Test on rk3288

Change-Id: Ia4068e148ee3cd91957a850058a7103ca6247d26
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2019-12-09 17:24:22 +08:00
Guochun Huang
8dc0384fda dt-bindings: display: media-bus-format: Sync with include/uapi/linux/media-bus-format.h
Change-Id: Idde9f3c350e226c4f023b9432964770cde8dc9cd
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2019-12-09 17:24:22 +08:00
Guochun Huang
369e075aff media: Add MEDIA_BUS_FMT_RGB101010_1X7X5_SPWG/JEIDA media bus code definitions
This patch adds a new RGB media bus formats that describe
30-bit samples transferred over an LVDS bus with five
differential data pairs, serialized into 7 time slots,
using standard VESA/JEIDA data ordering.

Change-Id: I922a48c70f96727f0292004bb38dabab99f6a918
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2019-12-09 17:24:22 +08:00
Sandy Huang
b007d60ce6 drm/rockchip: drv: delete legacy fb setting
Primary plane for this CRTC, this is only relevant for legacy IOCTL,
it specifies the plane implicitly used by the SETCRTC and PAGE_FLIP IOCTLs,
It does not have any significance beyond that.

Change-Id: Ia4b0ac8fd4f597cd628377be32eef2ef498f4af3
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-12-09 17:23:22 +08:00
Wu Liangqing
7ec17eafde ARM: dts: rockchip: remove firmwre_android node
Which is not needed for Android 10.

Change-Id: Ibcbc2afb1f7d216821e70bd5a0ff66c78ee5f39c
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2019-12-06 20:46:01 +08:00
Wu Liangqing
e2a88d8a2a arm64: dts: rockchip: remove firmwre_android node
Which is not needed for Android 10.

Change-Id: Iaa07d61d15b608e1c23fed97b87f31384a75df0a
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2019-12-06 20:40:10 +08:00
Ding Wei
cda9d27c62 video: rockchip: mpp: modify ioctl style
It is a new structure for compat_ioctl and unlock_ioctl.
The target is adpat to kinds of ioctl data.
Data structure as:
    cmd_type | flag | size | offset | data
    a) each fixed at 32bit.
    b) size is the length of following data.
    c) In kernel space, first parse this header, then read
    the following data according to the cmd_type and data_size.

Change-Id: If3d08d54f42606ec71fbca402e5b330f7f37438d
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2019-12-06 14:13:28 +08:00
Ding Wei
b94ac0df87 video: rockchip: mpp: re-define MPP_DEVICE_TYPE
Change-Id: I9cc654388c15394198575fa321edbdca437d5f77
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2019-12-06 14:13:18 +08:00
Huibin Hong
a427468e9e drivers: devfreq: rockchip_dmc: rk3128: fix bug about ddr_2t
Change-Id: I4a30b7f5524df7862e2277d7b252bdbfc767886c
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2019-12-06 08:40:40 +08:00
Ding Wei
a6f3db2758 video: rockchip: mpp: deal with the case for iommu share
In platform arm32, iommu is shared in different device,
it must attach to ensure hardware working in current device.

Change-Id: I854a362adf6145dcfd796885922683f8a6b7e131
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2019-12-05 15:39:47 +08:00
Wang Jie
f128f29c38 input: sensors: increase sampling frequency.
for android-10.0: increase the sampling frequency to pass the vts test.

Change-Id: I2d68b51e5697a576acebff03b5b1e92b1c90a7d8
Signed-off-by: Wang Jie <dave.wang@rock-chips.com>
2019-12-05 13:12:05 +08:00
wlq
bfb2fb2e61 arm: dts: rk312x: dmc freq set all scenes on 456MHZ TEMP
Change-Id: Idc2d2b52208833ba4e7905abbe4c955865e2deec
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2019-12-04 17:47:40 +08:00
Simon Xue
b03102c010 iommu/rockchip: add max segment size for device
The default max segment size is 64Kb, if memory that device
want to map larger than default then it will break to several times
mapping which may result in non-contiguous IOVA. So set to 4Gb

Change-Id: I22eb7f30a3f741689c8c32734509c34f99fd8100
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2019-12-04 09:48:37 +08:00
Grey Li
f38a8b7992 video: rockchip: mpp: fix reset fail in shared reset clk
Use devm_reset_control_get replace devm_reset_control_get_shared
because we want to reset hardware really and don't care about others.

Change-Id: I548ed01e0ce7bbed46c37e2da1476b2623c3d452
Signed-off-by: Grey Li <grey.li@rock-chips.com>
2019-12-03 20:58:58 +08:00
Wu Liangqing
d2bade67b4 arm64: dts: rockchip: rk3399-evb-ind: fix ov13855 reset gpio error
Change-Id: Ic367c80f43cb6aed4a68e6d2bb3097313ac6ba03
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2019-12-02 17:31:41 +08:00
Patrik Torstensson
ded2feb24a ANDROID: Add kconfig to make dm-verity check_at_most_once default enabled
This change adds a kernel config for default enable
the check_at_most_once dm-verity option. This is to give us
the ability to enforce the usage of at_most_once
for entry-level phones.

Change-Id: Id40416672c4c2209a9866997d8c164b5de5dc7dc
Signed-off-by: Patrik Torstensson <totte@google.com>
Bug: 72664474
2019-11-29 09:53:13 +08:00
Tao Huang
d09befa503 ARM: rockchip_defconfig: enable CFQ group schedule
Sync with floral_defconfig
CONFIG_BLK_CGROUP=y
CONFIG_CFQ_GROUP_IOSCHED=y

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ieca67acd29962b3c6820d50551a4857f5a1c980d
2019-11-29 08:45:49 +08:00
Tao Huang
434a9a0195 ARM: rockchip_defconfig: disable CONFIG_SYSFS_SYSCALL
Sync with floral_defconfig

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I3d2e6e3ddfa2ed6a5dcf0ebe065d355b9ea6e305
2019-11-29 08:45:34 +08:00
Tao Huang
8ff5bc87d8 ARM: rockchip_defconfig: Enable zram writeback
Sync with floral_defconfig
CONFIG_ZRAM_WRITEBACK=y

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ib5be461af0c4b290983e8374e0e9fe2ebae2594f
2019-11-29 08:45:20 +08:00
Tao Huang
f25c5fdb94 ARM: rockchip_defconfig: add security configs
Sync with floral_defconfig
CONFIG_BUG_ON_DATA_CORRUPTION
CONFIG_SCHED_STACK_END_CHECK

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I97164085a28468667ae69b84632c3bd70c188614
2019-11-29 08:44:58 +08:00
Tao Huang
6617c3acd6 ARM: rockchip_defconfig: enable CONFIG_MODULE_FORCE_UNLOAD
Sync with floral_defconfig

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I725cab4a3d8674a9775abba3bf314d07a660ffab
2019-11-29 08:44:42 +08:00
Tao Huang
af7888c635 ARM: rockchip_defconfig: disable CONFIG_COMPAT_BRK
Sync with floral_defconfig

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I21827cf22d9166bc811507cedd56a5d54bf4b22a
2019-11-29 08:44:28 +08:00
Tao Huang
54f08e2b86 ARM: rockchip_defconfig: disable CONFIG_PM_AUTOSLEEP
Autosleep is no longer used by Android.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I5eb7126ba49bd7200bff540ce94ae935969acfa2
2019-11-29 08:44:18 +08:00