Commit Graph

854628 Commits

Author SHA1 Message Date
Wyon Bi
914ec09489 clk/rockchip: rk618: add CLK_IGNORE_UNUSED for mipi_clk
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I0cecefac11dca735d51c5b1b73eb87dd4a4af3a0
2020-08-11 19:59:37 +08:00
Wyon Bi
9622365e64 drm/rockchip/rk618: hdmi: check hpd before set power mode
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: If7d8365009576fcf5ce2df833efdf5b7d138b5e7
2020-08-11 19:59:37 +08:00
Wyon Bi
dbc4f10f1b drm/rockchip: rk618: Don't use dev_get_regmap()
All child devices share the same one i2c_client, so the
device resource (regmap) for the parent device may be changed
when the child device initializes its own register map. So the regmap
we get from dev_get_regmap() may not be what we want.

Change-Id: I6b2d2d676f0406e8e78f79a308138401d6fe3b63
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-08-11 19:59:37 +08:00
Wyon Bi
d1ae948ab3 drm/rockchip: rk618: Correct the bus format setting
Change-Id: I7a22e2436c37a9c990fd7bf76aa6ddfdc1964241
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-08-11 19:59:37 +08:00
Wyon Bi
1ac8ed3416 drm/rockchip/rk618: hdmi: support hotplug detect in clone mode
Change-Id: Icabc6d3f7b81efca99debf97445219999dabd556
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-08-11 19:59:37 +08:00
Wyon Bi
66636836ae drm/rockchip/rk618: vif: disable sync mode by default
Change-Id: Ia48e5657b495e045ef4b594c08e43e8c494b957a
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-08-11 19:59:37 +08:00
Wyon Bi
2f914c1e02 drm/rockchip/rk618: lvds: Add support for MEDIA_BUS_FMT_RGB666_1X7X3_JEIDA bus format
Change-Id: I2d173633373137ac103946aceedc39bb8118d35a
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-08-11 19:59:37 +08:00
Caesar Wang
cbe1c03414 arm64: dts: rockchip: support more rk3399 and rk3399pro linux dts in Makefile
Add the rk3399-sapphire-excavator*-linux.dts and rk3399pro-evb*-linux.dts
for supporting.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I1721bcf170208791fd320c63c5f0c762bf0f63b3
2020-08-11 19:48:36 +08:00
Caesar Wang
979b17cca8 arm64: dts: rockchip: fixes the camera for rk3399pro-evb-v14-linux
The mipi camera used the i2c4 on rk3399pro v14 board.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I18eb70bc2483c05b41527098c5be83b450e161d9
2020-08-11 19:45:24 +08:00
Caesar Wang
797901dbc0 arm64: dts: rockchip: support rk3399pro evb v14 board for linux
The V14 board will support npu combining with usb and pcie solution.

Change-Id: Ic04ad2415b989308d2acf4fddfe345cc774d9b47
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2020-08-11 19:45:11 +08:00
Hu Kejun
9bfa6a3d05 arm64: dts: rockchip: add vm149c for ov13850
Conflicts:
	arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi
	arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts
	arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts
	arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts

remove the old camera module information.

Change-Id: Ida81f26ebc718840d750919a6e591da6d5865765
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2020-08-11 19:44:44 +08:00
Zefa Chen
ee6254d280 arm64: dts: rockchip: change default camera to imx327 on rk3399pro linux
Change-Id: Id2f375cab92ac23d81a820c8269fef0c98cb3bc4
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2020-08-11 19:41:43 +08:00
Caesar Wang
4133a3a21a arm64: dts: rockchip: support lpddr4 configure on rk3399/rk3399pro linux
That built just is ok for rk3399/rk3399pr linux. Add the lpddr4
configure for the customers reference.

Change-Id: Ic9c833bcfa55b962609ce5a54a037e65546d3011
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2020-08-11 19:40:41 +08:00
Caesar Wang
3b1df49582 arm64: dts: rockchip: add media link on rk3399pro evb board for linux
Change-Id: I76eee014fe3623b03a6d36380976988809d03e55
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2020-08-11 19:34:58 +08:00
Xing Zheng
be16b78591 arm64: dts: rk3399pro: using multicodec sound for rt5651 codec
We need to export Headphone Jack snd ctl to userspace
on linux platform via multicodec machine driver.

