Commit Graph

859336 Commits

Author SHA1 Message Date
Wang Panzhenzhuan
f5767ec5fa media: i2c: gc5035 fix vb & gain set issues
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I7cf1e61c574a4d31ee06da9d8eea7b6dbd32ae50
2020-10-22 10:23:00 +08:00
Hu Kejun
b252096154 media: rockchip: isp and ispp version to v0.1.9
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I82e2344df54448c2747c71c5daae8918c2147c54
2020-10-21 18:32:56 +08:00
Hu Kejun
af010aa87d media: rockchip: isp: skip frame when change hdr/normal mode
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I103653f36bbfcc310e9648715baf870db967c9c3
2020-10-21 18:32:56 +08:00
Hu Kejun
54e1a2cf73 media: rockchip: ispp: use fec share buffer to reduce buffer size
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Ie59ce6dbedbbc1a60d5eb3e8a4216b2f4869140d
2020-10-21 18:32:56 +08:00
Hu Kejun
7dfb03af68 media: rockchip: isp: use ldch share buffer to reduce buffer size
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I243023a4d689f9f9a878095d8edaf8576bb26102
2020-10-21 18:32:56 +08:00
Ding Wei
3aa6c0bc71 video: rockchip: mpp: add command support info
show support cmd:
    cat /proc/mpp_service/support_cmd

Change-Id: I5ba150fcf2da797e32c8f5b38c8ff27886182460
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2020-10-21 18:25:01 +08:00
William Wu
e66cf88ee2 arm64: dts: rockchip: Add usb controllers nodes for RK3568 Soc
Change-Id: I003e434c95bb5a8f9d355cfb5637735a26dd9d65
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-10-21 18:11:27 +08:00
Liang Chen
a56d9f6eb9 arm64: dts: rockchip: rk3568: correct gic address
There is no GICC/GICH/GICV memory-mapped address for RK3568 SoC.

Change-Id: Ie128cc2e5994b703d1fba9df44216331ed3c6c54
Signed-off-by: Liang Chen <cl@rock-chips.com>
2020-10-21 18:11:02 +08:00
Biju Das
4505520aed UPSTREAM: drm: of: Fix double-free bug
Fix double-free bug in the error path.

Fixes: 6529007522 ("drm: of: Add drm_of_lvds_get_dual_link_pixel_order")
Reported-by: Pavel Machek <pavel@denx.de>
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: stable@vger.kernel.org
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/1595502654-40595-1-git-send-email-biju.das.jz@bp.renesas.com
(cherry picked from commit 4ee48cc558)
Change-Id: I9dcf69801d75592bc6e721b40734cb766a29366c
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-10-21 18:07:06 +08:00
Laurent Pinchart
24713d8860 UPSTREAM: drm: of: Fix linking when CONFIG_OF is not set
The new helper drm_of_lvds_get_dual_link_pixel_order() introduced in
commit 6529007522 has a fallback stub when CONFIG_OF is not set, but
the stub is declared in drm_of.h without a static inline. This causes
multiple definitions of the function to be linked when the CONFIG_OF
option isn't set. Fix it by making the stub static inline.

Fixes: 6529007522 ("drm: of: Add drm_of_lvds_get_dual_link_pixel_order")
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191219103703.8547-1-laurent.pinchart+renesas@ideasonboard.com
(cherry picked from commit 528d06d41b)
Change-Id: I9dcf69801d75592bc6e721b40734cb766a29366b
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-10-21 18:07:06 +08:00
Fabrizio Castro
277fdbc035 UPSTREAM: drm: of: Add drm_of_lvds_get_dual_link_pixel_order
An LVDS dual-link connection is made of two links, with even
pixels transitting on one link, and odd pixels on the other
link. The device tree can be used to fully describe dual-link
LVDS connections between encoders and bridges/panels.
The sink of an LVDS dual-link connection is made of two ports,
the corresponding OF graph port nodes can be marked
with either dual-lvds-even-pixels or dual-lvds-odd-pixels,
and that fully describes an LVDS dual-link connection,
including pixel order.

