Commit Graph

1060437 Commits

Author SHA1 Message Date
Tao Huang
55eeccd877 arm64: rockchip_gki.config: Disable CONFIG_STMMAC_ETH
These modules are not compatible with GKI because of missing symbols.

-CONFIG_STMMAC_ETH=m

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I7361d48940ccd3a26835636c18adeff6ec78b7ee
2021-10-20 16:11:11 +08:00
Tao Huang
8342be98a9 arm64: rockchip_gki.config: Disable CONFIG_USB_SERIAL_OPTION
These modules are not compatible with GKI because of missing symbols.

-CONFIG_USB_SERIAL_OPTION=m

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I9c6a4ddd081a56ef01727308818be06d69c04657
2021-10-20 14:39:24 +08:00
Tao Huang
f891dd1b27 arm64: rockchip_gki.config: Disable some usb storage
These modules are not compatible with GKI because of missing symbols.

-CONFIG_USB_STORAGE_ALAUDA=m
-CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-CONFIG_USB_STORAGE_DATAFAB=m
-CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_STORAGE_FREECOM=m
-CONFIG_USB_STORAGE_ISD200=m
-CONFIG_USB_STORAGE_JUMPSHOT=m
-CONFIG_USB_STORAGE_KARMA=m
-CONFIG_USB_STORAGE_ONETOUCH=m
-CONFIG_USB_STORAGE_SDDR09=m
-CONFIG_USB_STORAGE_SDDR55=m
-CONFIG_USB_STORAGE_USBAT=m

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I3fed6d3b1643a6625833ade16f11702ac355ece4
2021-10-20 12:28:03 +08:00
Tao Huang
6b4044ffbb arm64: rockchip_gki.config: Disable some usb ethernet
These modules are not compatible with GKI because of missing symbols.

-CONFIG_USB_CATC=m
-CONFIG_USB_HSO=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_NET_CX82310_ETH=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_SIERRA_NET=m

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ibd9b077fad1aee5d419f3d44781af095ef2e054b
2021-10-20 12:05:13 +08:00
Tao Huang
60f2ba1898 arm64: rockchip_gki.config: Disable CONFIG_BT_BNEP
These modules are not compatible with GKI because of missing symbols.

-CONFIG_BT_BNEP=m

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: If047a9e6fea58aaccbce4f6df0ffc679600d75e7
2021-10-20 11:46:07 +08:00
Tao Huang
920569e3b2 arm64: rockchip_gki.config: Disable ATA
These modules are not compatible with GKI because of missing symbols.

-CONFIG_ATA=m
-CONFIG_SATA_AHCI=m
-CONFIG_SATA_AHCI_PLATFORM=m

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I9f71e28fd86d47307b1d89ee0ceb89e0ddc67d7f
2021-10-20 11:25:39 +08:00
Algea Cao
dbd228a254 drm/bridge: synopsys: dw-hdmi: Get edid yuv422 info independently
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ibd340a273a16a5faa7ac1b548c81cc89914f442f
2021-10-20 10:40:27 +08:00
Algea Cao
1bd6270500 drm/rockchip: drv: Parse edid yuv422 info in rockchip driver
In drm_edid.c, yuv422 supported flag will be clean although EDID
indicates support for it. To be compatible with GKI, we can not
modify drm_edid.c. So we parse the information about yuv422 in EDID
in rockchip driver.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Iecae74173f6b1d87e0c1381e96b71365ea4a1fac
2021-10-20 10:40:20 +08:00
Tao Huang
b1a5ad8bd8 arm64: rockchip_gki.config: Disable CDROM FS
These modules are not compatible with GKI because of missing symbols.

-CONFIG_ISO9660_FS=m
-CONFIG_UDF_FS=m

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I01e5a615461a15be6f7e9aa9aecd179f3d6975fd
2021-10-20 10:26:54 +08:00
Tao Huang
7d864c248c arm64: rockchip_gki.config: Disable ppp modules
These modules are not compatible with GKI because of missing symbols.

