Commit Graph

847584 Commits

Author SHA1 Message Date
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
Tao Huang
bd22afbc73 arm64: rockchip_defconfig: enable CONFIG_IRQ_TIME_ACCOUNTING
Change-Id: I0be61d3ae6c294a0c9f3bc2a832a73411ce6688e
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-11-29 08:43:45 +08:00
Tao Huang
68a91765a6 arm64: rockchip_defconfig: enable CFQ group schedule
Sync with floral_defconfig
CONFIG_BLK_CGROUP=y
CONFIG_CFQ_GROUP_IOSCHED=y

Change-Id: I87d283eb6dbc5551165295a019bebb50a430298f
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-11-29 08:43:24 +08:00
Tao Huang
c05b7eda52 arm64: rockchip_defconfig: disable CONFIG_SYSFS_SYSCALL
Sync with floral_defconfig

Change-Id: Id55a93e0c0ec7cfedfb8769dd5c1cf536aea8011
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-11-29 08:43:06 +08:00
Tao Huang
cb0568114d arm64: rockchip_defconfig: Enable zram writeback
Sync with floral_defconfig
CONFIG_ZRAM_WRITEBACK=y

Change-Id: If00127e9202e4fe4392c6593612a188bfc4e8c66
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-11-29 08:42:50 +08:00
Tao Huang
ced8cf2fbf arm64: rockchip_defconfig: add security configs
Sync with floral_defconfig
CONFIG_BUG_ON_DATA_CORRUPTION
CONFIG_SCHED_STACK_END_CHECK
CONFIG_DEFAULT_MMAP_MIN_ADDR to 32768

Change-Id: I11a8fc79a47da62e4f3df04da4614e6fcfc8e247
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-11-29 08:42:34 +08:00
Tao Huang
2882261031 arm64: rockchip_defconfig: enable CONFIG_MODULE_FORCE_UNLOAD
Sync with floral_defconfig

Change-Id: I698607c525e53c586bf10b9ef9b3b686a9cacd9e
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-11-29 08:42:14 +08:00
Tao Huang
388967179c arm64: rockchip_defconfig: disable CONFIG_COMPAT_BRK
Sync with floral_defconfig

Change-Id: I93a8d8787e5c45a96bf4b70f9e68fd0ee84ee0f4
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-11-29 08:41:55 +08:00
Tao Huang
b3d8ae349e arm64: rockchip_defconfig: disable CONFIG_PM_AUTOSLEEP
Autosleep is no longer used by Android.

Change-Id: I0ba79c9581130f48d419381e6677306ad434e16f
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-11-29 08:41:34 +08:00
Tao Huang
d72da8b8bd arm64: rockchip_defconfig: disable CONFIG_RELAY
Sync with floral_defconfig

Change-Id: I522f29a0a73c2db0e11c95916516685d6ecdee61
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-11-28 17:57:00 +08:00
Bradley Bolen
833e626ee6 UPSTREAM: mmc: core: Fix size overflow for mmc partitions
With large eMMC cards, it is possible to create general purpose
partitions that are bigger than 4GB.  The size member of the mmc_part
struct is only an unsigned int which overflows for gp partitions larger
than 4GB.  Change this to a u64 to handle the overflow.

Change-Id: I95594ae67987bc3f9599bc4a13952eb59c43e813
Signed-off-by: Bradley Bolen <bradleybolen@gmail.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
(cherry picked from f3d7c2292d)
2019-11-28 11:15:32 +08:00
Wang Panzhenzhuan
99b3695fef media: rockchip: cif: add pipeline power management
reference commit:
Commit fda2824552 ("media: rockchip: isp1: add pipeline power management")