drm_of_lvds_get_dual_link_pixel_order is a new helper
added by this patch, given the source port nodes it
returns DRM_LVDS_DUAL_LINK_EVEN_ODD_PIXELS if the source
port nodes belong to an LVDS dual-link connection, with even
pixels expected to be generated from the first port, and odd
pixels expected to be generated from the second port.
If the new helper returns DRM_LVDS_DUAL_LINK_ODD_EVEN_PIXELS,
odd pixels are expected to be generated from the first port,
and even pixels from the other port.

Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
(cherry picked from commit 6529007522)
Change-Id: I9dcf69801d75592bc6e721b40734cb766a29366a
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-10-21 18:07:06 +08:00
Allon Huang
8d23446aea media: rockchip: cif: stop reset watchdog timer when stop multi streams in non-hdr
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I2c96d039c2248e39df5cf05b4d713386c858141c
2020-10-21 17:10:29 +08:00
Shunqian Zheng
4296e1fe9e media: i2c: jx_f37: fix copy-paste typo
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Change-Id: Ieb3f45b26121654d594fd8c6de23cfc39e294ab6
2020-10-21 14:06:12 +08:00
Shunqing Chen
8c58b4696e drm/rockchip: rk628: Add hdmi driver
Change-Id: If2efcf0e61a93bda86ce7969dc05ab1bbebcddff
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
2020-10-20 19:06:56 +08:00
Guochun Huang
32d90bf6dc drm/rockchip: rk628: add support for yuv/bt1120 format
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I3112e0ce273e7f8207b4b354fefe0040e3c9ae99
2020-10-20 19:06:23 +08:00
Weiwen Chen
1c8eabcd08 ARM: dts: rockchip: rv1109-38-v10-spi-nand: support sdcard
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: Ic5e114e7e384c021a5e50b7064057dac23b2d46f
2020-10-20 18:13:56 +08:00
Wyon Bi
aaf60d96c6 dt-bindings: reset: Fix reset id for rk628
Change-Id: Iecccf714dd4f0c5220eb1ea4fc6c97b6f624a908
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-20 18:03:22 +08:00
Guochun Huang
9cbe5f3403 ARM: dts: rockchip: rk628: modify IO drive strength for RGB
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I4ce54dfee0fa606c7b50c40fc1395007f679e820
2020-10-20 17:29:09 +08:00
Guochun Huang
b90e223867 ARM: dts: rockchip: rk628: add yuv/bt1120 tx and rx node
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: Ic2ca195edc5a49c4ad83f70d1dc03b7c5e768f76
2020-10-20 17:29:09 +08:00
Yao Xiao
739633af17 arm: config: add CONFIG_AP6XXX_INDEP_POWER for rk1126_battery
Change-Id: Iec98a76dd3d7fe2a6dd3af2d2c95161db600c9b2
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
2020-10-20 16:32:56 +08:00
Wang Panzhenzhuan
51ef30961c dt-bindings: media: i2c: Document add sc4238
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I60b3578799d381bb342764379236cdc5f9d53c49
2020-10-20 14:11:08 +08:00
Wang Panzhenzhuan
dafa0a433c media: i2c: add sc4238 driver
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I049d127f3b9ce6df88ba235997167f9d0b658075
2020-10-20 14:06:47 +08:00
Jianqun Xu
b4b8e03c0a pinctrl: rockchip: add rk3568 support
Change-Id: I857882a985f10fdd8551bbacb632fe206052f40c
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-10-19 17:09:49 +08:00
Yao Xiao
cc3b8684e5 net: rockchip_wlan: bcmdhd_indep_power
1. add ENABLE_INSMOD_NO_FW_LOAD for init stability
2. reduce print level
3. modify module name for keepalive

Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
Change-Id: I1be21817e53558945a35389ee02d8229e2b1a58a
2020-10-19 16:59:13 +08:00
Cai YiWei
1ae7b73267 media: rockchip: ispp: fix error status of stream off
Change-Id: I9cc099035889e325d225f9252c2283629214b922
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-10-19 16:39:36 +08:00
Sugar Zhang
bbb2cf8b90 arm64: dts: rockchip: rk3568: Add i2s/pdm/spdif/audpwm/dig_acodec
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Id4d5f8ce0c63d3424e776e4b100d981bec64967d
2020-10-19 16:37:58 +08:00
Sugar Zhang
f5f629f9be ASoC: rockchip: Add support for rk3568 codec digital
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Idaab1cbe0228d48d51e505c7e5e924f02c165e93
2020-10-19 16:33:41 +08:00
Sugar Zhang
1ce1d8b44e dt-bindings: sound: rockchip: Add binding for rk3568 codec digital
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I738bdd2f47f76cab6a01ea26189217942f8c1cbb
2020-10-19 16:33:41 +08:00
Sugar Zhang
051faf3a86 ASoC: rockchip: spdif: Add support for rk3568 spdif
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ib6e80389b90396f0397a86b61fbfb2e55c8e1adf
2020-10-19 16:33:41 +08:00
Sugar Zhang
43b82f9379 dt-bindings: sound: rockchip: Add binding for rk3568 spdif
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ia3edda132bd30edf8fa80ec6ee4f25f279c5d3a9
2020-10-19 16:33:41 +08:00
Sugar Zhang
b08d29a90f ASoC: rockchip: pdm: Add support for rk3568 pdm
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I41b6c2a443e118f3a125ce7376fa349d61d78b6b
2020-10-19 16:33:41 +08:00
Sugar Zhang
a062e0df1f dt-bindings: sound: rockchip: Add binding for rk3568 pdm
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ifcaafe8b0f38748e30f1db470acca7119a496b25
2020-10-19 16:33:41 +08:00
Sugar Zhang
0ac3329e47 clk: rockchip: rk3568: Fix HCLK_ACDCDIG
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ifaf30bbdf88f24b330c0caa6861313070c5d2784
2020-10-19 16:31:19 +08:00
Sugar Zhang
c66ee6a770 ASoC: rockchip: Add support for rk3568 i2s
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I5d4abfd94e627417258bc937b58eec6deee04d3c
2020-10-19 16:19:27 +08:00
Sugar Zhang
b1cd892609 dt-bindings: sound: rockchip: Add binding for rk3568 i2s
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I5656f0cd7a04fcd0595fa255b9d30bf47325f0e2
2020-10-19 16:19:02 +08:00
Sugar Zhang
d11a687bd0 ASoC: rockchip: i2s-tdm: Make reset property as optional
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I9707e8c763450f3a78f0fb419d90d9992cecfe59
2020-10-19 16:04:19 +08:00
Sugar Zhang
d9f47a7b9c ASoC: rockchip: i2s-tdm: Fix configs init failed
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I25b4971a1e7b0c7a740f195791238d5e74d4cc9c
2020-10-19 16:03:18 +08:00
Simon Xue
c4026e63aa ANDROID: GKI: iommu/rockchip: Add .map_sg callback for V2
Fixes: e24979f0e7 ("ANDROID: GKI: iommu: Snapshot of vendor changes")
Change-Id: I3929a7b47a1523a01b64190031fee3b001f3e676
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2020-10-19 16:02:05 +08:00
Wyon Bi
3631fa6e38 ARM: dts: rockchip: Add support for rk3288-evb-rk628 board
Change-Id: I7b900c16a9ea30590220a1cf95a84e018fa701e2
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-19 15:36:59 +08:00
Wyon Bi
d6feca9685 ARM: dts: rockchip: Add dtsi file for rk628
Change-Id: I4b2a092d4c403a17c83371c5a6165b2ae5ec0eb8
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-19 15:36:58 +08:00
Wyon Bi
afd057d164 ARM: rockchip_defconfig: enable CONFIG_DRM_ROCKCHIP_RK628
Change-Id: I5026a61d973ca264f3c7cb2bb9088a5f2cffabb3
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-19 15:36:58 +08:00
Wyon Bi
e285c9b20e drm/rockchip: Add rk628 display driver
Change-Id: I7be65c5ed58df2be2cf2cfe819feacf8a610e880
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-19 15:36:58 +08:00
Wyon Bi
bd9377a5be phy: add GVI/HDMI modes to the phy_mode enum
This patch adds more generic PHY modes to the phy_mode enum, to
allow configuring generic PHYs to the GVI/HDMI mode by
using the set_mode callback.