Change-Id: I5664a0b29dfda2ed8cc450a5f0fd388d32dfdd48
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2020-08-11 19:34:58 +08:00
Caesar Wang
16a12f5461 arm64: dts: rockchip: add hdmi-sound for rk3399pro evb board
This patch support the audio on hdmi display.

Tested on rk3399pro evb v11 board with debian9, as below:
...
asoc-simple-card hdmi-sound: i2s-hifi <-> ff8a0000.i2s mapping ok
0: rockchip,hdmi

root@linaro-alip:~# aplay -l
**** List of PLAYBACK Hardware Devices ****
card 0: rockchiphdmi [rockchip,hdmi], device 0: ff8a0000.i2s-i2s-hifi
i2s-hifi-0 []
  Subdevices: 1/1
  Subdevice #0: subdevice #0
card 1: rockchiprk809co [rockchip,rk809-codec], device 0: ff890000.i2s-rk817-hifi
rk817-hifi-0 []
  Subdevices: 1/1
  Subdevice #0: subdevice #0

root@linaro-alip:~# aplay -D plughw:0,0 /dev/urandom

The sound is fine on display.

Change-Id: I1a04d44922707e8dba150f2d6b814b19eaea1149
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2020-08-11 19:34:58 +08:00
Caesar Wang
60c70308ac arm64: dts: rockchip: pulldown BT irq gpio for rk3399pro-evb-v*-linux.dts
This patch fixes the BT interrupt abnormal with bootup.

Change-Id: If4c5a8792d95cad4339e57219fd7a17dc8bc349f
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2020-08-11 19:34:58 +08:00
Longjian Lin
d9e680986e arm64: dts: rockchip: pulldown BT irq gpio for rk3399pro evb v10
Change-Id: I8c4ac43cd2ff560f2f94a01570ec82b143a7966a
Signed-off-by: Longjian Lin <llj@rock-chips.com>
2020-08-11 19:34:58 +08:00
Longjian Lin
fa797df8c3 arm64: dts: rockchip: pulldown BT irq gpio for rk3399pro evb
Change-Id: I0426e9335154b9069fa3d73068250745b8481053
Signed-off-by: Longjian Lin <llj@rock-chips.com>
2020-08-11 19:34:58 +08:00
Caesar Wang
798b624811 arm64: dts: rockchip: fixes incorrect wifi chip on rk3399pro evb
As the wifi module used the ap6398s on rk3399pro evb, not the ap6255.
Even though the wifi chip name isn't effect to load wifi module, at least
it won't be misunderstand.

Change-Id: Icd44ce27d9aebcdb0d252f7c8c1dabce657cd573
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2020-08-11 19:34:58 +08:00
Ren Jianing
b6032f4f38 phy: phy-rockchip-usb: add USB external connectors
This patch add EXTCON_USB, EXTCON_USB_HOST and EXTCON_USB_VBUS_EN
to rockchip_usb_phy_extcon_cable. Without these extcons, the probe
of battery charger(such as rk818_charger) will fail when registering
extcon notifier.

Signed-off-by: Ren Jianing <jianing.ren@rock-chips.com>
Change-Id: I17774f63bc84fc1f5afa11d2ecc9d0eb2469acbc
2020-08-11 15:14:44 +08:00
Caesar Wang
4b9efc24b1 arm64: rockchip_linux_defconfig: remove the bifrost
This driver is used by rk3326_linux_defconfig or px30_linux_defconfig

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I58137f3dbe58b2442674331f3ec554c825ff625a
2020-08-11 14:36:12 +08:00
Tao Huang
7bb3c2ecbd soc: rockchip: cpuinfo: Support building as module
Enable building rockchip-cpuinfo driver as a module.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I1484794a0a844e45a4c20cf4ea0f0ed6f16873a1
2020-08-11 14:13:24 +08:00
Mark Huang
60cf304989 ARM: dts: rv1126-ai-cam-ddr3-v1: fixup gc4c33 camera module name
Change-Id: Ie453e0ec2c0fdda75ae767e15d43ced08abbc284
Signed-off-by: Mark Huang <mark.huang@rock-chips.com>
2020-08-11 09:28:09 +08:00
Weiwen Chen
c38b8f2fc2 ARM: dts: rv1126: 38x38 board: fix flash led use pwm
Test:
insmod kernel/drivers/leds/leds-pwm.ko
echo 77 > /sys/devices/platform/pwmleds/leds/PWM-IR/brightness

Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I4dd75bd124eeed1b2e13c638c34d315772aea3c1
2020-08-11 09:15:29 +08:00
Weiwen Chen
501a65311e ARM: configs: rv1126-spi-nor.config: add leds pwm driver
Update by:
    make ARCH=arm rv1126_defconfig
    cp .config rv1126.config
    make ARCH=arm rv1126_defconfig rv1126-spi-nor.config
    make ARCH=arm menuconfig
    scripts/diffconfig -m rv1126.config .config > arch/arm/configs/rv1126-spi-nor.config

Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I7b3b087ef62094eebb90a22ef2fde8ce150f340b
2020-08-10 20:39:50 +08:00
Zhichao Yu
e5ba89d8a1 ARM: dts: rv1126: 38x38 board: fix ircut invalid status
Signed-off-by: Zhichao Yu <zhichao.yu@rock-chips.com>
Change-Id: I0d339a6a2e6c08811031774f7687cf59b1f4a01e
2020-08-10 20:39:50 +08:00
Nickey Yang
c828effdff ARM: dts: rockchip: rv1109-38-v10-spi-nand: modify rootfs to mtd:2
The UBIFS file system does not need misc partition,
So modify the mtd of rootfs to 2.

Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Change-Id: Ic44411fd5251871f768d7192e792190769a92633
2020-08-10 14:06:41 +08:00
Sandy Huang
0a05fb7bcf drm/rockchip: cdn-dp use rockchip_drm_add_modes_noedid to get modes
use rockchip_drm_add_modes_noedid to get recommend modes when get
edid failed.

