Commit Graph

847489 Commits

Author SHA1 Message Date
Meiyou Chen
438f0da00a arm64: dts: rockchip: rk3399-sapphire-excavator-edp: remove tc358749x DAI
Change-Id: I1b5dc6282e5351a29d26f9c82f630292267df4d8
Signed-off-by: Meiyou Chen <cmy@rock-chips.com>
2019-11-20 17:04:38 +08:00
Meiyou Chen
0db43c9197 ASoC: rt5651: remove tc358749x DAI
Change-Id: Ia4d60491bc3e49616e24df2868120372f40ff905
Signed-off-by: Meiyou Chen <cmy@rock-chips.com>
2019-11-20 17:04:20 +08:00
Ding Wei
36c02844b6 video: rockchip: mpp: fix error when alloc_task failed
When alloc task failed, it must return NULL instead of the PTR_ERR.

Change-Id: I309e934badd0c88a66beccbb8f03096f1eb91745
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2019-11-19 21:53:25 +08:00
Sugar Zhang
35728f6644 ASoC: codecs: Adds support for rk3228 codec
- replace codec to component
- convert to SPDX identifiers

Change-Id: Icf83257726f12558cbdde4d4b2876dc8a3123626
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2019-11-19 20:15:22 +08:00
Sugar Zhang
34f6429ad2 ASoC: codecs: Adds support for rk1000 codec
- replace codec to component
- convert to SPDX identifiers

Change-Id: I025415287f8436d5672b8f1f8d81d87c8273772a
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2019-11-19 20:12:34 +08:00
Jon Lin
a51866a6c5 arm: dts: rv1108: add nandc node
Change-Id: I34a1c10ada37b0473eb78d6daf650f1c152724d1
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2019-11-19 20:06:53 +08:00
Bian Jin chen
2b3a59ee72 net: rockchip_wlan: rtl8822bs: fix clang compile error
drivers/net/wireless/rockchip_wlan/rtl8822bs/core/rtw_debug.c:45:44: error: expansion of date or time macro is not reproducible [-Werror,-Wdate-time]
        RTW_PRINT_SEL(sel, "build time: %s %s\n", __DATE__, __TIME__);

Change-Id: I9f786a4305e668dac97d527baac4e948b53332ed
Signed-off-by: Bian Jin chen <kenjc.bian@rock-chips.com>
2019-11-19 19:27:07 +08:00
Ding Wei
316a8ec31a ARM: dts: rockchip: rk312x: dtsi for video codec
Change-Id: I911f413d05a7ca10eeb7abbb808cc3165b6a56bc
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2019-11-19 16:54:39 +08:00
Zhou Jing
d30a7f302e ARM: rockchip_defconfig: add video codec configs
add configs:
    CONFIG_ROCKCHIP_MPP_RKVDEC
    CONFIG_ROCKCHIP_MPP_VDPU1
    CONFIG_ROCKCHIP_MPP_VDPU2
    CONFIG_ROCKCHIP_MPP_VEPU1
    CONFIG_ROCKCHIP_MPP_VEPU2

Signed-off-by: Zhou Jing <tracy.zhou@rock-chips.com>
Change-Id: I3ccf676986e737e40ff9713c47f0500ac95987b1
2019-11-19 16:21:25 +08:00
Zheng Yang
28566d7a06 drm/bridge: synopsys: dw-hdmi: fix kernel logo flash when output YCbCr422 mode
On rockchip platform, hdmi input format is YCbCr444 when output mode
is YCbCr422. Then the value of HDMI_TX_INVID0 on YCbCr422 is same as
the value of YCbCr444, both is 0x09/0x0b. This make enc_out_bus_format
stroed in struct hdmi_data is wrong, which is MEDIA_BUS_FMT_YUV8_1X24
or MEDIA_BUS_FMT_YUV10_1X30.

When android set enc_out_bus_format to YCbCr422, dw_hdmi_setup will be
called and logo will flash.

This patch use colorspace restored in HDMI_FC_AVICONF0 to distinguish them.

Change-Id: I6b913951b58fb47628617c11d6059bc1be4e370a
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2019-11-19 16:18:14 +08:00
Zheng Yang
7ef4b6eef9 drm: bridge: dw-hdmi: fix VP_PR_CD pixel repetition factor configuration
The configured value sets H13T PHY PLL to multiply pixel clock by the
factor in order to obtain the desired repetition clock. For the CEA
modes some are already defined with pixel repetition in the input video.
So for CEA modes this shall be always 0.

