Commit Graph

847603 Commits

Author SHA1 Message Date
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
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