Change-Id: Ibf23890af5efb26a282a490faf5a7320349a5046
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
2019-11-28 10:43:38 +08:00
Wang Panzhenzhuan
1b02d60cf5 ARM: rockchip_defconfig: rk3126c_bnd_m88: enable gc0312 gc2035
Change-Id: Ide53d3bb7cd87314385e7c78dcdd408512975a76
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
2019-11-28 10:42:43 +08:00
Wang Panzhenzhuan
4419a79ab1 ARM: dts: rockchip: rk3126-bnd-m88-emmc: add gc0312 & gc2035 support
Change-Id: I2acb7acea7b548b25e5627199dab2d347943140f
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
2019-11-28 10:42:09 +08:00
Zefa Chen
b7526773a3 media: i2c: add enum_frame_interval function for iq tool 2.2 and hal3
Change-Id: I03344cd6cf278dd7c18fce8e97479089ef185a5c
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2019-11-28 10:40:19 +08:00
Sandy Huang
ff1c90f701 ARM: dts: rockchip: add rk3228 vop compatible name for rk322x
Upstream kernel and uboot use rockchip,rk3228-vop as rk322x vop
compatible name, so add this.

Fixes: 810b044867 ("ARM: dts: rk322x: add vop display node")
Change-Id: I552b99a64f8de679aa4504624e35482e2b0a0508
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-11-28 10:26:19 +08:00
David Wu
ea92092755 net: ethernet: stmicro: stmmac: Get the ethernet mac address at stmmac_open
When it is the initialized probe, getting or setting the Ethernet address
from the vendor partition will fail. The function for reading/writting
vendor partition is not registered and changed this to stmmac_open to
ensure the operation worked.

Change-Id: Id9401e7ffcbc16a266ecb69b3777499919c50ed6
Signed-off-by: David Wu <david.wu@rock-chips.com>
2019-11-28 10:19:01 +08:00
David Wu
0bacdd1bd8 ARM: dts: rockchip: Config the pwm2 pinctrl with pull up for rk322x
Default pull state of pwm2 and pwm3 pin are up, keep them
when pwm2 and pwm3 are used for pwm regulator. And remove
the pull down config for pwm2 and pwm3, they are not used.

Change-Id: Id8c4767627bd00d224aec734f4a1cacb619c79aa
Signed-off-by: David Wu <david.wu@rock-chips.com>
2019-11-28 10:12:51 +08:00
Tao Huang
7fa2f030b0 Documentation: remove unused cgroup-legacy
Change-Id: I965839be7b62a3f4cf86b9df3b0d74932958fb91
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-11-27 16:53:23 +08:00
Tao Huang
a346a6066c Documentation: remove unused pixfmt-yuv422m.xml and pixfmt-yuv444m.xml
Change-Id: Icaf713dd318cd18355a89b6cdff5c12d959de578
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-11-27 16:51:39 +08:00
Sandy Huang
cb22710859 arm: dts: rk322x: add rockchip,disable-device-link-resume for vop
vop iommu handled by vop driver, so ignore the iommu operation
when vop call pm_runtime_get_sync/pm_runtime_put_sync

Change-Id: Id8e21902ea3941e9ccef3e3d1b12efbbdee8e337
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-11-27 16:38:15 +08:00
Wang Panzhenzhuan
9f37bae407 media: rockchip: isp1: fix crash issue
vb2_fop_release should be called before v4l2_pipeline_pm_use,
otherwise it causes system crash when start stream with v4l2-ctl command,
and stop stream unexpected with ctrl+c.

Change-Id: Ia46078aaf1e436fdc10272ef778b4d8b11589520
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
2019-11-27 16:35:54 +08:00
Xiao Ya peng
72a11f11d8 ARM: dts: rockchip: rk322x: Add the pwm2/pwm3 pinctrl with pull up
The default state of pwm2/pwm3 pin is a pull up, we need to keep it
for the second global reset issue, when pwm2/pwm3 used for the regulator

Change-Id: Ic57e26338f7f546e3f784bd34790ed9b027d78de
Signed-off-by: Xiao Ya peng <yp.xiao@rock-chips.com>
2019-11-27 15:53:55 +08:00
Zhen Chen
eccee24a64 ARM: dts: rockchip: rk312x: Fix incorrect base address of gpu register
Fixes: 1f66f15d73 ("ARM: dts: rockchip: rk312x: refine gpu node")
Change-Id: I47cc24625d3b5455351573333d7e653ef4a6c51b
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2019-11-27 14:36:26 +08:00
Sandy Huang
7091540a86 drm/rockchip: gem: support cpu cache for drm memory
Change-Id: Ic9ca3d0862eb8c5c4d8a002db8cbbcc93d2dcc02
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-11-27 14:06:26 +08:00
Grey Li
7abe2657b7 ARM: dts: rockchip: change rkvdec version for rk322x
Fixes: 41ee9439d0 ("ARM: dts: rockchip: rk322x: dtsi for video codec")
Change-Id: I2ebb36b3f990a9420c418cc9ed9861be7bfd740f
Signed-off-by: Grey Li <grey.li@rock-chips.com>
2019-11-27 08:49:21 +08:00
Zhen Chen
4e2b2ec2ef Mali: utgard: adjust corresponding to the refined gpu node in dts files
Such as :
	arch/arm/boot/dts/rk312x.dtsi,
	arch/arm/boot/dts/rk322x.dtsi