Change-Id: Iee9f0dc82c284654c363eaa2bb155654e51e0ba7
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-08-10 10:43:19 +08:00
Sandy Huang
6a1ba17bc9 drm/rockchip: hdmi: use rockchip_drm_add_modes_noedid to get modes
use rockchip_drm_add_modes_noedid to get recommend modes when get
edid failed.

Change-Id: Iec6ae9a56ce4b663a009667cd2e32c421c962ed3
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-08-10 10:43:12 +08:00
Sandy Huang
8b3f2b0963 drm/rockchip: add rockchip_drm_add_modes_noedid
rockchip_drm_add_modes_noedid() used to get the following
recommend modes at rockchip platform when get edid failed:

the recommend modes is: 480p60, 576p50, 720p50, 720p60,
1080p50, 1080p60 and 720p60 is the preferred mode.

Change-Id: I9c82b3949506a616e8c98bfa2d77532bdb870390
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-08-10 10:43:06 +08:00
Weiwen Chen
5bb742c67c ARM: dts: rv1126: 38x38 board: fix IQ filename
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I0f2a1d8aa009c87b6fae6d7256f5978419ee426c
2020-08-08 17:38:10 +08:00
Weiwen Chen
5483387397 ARM: dts: rv1126: 38x38 board: add flash led
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I2210c9d2229ebbb9390c3904b3b0c63c4dda9a20
2020-08-08 17:38:10 +08:00
Frank Liu
01b6dd0124 media: i2c: gc2053 output grbg bayer format
Optimize the stripe problem under strong light

