Switched rockchip64-dev to 5.10.0-rc (#2378)
This commit is contained in:
parent
62c27823a6
commit
d418e595cf
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm64 5.9.1 Kernel Configuration
|
||||
# Linux/arm64 5.10.0-rc5 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 9.2-2019.12 (arm-9.10)) 9.2.1 20191025"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
@ -50,6 +50,7 @@ CONFIG_GENERIC_IRQ_CHIP=y
|
||||
CONFIG_IRQ_DOMAIN=y
|
||||
CONFIG_IRQ_SIM=y
|
||||
CONFIG_IRQ_DOMAIN_HIERARCHY=y
|
||||
CONFIG_GENERIC_IRQ_IPI=y
|
||||
CONFIG_GENERIC_MSI_IRQ=y
|
||||
CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
|
||||
CONFIG_IRQ_MSI_IOMMU=y
|
||||
@ -219,6 +220,8 @@ CONFIG_BPF_SYSCALL=y
|
||||
CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
|
||||
# CONFIG_BPF_JIT_ALWAYS_ON is not set
|
||||
CONFIG_BPF_JIT_DEFAULT_ON=y
|
||||
CONFIG_USERMODE_DRIVER=y
|
||||
# CONFIG_BPF_PRELOAD is not set
|
||||
# CONFIG_USERFAULTFD is not set
|
||||
CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
|
||||
CONFIG_RSEQ=y
|
||||
@ -255,7 +258,8 @@ CONFIG_ARM64=y
|
||||
CONFIG_64BIT=y
|
||||
CONFIG_MMU=y
|
||||
CONFIG_ARM64_PAGE_SHIFT=12
|
||||
CONFIG_ARM64_CONT_SHIFT=4
|
||||
CONFIG_ARM64_CONT_PTE_SHIFT=4
|
||||
CONFIG_ARM64_CONT_PMD_SHIFT=4
|
||||
CONFIG_ARCH_MMAP_RND_BITS_MIN=18
|
||||
CONFIG_ARCH_MMAP_RND_BITS_MAX=33
|
||||
CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
|
||||
@ -317,6 +321,7 @@ CONFIG_ARCH_S32=y
|
||||
# CONFIG_ARCH_THUNDER2 is not set
|
||||
# CONFIG_ARCH_UNIPHIER is not set
|
||||
# CONFIG_ARCH_VEXPRESS is not set
|
||||
# CONFIG_ARCH_VISCONTI is not set
|
||||
# CONFIG_ARCH_XGENE is not set
|
||||
# CONFIG_ARCH_ZX is not set
|
||||
# CONFIG_ARCH_ZYNQMP is not set
|
||||
@ -348,6 +353,7 @@ CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y
|
||||
CONFIG_ARM64_ERRATUM_1286807=y
|
||||
CONFIG_ARM64_ERRATUM_1463225=y
|
||||
CONFIG_ARM64_ERRATUM_1542419=y
|
||||
CONFIG_ARM64_ERRATUM_1508412=y
|
||||
CONFIG_CAVIUM_ERRATUM_22375=y
|
||||
CONFIG_CAVIUM_ERRATUM_23144=y
|
||||
CONFIG_CAVIUM_ERRATUM_23154=y
|
||||
@ -399,7 +405,6 @@ CONFIG_SYS_SUPPORTS_HUGETLBFS=y
|
||||
CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
|
||||
CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
|
||||
CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
|
||||
CONFIG_SECCOMP=y
|
||||
CONFIG_PARAVIRT=y
|
||||
# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
|
||||
CONFIG_KEXEC=y
|
||||
@ -409,8 +414,6 @@ CONFIG_XEN_DOM0=y
|
||||
CONFIG_XEN=y
|
||||
CONFIG_FORCE_MAX_ZONEORDER=11
|
||||
CONFIG_UNMAP_KERNEL_AT_EL0=y
|
||||
CONFIG_HARDEN_BRANCH_PREDICTOR=y
|
||||
CONFIG_ARM64_SSBD=y
|
||||
CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
|
||||
# CONFIG_ARM64_SW_TTBR0_PAN is not set
|
||||
CONFIG_ARM64_TAGGED_ADDR_ABI=y
|
||||
@ -465,6 +468,8 @@ CONFIG_ARM64_BTI=y
|
||||
CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y
|
||||
CONFIG_ARM64_E0PD=y
|
||||
CONFIG_ARCH_RANDOM=y
|
||||
CONFIG_ARM64_AS_HAS_MTE=y
|
||||
CONFIG_ARM64_MTE=y
|
||||
# end of ARMv8.5 architectural features
|
||||
|
||||
CONFIG_ARM64_SVE=y
|
||||
@ -487,6 +492,7 @@ CONFIG_DMI=y
|
||||
|
||||
CONFIG_SYSVIPC_COMPAT=y
|
||||
CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
|
||||
CONFIG_ARCH_ENABLE_THP_MIGRATION=y
|
||||
|
||||
#
|
||||
# Power management options
|
||||
@ -585,13 +591,15 @@ CONFIG_ROCKCHIP_SIP=y
|
||||
#
|
||||
# EFI (Extensible Firmware Interface) Support
|
||||
#
|
||||
# CONFIG_EFI_VARS is not set
|
||||
CONFIG_EFI_ESRT=y
|
||||
CONFIG_EFI_VARS_PSTORE=y
|
||||
# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
|
||||
CONFIG_EFI_PARAMS_FROM_FDT=y
|
||||
CONFIG_EFI_RUNTIME_WRAPPERS=y
|
||||
CONFIG_EFI_GENERIC_STUB=y
|
||||
CONFIG_EFI_ARMSTUB_DTB_LOADER=y
|
||||
CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
|
||||
# CONFIG_EFI_BOOTLOADER_CONTROL is not set
|
||||
CONFIG_EFI_CAPSULE_LOADER=y
|
||||
# CONFIG_EFI_TEST is not set
|
||||
# CONFIG_RESET_ATTACK_MITIGATION is not set
|
||||
@ -630,7 +638,6 @@ CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
|
||||
CONFIG_HAVE_KVM_IRQ_BYPASS=y
|
||||
CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y
|
||||
CONFIG_KVM_ARM_PMU=y
|
||||
CONFIG_KVM_INDIRECT_VECTORS=y
|
||||
CONFIG_ARM64_CRYPTO=y
|
||||
CONFIG_CRYPTO_SHA256_ARM64=y
|
||||
CONFIG_CRYPTO_SHA512_ARM64=y
|
||||
@ -657,6 +664,7 @@ CONFIG_CRYPTO_AES_ARM64_BS=y
|
||||
#
|
||||
CONFIG_CRASH_CORE=y
|
||||
CONFIG_KEXEC_CORE=y
|
||||
CONFIG_SET_FS=y
|
||||
# CONFIG_KPROBES is not set
|
||||
CONFIG_JUMP_LABEL=y
|
||||
# CONFIG_STATIC_KEYS_SELFTEST is not set
|
||||
@ -691,7 +699,9 @@ CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
|
||||
CONFIG_HAVE_CMPXCHG_LOCAL=y
|
||||
CONFIG_HAVE_CMPXCHG_DOUBLE=y
|
||||
CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
|
||||
CONFIG_HAVE_ARCH_SECCOMP=y
|
||||
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
|
||||
CONFIG_SECCOMP=y
|
||||
CONFIG_SECCOMP_FILTER=y
|
||||
CONFIG_HAVE_ARCH_STACKLEAK=y
|
||||
CONFIG_HAVE_STACKPROTECTOR=y
|
||||
@ -700,6 +710,7 @@ CONFIG_STACKPROTECTOR_STRONG=y
|
||||
CONFIG_HAVE_CONTEXT_TRACKING=y
|
||||
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
|
||||
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
|
||||
CONFIG_HAVE_MOVE_PMD=y
|
||||
CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
|
||||
CONFIG_HAVE_ARCH_HUGE_VMAP=y
|
||||
CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
|
||||
@ -894,6 +905,7 @@ CONFIG_GENERIC_EARLY_IOREMAP=y
|
||||
# CONFIG_IDLE_PAGE_TRACKING is not set
|
||||
CONFIG_ARCH_HAS_PTE_DEVMAP=y
|
||||
CONFIG_FRAME_VECTOR=y
|
||||
CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
|
||||
# CONFIG_PERCPU_STATS is not set
|
||||
# CONFIG_GUP_BENCHMARK is not set
|
||||
# CONFIG_READ_ONLY_THP_FOR_FS is not set
|
||||
@ -1025,7 +1037,6 @@ CONFIG_IPV6_SEG6_BPF=y
|
||||
# CONFIG_IPV6_RPL_LWTUNNEL is not set
|
||||
CONFIG_NETLABEL=y
|
||||
# CONFIG_MPTCP is not set
|
||||
# CONFIG_MPTCP_KUNIT_TESTS is not set
|
||||
CONFIG_NETWORK_SECMARK=y
|
||||
CONFIG_NET_PTP_CLASSIFY=y
|
||||
CONFIG_NETWORK_PHY_TIMESTAMPING=y
|
||||
@ -1656,6 +1667,7 @@ CONFIG_CAN_RAW=m
|
||||
CONFIG_CAN_BCM=m
|
||||
CONFIG_CAN_GW=m
|
||||
CONFIG_CAN_J1939=m
|
||||
# CONFIG_CAN_ISOTP is not set
|
||||
|
||||
#
|
||||
# CAN Device Drivers
|
||||
@ -1696,6 +1708,7 @@ CONFIG_CAN_SOFTING=m
|
||||
#
|
||||
CONFIG_CAN_HI311X=m
|
||||
CONFIG_CAN_MCP251X=m
|
||||
# CONFIG_CAN_MCP251XFD is not set
|
||||
# end of CAN SPI interfaces
|
||||
|
||||
#
|
||||
@ -1913,6 +1926,11 @@ CONFIG_PCI_IOV=y
|
||||
# CONFIG_PCI_PRI is not set
|
||||
# CONFIG_PCI_PASID is not set
|
||||
CONFIG_PCI_LABEL=y
|
||||
# CONFIG_PCIE_BUS_TUNE_OFF is not set
|
||||
CONFIG_PCIE_BUS_DEFAULT=y
|
||||
# CONFIG_PCIE_BUS_SAFE is not set
|
||||
# CONFIG_PCIE_BUS_PERFORMANCE is not set
|
||||
# CONFIG_PCIE_BUS_PEER2PEER is not set
|
||||
CONFIG_HOTPLUG_PCI=y
|
||||
# CONFIG_HOTPLUG_PCI_CPCI is not set
|
||||
# CONFIG_HOTPLUG_PCI_SHPC is not set
|
||||
@ -2029,6 +2047,7 @@ CONFIG_SUN50I_DE2_BUS=y
|
||||
CONFIG_SUNXI_RSB=m
|
||||
CONFIG_VEXPRESS_CONFIG=y
|
||||
CONFIG_MHI_BUS=m
|
||||
# CONFIG_MHI_BUS_DEBUG is not set
|
||||
# end of Bus devices
|
||||
|
||||
CONFIG_CONNECTOR=m
|
||||
@ -2120,6 +2139,11 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
|
||||
# CONFIG_MTD_ONENAND is not set
|
||||
# CONFIG_MTD_RAW_NAND is not set
|
||||
# CONFIG_MTD_SPI_NAND is not set
|
||||
|
||||
#
|
||||
# ECC engine support
|
||||
#
|
||||
# end of ECC engine support
|
||||
# end of NAND
|
||||
|
||||
#
|
||||
@ -2143,7 +2167,6 @@ CONFIG_OF_DYNAMIC=y
|
||||
CONFIG_OF_ADDRESS=y
|
||||
CONFIG_OF_IRQ=y
|
||||
CONFIG_OF_NET=y
|
||||
CONFIG_OF_MDIO=y
|
||||
CONFIG_OF_RESERVED_MEM=y
|
||||
CONFIG_OF_RESOLVE=y
|
||||
CONFIG_OF_OVERLAY=y
|
||||
@ -2220,6 +2243,7 @@ CONFIG_SRAM=y
|
||||
CONFIG_XILINX_SDFEC=m
|
||||
CONFIG_MISC_RTSX=m
|
||||
# CONFIG_PVPANIC is not set
|
||||
# CONFIG_HISI_HIKEY_USB is not set
|
||||
# CONFIG_C2PORT is not set
|
||||
|
||||
#
|
||||
@ -2248,13 +2272,6 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
|
||||
# CONFIG_SENSORS_LIS3_SPI is not set
|
||||
# CONFIG_SENSORS_LIS3_I2C is not set
|
||||
# CONFIG_ALTERA_STAPL is not set
|
||||
|
||||
#
|
||||
# Intel MIC & related support
|
||||
#
|
||||
# CONFIG_VOP_BUS is not set
|
||||
# end of Intel MIC & related support
|
||||
|
||||
CONFIG_GENWQE=m
|
||||
CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
|
||||
# CONFIG_ECHO is not set
|
||||
@ -2316,7 +2333,6 @@ CONFIG_ISCSI_TCP=m
|
||||
# CONFIG_SCSI_AIC79XX is not set
|
||||
# CONFIG_SCSI_AIC94XX is not set
|
||||
CONFIG_SCSI_HISI_SAS=y
|
||||
# CONFIG_SCSI_HISI_SAS_PCI is not set
|
||||
# CONFIG_SCSI_MVSAS is not set
|
||||
# CONFIG_SCSI_MVUMI is not set
|
||||
# CONFIG_SCSI_ADVANSYS is not set
|
||||
@ -2504,6 +2520,13 @@ CONFIG_DM_SWITCH=m
|
||||
CONFIG_DM_LOG_WRITES=m
|
||||
CONFIG_DM_INTEGRITY=m
|
||||
CONFIG_DM_ZONED=m
|
||||
CONFIG_TARGET_CORE=m
|
||||
CONFIG_TCM_IBLOCK=m
|
||||
CONFIG_TCM_FILEIO=m
|
||||
CONFIG_TCM_PSCSI=m
|
||||
CONFIG_TCM_USER2=m
|
||||
# CONFIG_LOOPBACK_TARGET is not set
|
||||
CONFIG_ISCSI_TARGET=m
|
||||
# CONFIG_FUSION is not set
|
||||
|
||||
#
|
||||
@ -2598,6 +2621,7 @@ CONFIG_NET_DSA_MICROCHIP_KSZ8795_SPI=m
|
||||
CONFIG_NET_DSA_MV88E6XXX=m
|
||||
CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
|
||||
# CONFIG_NET_DSA_MV88E6XXX_PTP is not set
|
||||
# CONFIG_NET_DSA_MSCC_SEVILLE is not set
|
||||
CONFIG_NET_DSA_AR9331=m
|
||||
CONFIG_NET_DSA_SJA1105=m
|
||||
# CONFIG_NET_DSA_SJA1105_PTP is not set
|
||||
@ -2736,6 +2760,7 @@ CONFIG_OCTEONTX2_MBOX=m
|
||||
# CONFIG_OCTEONTX2_AF is not set
|
||||
CONFIG_OCTEONTX2_PF=m
|
||||
CONFIG_OCTEONTX2_VF=m
|
||||
# CONFIG_PRESTERA is not set
|
||||
CONFIG_NET_VENDOR_MELLANOX=y
|
||||
# CONFIG_MLX4_EN is not set
|
||||
# CONFIG_MLX5_CORE is not set
|
||||
@ -2825,6 +2850,7 @@ CONFIG_DWMAC_MESON=m
|
||||
CONFIG_DWMAC_ROCKCHIP=m
|
||||
CONFIG_DWMAC_SUNXI=m
|
||||
CONFIG_DWMAC_SUN8I=m
|
||||
# CONFIG_DWMAC_INTEL_PLAT is not set
|
||||
# CONFIG_STMMAC_PCI is not set
|
||||
CONFIG_NET_VENDOR_SUN=y
|
||||
# CONFIG_HAPPYMEAL is not set
|
||||
@ -2849,63 +2875,36 @@ CONFIG_XILINX_AXI_EMAC=m
|
||||
CONFIG_XILINX_LL_TEMAC=m
|
||||
# CONFIG_FDDI is not set
|
||||
# CONFIG_HIPPI is not set
|
||||
CONFIG_MDIO_DEVICE=y
|
||||
CONFIG_MDIO_BUS=y
|
||||
CONFIG_MDIO_DEVRES=y
|
||||
CONFIG_MDIO_BCM_UNIMAC=m
|
||||
CONFIG_MDIO_BITBANG=y
|
||||
CONFIG_MDIO_BUS_MUX=y
|
||||
# CONFIG_MDIO_BUS_MUX_GPIO is not set
|
||||
CONFIG_MDIO_BUS_MUX_MESON_G12A=m
|
||||
CONFIG_MDIO_BUS_MUX_MMIOREG=y
|
||||
CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m
|
||||
CONFIG_MDIO_CAVIUM=y
|
||||
# CONFIG_MDIO_GPIO is not set
|
||||
# CONFIG_MDIO_HISI_FEMAC is not set
|
||||
CONFIG_MDIO_I2C=m
|
||||
# CONFIG_MDIO_IPQ4019 is not set
|
||||
CONFIG_MDIO_IPQ8064=m
|
||||
CONFIG_MDIO_MSCC_MIIM=m
|
||||
CONFIG_MDIO_MVUSB=m
|
||||
# CONFIG_MDIO_OCTEON is not set
|
||||
CONFIG_MDIO_SUN4I=m
|
||||
CONFIG_MDIO_THUNDER=y
|
||||
CONFIG_MDIO_XPCS=m
|
||||
CONFIG_PHYLINK=y
|
||||
CONFIG_PHYLIB=y
|
||||
CONFIG_SWPHY=y
|
||||
CONFIG_LED_TRIGGER_PHY=y
|
||||
CONFIG_FIXED_PHY=y
|
||||
CONFIG_SFP=m
|
||||
|
||||
#
|
||||
# MII PHY device drivers
|
||||
#
|
||||
CONFIG_SFP=m
|
||||
CONFIG_ADIN_PHY=m
|
||||
CONFIG_AMD_PHY=m
|
||||
CONFIG_MESON_GXL_PHY=m
|
||||
CONFIG_ADIN_PHY=m
|
||||
CONFIG_AQUANTIA_PHY=m
|
||||
CONFIG_AX88796B_PHY=m
|
||||
CONFIG_BCM7XXX_PHY=m
|
||||
CONFIG_BCM87XX_PHY=m
|
||||
CONFIG_BCM_NET_PHYLIB=m
|
||||
CONFIG_BROADCOM_PHY=m
|
||||
# CONFIG_BCM54140_PHY is not set
|
||||
CONFIG_BCM7XXX_PHY=m
|
||||
CONFIG_BCM84881_PHY=m
|
||||
CONFIG_BCM87XX_PHY=m
|
||||
CONFIG_BCM_NET_PHYLIB=m
|
||||
CONFIG_CICADA_PHY=m
|
||||
# CONFIG_CORTINA_PHY is not set
|
||||
CONFIG_DAVICOM_PHY=m
|
||||
# CONFIG_DP83822_PHY is not set
|
||||
CONFIG_DP83TC811_PHY=m
|
||||
CONFIG_DP83848_PHY=m
|
||||
# CONFIG_DP83867_PHY is not set
|
||||
CONFIG_DP83869_PHY=m
|
||||
CONFIG_FIXED_PHY=y
|
||||
CONFIG_ICPLUS_PHY=m
|
||||
CONFIG_LXT_PHY=m
|
||||
# CONFIG_INTEL_XWAY_PHY is not set
|
||||
CONFIG_LSI_ET1011C_PHY=m
|
||||
CONFIG_LXT_PHY=m
|
||||
CONFIG_MARVELL_PHY=m
|
||||
CONFIG_MARVELL_10G_PHY=m
|
||||
CONFIG_MESON_GXL_PHY=m
|
||||
CONFIG_MICREL_PHY=y
|
||||
CONFIG_MICROCHIP_PHY=m
|
||||
CONFIG_MICROCHIP_T1_PHY=m
|
||||
@ -2917,12 +2916,50 @@ CONFIG_QSEMI_PHY=m
|
||||
CONFIG_REALTEK_PHY=m
|
||||
# CONFIG_RENESAS_PHY is not set
|
||||
CONFIG_ROCKCHIP_PHY=y
|
||||
# CONFIG_SMSC_PHY is not set
|
||||
CONFIG_SMSC_PHY=m
|
||||
# CONFIG_STE10XP is not set
|
||||
# CONFIG_TERANETICS_PHY is not set
|
||||
# CONFIG_DP83822_PHY is not set
|
||||
CONFIG_DP83TC811_PHY=m
|
||||
CONFIG_DP83848_PHY=m
|
||||
# CONFIG_DP83867_PHY is not set
|
||||
CONFIG_DP83869_PHY=m
|
||||
CONFIG_VITESSE_PHY=m
|
||||
# CONFIG_XILINX_GMII2RGMII is not set
|
||||
# CONFIG_MICREL_KS8995MA is not set
|
||||
CONFIG_MDIO_DEVICE=y
|
||||
CONFIG_MDIO_BUS=y
|
||||
CONFIG_OF_MDIO=y
|
||||
CONFIG_MDIO_DEVRES=y
|
||||
CONFIG_MDIO_SUN4I=m
|
||||
CONFIG_MDIO_BITBANG=y
|
||||
CONFIG_MDIO_BCM_UNIMAC=m
|
||||
CONFIG_MDIO_CAVIUM=y
|
||||
# CONFIG_MDIO_GPIO is not set
|
||||
# CONFIG_MDIO_HISI_FEMAC is not set
|
||||
CONFIG_MDIO_I2C=m
|
||||
CONFIG_MDIO_MVUSB=m
|
||||
CONFIG_MDIO_MSCC_MIIM=m
|
||||
# CONFIG_MDIO_OCTEON is not set
|
||||
# CONFIG_MDIO_IPQ4019 is not set
|
||||
CONFIG_MDIO_IPQ8064=m
|
||||
CONFIG_MDIO_THUNDER=y
|
||||
|
||||
#
|
||||
# MDIO Multiplexers
|
||||
#
|
||||
CONFIG_MDIO_BUS_MUX=y
|
||||
CONFIG_MDIO_BUS_MUX_MESON_G12A=m
|
||||
# CONFIG_MDIO_BUS_MUX_GPIO is not set
|
||||
CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m
|
||||
CONFIG_MDIO_BUS_MUX_MMIOREG=y
|
||||
|
||||
#
|
||||
# PCS device drivers
|
||||
#
|
||||
CONFIG_PCS_XPCS=m
|
||||
# end of PCS device drivers
|
||||
|
||||
CONFIG_PPP=m
|
||||
CONFIG_PPP_BSDCOMP=m
|
||||
CONFIG_PPP_DEFLATE=m
|
||||
@ -3033,6 +3070,7 @@ CONFIG_ATH10K_USB=m
|
||||
# CONFIG_ATH10K_DEBUGFS is not set
|
||||
# CONFIG_ATH10K_TRACING is not set
|
||||
# CONFIG_WCN36XX is not set
|
||||
# CONFIG_ATH11K is not set
|
||||
CONFIG_WLAN_VENDOR_ATMEL=y
|
||||
CONFIG_ATMEL=m
|
||||
CONFIG_PCI_ATMEL=m
|
||||
@ -3430,6 +3468,7 @@ CONFIG_TOUCHSCREEN_ZET6223=m
|
||||
CONFIG_TOUCHSCREEN_ZFORCE=m
|
||||
CONFIG_TOUCHSCREEN_ROHM_BU21023=m
|
||||
CONFIG_TOUCHSCREEN_IQS5XX=m
|
||||
# CONFIG_TOUCHSCREEN_ZINITIX is not set
|
||||
CONFIG_INPUT_MISC=y
|
||||
# CONFIG_INPUT_AD714X is not set
|
||||
# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
|
||||
@ -3474,6 +3513,7 @@ CONFIG_RMI4_F11=y
|
||||
CONFIG_RMI4_F12=y
|
||||
CONFIG_RMI4_F30=y
|
||||
# CONFIG_RMI4_F34 is not set
|
||||
# CONFIG_RMI4_F3A is not set
|
||||
# CONFIG_RMI4_F54 is not set
|
||||
# CONFIG_RMI4_F55 is not set
|
||||
|
||||
@ -3609,6 +3649,7 @@ CONFIG_HW_RANDOM=m
|
||||
CONFIG_HW_RANDOM_MESON=m
|
||||
CONFIG_HW_RANDOM_CAVIUM=m
|
||||
# CONFIG_HW_RANDOM_CCTRNG is not set
|
||||
# CONFIG_HW_RANDOM_XIPHERA is not set
|
||||
# CONFIG_APPLICOM is not set
|
||||
CONFIG_DEVMEM=y
|
||||
# CONFIG_RAW_DRIVER is not set
|
||||
@ -3709,6 +3750,7 @@ CONFIG_I2C_CROS_EC_TUNNEL=y
|
||||
CONFIG_I2C_STUB=m
|
||||
CONFIG_I2C_SLAVE=y
|
||||
CONFIG_I2C_SLAVE_EEPROM=m
|
||||
# CONFIG_I2C_SLAVE_TESTUNIT is not set
|
||||
# CONFIG_I2C_DEBUG_CORE is not set
|
||||
# CONFIG_I2C_DEBUG_ALGO is not set
|
||||
# CONFIG_I2C_DEBUG_BUS is not set
|
||||
@ -3813,6 +3855,12 @@ CONFIG_PINCTRL_STMFX=m
|
||||
CONFIG_PINCTRL_MAX77620=y
|
||||
CONFIG_PINCTRL_RK805=y
|
||||
# CONFIG_PINCTRL_OCELOT is not set
|
||||
|
||||
#
|
||||
# Renesas pinctrl drivers
|
||||
#
|
||||
# end of Renesas pinctrl drivers
|
||||
|
||||
CONFIG_PINCTRL_SUNXI=y
|
||||
# CONFIG_PINCTRL_SUN4I_A10 is not set
|
||||
CONFIG_PINCTRL_SUN5I=y
|
||||
@ -3830,6 +3878,8 @@ CONFIG_PINCTRL_SUN9I_A80=y
|
||||
CONFIG_PINCTRL_SUN9I_A80_R=y
|
||||
CONFIG_PINCTRL_SUN50I_A64=y
|
||||
CONFIG_PINCTRL_SUN50I_A64_R=y
|
||||
CONFIG_PINCTRL_SUN50I_A100=y
|
||||
CONFIG_PINCTRL_SUN50I_A100_R=y
|
||||
CONFIG_PINCTRL_SUN50I_H5=y
|
||||
CONFIG_PINCTRL_SUN50I_H6=y
|
||||
CONFIG_PINCTRL_SUN50I_H6_R=y
|
||||
@ -3847,6 +3897,8 @@ CONFIG_OF_GPIO=y
|
||||
CONFIG_GPIOLIB_IRQCHIP=y
|
||||
# CONFIG_DEBUG_GPIO is not set
|
||||
CONFIG_GPIO_SYSFS=y
|
||||
CONFIG_GPIO_CDEV=y
|
||||
CONFIG_GPIO_CDEV_V1=y
|
||||
CONFIG_GPIO_GENERIC=y
|
||||
CONFIG_GPIO_MAX730X=m
|
||||
|
||||
@ -3966,9 +4018,6 @@ CONFIG_W1_SLAVE_DS28E04=m
|
||||
CONFIG_W1_SLAVE_DS28E17=m
|
||||
# end of 1-wire Slaves
|
||||
|
||||
CONFIG_POWER_AVS=y
|
||||
CONFIG_QCOM_CPR=m
|
||||
CONFIG_ROCKCHIP_IODOMAIN=y
|
||||
CONFIG_POWER_RESET=y
|
||||
# CONFIG_POWER_RESET_AS3722 is not set
|
||||
CONFIG_POWER_RESET_BRCMSTB=y
|
||||
@ -3994,7 +4043,6 @@ CONFIG_BATTERY_DS2760=m
|
||||
CONFIG_BATTERY_DS2780=m
|
||||
CONFIG_BATTERY_DS2781=m
|
||||
CONFIG_BATTERY_DS2782=m
|
||||
CONFIG_BATTERY_LEGO_EV3=m
|
||||
CONFIG_BATTERY_SBS=m
|
||||
CONFIG_CHARGER_SBS=m
|
||||
CONFIG_MANAGER_SBS=m
|
||||
@ -4023,6 +4071,7 @@ CONFIG_CHARGER_MAX77650=m
|
||||
# CONFIG_CHARGER_BQ24735 is not set
|
||||
# CONFIG_CHARGER_BQ2515X is not set
|
||||
# CONFIG_CHARGER_BQ25890 is not set
|
||||
# CONFIG_CHARGER_BQ25980 is not set
|
||||
# CONFIG_CHARGER_SMB347 is not set
|
||||
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
|
||||
CONFIG_BATTERY_RT5033=m
|
||||
@ -4031,6 +4080,7 @@ CONFIG_BATTERY_RT5033=m
|
||||
CONFIG_CHARGER_UCS1002=m
|
||||
CONFIG_CHARGER_BD70528=m
|
||||
# CONFIG_CHARGER_BD99954 is not set
|
||||
# CONFIG_RN5T618_POWER is not set
|
||||
CONFIG_HWMON=y
|
||||
CONFIG_HWMON_VID=m
|
||||
# CONFIG_HWMON_DEBUG_CHIP is not set
|
||||
@ -4107,6 +4157,7 @@ CONFIG_SENSORS_MAX6697=m
|
||||
CONFIG_SENSORS_MAX31790=m
|
||||
CONFIG_SENSORS_MCP3021=m
|
||||
CONFIG_SENSORS_TC654=m
|
||||
# CONFIG_SENSORS_MR75203 is not set
|
||||
CONFIG_SENSORS_ADCXX=m
|
||||
CONFIG_SENSORS_LM63=m
|
||||
CONFIG_SENSORS_LM70=m
|
||||
@ -4137,6 +4188,7 @@ CONFIG_SENSORS_OCC=m
|
||||
CONFIG_SENSORS_PCF8591=m
|
||||
CONFIG_PMBUS=m
|
||||
CONFIG_SENSORS_PMBUS=m
|
||||
# CONFIG_SENSORS_ADM1266 is not set
|
||||
CONFIG_SENSORS_ADM1275=m
|
||||
CONFIG_SENSORS_BEL_PFE=m
|
||||
CONFIG_SENSORS_IBM_CFFPS=m
|
||||
@ -4156,6 +4208,7 @@ CONFIG_SENSORS_MAX20751=m
|
||||
CONFIG_SENSORS_MAX31785=m
|
||||
CONFIG_SENSORS_MAX34440=m
|
||||
CONFIG_SENSORS_MAX8688=m
|
||||
# CONFIG_SENSORS_MP2975 is not set
|
||||
CONFIG_SENSORS_PXE1610=m
|
||||
CONFIG_SENSORS_TPS40422=m
|
||||
CONFIG_SENSORS_TPS53679=m
|
||||
@ -4374,6 +4427,7 @@ CONFIG_MFD_RK808=y
|
||||
CONFIG_MFD_RN5T618=m
|
||||
CONFIG_MFD_SEC_CORE=y
|
||||
# CONFIG_MFD_SI476X_CORE is not set
|
||||
# CONFIG_MFD_SL28CPLD is not set
|
||||
# CONFIG_MFD_SM501 is not set
|
||||
# CONFIG_MFD_SKY81452 is not set
|
||||
# CONFIG_ABX500_CORE is not set
|
||||
@ -4422,6 +4476,7 @@ CONFIG_MFD_STMFX=m
|
||||
# CONFIG_MFD_KHADAS_MCU is not set
|
||||
CONFIG_MFD_VEXPRESS_SYSREG=y
|
||||
CONFIG_RAVE_SP_CORE=m
|
||||
# CONFIG_MFD_INTEL_M10_BMC is not set
|
||||
# end of Multifunction device drivers
|
||||
|
||||
CONFIG_REGULATOR=y
|
||||
@ -4474,11 +4529,14 @@ CONFIG_REGULATOR_MPQ7920=m
|
||||
CONFIG_REGULATOR_PWM=y
|
||||
CONFIG_REGULATOR_QCOM_SPMI=y
|
||||
# CONFIG_REGULATOR_QCOM_USB_VBUS is not set
|
||||
# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
|
||||
CONFIG_REGULATOR_RC5T583=m
|
||||
CONFIG_REGULATOR_RK808=y
|
||||
CONFIG_REGULATOR_RN5T618=m
|
||||
CONFIG_REGULATOR_ROHM=m
|
||||
# CONFIG_REGULATOR_RT4801 is not set
|
||||
CONFIG_REGULATOR_RT5033=m
|
||||
# CONFIG_REGULATOR_RTMV20 is not set
|
||||
# CONFIG_REGULATOR_S2MPA01 is not set
|
||||
CONFIG_REGULATOR_S2MPS11=y
|
||||
# CONFIG_REGULATOR_S5M8767 is not set
|
||||
@ -4828,6 +4886,7 @@ CONFIG_SDR_PLATFORM_DRIVERS=y
|
||||
#
|
||||
CONFIG_SMS_SDIO_DRV=m
|
||||
# CONFIG_V4L_TEST_DRIVERS is not set
|
||||
# CONFIG_DVB_TEST_DRIVERS is not set
|
||||
# end of Media drivers
|
||||
|
||||
#
|
||||
@ -5311,7 +5370,6 @@ CONFIG_ROCKCHIP_LVDS=y
|
||||
# CONFIG_DRM_MGAG200 is not set
|
||||
# CONFIG_DRM_RCAR_DW_HDMI is not set
|
||||
CONFIG_DRM_RCAR_LVDS=m
|
||||
CONFIG_DRM_RCAR_WRITEBACK=y
|
||||
CONFIG_DRM_SUN4I=m
|
||||
CONFIG_DRM_SUN4I_HDMI=m
|
||||
CONFIG_DRM_SUN4I_HDMI_CEC=y
|
||||
@ -5350,6 +5408,7 @@ CONFIG_DRM_PANEL_LG_LB035Q02=m
|
||||
CONFIG_DRM_PANEL_NEC_NL8048HL11=m
|
||||
CONFIG_DRM_PANEL_NOVATEK_NT35510=m
|
||||
CONFIG_DRM_PANEL_NOVATEK_NT39016=m
|
||||
# CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
|
||||
CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
|
||||
CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
|
||||
# CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set
|
||||
@ -5390,6 +5449,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
|
||||
CONFIG_DRM_CDNS_DSI=m
|
||||
# CONFIG_DRM_CHRONTEL_CH7033 is not set
|
||||
CONFIG_DRM_DISPLAY_CONNECTOR=m
|
||||
# CONFIG_DRM_LONTIUM_LT9611 is not set
|
||||
CONFIG_DRM_LVDS_CODEC=m
|
||||
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
|
||||
# CONFIG_DRM_NWL_MIPI_DSI is not set
|
||||
@ -5401,9 +5461,11 @@ CONFIG_DRM_PARADE_PS8640=m
|
||||
CONFIG_DRM_SII9234=m
|
||||
# CONFIG_DRM_SIMPLE_BRIDGE is not set
|
||||
CONFIG_DRM_THINE_THC63LVD1024=m
|
||||
# CONFIG_DRM_TOSHIBA_TC358762 is not set
|
||||
CONFIG_DRM_TOSHIBA_TC358764=m
|
||||
# CONFIG_DRM_TOSHIBA_TC358767 is not set
|
||||
CONFIG_DRM_TOSHIBA_TC358768=m
|
||||
# CONFIG_DRM_TOSHIBA_TC358775 is not set
|
||||
# CONFIG_DRM_TI_TFP410 is not set
|
||||
# CONFIG_DRM_TI_SN65DSI86 is not set
|
||||
CONFIG_DRM_TI_TPD12S015=m
|
||||
@ -5413,6 +5475,7 @@ CONFIG_DRM_ANALOGIX_DP=m
|
||||
CONFIG_DRM_I2C_ADV7511=m
|
||||
# CONFIG_DRM_I2C_ADV7511_AUDIO is not set
|
||||
CONFIG_DRM_I2C_ADV7511_CEC=y
|
||||
# CONFIG_DRM_CDNS_MHDP8546 is not set
|
||||
CONFIG_DRM_DW_HDMI=m
|
||||
# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
|
||||
CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
|
||||
@ -5532,6 +5595,7 @@ CONFIG_LCD_CLASS_DEVICE=m
|
||||
# CONFIG_LCD_HX8357 is not set
|
||||
CONFIG_LCD_OTM3225A=m
|
||||
CONFIG_BACKLIGHT_CLASS_DEVICE=y
|
||||
# CONFIG_BACKLIGHT_KTD253 is not set
|
||||
CONFIG_BACKLIGHT_LM3533=m
|
||||
CONFIG_BACKLIGHT_PWM=m
|
||||
CONFIG_BACKLIGHT_QCOM_WLED=m
|
||||
@ -5826,6 +5890,7 @@ CONFIG_SND_SOC_CS35L36=m
|
||||
# CONFIG_SND_SOC_CS42L52 is not set
|
||||
# CONFIG_SND_SOC_CS42L56 is not set
|
||||
# CONFIG_SND_SOC_CS42L73 is not set
|
||||
# CONFIG_SND_SOC_CS4234 is not set
|
||||
# CONFIG_SND_SOC_CS4265 is not set
|
||||
# CONFIG_SND_SOC_CS4270 is not set
|
||||
# CONFIG_SND_SOC_CS4271_I2C is not set
|
||||
@ -5900,6 +5965,7 @@ CONFIG_SND_SOC_STA350=m
|
||||
CONFIG_SND_SOC_STI_SAS=m
|
||||
CONFIG_SND_SOC_TAS2552=m
|
||||
CONFIG_SND_SOC_TAS2562=m
|
||||
# CONFIG_SND_SOC_TAS2764 is not set
|
||||
CONFIG_SND_SOC_TAS2770=m
|
||||
CONFIG_SND_SOC_TAS5086=m
|
||||
CONFIG_SND_SOC_TAS571X=m
|
||||
@ -6010,6 +6076,7 @@ CONFIG_HID_GLORIOUS=m
|
||||
CONFIG_HID_HOLTEK=m
|
||||
CONFIG_HOLTEK_FF=y
|
||||
CONFIG_HID_GOOGLE_HAMMER=m
|
||||
# CONFIG_HID_VIVALDI is not set
|
||||
CONFIG_HID_GT683R=m
|
||||
CONFIG_HID_KEYTOUCH=m
|
||||
CONFIG_HID_KYE=m
|
||||
@ -6118,6 +6185,7 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
|
||||
# Miscellaneous USB options
|
||||
#
|
||||
CONFIG_USB_DEFAULT_PERSIST=y
|
||||
# CONFIG_USB_FEW_INIT_RETRIES is not set
|
||||
# CONFIG_USB_DYNAMIC_MINORS is not set
|
||||
CONFIG_USB_OTG=y
|
||||
# CONFIG_USB_OTG_PRODUCTLIST is not set
|
||||
@ -6421,6 +6489,7 @@ CONFIG_USB_CONFIGFS_F_MIDI=y
|
||||
CONFIG_USB_CONFIGFS_F_HID=y
|
||||
CONFIG_USB_CONFIGFS_F_UVC=y
|
||||
CONFIG_USB_CONFIGFS_F_PRINTER=y
|
||||
# CONFIG_USB_CONFIGFS_F_TCM is not set
|
||||
|
||||
#
|
||||
# USB Gadget precomposed configurations
|
||||
@ -6439,6 +6508,7 @@ CONFIG_USB_FUNCTIONFS_ETH=y
|
||||
CONFIG_USB_FUNCTIONFS_RNDIS=y
|
||||
CONFIG_USB_FUNCTIONFS_GENERIC=y
|
||||
CONFIG_USB_MASS_STORAGE=m
|
||||
# CONFIG_USB_GADGET_TARGET is not set
|
||||
CONFIG_USB_G_SERIAL=m
|
||||
CONFIG_USB_MIDI_GADGET=m
|
||||
CONFIG_USB_G_PRINTER=m
|
||||
@ -6458,11 +6528,13 @@ CONFIG_TYPEC=m
|
||||
CONFIG_TYPEC_TCPM=m
|
||||
CONFIG_TYPEC_TCPCI=m
|
||||
CONFIG_TYPEC_RT1711H=m
|
||||
# CONFIG_TYPEC_TCPCI_MAXIM is not set
|
||||
CONFIG_TYPEC_FUSB302=m
|
||||
CONFIG_TYPEC_UCSI=m
|
||||
CONFIG_UCSI_CCG=m
|
||||
CONFIG_TYPEC_HD3SS3220=m
|
||||
CONFIG_TYPEC_TPS6598X=m
|
||||
# CONFIG_TYPEC_STUSB160X is not set
|
||||
|
||||
#
|
||||
# USB Type-C Multiplexer/DeMultiplexer Switch support
|
||||
@ -6557,6 +6629,7 @@ CONFIG_LEDS_LM3692X=m
|
||||
CONFIG_LEDS_GPIO=y
|
||||
# CONFIG_LEDS_LP3944 is not set
|
||||
# CONFIG_LEDS_LP3952 is not set
|
||||
# CONFIG_LEDS_LP50XX is not set
|
||||
# CONFIG_LEDS_LP55XX_COMMON is not set
|
||||
# CONFIG_LEDS_LP8860 is not set
|
||||
# CONFIG_LEDS_PCA955X is not set
|
||||
@ -6674,6 +6747,7 @@ CONFIG_RTC_DRV_RX8581=m
|
||||
CONFIG_RTC_DRV_RX8025=m
|
||||
CONFIG_RTC_DRV_EM3027=m
|
||||
CONFIG_RTC_DRV_RV3028=m
|
||||
# CONFIG_RTC_DRV_RV3032 is not set
|
||||
CONFIG_RTC_DRV_RV8803=m
|
||||
CONFIG_RTC_DRV_S5M=m
|
||||
CONFIG_RTC_DRV_SD3078=m
|
||||
@ -6824,6 +6898,7 @@ CONFIG_VIRTIO_BALLOON=y
|
||||
CONFIG_VIRTIO_INPUT=m
|
||||
CONFIG_VIRTIO_MMIO=y
|
||||
# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
|
||||
CONFIG_VIRTIO_DMA_SHARED_BUFFER=m
|
||||
CONFIG_VDPA=m
|
||||
CONFIG_VDPA_SIM=m
|
||||
CONFIG_IFCVF=m
|
||||
@ -6832,6 +6907,7 @@ CONFIG_VHOST_RING=m
|
||||
CONFIG_VHOST=m
|
||||
CONFIG_VHOST_MENU=y
|
||||
CONFIG_VHOST_NET=m
|
||||
# CONFIG_VHOST_SCSI is not set
|
||||
# CONFIG_VHOST_VSOCK is not set
|
||||
CONFIG_VHOST_VDPA=m
|
||||
# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
|
||||
@ -6858,6 +6934,7 @@ CONFIG_XEN_GRANT_DEV_ALLOC=y
|
||||
CONFIG_SWIOTLB_XEN=y
|
||||
# CONFIG_XEN_PVCALLS_FRONTEND is not set
|
||||
# CONFIG_XEN_PVCALLS_BACKEND is not set
|
||||
# CONFIG_XEN_SCSI_BACKEND is not set
|
||||
CONFIG_XEN_PRIVCMD=y
|
||||
CONFIG_XEN_EFI=y
|
||||
CONFIG_XEN_AUTO_XLATE=y
|
||||
@ -6946,9 +7023,8 @@ CONFIG_VIDEO_MESON_VDEC=m
|
||||
CONFIG_VIDEO_ROCKCHIP_VDEC=m
|
||||
CONFIG_VIDEO_SUNXI=y
|
||||
CONFIG_VIDEO_SUNXI_CEDRUS=m
|
||||
CONFIG_PHY_ROCKCHIP_DPHY_RX0=m
|
||||
# CONFIG_VIDEO_ZORAN is not set
|
||||
CONFIG_VIDEO_ROCKCHIP_ISP1=m
|
||||
CONFIG_VIDEO_USBVISION=m
|
||||
|
||||
#
|
||||
# Android
|
||||
@ -7011,8 +7087,9 @@ CONFIG_HMS_ANYBUSS_BUS=m
|
||||
# CONFIG_KPC2000 is not set
|
||||
# CONFIG_QLGE is not set
|
||||
CONFIG_WFX=m
|
||||
# CONFIG_SPMI_HISI3670 is not set
|
||||
# CONFIG_MFD_HI6421_SPMI is not set
|
||||
# CONFIG_GOLDFISH is not set
|
||||
CONFIG_MFD_CROS_EC=y
|
||||
CONFIG_CHROME_PLATFORMS=y
|
||||
CONFIG_CROS_EC=y
|
||||
# CONFIG_CROS_EC_I2C is not set
|
||||
@ -7031,7 +7108,6 @@ CONFIG_HAVE_CLK=y
|
||||
CONFIG_CLKDEV_LOOKUP=y
|
||||
CONFIG_HAVE_CLK_PREPARE=y
|
||||
CONFIG_COMMON_CLK=y
|
||||
# CONFIG_CLK_HSDK is not set
|
||||
# CONFIG_COMMON_CLK_MAX77686 is not set
|
||||
# CONFIG_COMMON_CLK_MAX9485 is not set
|
||||
CONFIG_COMMON_CLK_RK808=y
|
||||
@ -7051,6 +7127,10 @@ CONFIG_COMMON_CLK_PWM=y
|
||||
# CONFIG_COMMON_CLK_VC5 is not set
|
||||
CONFIG_COMMON_CLK_BD718XX=m
|
||||
# CONFIG_COMMON_CLK_FIXED_MMIO is not set
|
||||
|
||||
#
|
||||
# Clock support for Amlogic platforms
|
||||
#
|
||||
CONFIG_COMMON_CLK_MESON_REGMAP=y
|
||||
CONFIG_COMMON_CLK_MESON_DUALDIV=y
|
||||
CONFIG_COMMON_CLK_MESON_MPLL=y
|
||||
@ -7065,6 +7145,19 @@ CONFIG_COMMON_CLK_GXBB=y
|
||||
CONFIG_COMMON_CLK_AXG=y
|
||||
CONFIG_COMMON_CLK_AXG_AUDIO=m
|
||||
CONFIG_COMMON_CLK_G12A=y
|
||||
# end of Clock support for Amlogic platforms
|
||||
|
||||
CONFIG_COMMON_CLK_ROCKCHIP=y
|
||||
CONFIG_CLK_PX30=y
|
||||
CONFIG_CLK_RV110X=y
|
||||
CONFIG_CLK_RK3036=y
|
||||
CONFIG_CLK_RK312X=y
|
||||
CONFIG_CLK_RK3188=y
|
||||
CONFIG_CLK_RK322X=y
|
||||
CONFIG_CLK_RK3308=y
|
||||
CONFIG_CLK_RK3328=y
|
||||
CONFIG_CLK_RK3368=y
|
||||
CONFIG_CLK_RK3399=y
|
||||
CONFIG_CLK_SUNXI=y
|
||||
CONFIG_CLK_SUNXI_CLOCKS=y
|
||||
CONFIG_CLK_SUNXI_PRCM_SUN6I=y
|
||||
@ -7072,6 +7165,8 @@ CONFIG_CLK_SUNXI_PRCM_SUN8I=y
|
||||
CONFIG_CLK_SUNXI_PRCM_SUN9I=y
|
||||
CONFIG_SUNXI_CCU=y
|
||||
CONFIG_SUN50I_A64_CCU=y
|
||||
CONFIG_SUN50I_A100_CCU=y
|
||||
CONFIG_SUN50I_A100_R_CCU=y
|
||||
CONFIG_SUN50I_H6_CCU=y
|
||||
CONFIG_SUN50I_H6_R_CCU=y
|
||||
CONFIG_SUN8I_A83T_CCU=y
|
||||
@ -7128,6 +7223,7 @@ CONFIG_ARM_SMMU=y
|
||||
# CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
|
||||
CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
|
||||
CONFIG_ARM_SMMU_V3=y
|
||||
# CONFIG_ARM_SMMU_V3_SVA is not set
|
||||
# CONFIG_VIRTIO_IOMMU is not set
|
||||
|
||||
#
|
||||
@ -7190,6 +7286,7 @@ CONFIG_SOC_BRCMSTB=y
|
||||
# end of Qualcomm SoC drivers
|
||||
|
||||
CONFIG_ROCKCHIP_GRF=y
|
||||
CONFIG_ROCKCHIP_IODOMAIN=y
|
||||
CONFIG_ROCKCHIP_PM_DOMAINS=y
|
||||
# CONFIG_ROCKCHIP_SUSPEND_MODE is not set
|
||||
CONFIG_SUNXI_SRAM=y
|
||||
@ -7240,6 +7337,8 @@ CONFIG_EXTCON_USB_GPIO=y
|
||||
CONFIG_IIO=y
|
||||
CONFIG_IIO_BUFFER=y
|
||||
CONFIG_IIO_BUFFER_CB=m
|
||||
# CONFIG_IIO_BUFFER_DMA is not set
|
||||
# CONFIG_IIO_BUFFER_DMAENGINE is not set
|
||||
# CONFIG_IIO_BUFFER_HW_CONSUMER is not set
|
||||
CONFIG_IIO_KFIFO_BUF=y
|
||||
CONFIG_IIO_TRIGGERED_BUFFER=y
|
||||
@ -7248,6 +7347,7 @@ CONFIG_IIO_TRIGGER=y
|
||||
CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
|
||||
CONFIG_IIO_SW_DEVICE=m
|
||||
CONFIG_IIO_SW_TRIGGER=m
|
||||
# CONFIG_IIO_TRIGGERED_EVENT is not set
|
||||
|
||||
#
|
||||
# Accelerometers
|
||||
@ -7493,6 +7593,7 @@ CONFIG_ADIS16080=m
|
||||
CONFIG_ADIS16130=m
|
||||
CONFIG_ADIS16136=m
|
||||
CONFIG_ADIS16260=m
|
||||
# CONFIG_ADXRS290 is not set
|
||||
CONFIG_ADXRS450=m
|
||||
CONFIG_BMG160=m
|
||||
CONFIG_BMG160_I2C=m
|
||||
@ -7529,6 +7630,7 @@ CONFIG_ITG3200=m
|
||||
CONFIG_AM2315=m
|
||||
CONFIG_DHT11=m
|
||||
CONFIG_HDC100X=m
|
||||
# CONFIG_HDC2010 is not set
|
||||
CONFIG_HID_SENSOR_HUMIDITY=m
|
||||
CONFIG_HTS221=m
|
||||
CONFIG_HTS221_I2C=m
|
||||
@ -7570,6 +7672,7 @@ CONFIG_AL3010=m
|
||||
CONFIG_AL3320A=m
|
||||
CONFIG_APDS9300=m
|
||||
CONFIG_APDS9960=m
|
||||
# CONFIG_AS73211 is not set
|
||||
CONFIG_BH1750=m
|
||||
CONFIG_BH1780=m
|
||||
CONFIG_CM32181=m
|
||||
@ -7801,6 +7904,7 @@ CONFIG_RESET_SUNXI=y
|
||||
CONFIG_GENERIC_PHY=y
|
||||
CONFIG_GENERIC_PHY_MIPI_DPHY=y
|
||||
CONFIG_PHY_XGENE=y
|
||||
# CONFIG_USB_LGM_PHY is not set
|
||||
CONFIG_PHY_SUN4I_USB=m
|
||||
CONFIG_PHY_SUN6I_MIPI_DPHY=m
|
||||
CONFIG_PHY_SUN9I_USB=m
|
||||
@ -7826,6 +7930,7 @@ CONFIG_PHY_MAPPHONE_MDM6600=m
|
||||
# CONFIG_PHY_QCOM_USB_HS is not set
|
||||
# CONFIG_PHY_QCOM_USB_HSIC is not set
|
||||
CONFIG_PHY_ROCKCHIP_DP=y
|
||||
CONFIG_PHY_ROCKCHIP_DPHY_RX0=m
|
||||
CONFIG_PHY_ROCKCHIP_EMMC=y
|
||||
CONFIG_PHY_ROCKCHIP_INNO_HDMI=y
|
||||
CONFIG_PHY_ROCKCHIP_INNO_USB2=y
|
||||
@ -7836,6 +7941,7 @@ CONFIG_PHY_ROCKCHIP_TYPEC=y
|
||||
CONFIG_PHY_ROCKCHIP_USB=y
|
||||
CONFIG_PHY_SAMSUNG_USB2=y
|
||||
# CONFIG_PHY_TUSB1210 is not set
|
||||
# CONFIG_PHY_INTEL_KEEMBAY_EMMC is not set
|
||||
# end of PHY Subsystem
|
||||
|
||||
# CONFIG_POWERCAP is not set
|
||||
@ -7848,6 +7954,7 @@ CONFIG_ARM_CCI_PMU=m
|
||||
# CONFIG_ARM_CCI400_PMU is not set
|
||||
# CONFIG_ARM_CCI5xx_PMU is not set
|
||||
# CONFIG_ARM_CCN is not set
|
||||
# CONFIG_ARM_CMN is not set
|
||||
CONFIG_ARM_PMU=y
|
||||
# CONFIG_ARM_DSU_PMU is not set
|
||||
# CONFIG_ARM_SPE_PMU is not set
|
||||
@ -7905,6 +8012,7 @@ CONFIG_FTM_QUADDEC=m
|
||||
# CONFIG_MICROCHIP_TCB_CAPTURE is not set
|
||||
CONFIG_MOST=m
|
||||
# CONFIG_MOST_USB_HDM is not set
|
||||
# CONFIG_MOST_CDEV is not set
|
||||
# end of Device Drivers
|
||||
|
||||
#
|
||||
@ -7940,6 +8048,7 @@ CONFIG_JFS_SECURITY=y
|
||||
# CONFIG_JFS_DEBUG is not set
|
||||
CONFIG_JFS_STATISTICS=y
|
||||
CONFIG_XFS_FS=m
|
||||
CONFIG_XFS_SUPPORT_V4=y
|
||||
CONFIG_XFS_QUOTA=y
|
||||
CONFIG_XFS_POSIX_ACL=y
|
||||
CONFIG_XFS_RT=y
|
||||
@ -8183,6 +8292,7 @@ CONFIG_NFSD_PNFS=y
|
||||
CONFIG_NFSD_BLOCKLAYOUT=y
|
||||
CONFIG_NFSD_SCSILAYOUT=y
|
||||
CONFIG_NFSD_FLEXFILELAYOUT=y
|
||||
# CONFIG_NFSD_V4_2_INTER_SSC is not set
|
||||
CONFIG_NFSD_V4_SECURITY_LABEL=y
|
||||
CONFIG_GRACE_PERIOD=m
|
||||
CONFIG_LOCKD=m
|
||||
@ -8413,6 +8523,7 @@ CONFIG_CRYPTO_DH=y
|
||||
CONFIG_CRYPTO_ECC=y
|
||||
CONFIG_CRYPTO_ECDH=y
|
||||
CONFIG_CRYPTO_ECRDSA=m
|
||||
# CONFIG_CRYPTO_SM2 is not set
|
||||
CONFIG_CRYPTO_CURVE25519=m
|
||||
|
||||
#
|
||||
@ -8527,7 +8638,9 @@ CONFIG_CRYPTO_USER_API=m
|
||||
CONFIG_CRYPTO_USER_API_HASH=m
|
||||
CONFIG_CRYPTO_USER_API_SKCIPHER=m
|
||||
CONFIG_CRYPTO_USER_API_RNG=m
|
||||
# CONFIG_CRYPTO_USER_API_RNG_CAVP is not set
|
||||
CONFIG_CRYPTO_USER_API_AEAD=m
|
||||
CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
|
||||
CONFIG_CRYPTO_STATS=y
|
||||
CONFIG_CRYPTO_HASH_INFO=y
|
||||
|
||||
@ -8556,8 +8669,13 @@ CONFIG_CRYPTO_DEV_SUN4I_SS=m
|
||||
# CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG is not set
|
||||
CONFIG_CRYPTO_DEV_SUN8I_CE=m
|
||||
# CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG is not set
|
||||
# CONFIG_CRYPTO_DEV_SUN8I_CE_HASH is not set
|
||||
# CONFIG_CRYPTO_DEV_SUN8I_CE_PRNG is not set
|
||||
# CONFIG_CRYPTO_DEV_SUN8I_CE_TRNG is not set
|
||||
CONFIG_CRYPTO_DEV_SUN8I_SS=m
|
||||
# CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG is not set
|
||||
# CONFIG_CRYPTO_DEV_SUN8I_SS_PRNG is not set
|
||||
# CONFIG_CRYPTO_DEV_SUN8I_SS_HASH is not set
|
||||
CONFIG_CRYPTO_DEV_ATMEL_I2C=m
|
||||
CONFIG_CRYPTO_DEV_ATMEL_ECC=m
|
||||
CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
|
||||
@ -8694,6 +8812,7 @@ CONFIG_DMA_COHERENT_POOL=y
|
||||
CONFIG_DMA_REMAP=y
|
||||
CONFIG_DMA_DIRECT_REMAP=y
|
||||
CONFIG_DMA_CMA=y
|
||||
CONFIG_DMA_PERNUMA_CMA=y
|
||||
|
||||
#
|
||||
# Default contiguous memory area size:
|
||||
@ -8737,8 +8856,10 @@ CONFIG_FONT_6x10=y
|
||||
# CONFIG_FONT_SUN8x16 is not set
|
||||
# CONFIG_FONT_SUN12x22 is not set
|
||||
CONFIG_FONT_TER16x32=y
|
||||
# CONFIG_FONT_6x8 is not set
|
||||
CONFIG_SG_SPLIT=y
|
||||
CONFIG_SG_POOL=y
|
||||
CONFIG_ARCH_STACKWALK=y
|
||||
CONFIG_SBITMAP=y
|
||||
# CONFIG_STRING_SELFTEST is not set
|
||||
# end of Library routines
|
||||
@ -8874,6 +8995,8 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
|
||||
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
|
||||
# CONFIG_LOCK_TORTURE_TEST is not set
|
||||
# CONFIG_WW_MUTEX_SELFTEST is not set
|
||||
# CONFIG_SCF_TORTURE_TEST is not set
|
||||
# CONFIG_CSD_LOCK_WAIT_DEBUG is not set
|
||||
# end of Lock Debugging (spinlocks, mutexes, etc...)
|
||||
|
||||
CONFIG_STACKTRACE=y
|
||||
@ -8897,7 +9020,7 @@ CONFIG_HAVE_DEBUG_BUGVERBOSE=y
|
||||
# RCU Debugging
|
||||
#
|
||||
CONFIG_TORTURE_TEST=m
|
||||
CONFIG_RCU_PERF_TEST=m
|
||||
# CONFIG_RCU_SCALE_TEST is not set
|
||||
CONFIG_RCU_TORTURE_TEST=m
|
||||
# CONFIG_RCU_REF_SCALE_TEST is not set
|
||||
CONFIG_RCU_CPU_STALL_TIMEOUT=60
|
||||
@ -8993,7 +9116,6 @@ CONFIG_TEST_STRSCPY=m
|
||||
# CONFIG_TEST_KSTRTOX is not set
|
||||
# CONFIG_TEST_PRINTF is not set
|
||||
# CONFIG_TEST_BITMAP is not set
|
||||
# CONFIG_TEST_BITFIELD is not set
|
||||
# CONFIG_TEST_UUID is not set
|
||||
CONFIG_TEST_XARRAY=m
|
||||
# CONFIG_TEST_OVERFLOW is not set
|
||||
@ -9009,6 +9131,7 @@ CONFIG_TEST_BLACKHOLE_DEV=m
|
||||
# CONFIG_FIND_BIT_BENCHMARK is not set
|
||||
# CONFIG_TEST_FIRMWARE is not set
|
||||
# CONFIG_TEST_SYSCTL is not set
|
||||
# CONFIG_BITFIELD_KUNIT is not set
|
||||
# CONFIG_SYSCTL_KUNIT_TEST is not set
|
||||
# CONFIG_LIST_KUNIT_TEST is not set
|
||||
# CONFIG_LINEAR_RANGES_TEST is not set
|
||||
@ -9019,15 +9142,7 @@ CONFIG_TEST_BLACKHOLE_DEV=m
|
||||
CONFIG_TEST_MEMCAT_P=m
|
||||
CONFIG_TEST_STACKINIT=m
|
||||
# CONFIG_TEST_MEMINIT is not set
|
||||
# CONFIG_TEST_FREE_PAGES is not set
|
||||
CONFIG_MEMTEST=y
|
||||
# end of Kernel Testing and Coverage
|
||||
# end of Kernel hacking
|
||||
|
||||
## LinuxIO - iSCSI Target modules
|
||||
CONFIG_TARGET_CORE=m
|
||||
CONFIG_ISCSI_TARGET=m
|
||||
CONFIG_TCM_IBLOCK=m
|
||||
CONFIG_TCM_FILEIO=m
|
||||
CONFIG_TCM_PSCSI=m
|
||||
CONFIG_TCM_USER2=m
|
||||
|
||||
|
||||
@ -82,8 +82,9 @@ case $BRANCH in
|
||||
|
||||
dev)
|
||||
|
||||
MAINLINE_KERNEL_SOURCE='git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git'
|
||||
KERNELPATCHDIR='rockchip64-'$BRANCH
|
||||
KERNELBRANCH="branch:linux-5.9.y"
|
||||
KERNELBRANCH="tag:v5.10-rc5"
|
||||
LINUXFAMILY=rockchip64
|
||||
LINUXCONFIG='linux-rockchip64-'$BRANCH
|
||||
|
||||
|
||||
@ -50,10 +50,10 @@ diff --git a/drivers/bluetooth/hci_serdev.c b/drivers/bluetooth/hci_serdev.c
|
||||
index 4652896d4990..043c585b34a7 100644
|
||||
--- a/drivers/bluetooth/hci_serdev.c
|
||||
+++ b/drivers/bluetooth/hci_serdev.c
|
||||
@@ -364,5 +364,7 @@ void hci_uart_unregister_device(struct hci_uart *hu)
|
||||
|
||||
hu->proto->close(hu);
|
||||
serdev_device_close(hu->serdev);
|
||||
@@ -395,5 +395,7 @@ void hci_uart_unregister_device(struct hci_uart *hu)
|
||||
clear_bit(HCI_UART_PROTO_READY, &hu->flags);
|
||||
serdev_device_close(hu->serdev);
|
||||
}
|
||||
+
|
||||
+clear_bit(HCI_UART_REGISTERED, &hu->flags);
|
||||
}
|
||||
|
||||
@ -491,22 +491,10 @@ index 7486f6e4e613..d46a267ea309 100644
|
||||
/**
|
||||
* regulator_suspend - prepare regulators for system wide suspend
|
||||
* @dev: ``&struct device`` pointer that is passed to _regulator_suspend()
|
||||
@@ -5278,10 +5286,34 @@ static int regulator_suspend(struct device *dev)
|
||||
{
|
||||
struct regulator_dev *rdev = dev_to_rdev(dev);
|
||||
suspend_state_t state = pm_suspend_target_state;
|
||||
+ struct regulator_state *rstate;
|
||||
int ret;
|
||||
@@ -5430,6 +5438,21 @@ static int regulator_suspend(struct device *dev)
|
||||
|
||||
regulator_lock(rdev);
|
||||
ret = suspend_set_state(rdev, state);
|
||||
+ if (ret) {
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+ rstate = regulator_get_suspend_state(rdev, state);
|
||||
+ if (rstate == NULL)
|
||||
+ goto out;
|
||||
ret = __suspend_set_state(rdev, rstate);
|
||||
+
|
||||
+ if (rstate->enabled == ENABLE_IN_SUSPEND && can_enable(rdev)) {
|
||||
+ if (!rdev->desc->ops->set_suspend_enable) {
|
||||
@ -521,18 +509,16 @@ index 7486f6e4e613..d46a267ea309 100644
|
||||
+ ret = _regulator_do_disable(rdev);
|
||||
+ }
|
||||
+ }
|
||||
+out:
|
||||
+
|
||||
regulator_unlock(rdev);
|
||||
|
||||
return ret;
|
||||
@@ -5300,10 +5332,19 @@ static int regulator_resume(struct device *dev)
|
||||
@@ -5452,9 +5475,19 @@ static int regulator_resume(struct device *dev)
|
||||
|
||||
regulator_lock(rdev);
|
||||
|
||||
- if (rdev->desc->ops->resume &&
|
||||
- (rstate->enabled == ENABLE_IN_SUSPEND ||
|
||||
- rstate->enabled == DISABLE_IN_SUSPEND))
|
||||
- if (rstate->enabled == ENABLE_IN_SUSPEND ||
|
||||
- rstate->enabled == DISABLE_IN_SUSPEND)
|
||||
- ret = rdev->desc->ops->resume(rdev);
|
||||
+ if (rstate->enabled == ENABLE_IN_SUSPEND || rstate->enabled == DISABLE_IN_SUSPEND) {
|
||||
+ if (rdev->desc->ops->resume) {
|
||||
|
||||
@ -212,9 +212,9 @@ index 82b19ebd7838..6f00b17afc15 100644
|
||||
#include <linux/debugfs.h>
|
||||
#include <linux/device.h>
|
||||
+#include <linux/extcon-provider.h>
|
||||
#include <linux/hrtimer.h>
|
||||
#include <linux/jiffies.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
@@ -322,6 +323,11 @@ struct tcpm_port {
|
||||
/* port belongs to a self powered device */
|
||||
bool self_powered;
|
||||
|
||||
@ -8,9 +8,9 @@ index 92d796a33..24a6c304f 100644
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb
|
||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2-rev00.dtb
|
||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2-rev20.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtb
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-dram-default-timing.dtsi
|
||||
new file mode 100644
|
||||
index 000000000..a3f5ff4bd
|
||||
|
||||
@ -2,10 +2,10 @@ diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchi
|
||||
index 1f18a9392..06ddfb869 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/Makefile
|
||||
+++ b/arch/arm64/boot/dts/rockchip/Makefile
|
||||
@@ -2,6 +2,7 @@
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb
|
||||
@@ -3,6 +3,7 @@
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2-rev00.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2-rev20.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb
|
||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock-pi-e.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb
|
||||
|
||||
@ -1,70 +0,0 @@
|
||||
Added sys_12v regulator for header supplied voltage
|
||||
|
||||
Additionally switched all outputs from dc_12v to it to allow
|
||||
booting of the boards without USB-C.
|
||||
|
||||
Signed-off-by: Piotr Szczepanik <piter75@gmail.com>
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts
|
||||
index 2acb3d500..5a7a5dab3 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts
|
||||
@@ -22,7 +22,7 @@
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <3300000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
- vin-supply = <&dc_12v>;
|
||||
+ vin-supply = <&sys_12v>;
|
||||
};
|
||||
|
||||
vcc3v3_pcie: vcc3v3-pcie {
|
||||
@@ -34,7 +34,7 @@
|
||||
pinctrl-0 = <&vcc3v3_pcie_en>;
|
||||
regulator-min-microvolt = <3300000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
- vin-supply = <&dc_12v>;
|
||||
+ vin-supply = <&sys_12v>;
|
||||
};
|
||||
};
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
|
||||
index 057c938be..40c25e6f6 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
|
||||
@@ -101,6 +101,15 @@
|
||||
reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
|
||||
+ sys_12v: sys_12v {
|
||||
+ compatible = "regulator-fixed";
|
||||
+ regulator-name = "sys_12v";
|
||||
+ regulator-always-on;
|
||||
+ regulator-boot-on;
|
||||
+ regulator-min-microvolt = <12000000>;
|
||||
+ regulator-max-microvolt = <12000000>;
|
||||
+ };
|
||||
+
|
||||
vcc_vbus_typec0: vcc-vbus-typec0 {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "vcc_vbus_typec0";
|
||||
@@ -141,7 +150,7 @@
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <3300000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
- vin-supply = <&dc_12v>;
|
||||
+ vin-supply = <&sys_12v>;
|
||||
};
|
||||
|
||||
vcca_0v9: vcca-0v9 {
|
||||
@@ -186,7 +195,7 @@
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <5000000>;
|
||||
regulator-max-microvolt = <5000000>;
|
||||
- vin-supply = <&dc_12v>;
|
||||
+ vin-supply = <&sys_12v>;
|
||||
};
|
||||
|
||||
vdd_log: vdd-log {
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
This patch reverts https://github.com/torvalds/linux/commit/aea6cb99703e17019e025aa71643b4d3e0a24413
|
||||
that got backported into both 5.8.17 and 5.9.2
|
||||
|
||||
Without it rk808 used by all rk3399 boards fails to be probed.
|
||||
|
||||
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
|
||||
index 4859cf84c..b6dcbb779 100644
|
||||
--- a/drivers/regulator/core.c
|
||||
+++ b/drivers/regulator/core.c
|
||||
@@ -5256,20 +5256,15 @@ regulator_register(const struct regulator_desc *regulator_desc,
|
||||
else if (regulator_desc->supply_name)
|
||||
rdev->supply_name = regulator_desc->supply_name;
|
||||
|
||||
+ /*
|
||||
+ * Attempt to resolve the regulator supply, if specified,
|
||||
+ * but don't return an error if we fail because we will try
|
||||
+ * to resolve it again later as more regulators are added.
|
||||
+ */
|
||||
+ if (regulator_resolve_supply(rdev))
|
||||
+ rdev_dbg(rdev, "unable to resolve supply\n");
|
||||
+
|
||||
ret = set_machine_constraints(rdev, constraints);
|
||||
- if (ret == -EPROBE_DEFER) {
|
||||
- /* Regulator might be in bypass mode and so needs its supply
|
||||
- * to set the constraints */
|
||||
- /* FIXME: this currently triggers a chicken-and-egg problem
|
||||
- * when creating -SUPPLY symlink in sysfs to a regulator
|
||||
- * that is just being created */
|
||||
- ret = regulator_resolve_supply(rdev);
|
||||
- if (!ret)
|
||||
- ret = set_machine_constraints(rdev, constraints);
|
||||
- else
|
||||
- rdev_dbg(rdev, "unable to resolve supply early: %pe\n",
|
||||
- ERR_PTR(ret));
|
||||
- }
|
||||
if (ret < 0)
|
||||
goto wash;
|
||||
|
||||
@ -802,7 +802,7 @@ index 000000000000..9e3c87019ada
|
||||
+ return PTR_ERR(data->dmc_clk);
|
||||
+ }
|
||||
+
|
||||
+ data->edev = devfreq_event_get_edev_by_phandle(dev, 0);
|
||||
+ data->edev = devfreq_event_get_edev_by_phandle(dev, "devfreq-events", 0);
|
||||
+ if (IS_ERR(data->edev))
|
||||
+ return -EPROBE_DEFER;
|
||||
+
|
||||
|
||||
@ -27,8 +27,8 @@ index 7b66e2743a4f..f0cfed84d60d 100644
|
||||
continue;
|
||||
|
||||
if (dpb[i].flags & V4L2_H264_DPB_ENTRY_FLAG_LONG_TERM ||
|
||||
- dpb[i].frame_num < sl_params->frame_num) {
|
||||
+ dpb[i].frame_num <= sl_params->frame_num) {
|
||||
- dpb[i].frame_num < dec_params->frame_num) {
|
||||
+ dpb[i].frame_num <= dec_params->frame_num) {
|
||||
p[i] = dpb[i].frame_num;
|
||||
continue;
|
||||
}
|
||||
|
||||
@ -10,13 +10,13 @@ Fixes: 1b5715c602fda ("arm64: dts: rockchip: add ROCK Pi 4 DTS support")
|
||||
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
|
||||
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
||||
---
|
||||
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts | 4 ++++
|
||||
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
|
||||
index 55e74f4d5cd0f..1ae1ebd4efdd0 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
|
||||
@@ -178,6 +178,10 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
@ -6,10 +6,10 @@ It could possibly be made controllable by its gpio with the help
|
||||
of soldering iron, steady hands, patience (SMD0402) and additional overlay
|
||||
to enable the led and its gpio pin in device tree.
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
|
||||
index e03062715..a97e02bc0 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
|
||||
@@ -111,6 +111,25 @@
|
||||
regulator-max-microvolt = <1400000>;
|
||||
vin-supply = <&vcc5v0_sys>;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
|
||||
index 1ae1ebd4e..2f84397d5 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
|
||||
@@ -62,6 +62,8 @@
|
||||
regulator-name = "vcc3v3_pcie";
|
||||
regulator-always-on;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts 2019-12-28 20:11:18.831388678 +0200
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts 2019-12-28 20:11:33.335365912 +0200
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi 2019-12-28 20:11:18.831388678 +0200
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi 2019-12-28 20:11:33.335365912 +0200
|
||||
@@ -735,7 +735,7 @@
|
||||
|
||||
&usbdrd_dwc3_0 {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts 2020-04-08 11:27:04.486670792 +0000
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts 2020-04-10 19:59:01.945704455 +0000
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi 2020-04-08 11:27:04.486670792 +0000
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi 2020-04-10 19:59:01.945704455 +0000
|
||||
@@ -34,6 +34,12 @@
|
||||
reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
|
||||
@ -49,9 +49,9 @@ index 48fb631d5451..e56a5527bab4 100644
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-evb.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-roc-cc.dtb
|
||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-rock-pi-s.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3318-a95x-z2.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go2.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
|
||||
new file mode 100644
|
||||
index 000000000000..4fccae43f008
|
||||
|
||||
@ -291,7 +291,7 @@ index 61c984f10d8e..e6125ebfe5a9 100644
|
||||
if (i2s->is_master_mode) {
|
||||
mclk_rate = clk_get_rate(i2s->mclk);
|
||||
- bclk_rate = 2 * 32 * params_rate(params);
|
||||
- if (bclk_rate && mclk_rate % bclk_rate)
|
||||
- if (bclk_rate == 0 || mclk_rate % bclk_rate)
|
||||
+ bclk_rate = i2s->bclk_fs * params_rate(params);
|
||||
+ if (!bclk_rate)
|
||||
return -EINVAL;
|
||||
|
||||
@ -1,75 +0,0 @@
|
||||
ROCKPi 4 has 3 variants of hardware platforms called
|
||||
RockPI 4A, 4B, and 4C.
|
||||
|
||||
- ROCKPi 4A has no Wif/BT.
|
||||
- ROCKPi 4B has AP6256 Wifi/BT, PoE.
|
||||
- ROCKPi 4C has AP6256 Wifi/BT, PoE, miniDP, USB Host enabled
|
||||
GPIO pin change compared to 4B, 4C
|
||||
|
||||
So move common nodes, properties into dtsi file and include
|
||||
on respective variant dts files.
|
||||
|
||||
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
|
||||
---
|
||||
Changes for v3:
|
||||
- none
|
||||
Changes for v2:
|
||||
- update commit message
|
||||
- add radxa,rockpi4a
|
||||
|
||||
arch/arm64/boot/dts/rockchip/Makefile | 2 +-
|
||||
.../{rk3399-rock-pi-4.dts => rk3399-rock-pi-4.dtsi} | 3 ---
|
||||
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts | 13 +++++++++++++
|
||||
3 files changed, 14 insertions(+), 4 deletions(-)
|
||||
rename arch/arm64/boot/dts/rockchip/{rk3399-rock-pi-4.dts => rk3399-rock-pi-4.dtsi} (99%)
|
||||
create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
|
||||
index b87b1f773083..42f9e1861461 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/Makefile
|
||||
+++ b/arch/arm64/boot/dts/rockchip/Makefile
|
||||
@@ -33,7 +33,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinebook-pro.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb
|
||||
-dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4.dtb
|
||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64-v2.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
|
||||
similarity index 99%
|
||||
rename from arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
|
||||
rename to arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
|
||||
index 60f98a3e19d8..e163f438f836 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
|
||||
@@ -11,9 +11,6 @@
|
||||
#include "rk3399-opp.dtsi"
|
||||
|
||||
/ {
|
||||
- model = "Radxa ROCK Pi 4";
|
||||
- compatible = "radxa,rockpi4", "rockchip,rk3399";
|
||||
-
|
||||
chosen {
|
||||
stdout-path = "serial2:1500000n8";
|
||||
};
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts
|
||||
new file mode 100644
|
||||
index 000000000000..89f2af5e111d
|
||||
--- /dev/null
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts
|
||||
@@ -0,0 +1,13 @@
|
||||
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
||||
+/*
|
||||
+ * Copyright (c) 2019 Akash Gajjar <Akash_Gajjar@mentor.com>
|
||||
+ * Copyright (c) 2019 Pragnesh Patel <Pragnesh_Patel@mentor.com>
|
||||
+ */
|
||||
+
|
||||
+/dts-v1/;
|
||||
+#include "rk3399-rock-pi-4.dtsi"
|
||||
+
|
||||
+/ {
|
||||
+ model = "Radxa ROCK Pi 4A";
|
||||
+ compatible = "radxa,rockpi4a", "radxa,rockpi4", "rockchip,rk3399";
|
||||
+};
|
||||
@ -1,118 +0,0 @@
|
||||
RockPI 4B has AP6256 Wifi/BT, so enable them in 4B dts
|
||||
instead of enable in common dtsi.
|
||||
|
||||
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
|
||||
---
|
||||
Changes for v3:
|
||||
- none
|
||||
Changes for v2:
|
||||
- update commit message
|
||||
- add radxa,rockpi4b
|
||||
|
||||
arch/arm64/boot/dts/rockchip/Makefile | 1 +
|
||||
.../boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 23 ----------
|
||||
.../boot/dts/rockchip/rk3399-rock-pi-4b.dts | 42 +++++++++++++++++++
|
||||
3 files changed, 43 insertions(+), 23 deletions(-)
|
||||
create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
|
||||
index 42f9e1861461..8832d05c2571 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/Makefile
|
||||
+++ b/arch/arm64/boot/dts/rockchip/Makefile
|
||||
@@ -34,6 +34,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.dtb
|
||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64-v2.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
|
||||
index e163f438f836..678a336010bf 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
|
||||
@@ -584,17 +584,6 @@ &sdio0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
|
||||
sd-uhs-sdr104;
|
||||
- status = "okay";
|
||||
-
|
||||
- brcmf: wifi@1 {
|
||||
- compatible = "brcm,bcm4329-fmac";
|
||||
- reg = <1>;
|
||||
- interrupt-parent = <&gpio0>;
|
||||
- interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
|
||||
- interrupt-names = "host-wake";
|
||||
- pinctrl-names = "default";
|
||||
- pinctrl-0 = <&wifi_host_wake_l>;
|
||||
- };
|
||||
};
|
||||
|
||||
&sdmmc {
|
||||
@@ -663,18 +652,6 @@ u2phy1_host: host-port {
|
||||
&uart0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>;
|
||||
- status = "okay";
|
||||
-
|
||||
- bluetooth {
|
||||
- compatible = "brcm,bcm43438-bt";
|
||||
- clocks = <&rk808 1>;
|
||||
- clock-names = "ext_clock";
|
||||
- device-wakeup-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>;
|
||||
- host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;
|
||||
- shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;
|
||||
- pinctrl-names = "default";
|
||||
- pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
|
||||
- };
|
||||
};
|
||||
|
||||
&uart2 {
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts
|
||||
new file mode 100644
|
||||
index 000000000000..f0055ce2fda0
|
||||
--- /dev/null
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts
|
||||
@@ -0,0 +1,42 @@
|
||||
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
||||
+/*
|
||||
+ * Copyright (c) 2019 Akash Gajjar <Akash_Gajjar@mentor.com>
|
||||
+ * Copyright (c) 2019 Pragnesh Patel <Pragnesh_Patel@mentor.com>
|
||||
+ */
|
||||
+
|
||||
+/dts-v1/;
|
||||
+#include "rk3399-rock-pi-4.dtsi"
|
||||
+
|
||||
+/ {
|
||||
+ model = "Radxa ROCK Pi 4B";
|
||||
+ compatible = "radxa,rockpi4b", "radxa,rockpi4", "rockchip,rk3399";
|
||||
+};
|
||||
+
|
||||
+&sdio0 {
|
||||
+ status = "okay";
|
||||
+
|
||||
+ brcmf: wifi@1 {
|
||||
+ compatible = "brcm,bcm4329-fmac";
|
||||
+ reg = <1>;
|
||||
+ interrupt-parent = <&gpio0>;
|
||||
+ interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
|
||||
+ interrupt-names = "host-wake";
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&wifi_host_wake_l>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&uart0 {
|
||||
+ status = "okay";
|
||||
+
|
||||
+ bluetooth {
|
||||
+ compatible = "brcm,bcm43438-bt";
|
||||
+ clocks = <&rk808 1>;
|
||||
+ clock-names = "ext_clock";
|
||||
+ device-wakeup-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>;
|
||||
+ host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;
|
||||
+ shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
|
||||
+ };
|
||||
+};
|
||||
@ -1,88 +0,0 @@
|
||||
Rock PI 4C has AP6256 Wifi/BT, PoE, miniDP, USB Host enabled
|
||||
GPIO pin change compared to 4B, 4A.
|
||||
|
||||
So, add or enable difference nodes/properties in 4C dts
|
||||
by including common dtsi.
|
||||
|
||||
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
|
||||
---
|
||||
Changes for v3:
|
||||
- none
|
||||
Changes for v2:
|
||||
- update commit message
|
||||
- add radxa,rockpi4c
|
||||
|
||||
arch/arm64/boot/dts/rockchip/Makefile | 1 +
|
||||
.../boot/dts/rockchip/rk3399-rock-pi-4c.dts | 51 +++++++++++++++++++
|
||||
2 files changed, 52 insertions(+)
|
||||
create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
|
||||
index 8832d05c2571..02cdb3c4a6c1 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/Makefile
|
||||
+++ b/arch/arm64/boot/dts/rockchip/Makefile
|
||||
@@ -35,6 +35,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b.dtb
|
||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4c.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64-v2.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts
|
||||
new file mode 100644
|
||||
index 000000000000..4c7ebb1c5d2d
|
||||
--- /dev/null
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts
|
||||
@@ -0,0 +1,51 @@
|
||||
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
||||
+/*
|
||||
+ * Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd
|
||||
+ * Copyright (c) 2019 Radxa Limited
|
||||
+ * Copyright (c) 2019 Amarula Solutions(India)
|
||||
+ */
|
||||
+
|
||||
+/dts-v1/;
|
||||
+#include "rk3399-rock-pi-4.dtsi"
|
||||
+
|
||||
+/ {
|
||||
+ model = "Radxa ROCK Pi 4C";
|
||||
+ compatible = "radxa,rockpi4c", "radxa,rockpi4", "rockchip,rk3399";
|
||||
+};
|
||||
+
|
||||
+&sdio0 {
|
||||
+ status = "okay";
|
||||
+
|
||||
+ brcmf: wifi@1 {
|
||||
+ compatible = "brcm,bcm4329-fmac";
|
||||
+ reg = <1>;
|
||||
+ interrupt-parent = <&gpio0>;
|
||||
+ interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
|
||||
+ interrupt-names = "host-wake";
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&wifi_host_wake_l>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&uart0 {
|
||||
+ status = "okay";
|
||||
+
|
||||
+ bluetooth {
|
||||
+ compatible = "brcm,bcm43438-bt";
|
||||
+ clocks = <&rk808 1>;
|
||||
+ clock-names = "ext_clock";
|
||||
+ device-wakeup-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>;
|
||||
+ host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;
|
||||
+ shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&vcc5v0_host {
|
||||
+ gpio = <&gpio3 RK_PD6 GPIO_ACTIVE_HIGH>;
|
||||
+};
|
||||
+
|
||||
+&vcc5v0_host_en {
|
||||
+ rockchip,pins = <3 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+};
|
||||
Loading…
Reference in New Issue
Block a user