-CONFIG_PPPOE=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I71b14c6849288295e277573555718015e8e93bae
2021-10-20 10:00:46 +08:00
Tao Huang
34d6602ed7 arm64: rockchip_gki.config: Disable net modules
These modules are not compatible with GKI because of missing symbols.
-CONFIG_INET6_AH=m
-CONFIG_INET_AH=m
-CONFIG_INET_IPCOMP=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: If4896cae2eb8fe9eb8510460e562272a8002f8b8
2021-10-20 09:14:17 +08:00
Tao Huang
c00db9df9e clk/rockchip/regmap: rk628: Use devm_reset_controller_register()
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I6ff802e11381bb980d55b005edfa6ed3a9c7a469
2021-10-19 18:03:40 +08:00
Shunqing Chen
466b01a904 drm/bridge: synopsys: dw-hdmi: fix the issue that can not display after force off
1. echo off > sys/class/drm/card0-HDMI-A-1/status
2. echo detect > sys/class/drm/card0-HDMI-A-1/status
HDMI is not displayed after executing the above commands.

Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I46fc984b278f5186a22c279def82570603af5494
2021-10-19 14:12:52 +08:00
Zhang Yubing
e291ddfbcb drm/rockchip: cdn-dp: use delay work replace work
In tcpm displayport driver, drm_connector_oob_hotplug_event()
execute before dp_altmode_notify().

The dp_altmode_notify() call the mux set function, which
transfer phy info(lane count, pin assignments) to typec
phy.

The drm_connector_oob_hotplug_event() call oob_hotplug_event
function, which notify the cdn-dp driver hotplug event, and
the cdn-dp will start work to deal with the hotpug event,
which will user the phy info.

if here no delay time, The phy info use may be early than phy
info update, whick may cause the phy info mismatch.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: Ic3394769f66bd3b7a621095e09978e4b15393b7e
2021-10-19 11:31:52 +08:00
Zhang Yubing
3a38a93376 drm/rockchip: cdn-dp: register dp sub_dev to support hotplug event
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: Ia2c6eb883b8b6e5500d2eb7ef7439ac42ebc6e52
2021-10-19 11:31:28 +08:00
Zhang Yubing
43a103fe8b drm/rockchip: cdn-dp: remove the extcon function
We will use tcpm framework to detect dp hotplug event,
no longer extcon, so remove it.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: If51f1f44f38ec0ae135735ac1ec1632132271a56
2021-10-19 11:31:14 +08:00
Hans de Goede
594af86e81 FORMLIST: usb: typec: altmodes/displayport: Notify drm subsys of hotplug events
Use the new drm_connector_oob_hotplug_event() functions to let drm/kms
drivers know about DisplayPort over Type-C hotplug events.

Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Tested-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I1763c3af6b2416a41a13f2f9c6b4ca6ec4917ffb
Link: https://lore.kernel.org/linux-usb/20210817215201.795062-9-hdegoede@redhat.com/
2021-10-19 11:31:00 +08:00
Zhang Yubing
82a87fa40a drm/rockchip: Add support for out-of-band hotplug notification
Add a new drm_connector_oob_hotplug_event() function and
oob_hotplug_event drm_connector_funcs member.

On some hardware a hotplug event notification may come from outside the
display driver / device. An example of this is some USB Type-C setups
where the hardware muxes the DisplayPort data and aux-lines but does
not pass the altmode HPD status bit to the GPU's DP HPD pin.

In cases like this the new drm_connector_oob_hotplug_event() function can
be used to report these out-of-band events.

