Commit Graph

1254904 Commits

Author SHA1 Message Date
Badhri Jagan Sridharan
79b5303e24 ANDROID: usb: gadget: configfs: Add usb_function ptr to fi struct
Add a pointer to the usb_function inside the
usb_function_instance structure to service
functions specific setup requests even before
the function gets added to the usb_gadget

Bug: 63740241
Bug: 68755607
Bug: 78114713
Bug: 120441124
[badhri: This is a supporting patch for other patches which have
         replacements pipelined. It can be dropped when those
         implementations land.]
Change-Id: I6f457006f6c5516cc6986ec2acdf5b1ecf259d0c
Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit 2d89290aec
 https://android.googlesource.com/kernel/common)
2023-05-24 16:45:02 +08:00
Frank Wang
640eb99d42 phy: rockchip: inno-usb2: only disable usb480m clk in error path
This fix the usb480m clk disable error when phy power on.

Fixes: daf2796321 ("Merge commit '52f971ee6e023d89d24f9e3cd145d86d707e459c'")
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: I79f84757cccdca56357794d3bb5bfdc8df6c0a1f
2023-05-24 16:12:58 +08:00
Sandy Huang
2585198687 drm/rockchip: dw_hdmi: regulator avdd-0v9 and avdd-1v8 is optional
Fixes: daf2796321 ("Merge commit '52f971ee6e023d89d24f9e3cd145d86d707e459c'")
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ib4034fac08e43801b1c15c63159ac871150a232f
2023-05-24 16:08:44 +08:00
Tao Huang
6081e59c48 rk: kbuild: silence resource_tool warning
scripts/resource_tool.c:718:9: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
...

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I393a60474eb557ca0cdd54df9a391171e097f8b0
2023-05-24 09:38:42 +08:00
Sandy Huang
36b0a9a80e drm/rockchp: dw-dp: move aux_register to bind
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I1906419841eb69958da780382e424008e7422490
2023-05-23 19:36:09 +08:00
Simon Xue
0004c2dd16 dma-buf: rk-debug: update namespace get_each_dmabuf to dma_buf_get_each
Change-Id: I6daaf1b5dd661c8545acdd52d215cd3548fe848e
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2023-05-23 18:54:58 +08:00
Vijayanand Jitta
77a20bac76 ANDROID: dma-buf: add dma_buf_get_each function
Add and export dma_buf_get_each function which helps in
traversing the db_list, this will be used by the minidump
module to get dmabuf info.

Bug: 267250898
Change-Id: Ie24788fcf9cf0a49316cb871dcb9191e8084ccde
Signed-off-by: Vijayanand Jitta <vjitta@codeaurora.org>
(cherry picked from commit 602e4e28d8)
[Yunfei: Change namespace get_each_dmabuf to dma_buf_get_each]
Signed-off-by: Yunfei Wang <yf.wang@mediatek.com>
Signed-off-by: Jaskaran Singh <quic_jasksing@quicinc.com>
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2023-05-23 18:54:58 +08:00
Tao Huang
a176f67f42 input: touchscreen: elan: Add missing break in elan_iap_ioctl
drivers/input/touchscreen/elan/elan_ts.c:1471:2: error: unannotated fall-through between switch labels [-Werror,-Wimplicit-fallthrough]
        default:
        ^

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I7b8d9d1d90d2fff2308ae0f9663447af6fd91569
2023-05-23 17:53:53 +08:00
Tao Huang
08a98cf5bf drm/rockchip: rk628: include drm/display/drm_dp_helper.h
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I57d428d9b0effb6819a709b208eb5a2597c577e7
2023-05-23 17:52:12 +08:00
Tao Huang
3fbf486ac5 drm/rockchip: rk628: include media-bus-format.h
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I7608e943c666b047ad1ca6c3c33a699b6e8e534b
2023-05-23 17:50:42 +08:00
Tao Huang
cc44c1ba66 drm/bridge: maxim-max96755: Add missing break in max96755f_link_parse
drivers/gpu/drm/bridge/maxim-max96755f.c:469:2: error: unannotated fall-through between switch labels [-Werror,-Wimplicit-fallthrough]
        case 1:
        ^

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I60ad30cc810080f0a0d62b1e805e37b1c532e9a6
2023-05-23 17:47:44 +08:00
Tao Huang
3afbc01cb7 drm/bridge: maxim-max96745: include drm_edid.h
drivers/gpu/drm/bridge/maxim-max96745.c:168:16: error: implicit declaration of function 'drm_add_modes_noedid'

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I6213205f51f125659da40fa8d04a3a9bb39c9d0c
2023-05-23 17:46:47 +08:00
Sandy Huang
2a9a256765 drm/edid: add config option of edid function
rv1126 does not support display interface which need to
read and parse edid, such as hdmi and dp, so add config
option to reduce memory usage.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I0c3813711cfdb4a38ec66136569ca826c94c6c58
2023-05-22 19:04:22 +08:00
Tao Huang
20af105547 rtc: rockchip: use devm_rtc_register_device()
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I94c870329cddec347ea4d29bed11a11cc52ee125
2023-05-22 12:33:03 +08:00
Frank Wang
62a6bd61d8 phy: rockchip: usbdp: fix compile error for kernel 5.19
Fix the typec_switch and typec_mux object to align with
Commit 713fd49b43 ("usb: typec: mux: Introduce indirection").

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: Ibb526c3d65a495426abf8c911f92df065b545132
2023-05-22 11:42:16 +08:00
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