Change-Id: Ib859024d7bd59cd39bff5e06f2b2ca133b023414
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-19 15:36:58 +08:00
Wyon Bi
96ebaa7857 ARM: rockchip_defconfig: enable CONFIG_MFD_RK628
Change-Id: I4ceffc60908c6c1a974936673f36180aed41d85d
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-19 15:36:58 +08:00
Wyon Bi
c4586725c3 mfd: Add rk628 mfd driver
Change-Id: Ibf4334f82f91237bff6a04b24bb390391a5c8130
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-19 15:36:58 +08:00
Weixin Zhou
4a70b21012 pinctrl: rk628: add rk628 pinctrl driver
Change-Id: If9d0fdcd63e7ceb9a52039f558961c2b67739747
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2020-10-19 15:36:58 +08:00
Wyon Bi
a416ee3e3a clk/rockchip/regmap: Add rk628 cru driver
Change-Id: Idf8d8a654c6d6d5e382f8bf591e7c9c8135ff1d4
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-19 15:36:58 +08:00
Wyon Bi
962d002400 clk/rockchip/regmap: Prepare RK628 PLL support
Change-Id: I45049b298de7635c08f92cd89db08b86ba6901f3
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-19 15:36:58 +08:00
Wyon Bi
459a08874a clk/rockchip/regmap: pll: limit postdiv2 max value
Change-Id: I0dcb5001960cf0dcaa82f992b7d428f6d08678ff
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-19 15:36:58 +08:00
Wyon Bi
0d3f9ae026 clk/rockchip/regmap: pll: fix integer overflow in clk_pll_round_rate
Change-Id: I94c90f400f69351f9e592f44c2e167a98d96945f
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-19 15:36:58 +08:00