Avoid the conflict of GKI, the drm_connector_oob_hotplug_event() is be
completed in rockchip drm driver, not the drm framework.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I5b1428daa83b0fdb7cf88e95d0b8fde2548d43d8
2021-10-19 11:31:00 +08:00
Guochun Huang
5aa16e093b drm/rockchip/rk628: combtxphy: reducing DUAL LVDS power consumption
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I831dc7879f8f4656e9db63c629c37cc5709d3e35
2021-10-19 10:49:59 +08:00
Sandy Huang
e261251240 drm/rockchip/rk628: max input resolution is 4k yuv420
Change-Id: I154b72b9ce3e975e62e9f107346eb57451dbb76d
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-10-19 10:49:52 +08:00
Dingxian Wen
050ba7e86a drm: rockchip: rk628: the combrxphy cable mode wait for clk to stabilize
Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
Change-Id: I7502b8f71f4fcc376a925045adbe6148ebdc2d3f
2021-10-19 10:49:46 +08:00
Shunqing Chen
8ba551e60d drm: rockchip: rk628: post_process: recalculate dst clock
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I93388ba499f0d74c5f5c549decc83f3225ae1b82
2021-10-19 10:49:38 +08:00
Tao Huang
26b711fa00 arm64: rockchip_gki.config: Enable CONFIG_DRM_ROCKCHIP_RK628
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Iedd3a37da2c1bcdd56b29676bf6321388279e29c
2021-10-19 10:37:07 +08:00
Wyon Bi
358218bef5 drm/rockchip: Add rk628 display driver
Change-Id: I7be65c5ed58df2be2cf2cfe819feacf8a610e880
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2021-10-19 10:36:14 +08:00
Shawn Lin
6523be7278 PCI: rockchip: dw: Fix gen switch case when link is up
L0 may be detected just in time if Gen1 training is finished.
But if EP supports higher Gen mode, Gen switch just happen
there but we keep on accessing devices, which leads unstable
link state and fail to detect the device finally.

And a bit more time before accessing devices to avoid this risky
case.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: If7eddce430b4590922b5c8f765be8a240b562d92
2021-10-19 09:54:55 +08:00
Wu Liangqing
89751e3f7d arm64: dts: rockchip: rk3588-evb: add sdmmc/sdhci/saradc
Change-Id: I44235e30b8480dbd1c505595ed5b6de9366beb40
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2021-10-18 18:59:07 +08:00
Jon Lin
2fb4d11d5e mtd: spinand: Support xtx
XT26G01A, XT26G02A, XT26G04A, XT26G01B, XT26G02B, XT26G01C, XT26G02C,
XT26G04C, XT26G11C

Change-Id: I3397f0a1f29c09a10446b3838504dc77d867f124
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-10-18 18:56:19 +08:00
Jon Lin
c691a1418d mtd: spinand: winbond: Support new devices
W25N512GV, W25N02KV, W25N04KV, W25N01GW

Change-Id: If178c6cf7024ec961593b235229a9f7a4366df33
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-10-18 18:56:19 +08:00
Jon Lin
ac2cf3c621 mtd: spinand: Support unim
TX25G01

Change-Id: Ifebf63cc803870602c627c741d1cd51c65977b6b
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-10-18 18:56:19 +08:00
Jon Lin
fce55885fd mtd: spinand: Support silicongo
SGM7000I-S24W1GH

Change-Id: I8bdaa383fd5977b4ee0828a04ddc738a1af0376a
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-10-18 18:56:19 +08:00
Jon Lin
fea785563f mtd: spinand: Support jsc
JS28U1GQSCAHG-83

Change-Id: Idf5062e23ccf1174c4f3096d86ce1975dc6b5c19
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-10-18 18:56:19 +08:00
Jon Lin
96ff56ea58 mtd: spinand: Support hyf
HYF1GQ4UPACAE, HYF1GQ4UDACAE, HYF2GQ4UAACAE, HYF2GQ4UHCCAE, HYF4GQ4UAACBE

Change-Id: I173aa2fbe8275a776fd63eb9c6d29b3589b7fe1c
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-10-18 18:56:19 +08:00
Jon Lin
9e2b33c54c mtd: spinand: gigadevice: Support new devices
GD5F2GQ5UExxG, GD5F2GQ4UBxxG, GD5F4GQ6UExxG, GD5F1GQ4UExxH, GD5F1GQ5RExxG,
GD5F2GQ5RExxG, GD5F2GM7RxG, GD5F2GM7UxG

Change-Id: Id2ec65a21bcdfc7687e57896513694609f34c48e
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-10-18 18:56:19 +08:00
Jon Lin
911bb5158a mtd: spinand: Support foresee
FS35ND01G-S1Y2, FS35ND02G-S3Y2, FS35ND04G-S2Y2, fsxxndxxg

Change-Id: Icdff45a209b5aa4dd2827e0e58bd543a84f9d809
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-10-18 18:56:19 +08:00
Jon Lin
205a24e347 mtd: spinand: Support fmsh
FM25S01A, FM25S02A, FM25S01