Change-Id: Iea4a00247f25c134dbd67ba77c00eb4393622385
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2019-11-19 16:18:14 +08:00
Alex Zhao
978ed0fdc2 net: rockchip_wlan: rtl8723cs: fix VTS test fail
update rtl8723cs wifi driver to version v5.7.1.3_35649.20191114_beta

Change-Id: Ic8991add439050919284ba53c49ba2469055450a
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
2019-11-19 15:58:49 +08:00
Alex Wang
c51f92a9ae arm64: rockchip_defconfig: add wifi config: CONFIG_RTL8822BS
Change-Id: I982f8629451c1e628959cd8cb084eb27bc5c4b7b
Signed-off-by: Alex Wang <alex.wang@rock-chips.com>
2019-11-19 15:54:14 +08:00
Guochun Huang
7dd63e4010 drm/rockchip: calculate lanes and rate for Main Link Lanes
the numbers and rate of Main Link lanes depend on
the panel display resolution and corlor depth, it
is recommended that the minimum number of lanes be
used, using the minimum link rate allowed for that
lane configuration.

Change-Id: Id207410589e1f77ebff79615f3367f153a9b2755
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2019-11-19 15:53:27 +08:00
Sugar Zhang
13963fed0b ASoC: rockchip: i2s: Adds properties to specify playback/capture capability
- 'rockchip,playback-only': support playback only.
- 'rockchip,capture-only': support capture only.

Change-Id: I0daee4dc5bda8bacc63201972b57c8d401fb8703
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2019-11-19 10:09:48 +08:00
Xing Zheng
70ab12578d ASoC: rk3308_codec: add support ADC grps and DAC endisable for testing
Some times, we need to enable/disable ADC grps or DAC
directly to debug.

Change-Id: I53b9fa94733d84f7101e299d3fcb6f9160e36112
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2019-11-19 10:09:48 +08:00
Xing Zheng
e5ec404571 ASoC: multicodecs&rk3308_codec: handle the request during no codec instance and hp det
If there is no codec instance or headphone jack, we
should not request headphone jack from machine driver.

Change-Id: If05ac2f4bbfd3fc495a75c0701a44a325e5010cd
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2019-11-19 10:09:48 +08:00
Xing Zheng
ab30c1bf0d ASoC: rk3308_codec: add support reversed headphone jack
Change-Id: I4752c935684e3b745185cc43b826cad06ff429c5
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2019-11-19 10:09:48 +08:00
Xing Zheng
6eba7ada5a ASoC: rk3308_codec: increase some delays to be stabe enabling DAC
From the suggest of IP vendor, we need more delays to
adapt to the playing scene in different temperature
environments.

Change-Id: I95abe2bac43de19241092d6e785f28960760dacd
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2019-11-19 10:09:48 +08:00
Xing Zheng
782f00a43a ASoC: rk3308_codec: add support checking external micbias
Change-Id: I644faff116184ee3fb927cff6531f8d4ac497edc
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2019-11-19 10:09:48 +08:00
Xing Zheng
b96531209c ASoC: rk3308_codec: add some delay to wait micbias is stable
To avoid bring some noise dues to unstable micbias.

Change-Id: I0127505f0adeacda5d852ae3cefae2fb5f4ee9d2
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2019-11-19 10:09:48 +08:00
Xiaotan Luo
5494c856b9 ASoC: rockchip: i2s: fixed PCM DSP format
DSP_A: PCM delay 1 bit mode,L data MSB after FRM LRC
DSP_B: PCM no delay mode,L data MSB during FRM LRC

Change-Id: I198519c431815de3ca1fc154da78773ca705f0e0
Signed-off-by: Xiaotan Luo <lxt@rock-chips.com>
2019-11-19 10:09:48 +08:00
Xiaotan Luo
ce779a4fc4 ASoC: codec: dummy-codec: add setting mclk
Many devices require MCLK to work, So add mclk

