Tao Huang
59dce5cd2b
drm/rockchip: drv: import DMA_BUF module namespace
...
Adds the proper MODULE_IMPORT_NS(DMA_BUF) line to the file to get it to
build properly.
Signed-off-by: Tao Huang <huangtao@rock-chips.com >
Change-Id: Ia79a478a46cefbbd69b27d54ae0605f1ca844b0b
2023-05-22 11:11:25 +08:00
Shashank Babu Chinta Venkata
4c5114723d
ANDROID: include: drm: increase DRM max property count to 64
...
Increase drm property count from 24 to 64 to make
room for custom properties of drm plane and drm
crtc objects.
Signed-off-by: Shashank Babu Chinta Venkata <sbchin@codeaurora.org >
Bug: 139653858
Change-Id: I3e42c1fc684d7d7cea828fc35b96673bdef598f4
(cherry picked from commit 89301363b2
https://android.googlesource.com/kernel/common )
Signed-off-by: Sandy Huang <hjc@rock-chips.com >
2023-05-22 11:11:25 +08:00
Shawn Lin
8327338ad0
PCI: rockchip: Fix compile error
...
drivers/pci/controller/dwc/pcie-dw-rockchip-acpi.c: In function 'rk_pcie_writel_ob_unroll':
drivers/pci/controller/dwc/pcie-dw-rockchip-acpi.c:32:22: error: implicit declaration of
function 'PCIE_GET_ATU_OUTB_UNR_REG_OFFSET' [-Werror=implicit-function-declaration]
32 | u32 offset = PCIE_GET_ATU_OUTB_UNR_REG_OFFSET(index);
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com >
Change-Id: I64b960ef3e8a9ad375b75048fb1406c1ac161e74
2023-05-22 10:43:30 +08:00
Tao Huang
7479131947
phy: rockchip-naneng-usb2: Use fallthrough pseudo-keyword
...
Signed-off-by: Tao Huang <huangtao@rock-chips.com >
Change-Id: Ibb2ab959c9d00920d50db9bf093126f63fc78a2c
2023-05-22 10:33:44 +08:00
Tao Huang
629c8e3872
video: rockchip: rve: Replace ksys_close with close_fd
...
Signed-off-by: Tao Huang <huangtao@rock-chips.com >
Change-Id: I31db3a41e28bab7f214bd8ae2ed06b3f0962aa9f
2023-05-22 10:24:56 +08:00
Tao Huang
daf2796321
Merge commit '52f971ee6e023d89d24f9e3cd145d86d707e459c'
...
* commit '52f971ee6e023d89d24f9e3cd145d86d707e459c': (84565 commits)
arm64: dts: rockchip: rk3562: Enable viLKsvPwrActive for soc bus
mtd: spi-nor: esmt: Support New devices
mtd: spi-nor: fmsh: Support New devices
mtd: spi-nor: gigadevice: Support New devices
mtd: spinand: gsto: Add code
mtd: spinand: hyf: Support new devices
mmc: convert thunder boot dependency
ARM: dts: rockchip: rv1106: add node for system sleep
ARM: rockchip: support rv1106 suspend
ARM: rockchip: add some pm-related functions
video: rockchip: mpp: fix rk3528 avsd not probe issue
arm64: dts: rockchip: rk3588-vehicle-maxim-serdes: Add BOE AV156FHT L83 support
arm64: rockchip_defconfig: Enable CONFIG_DRM_PANEL_MAXIM_MAX96752F
drm/panel: Add panel driver for Maxim MAX96752F based LCDs
media: i2c: techpoint: add support 4 channel 2 lane mode
drm/rockchip: dsi2: fix NULL in component_ops .unbind helper
media: rockchip: vicap: fixes cma can not alloc when capture raw
media: rockchip: vicap: fixed vc err for multi channel
media: rockchip: hdmirx: fix timing info for interlaced resolution
media: rockchip: hdmirx: fix code error for cec register failed
...
Change-Id: Ia7ac365455d87a295e62bbf481d80694a9712f30
Conflicts:
.gitignore
Documentation/devicetree/bindings/clock/rockchip,px30-cru.txt
Documentation/devicetree/bindings/connector/usb-connector.yaml
Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt
Documentation/devicetree/bindings/hwmon/pwm-fan.txt
Documentation/devicetree/bindings/iio/light/vl6180.txt
Documentation/devicetree/bindings/iommu/rockchip,iommu.txt
Documentation/devicetree/bindings/mtd/rockchip,nand-controller.yaml
Documentation/devicetree/bindings/net/rockchip-dwmac.yaml
Documentation/devicetree/bindings/net/snps,dwmac.yaml
Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml
Documentation/devicetree/bindings/power/rockchip-io-domain.txt
Documentation/devicetree/bindings/regulator/fan53555.txt
Documentation/devicetree/bindings/soc/rockchip/power_domain.txt
Documentation/devicetree/bindings/sound/rockchip,pdm.yaml
Documentation/devicetree/bindings/sound/rockchip-spdif.yaml
Documentation/devicetree/bindings/spi/spi-rockchip.yaml
Documentation/devicetree/bindings/thermal/rockchip-thermal.txt
Documentation/devicetree/bindings/usb/usb-xhci.txt
Documentation/filesystems/erofs.rst
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/boot/compressed/head.S
arch/arm/boot/dts/rk3036.dtsi
arch/arm/boot/dts/rk3066a-rayeager.dts
arch/arm/boot/dts/rk3066a.dtsi
arch/arm/boot/dts/rk322x.dtsi
arch/arm/boot/dts/rk3288.dtsi
arch/arm/boot/dts/rk3xxx.dtsi
arch/arm64/boot/dts/rockchip/Makefile
arch/arm64/boot/dts/rockchip/px30.dtsi
arch/arm64/boot/dts/rockchip/rk3308.dtsi
arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi
arch/arm64/boot/dts/rockchip/rk3399.dtsi
arch/arm64/boot/dts/rockchip/rk3566.dtsi
arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi
arch/arm64/boot/dts/rockchip/rk3568.dtsi
arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi
arch/arm64/kernel/process.c
arch/arm64/mm/Makefile
arch/arm64/mm/fault.c
arch/arm64/mm/init.c
drivers/Kconfig
drivers/Makefile
drivers/android/Kconfig
drivers/ata/ahci_platform.c
drivers/char/hw_random/Kconfig
drivers/char/hw_random/Makefile
drivers/clk/clk.c
drivers/clk/rockchip/Kconfig
drivers/clk/rockchip/Makefile
drivers/clk/rockchip/clk-cpu.c
drivers/clk/rockchip/clk-rk3036.c
drivers/clk/rockchip/clk-rk3188.c
drivers/clk/rockchip/clk-rk3308.c
drivers/clk/rockchip/clk-rk3399.c
drivers/clk/rockchip/clk-rk3568.c
drivers/clk/rockchip/clk-rv1126.c
drivers/clk/rockchip/clk.c
drivers/clk/rockchip/clk.h
drivers/cpufreq/cpufreq-dt.c
drivers/crypto/Kconfig
drivers/devfreq/Makefile
drivers/devfreq/devfreq.c
drivers/dma-buf/dma-buf.c
drivers/dma-buf/heaps/Makefile
drivers/dma/pl330.c
drivers/firmware/Kconfig
drivers/gpio/Kconfig
drivers/gpio/Makefile
drivers/gpio/gpio-rockchip.c
drivers/gpu/Makefile
drivers/gpu/drm/Kconfig
drivers/gpu/drm/Makefile
drivers/gpu/drm/bridge/Kconfig
drivers/gpu/drm/bridge/Makefile
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
drivers/gpu/drm/bridge/display-connector.c
drivers/gpu/drm/bridge/sii902x.c
drivers/gpu/drm/bridge/synopsys/Makefile
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c
drivers/gpu/drm/drm_atomic_helper.c
drivers/gpu/drm/drm_crtc_internal.h
drivers/gpu/drm/drm_edid.c
drivers/gpu/drm/panel/panel-simple.c
drivers/gpu/drm/rockchip/Kconfig
drivers/gpu/drm/rockchip/Makefile
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
drivers/gpu/drm/rockchip/inno_hdmi.c
drivers/gpu/drm/rockchip/rockchip_drm_drv.c
drivers/gpu/drm/rockchip/rockchip_drm_drv.h
drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
drivers/gpu/drm/rockchip/rockchip_drm_gem.c
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
drivers/gpu/drm/rockchip/rockchip_drm_vop.h
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
drivers/gpu/drm/rockchip/rockchip_lvds.c
drivers/gpu/drm/rockchip/rockchip_rgb.c
drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
drivers/gpu/drm/rockchip/rockchip_vop_reg.c
drivers/gpu/drm/rockchip/rockchip_vop_reg.h
drivers/hwmon/pwm-fan.c
drivers/hwspinlock/Kconfig
drivers/hwspinlock/Makefile
drivers/i2c/busses/i2c-rk3x.c
drivers/i2c/i2c-core-base.c
drivers/iio/adc/Kconfig
drivers/iio/adc/rockchip_saradc.c
drivers/iio/industrialio-event.c
drivers/input/touchscreen/Makefile
drivers/iommu/iommu.c
drivers/iommu/rockchip-iommu.c
drivers/irqchip/irq-gic-v3-its.c
drivers/leds/Makefile
drivers/mailbox/Kconfig
drivers/media/common/videobuf2/Makefile
drivers/media/i2c/Kconfig
drivers/media/i2c/Makefile
drivers/media/i2c/dw9714.c
drivers/media/i2c/hi556.c
drivers/media/i2c/imx214.c
drivers/media/i2c/imx258.c
drivers/media/i2c/imx334.c
drivers/media/i2c/imx335.c
drivers/media/i2c/ov5648.c
drivers/media/i2c/ov5670.c
drivers/media/i2c/ov5695.c
drivers/media/i2c/ov7251.c
drivers/media/platform/Kconfig
drivers/media/platform/Makefile
drivers/media/platform/rockchip/Kconfig
drivers/media/spi/Kconfig
drivers/media/spi/Makefile
drivers/media/usb/uvc/uvc_driver.c
drivers/media/usb/uvc/uvcvideo.h
drivers/media/v4l2-core/v4l2-async.c
drivers/media/v4l2-core/v4l2-ioctl.c
drivers/mfd/rk808.c
drivers/mmc/core/block.c
drivers/mmc/core/host.c
drivers/mmc/core/mmc.c
drivers/mmc/core/mmc_ops.c
drivers/mmc/host/Makefile
drivers/mmc/host/dw_mmc-rockchip.c
drivers/mmc/host/dw_mmc.c
drivers/mmc/host/dw_mmc.h
drivers/mmc/host/sdhci-of-dwcmshc.c
drivers/mtd/nand/Makefile
drivers/mtd/nand/raw/Kconfig
drivers/mtd/nand/raw/Makefile
drivers/mtd/nand/raw/rockchip-nand-controller.c
drivers/mtd/nand/spi/Makefile
drivers/mtd/nand/spi/core.c
drivers/mtd/nand/spi/gigadevice.c
drivers/mtd/nand/spi/macronix.c
drivers/mtd/nand/spi/xtx.c
drivers/mtd/spi-nor/Kconfig
drivers/mtd/spi-nor/Makefile
drivers/mtd/spi-nor/core.c
drivers/mtd/spi-nor/core.h
drivers/mtd/spi-nor/eon.c
drivers/mtd/spi-nor/esmt.c
drivers/mtd/spi-nor/gigadevice.c
drivers/mtd/spi-nor/macronix.c
drivers/mtd/spi-nor/winbond.c
drivers/mtd/spi-nor/xmc.c
drivers/net/ethernet/stmicro/stmmac/Makefile
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
drivers/net/ethernet/stmicro/stmmac/stmmac.h
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
drivers/net/phy/Kconfig
drivers/net/phy/motorcomm.c
drivers/net/phy/phy_device.c
drivers/nvmem/Kconfig
drivers/nvmem/Makefile
drivers/pci/controller/dwc/Makefile
drivers/pci/controller/dwc/pcie-designware-host.c
drivers/pci/controller/dwc/pcie-dw-rockchip.c
drivers/pci/controller/pcie-rockchip-host.c
drivers/pci/controller/pcie-rockchip.h
drivers/pci/pci-sysfs.c
drivers/pci/pcie/Makefile
drivers/phy/rockchip/Kconfig
drivers/phy/rockchip/Makefile
drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c
drivers/phy/rockchip/phy-rockchip-inno-usb2.c
drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
drivers/phy/rockchip/phy-rockchip-snps-pcie3.c
drivers/phy/rockchip/phy-rockchip-typec.c
drivers/pinctrl/Kconfig
drivers/pinctrl/Makefile
drivers/pinctrl/pinctrl-rk805.c
drivers/pinctrl/pinctrl-rockchip.c
drivers/pinctrl/pinctrl-rockchip.h
drivers/power/supply/Kconfig
drivers/power/supply/Makefile
drivers/power/supply/bq25890_charger.c
drivers/power/supply/rk817_charger.c
drivers/pwm/core.c
drivers/pwm/pwm-rockchip.c
drivers/regulator/fan53555.c
drivers/regulator/rk808-regulator.c
drivers/rtc/rtc-hym8563.c
drivers/soc/rockchip/Kconfig
drivers/soc/rockchip/Makefile
drivers/soc/rockchip/grf.c
drivers/soc/rockchip/io-domain.c
drivers/soc/rockchip/pm_domains.c
drivers/spi/Kconfig
drivers/spi/spi-rockchip-sfc.c
drivers/spi/spi-rockchip.c
drivers/spi/spidev.c
drivers/staging/android/ion/heaps/ion_system_heap.c
drivers/thermal/rockchip_thermal.c
drivers/tty/serial/8250/8250_dma.c
drivers/tty/serial/8250/8250_dw.c
drivers/tty/serial/8250/8250_dwlib.c
drivers/tty/serial/8250/8250_port.c
drivers/usb/dwc2/platform.c
drivers/usb/dwc3/core.c
drivers/usb/dwc3/core.h
drivers/usb/dwc3/ep0.c
drivers/usb/dwc3/gadget.c
drivers/usb/gadget/configfs.c
drivers/usb/gadget/function/f_fs.c
drivers/usb/gadget/function/f_uvc.c
drivers/usb/gadget/function/uvc.h
drivers/usb/gadget/function/uvc_configfs.c
drivers/usb/gadget/function/uvc_queue.c
drivers/usb/gadget/function/uvc_v4l2.c
drivers/usb/gadget/function/uvc_video.c
drivers/usb/gadget/udc/core.c
drivers/usb/host/ehci-hcd.c
drivers/usb/host/ehci-platform.c
drivers/usb/storage/unusual_uas.h
drivers/usb/typec/altmodes/Kconfig
drivers/usb/typec/altmodes/displayport.c
drivers/usb/typec/class.c
drivers/usb/typec/tcpm/tcpm.c
fs/Kconfig
fs/cifs/inode.c
fs/dax.c
fs/erofs/data.c
fs/erofs/inode.c
fs/erofs/internal.h
fs/erofs/super.c
fs/f2fs/super.c
fs/fuse/dev.c
include/drm/bridge/dw_hdmi.h
include/drm/drm_connector.h
include/drm/drm_edid.h
include/dt-bindings/clock/rk3568-cru.h
include/dt-bindings/power/rk3568-power.h
include/dt-bindings/power/rk3588-power.h
include/linux/clk-provider.h
include/linux/cma.h
include/linux/dma-buf.h
include/linux/dma-heap.h
include/linux/mfd/rk808.h
include/linux/mtd/spi-nor.h
include/linux/mtd/spinand.h
include/linux/phy/pcie.h
include/linux/pwm.h
include/linux/sched/sysctl.h
include/linux/slub_def.h
include/linux/stmmac.h
include/linux/usb/typec.h
include/media/v4l2-async.h
include/soc/rockchip/pm_domains.h
include/uapi/drm/drm_fourcc.h
include/uapi/linux/iio/types.h
include/uapi/linux/media-bus-format.h
init/Kconfig
init/main.c
kernel/printk/printk.c
kernel/rcu/Kconfig.debug
kernel/rcu/tree_stall.h
kernel/sched/core.c
kernel/sched/cpufreq_schedutil.c
kernel/sched/fair.c
kernel/sched/pelt.c
kernel/sched/rt.c
kernel/sched/sched.h
kernel/softirq.c
kernel/sysctl.c
mm/Makefile
mm/cma.c
mm/page_alloc.c
mm/slub.c
scripts/.gitignore
scripts/headers_install.sh
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile
sound/soc/codecs/es8326.c
sound/soc/codecs/es8326.h
sound/soc/codecs/hdmi-codec.c
sound/soc/codecs/rk817_codec.c
sound/soc/rockchip/Kconfig
sound/soc/rockchip/Makefile
sound/soc/rockchip/rockchip_i2s.c
sound/soc/rockchip/rockchip_i2s_tdm.c
sound/soc/rockchip/rockchip_i2s_tdm.h
sound/soc/rockchip/rockchip_pdm.c
sound/soc/rockchip/rockchip_spdif.c
sound/soc/soc-generic-dmaengine-pcm.c
tools/iio/iio_event_monitor.c
2023-05-20 18:57:29 +08:00
Tao Huang
c1354ca3d7
Merge tag 'android12-5.10-2023-02_r1' of https://android.googlesource.com/kernel/common
...
Merge with ours strategy, nothing is changed.
Change-Id: I995d1fda2bbfa61edcf6aa86bc69ef296c6f1987
2023-05-05 18:49:04 +08:00
Finley Xiao
52f971ee6e
arm64: dts: rockchip: rk3562: Enable viLKsvPwrActive for soc bus
...
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com >
Change-Id: I5758c18130c5900cf23caddd25c80450e172650b
2023-04-28 14:24:48 +08:00
Jon Lin
d692435db7
mtd: spi-nor: esmt: Support New devices
...
en25qx128a
Change-Id: Ie136512a1cd8d44508c114abb2b59397acd982ee
Signed-off-by: Jon Lin <jon.lin@rock-chips.com >
2023-04-28 14:22:18 +08:00
Jon Lin
00cd81ba44
mtd: spi-nor: fmsh: Support New devices
...
FM25Q256I3
Change-Id: I4922debff3dbd3d6d480d1565e183e9c8e10bd4c
Signed-off-by: Jon Lin <jon.lin@rock-chips.com >
2023-04-28 14:22:18 +08:00
Jon Lin
81826077f1
mtd: spi-nor: gigadevice: Support New devices
...
gd55lb01ge
Change-Id: I25d8d2a35877baaaf12bbb3c85d0a7b4d647e455
Signed-off-by: Jon Lin <jon.lin@rock-chips.com >
2023-04-28 14:22:18 +08:00
Jon Lin
1e5200d59e
mtd: spinand: gsto: Add code
...
GSS01GSAK1, GSS02GSAK1
Change-Id: I7ee9048d934694803d6d081cb7d0cdc56f114e79
Signed-off-by: Jon Lin <jon.lin@rock-chips.com >
2023-04-28 14:22:18 +08:00
Jon Lin
a105534351
mtd: spinand: hyf: Support new devices
...
HYF2GQ4IAACAE, HYF1GQ4IDACAE
Change-Id: Ie01fcab9be9c5e1982cfc4ab2e63aac2e95c8557
Signed-off-by: Jon Lin <jon.lin@rock-chips.com >
2023-04-28 14:22:18 +08:00
Shawn Lin
ff11acc4e1
mmc: convert thunder boot dependency
...
If no need to activate the decompress flow, using CONFIG_ROCKCHIP_THUNDER_BOOT_MMC
should be better.
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com >
Change-Id: Ic9750ab71cc0d7c5beddd41f11ab71aa4df69bff
2023-04-28 08:56:04 +08:00
XiaoDong Huang
32a239027d
ARM: dts: rockchip: rv1106: add node for system sleep
...
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com >
Change-Id: I9b41dd418c5274d57fd992071cabf7393e9fbee2
2023-04-27 16:41:15 +08:00
XiaoDong Huang
8dfc627542
ARM: rockchip: support rv1106 suspend
...
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com >
Change-Id: Iee8830ceed2d264dfa388b8b8a437486d32d9bc5
2023-04-27 16:41:15 +08:00
XiaoDong Huang
b8ef7d0e0c
ARM: rockchip: add some pm-related functions
...
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com >
Change-Id: I736e032e604fa5fb6d1e1cfc9547747c443422dd
2023-04-27 16:41:15 +08:00
Chandler Chen
985afae872
video: rockchip: mpp: fix rk3528 avsd not probe issue
...
Signed-off-by: Chandler Chen <chandler.chen@rock-chips.com >
Change-Id: I79c9b010e0b863c76a9cbfc59433480d1581bbfa
2023-04-27 15:02:33 +08:00
Wyon Bi
188bc14523
arm64: dts: rockchip: rk3588-vehicle-maxim-serdes: Add BOE AV156FHT L83 support
...
Change-Id: Ibac167c55aa0dacf61080501cc413957200670c9
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com >
2023-04-27 14:48:38 +08:00
Wyon Bi
56965f2b15
arm64: rockchip_defconfig: Enable CONFIG_DRM_PANEL_MAXIM_MAX96752F
...
Change-Id: I5579987218d72331cc1cfa10addd01687af0d987
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com >
2023-04-27 14:46:33 +08:00
Wyon Bi
2d68ed1a6b
drm/panel: Add panel driver for Maxim MAX96752F based LCDs
...
Change-Id: I4ef26760dc87096745d7e4cadc49976a1cb71330
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com >
2023-04-27 14:46:22 +08:00
LongChang Ma
3614b1205b
media: i2c: techpoint: add support 4 channel 2 lane mode
...
Signed-off-by: LongChang Ma <chad.ma@rock-chips.com >
Change-Id: I2fc8cf3bd185ba40f229b125cf591663ed53ae5e
2023-04-27 14:32:35 +08:00
Guochun Huang
ce43008326
drm/rockchip: dsi2: fix NULL in component_ops .unbind helper
...
dsi->connector.funcs may be NULL, because drm connector may be
implemented in drm bridge which attached dsi.
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com >
Change-Id: Id8668a70405ff41d770784cb9a5db3b16d92f3a3
2023-04-27 14:31:24 +08:00
Su Yuefu
9588e987c7
media: rockchip: vicap: fixes cma can not alloc when capture raw
...
Signed-off-by: Su Yuefu <yuefu.su@rock-chips.com >
Change-Id: Ib3752fd1a1f22345df91812bfe85225233a0217d
2023-04-27 14:25:29 +08:00
Zefa Chen
b7ae3521f9
media: rockchip: vicap: fixed vc err for multi channel
...
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com >
Change-Id: I4f8fb4498539d7cbf0739d6fcc764ac6a3e32546
2023-04-27 14:25:29 +08:00
Dingxian Wen
82153fa496
media: rockchip: hdmirx: fix timing info for interlaced resolution
...
Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com >
Change-Id: I903659437334c4d47b9f876ef26e800a11d85dfc
2023-04-27 14:09:22 +08:00
Chen Shunqing
827ac7bbce
media: rockchip: hdmirx: fix code error for cec register failed
...
Change-Id: I0174fef279b8efc0eb16f31b427faab144eabc67
Signed-off-by: Chen Shunqing <csq@rock-chips.com >
2023-04-27 14:08:54 +08:00
Algea Cao
84d542c4b8
drm/rockchip: dw_hdmi: Allow RK3588 4K-60Hz YUV444/YUV422/RGB output
...
Signed-off-by: Algea Cao <algea.cao@rock-chips.com >
Change-Id: I03541eb421c9ce6fbdd94575688391ee3352390e
2023-04-27 11:22:16 +08:00
Algea Cao
8a26ca654a
drm/bridge: synopsys: dw-hdmi-qp: Support rk3588 hdmi yuv422
...
Signed-off-by: Algea Cao <algea.cao@rock-chips.com >
Change-Id: I74c0ac58a71802edc8374b492c6da9c5fe69e784
2023-04-27 11:21:39 +08:00
Algea Cao
23a37b3ec4
drm/rockchip: vop2: Support rk3588 hdmi yuv422 output mode
...
Signed-off-by: Algea Cao <algea.cao@rock-chips.com >
Change-Id: I0fb333bf818de0ae2519600ad9a627a05e9fb0ee
2023-04-27 11:21:39 +08:00
Yandong Lin
92104b3709
video: rockchip: mpp: refactor rkvdec2_link worker flow
...
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com >
Change-Id: I00a1a5551e1684d615130e5f3dd0714e284b6aa8
2023-04-27 11:10:14 +08:00
Zhen Chen
d3eea38dbb
Mali: bifrost: make some functions not depend on CONFIG_DEBUG_FS
...
Including:
kbase_device_kinstr_prfcnt_init(),
kbase_device_kinstr_prfcnt_term(),
kbase_device_io_history_init(),
kbase_device_io_history_term.
To resolve compilation errors when CONFIG_DEBUG_FS is not enabled.
Change-Id: Ibeaf97bd9fdbbb45308160e11c4dbb386a0dea71
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com >
2023-04-27 09:49:05 +08:00
Zhen Chen
68c4487930
MALI: bifrost: not to call kbase_ipa_init() if rockchip simple-power-model is used
...
To avoid warning logs:
[ 4.268726] mali fb000000.gpu: Couldn't find power_model DT node matching 'arm,mali-simple-power-model'
[ 4.268737] mali fb000000.gpu: Error -22, no DT entry: mali-simple-power-model.static-coefficient = 1*[0]
[ 4.268899] mali fb000000.gpu: Error -22, no DT entry: mali-simple-power-model.dynamic-coefficient = 1*[0]
[ 4.269057] mali fb000000.gpu: Error -22, no DT entry: mali-simple-power-model.ts = 4*[0]
[ 4.269222] mali fb000000.gpu: Error -22, no DT entry: mali-simple-power-model.thermal-zone = ''
Change-Id: I4f7248c0847b0f161ad2fb04b4ce5a7c6777a770
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com >
2023-04-27 09:48:57 +08:00
Jason Zhu
c938fada4a
arm64: dts: rockchip: rk3528-evb1: close es7243_sound
...
Since we must switch the DIP switch to make es7243 work in evb1, if
not do that, the i2c error accur:
[0321084917][ 41.145030] rk3x-i2c ffa80000.i2c: timeout, ipd: 0x00, state: 2
[ 41.145088] es7243_write error->[REG-0x0b,val-0x8c]
[0321084918][ 42.158359] rk3x-i2c ffa80000.i2c: timeout, ipd: 0x00, state: 2
[ 42.158409] es7243_read error1
[0321084919][ 43.171692] rk3x-i2c ffa80000.i2c: timeout, ipd: 0x00, state: 2
[ 43.171743] es7243_write error->[REG-0x0c,val-0x80]
[0321084920][ 44.185026] rk3x-i2c ffa80000.i2c: timeout, ipd: 0x00, state: 2
[ 44.185080] es7243_write error->[REG-0x03,val-0x20]
[0321084921][ 45.198330] rk3x-i2c ffa80000.i2c: timeout, ipd: 0x00, state: 2
[ 45.198379] es7243_write error->[REG-0x0d,val-0x00]
[0321084923][ 46.211691] rk3x-i2c ffa80000.i2c: timeout, ipd: 0x00, state: 2
So close it. Then switch the DIP switch and enable es7243_sound node if use
es7243_sound card.
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com >
Change-Id: I0dc4139aef4587ad4a303ede594ef1213704d808
2023-04-27 09:45:44 +08:00
Liang Chen
c70a59e2db
arm64: dts: rockchip: rk3562: adjust opp-table for cpu/gpu/npu/dmc
...
1. get the value of pvtpll@0.9v from otp.
1. adjust opp-table by pvtpll value.
2. adjust opp-table by mbist-vmin.
3. adjust opp-table when low temperature.
Change-Id: Idc0c0e811c80d1b9b51d4a4f5c7176c546558386
Signed-off-by: Liang Chen <cl@rock-chips.com >
2023-04-27 09:33:44 +08:00
Liang Chen
3d61cdad95
soc: rockchip: opp_select: support get pvtm from otp
...
Change-Id: Id0d7e909150c7c3c8747b49ce0e00085345db968
Signed-off-by: Liang Chen <cl@rock-chips.com >
2023-04-26 15:25:46 +08:00
Chen Shunqing
a6a48744be
drm/rockchip: dw_hdmi-qp: fix hdmi->i2c null pointer
...
An interrupt may be triggered first,
but hdmi->i2c is not registered yet.
Change-Id: I45b0adc71ccdd6bf7543601b587976fa47ffd7d4
Signed-off-by: Chen Shunqing <csq@rock-chips.com >
2023-04-26 10:33:14 +08:00
Algea Cao
86f4cace86
drm/rockchip: dw_hdmi: Fix phy pll rate overflow when frl 48G mode
...
Signed-off-by: Algea Cao <algea.cao@rock-chips.com >
Change-Id: Id2612aaedb887f518d9d7458c2b33e3b969af51e
2023-04-25 17:48:39 +08:00
Shawn Lin
006505ca76
misc: add rockchip standard EP function driver
...
This is a PCIe function driver for rockchip RKEP demo which works on RC
side, it includes following features:
1. Support rc dma
2. Support mmap reserved memory
3. Add dma msi obj irq signal
4. Add user msi obj irq signal
5. Support RKEP-boot
Change-Id: Id71ebd31f86b688d3e6e07ce5055aad81ce7e206
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com >
Signed-off-by: Kever Yang <kever.yang@rock-chips.com >
Signed-off-by: Jon Lin <jon.lin@rock-chips.com >
2023-04-25 16:23:23 +08:00
Kever Yang
35b75819df
PCI: add rockchip vendor id
...
Signed-off-by: Kever Yang <kever.yang@rock-chips.com >
Change-Id: Iac28bf81f654f30e1e99e9112cf50ff08fe9e10b
2023-04-25 16:23:11 +08:00
Zhang Yubing
7481ef209d
drm/rockchip: dw-dp: use vsc sdp only output yuv420 or hdr
...
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com >
Change-Id: I841ae4d83814682f8d9c2843dde082ad8929c392
2023-04-25 16:21:39 +08:00
Algea Cao
5e54a1092f
drm/rockchip: dw_hdmi: Fix hdmi2.0 mode no signal when plug out before hdmi bind
...
When the hdmi is plugged in and out after uboot but
before kernel initialization, the TV will enter hdmi 1.4 mode,
hdmi 2.0 resolution can't be display.
In this case, we need to disable/enable hdmi again to make TV
into hdmi 2.0 mode again.
Signed-off-by: Algea Cao <algea.cao@rock-chips.com >
Change-Id: I39fbe519d54329ae7db57904013bfdef6f5a068e
2023-04-25 16:20:16 +08:00
Algea Cao
35d3b7a0e8
drm/rockchip: dw_hdmi: hdmi plug out don't check mode valid when play hdr video
...
HWC will set hdmi out of hdr mode then disable hdmi
when hdmi plug out in hdr mode.
If hdmi is disconnect edid is null, mode valid check
is always failed, HWC set hdr disable will failed.
Signed-off-by: Algea Cao <algea.cao@rock-chips.com >
Change-Id: I12ebf23539be17b338617131e879296ed20d6a95
2023-04-25 16:20:16 +08:00
Dingxian Wen
a6cd7f2bea
media: rockchip: hdmirx: enhance compatibility and stability
...
1.Add phy configuration retry when signal can not be locked.
2.Add the judgment that signal locking has stabilized.
3.Add the judgment of signal loss when starting stream.
4.Modify the calculation method of pixclk and fps in YUV420 format.
5.When DMA is enabled, if the 5V_Det level changes, an interrupt will be
forcibly triggered to reset the controller in BL31 as soon as possible.
Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com >
Change-Id: I27846bca7059d834b5bd069b5959a2279295568d
2023-04-25 16:11:12 +08:00
Zefa Chen
c49ee74470
media: rockchip: vicap: hdr buffer sync detect by fe timestamp
...
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com >
Change-Id: I96b8c45c716b0c55015ccad5fc577c176229bf5b
2023-04-25 09:48:04 +08:00
Zefa Chen
ea2f26927f
media: rockchip: vicap: fixes dvp capture not config buffer in rockit mode
...
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com >
Change-Id: I97fbc49e73574339708882efe4a435b8716ce606
2023-04-25 09:47:32 +08:00
Wu Liangqing
82db0cd943
arm64: configs: rockchip_gki: support PX30 RK3399
...
Signed-off-by: Wu Liangqing <wlq@rock-chips.com >
Change-Id: Id89bcb56320e29e9830f1813dead4404a6683828
2023-04-24 15:54:51 +08:00
Jianlong Wang
51142e249f
arm64: dts: rockchip: add px30 ddr4 v10 evb for linux
...
Signed-off-by: Jianlong Wang <jianlong.wang@rock-chips.com >
Change-Id: I52847160e5edde3cbd06e58313c00dba7e61f7e3
2023-04-24 15:00:35 +08:00
Yifeng Zhao
34edb448a8
arm64: dts: rockchip: rk3588-android: add reserved memory for vendor storage
...
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com >
Change-Id: I538bd0032ad2613a2d9a148c7483b9ab244be5f3
2023-04-24 14:29:59 +08:00
Yifeng Zhao
bd3936b42a
arm64: dts: rockchip: rk3568-android: add reserved memory for vendor storage
...
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com >
Change-Id: Id080d4570c2c54e8565813731400f0edcc9c53a1
2023-04-24 14:29:09 +08:00