Change-Id: I7e0ceec39c57dc591d77a4ebde599ad326cf25b7
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-10-18 18:56:19 +08:00
Jon Lin
8506f6e6e7 mtd: spinand: Support etron
EM73C044VCF-0H

Change-Id: Ia61c2f4b20a1590c8208244cc984e1909108b1e1
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-10-18 18:56:19 +08:00
Jon Lin
560380d22f mtd: spinand: Support esmt
F50L1G41LB

Change-Id: I4a42522d775b511e9c049b5481ebc35e00821f95
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-10-18 18:56:19 +08:00
Jon Lin
cead43cc57 mtd: spinand: Support dosilicon
DS35X1GA, DS35Q2GA, DS35M1GA, DS35M2GA, DS35Q2GB, DS35M1GB

Change-Id: I5aeb0219f01dbe98d36b398e66b94ab31b07788e
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-10-18 18:56:19 +08:00
Jon Lin
1f221f71d8 mtd: spinand: Support biwin
BWJX08K

Change-Id: I0e269e47b264190951c19f4315706b40d3b765e5
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-10-18 18:56:19 +08:00
Shunhua Lan
cae7ca5fef ARM: dts: rockchip: rk628: add i2s mclk config and select test_clkout pin as mclk output
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: I32ef6ae68a0ffe6ac42a75de09d7995388815f03
2021-10-18 16:57:26 +08:00
Weixin Zhou
b279cde0ad ARM: dts: rockchip: rk628: Avoid namespace conflicts for pinctrl
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: Ibc14654e8b321daebf5b15d51c0de26acb41df91
2021-10-18 16:57:08 +08:00
Wyon Bi
923c9784a6 ARM: dts: rockchip: rk628: Avoid namespace conflicts
Add a prefix for all clocks to avoid namespace conflicts,
and no functional changes.

Change-Id: I1cf1c868f84b9bee4ba033bdd80c4995876b43f1
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2021-10-18 16:57:02 +08:00
Shunqing Chen
4d66e9d27f clk/rockchip/regmap: rk628: compatible with MCU mode
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I85f2c97ac23c585fc136eb5efa4e01fde979f883
2021-10-18 16:56:49 +08:00
Wyon Bi
3082499844 clk/rockchip/regmap: rk628: Add support for clk_testout
Change-Id: I71f5ca1d4002d45438ff9d038ccc7eef5a28a857
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2021-10-18 16:56:42 +08:00
Wyon Bi
78c32c6bb6 clk/rockchip/regmap: rk628: Avoid namespace conflicts
Add a prefix for all clocks to avoid namespace conflicts,
and no functional changes.

Change-Id: I6b586ce859ecf084fe6037c10c775d6bcc78baa1
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2021-10-18 16:56:30 +08:00
Wyon Bi
ec8bb8ccf6 clk/rockchip/regmap: divider: Make round to closest divider valid
Change-Id: I6cff98ec7573f6774700bbbd2650b6e3a01b66f0
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2021-10-18 16:56:20 +08:00
Tao Huang
094029e17f arm64: rockchip_gki.config: Enable CONFIG_MFD_RK628
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ife16b13cefc172ea57c48532bfcc7a124631b032
2021-10-18 15:19:59 +08:00
Tao Huang
576a136e12 clk/rockchip/regmap: Add missing MODULE_LICENSE()
Fix build error:
ERROR: modpost: missing MODULE_LICENSE() in
drivers/clk/rockchip/regmap/clk-rockchip-regmap.o

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ic21ad1e5b9c90a91ce5b4538ba24f8b4dcbf55f9
2021-10-18 15:19:59 +08:00
Wyon Bi
52d07dc92b clk/rockchip/regmap: Add rk628 cru driver
Change-Id: Idf8d8a654c6d6d5e382f8bf591e7c9c8135ff1d4
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2021-10-18 14:59:34 +08:00
Wyon Bi
c6a27215cd pinctrl: rk628: Dynamic allocation of GPIOs
Change-Id: I7b6de3d5a1f0866fc18bd3355c44ecc0862ad800
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2021-10-18 14:59:34 +08:00