Change-Id: I666e46c8968330afd81506d0c64769b59ad0837d
Signed-off-by: Xiaotan Luo <lxt@rock-chips.com>
2019-11-19 10:09:48 +08:00
Sugar Zhang
47986340e4 dt-bindings: sound: add compatible for rk1808es vad
Change-Id: I9eff5ec7ff87f2c26fdd4264cad1169a42889992
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2019-11-19 10:09:48 +08:00
Sugar Zhang
24d4d9dc6d ASoC: rockchip: vad: compatible with rk1808es/rk1808
Change-Id: I54c968f8fcf37cc4d7a52137ac0aac57d4367dc7
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2019-11-19 10:09:48 +08:00
Binyuan Lan
343f00608d ASoC: rockchip: rk817-codec: solve sound L/R channel conversion problem
There is playback's sound L/R channel conversion problem when recording is opened

Change-Id: Iae7160e25bdd834df9904fbd34fe964449c93560
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
2019-11-19 10:09:48 +08:00
Tao Huang
3d8f1c168d arm64: rockchip_defconfig: disable WQ_POWER_EFFICIENT_DEFAULT
From floral_defconfig

Change-Id: I2cb38826efe14229110b8d6864fa3c3089ebc608
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-11-18 16:37:01 +08:00
Algea Cao
76f27bdd76 drm: bridge: dw-hdmi: using extcon instead of switch
Switch is no longer available in kernel 4.19, so
we use extcon instead.

the hdmi connect status node:

/sys/class/extcon/extconX/state

HDMI=0:
	hdmi is disconnected
HDMI=1:
	hdmi is connected

Change-Id: I806d8fd5b9b4b36f15aa6aec275fad2ecf122e91
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2019-11-18 15:29:39 +08:00
Tao Huang
513c60a1ba extcon: Add named extcon link
Allow Android access by name.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ia81c1887f41a0ad587d7f78683213e9716e9806b
2019-11-18 15:28:44 +08:00
Tao Huang
c653aafaf9 video: rockchip: remove unused vcodec driver
Change-Id: Ibc186e02c2e3d390056fd79066e27af61233798e
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-11-18 15:25:12 +08:00
Tao Huang
79a601c2be arm64: rockchip_defconfig: enable CPU_FREQ_STAT and CPU_FREQ_TIMES
Change-Id: I0fa41814e2501cff95fc2e743725b0635b2503d5
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-11-18 15:24:44 +08:00
Tao Huang
f44b4ac6a0 ARM: rockchip_defconfig: enable CPU_FREQ_STAT and CPU_FREQ_TIMES
Change-Id: I8dd538d0c55bfbfc71f10af56645b13796390ec6
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-11-18 14:35:38 +08:00
Tao Huang
316a419908 ARM: rockchip_defconfig: cleanup by savedefconfig
Change-Id: I7219025f62661c886e4cb287a05cfc30e85211a8
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-11-18 14:31:53 +08:00
Tao Huang
cdc6f7d0b0 media: remove unused video drivers
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ic8d08dc1c2e41a97fd1baf874efaa05f9b5de9d9
2019-11-18 14:13:42 +08:00
Sandy Huang
5dad1298c3 drm/rockchip: vop: reset 10bit config after exit 10bit video
Change-Id: I4bf0a68c7f851e745607901ff2cf426902edf467
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-11-18 14:12:01 +08:00
Sandy Huang
c28375d507 drm/rockchip: vop: use pm_runtime_put_sync
Change-Id: Id1a67096a12518c24f6cf7a548fe78cf40fa25e1
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-11-18 14:04:56 +08:00
Zhen Chen
a803fa6605 Mali: utgard: fix memory(fences) leaks
In deed, Zhixiong Lin missed these codes when he picking source codes
from DDK r9 to port utgard device driver of r7 to kernel 4.19.

Change-Id: If140b478b4ea8a4f72d532b8e8216ab53856be08
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2019-11-18 09:10:15 +08:00
Wang Panzhenzhuan
1e178b2030 arm64: dts: rk3399-evb-ind-lpddr4-android: add camera configs
Change-Id: Ie0d008eb3ef839ff526c242e2412fbf879268659
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
2019-11-15 19:13:48 +08:00
Ding Wei
1bbea0db47 video: rockchip: mpp: fix error when queue_work
When different devices are running, there will be use wrong
device to deal with task.The reasion is that the true device
is task->queue->mpp.