Change-Id: Ib92193685fc7572558f2f4e65fec6be29d20ac2f
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2019-11-26 19:37:41 +08:00
Zhen Chen
20a1cf7ac6 arm64: dts: rockchip: rk3328: refine gpu node
Change-Id: Ibf3975e0d7e77bc24bca8dac06d8308d65013dee
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2019-11-26 19:37:41 +08:00
Zhen Chen
1f66f15d73 ARM: dts: rockchip: rk312x: refine gpu node
Change-Id: I9e6ebd6fc01a2bbfecdefeda307ed94334edccae
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2019-11-26 19:37:41 +08:00
Grey Li
701a3b0ff8 ARM: dts: rockchip: add iep iommu clk for rk322x
Change-Id: If980d9bc1d448f94a9fc5dfe777a92c155f971e5
Signed-off-by: Grey Li <grey.li@rock-chips.com>
2019-11-26 19:35:19 +08:00
Xiao Ya peng
c74dfe312c ARM: dts: rockchip: enable rng for rk322x-android
Change-Id: Ic2b582b04eba22a2e7e608bedcb43924432f4efe
Signed-off-by: Xiao Ya peng <yp.xiao@rock-chips.com>
2019-11-26 19:21:03 +08:00
Zhen Chen
786105b4d0 ARM: dts: rk322x: Adapt gpu node for Mali400 device driver base on ARM DDK
The source files are under drivers/gpu/arm/mali400.

Change-Id: I4ee1055cf3f630e2d609ab72e26c36daf51cddbb
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2019-11-26 19:14:08 +08:00
Lin Jinhan
c79f3d6056 ARM: dts: rockchip: rk322x: add rng node
Change-Id: Ie39242a306d8d6f26c4b6adc19ec09cea5b93ede
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2019-11-26 19:12:46 +08:00
Finley Xiao
f02d92ba53 ARM: dts: rockchip: rk312x: Add SYS_STATUS_REBOOT for dmc
Add SYS_STATUS_REBOOT for dmc so that the frequency and voltage will
change when reboot.

Change-Id: If26c704bfda361d03cf3a8b0e16781902ddf7e12
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-11-26 19:09:19 +08:00
Finley Xiao
7b2e34a7e4 soc: rockchip: system_monitor: Add default reboot frequency for cpu
There is an reboot frequency event if don't add property 'rockchip,reboot-freq'
in cpu opp table node.

Change-Id: I79a56d62c70d99f60840cd3304622799aaa66476
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-11-26 15:53:57 +08:00
Finley Xiao
28cab7d2d6 ARM: dts: rockchip: Add system monitor node for some platfroms
The reboot and fb notifiers are also need for some platfroms when enable
dmcfreq.

Change-Id: I7a02e43ebfff6f8cdccd050a30a9e6c270fc5b5e
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-11-26 15:53:27 +08:00
Ding Wei
869938b29a video: rockchip: mpp: fix mistake writing
Change-Id: I0cd75cc86810bdc29f75d9dd797c9100e1d5c440
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2019-11-26 11:03:18 +08:00
Finley Xiao
8e651bd57d cpufreq: dt-platdev: Add rk3229 project into blacklist
Change-Id: I38a3880206f0772b8b0ba29798389cac616197ad
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-11-26 09:06:26 +08:00
Ding Wei
41ee9439d0 ARM: dts: rockchip: rk322x: dtsi for video codec
Change-Id: I96428170f3d588225de24e028db42c431817dbd1
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2019-11-26 09:04:55 +08:00