Signed-off-by: Frank Liu <frank.liu@rock-chips.com>
Change-Id: Ia74dd4644518aaa7e12537771234f97de73bad80
2020-08-07 18:30:04 +08:00
Tao Huang
8d2597e064 ARM: configs: rv1126-facial-gate.config: Update by diffconfig
Change-Id: Ib90a44a24c6bb1dc2039e69805fffbe9c01ace95
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-08-07 18:08:34 +08:00
Xing Zheng
10e1db95c9 ARM: configs: rv1126-spi-nor.config: add module for wm8974 codec driver
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I6bb2c532b8e36aada4ac1843745040eab83a2a6c
2020-08-07 17:23:53 +08:00
Xing Zheng
12073b53f6 ARM: dts: rv1126: 38x38 board: add i2s0-sound via wm8974 codec
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I010aee682e8183e194d4b62a1516389f3ea6d72c
2020-08-07 17:23:49 +08:00
Xing Zheng
e1275e3bb1 ASoC: wm8974: add support enable/disable external mclk on runtime
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I6711bf6ca1406036eafe3755e9595414bfedcb3f
2020-08-07 17:21:01 +08:00
Xing Zheng
ff6fa35d18 ASoC: wm8974: add support enable/disable micbias during capturing
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I3696c0c73db6550795d192442d6bba41cea5086d
2020-08-07 17:21:01 +08:00
Weiwen Chen
4368c0b9a6 ARM: configs: rv1126-spi-nor.config: add iep2 module
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: Id6fe223f6174de0fae5bb314ad839e902dcddfc4
2020-08-07 14:36:09 +08:00
Tao Huang
6104a6618d ARM: configs: rv1126-spi-nor.config: Update by diffconfig
Change-Id: I1ea10d8cedafc7ac6d94a362b9d62a6b57fc4596
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-08-07 14:27:21 +08:00
Weiwen Chen
d1d7bc9dc2 ARM: dts: rv1126: 38x38 board: add sdcard support
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: Iff6d641fecd69baf0e022d96992b4b4ebf9cf73a
2020-08-07 12:11:51 +08:00
Algea Cao
db1d765195 drm/bridge: synopsys: dw-hdmi: use default mode list when no edid
For compatibility with GKI, drm_display_mode_from_vic_index() can't
be export function. So we use use default mode list when edid can't
be got.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ic7d046e4ccf36981449d36067efd8bb2388e27e4
2020-08-07 10:32:54 +08:00
Tao Huang
80d1e37696 ARM: dts: rockchip: rename rv11xx to rv1126
rv11xx-evb-v13.dtsi -> rv1126-evb-v13.dtsi
rv11xx-evb-v12.dtsi -> rv1126-evb-v12.dtsi
rv11xx-evb-v10.dtsi -> rv1126-evb-v10.dtsi
rv11xx-evb-v10-robot.dtsi -> rv1126-evb-v10-robot.dtsi
rv11xx-thunder-boot-emmc.dtsi -> rv1126-thunder-boot-emmc.dtsi
rv11xx-thunder-boot-spi-nor.dtsi -> rv1126-thunder-boot-spi-nor.dtsi
rv11xx-thunder-boot.dtsi -> rv1126-thunder-boot.dtsi
rv11xx-ai-cam.dtsi -> rv1126-ai-cam.dtsi
rv11xx-evb-thunder-boot.dtsi -> rv1126-evb-thunder-boot.dtsi
rv11xx-ipc.dtsi -> rv1126-ipc.dtsi

Change-Id: I815b0d1b471c9b14d627cff7fad961290c7f043f
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-08-06 17:55:28 +08:00
Weiwen Chen
15a54e8d8c media: i2c: imx415: fix power on timing
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: If6857d0f7e4a1c8614c39fafdbb927f4d3465991
2020-08-06 17:26:25 +08:00
Nickey Yang
e0a4fef684 ARM: dts: rv1126: add evb tb robot dts of V13 board
add the support of v13 for evb tb and robot product forms.

Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Change-Id: I45cc935579997210805b4c5d41415dd06b468b4f
2020-08-06 16:22:56 +08:00
Nickey Yang
e6fee67715 ARM: dts: rv1109: remove the dts repeated with rv1126
Now the code has realized compatible with rv1109 and rv1126.
It is no longer need these duplicate dts of rv1109.
At the same time, the configuration of LP3 and DDR3 is the same.
Remove them together for reduces maintenance work.

Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Change-Id: Ie732509aa821d37376a725fc12c358915c7d6869
2020-08-06 16:17:55 +08:00
Nickey Yang
b4f903cb10 ARM: dts: rockchip: rv1126: add version in model name on evb board
uboot will parse and print model name, add version information
for debug.

Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Change-Id: I380548037a56321f78d1c24e1877f06a098330e0
2020-08-06 16:14:29 +08:00
Sandy Huang
cde7e5ca77 Revert "drm/sysfs: add current display mode to sysfs"
This reverts commit 6b6e9cabe9.
We can get the current mode from cat /d/dri/0/summary for debug.

Change-Id: I13396986a8c996678fb831731063f4d02776b297
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-08-06 10:57:14 +08:00
Jason Zhu
8d2474c477 ARM: configs: Rename rv1126-tb-emmc.config to rv1126-tb.config
It is not need to separate storages with emmc, spi-nor and so on in
defconfig. Separate them in dts.

Update by:
make ARCH=arm rv1126_defconfig
cp .config rv1126.config
make ARCH=arm rv1126_defconfig rv1126-tb.config
make ARCH=arm menuconfig
scripts/diffconfig -m rv1126.config .config > arch/arm/configs/rv1126-tb.config

Usage:
make ARCH=arm rv1126_defconfig rv1126-tb.config

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I328091889c45ca1d09d2b2ce894b5a1d317d806d
2020-08-05 18:17:38 +08:00