Change-Id: I8fe4dd59d2525f02d010b32299ee0b82815d210a
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2019-11-15 14:00:22 +08:00
Wyon Bi
6f86fc8c00 drm/rockchip: cdn-dp: Reject non-32-bits-aligned mode widths
Change-Id: I8f6b94baef9fd5db2090e36dc8974769b7d469f7
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-11-15 08:52:28 +08:00
Wenping Zhang
43fd724887 drm/rockchip: cdn_dp: fix issue 1 lane dp device can't output audio.
Change-Id: Ic148a2c5a5bf12ded9f83201d9a4dffe406b4e3f
Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
2019-11-15 08:52:22 +08:00
Wang Jie
8c51e8bb0e arm64: dts: rockchip: modify rk3399-evb-ind.dtsi.
modify the layout value of mpu6500 and ak8963.

Change-Id: I2968a71343ad2c004690b6cd9ecab4e900ba320b
Signed-off-by: Wang Jie <dave.wang@rock-chips.com>
2019-11-14 19:24:57 +08:00
Weiguo Hu
0e3aed9b03 net: rockchip_wlan: add rtl8822bs driver: v5.8.7_35628.20191031_COEX20190625-7272
Change-Id: If9d481a4873d7bd3b6255f0d68723374281f73ee
Signed-off-by: Weiguo Hu <hwg@rock-chips.com>
2019-11-14 19:23:17 +08:00
Nick Bray
008704c50f ANDROID: initramfs: call free_initrd() when skipping init
Memory allocated for initrd would not be reclaimed if initializing ramfs
was skipped.

Bug: 69901741
Test: "grep MemTotal /proc/meminfo" increases by a few MB on an Android
device with a/b boot.

Change-Id: Ifbe094d303ed12cfd6de6aa004a8a19137a2f58a
Signed-off-by: Nick Bray <ncbray@google.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-11-14 19:17:07 +08:00
Rom Lemarchand
79f3326944 ANDROID: initramfs: Add skip_initramfs command line option
Add a skip_initramfs option to allow choosing whether to boot using
the initramfs or not at runtime.

Change-Id: If30428fa748c1d4d3d7b9d97c1f781de5e4558c3
Signed-off-by: Rom Lemarchand <romlem@google.com>
Signed-off-by: Dayao Ji <jdy@rock-chips.com>
2019-11-14 19:17:07 +08:00
Ding Wei
7f124ab617 arm64: dts: rockchip: rk3328: dtsi for video codec
Change-Id: I08b2be091c85a4ccf005f835da09657df66f815b
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2019-11-14 17:04:34 +08:00
Ding Wei
9dc4984769 video: rockchip: mpp: clear cache before run hardware
Change-Id: Ifbac051031433106c26de82d1fe691e5b7ac2429
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2019-11-14 17:04:14 +08:00
Zhen Chen
69c7c17655 MALI: rockchip: upgrade bifrost DDK to r21p0-01rel0, from r20p0-01rel0
Change-Id: Ibdb2508859f24df1014fc485097685bcecb7b31b
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2019-11-14 11:38:21 +08:00
Sandy Huang
6704c0590d drm/rockchip: vop: fix plane number calc error
before this commit, the plane number to dmc is error, this
will lead to DDR freq is too low and lead to display splash.

Change-Id: Iaa285b36d41b6e86c97260ac83c5d9a21ef62a05
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-11-14 11:37:34 +08:00
William Wu
b43b8174c1 usb: gadget: composite: fix dead lock when uvc disconnect
When test uvc hotplug, it may caused a dead lock in the
following case:

1. Test on Rockchip platforms used USB DWC2 controller.
2. Set USB as UVC gadget and connect to PC.
3. Open UVC to preview picture, and then disconnect USB.

Then a dead lock happens.

1. usb_function_deactivate() hold the cdev->lock;
2. usb_function_deactivate() --> usb_gadget_deactivate()
   --> usb_gadget_disconnect() --> dwc2_hsotg_disconnect()
   --> composite_disconnect() try to get the cdev->lock again.

According to the comment for cdev->lock, it's used to protect
deactivations and delayed_status count, so we can drop the
spinlock safely before do usb_gadget_deactivate(), and hold
the spinlock again after usb_gadget_deactivate() done to
protect the deactivations.

Change-Id: I24310434f0a11f9e981817de5e31b36cdbad7344
Signed-off-by: William Wu <william.wu@rock-chips.com>
2019-11-14 11:17:26 +08:00