ipq40xx: 5.4: refresh patches and config
authorChristian Lamparter <chunkeey@gmail.com>
Fri, 28 Feb 2020 20:15:48 +0000 (21:15 +0100)
committerChristian Lamparter <chunkeey@gmail.com>
Fri, 28 Feb 2020 21:46:27 +0000 (22:46 +0100)
This patch just refreshes the 5.4 patches. It seems as if
070-v4.20-soc-qcom-spm-add-SCM-probe-dependency.patch is
already applied, so drop it. It also does a quick
make kernel_oldconfig to get rid of unneeded symbols.

[Looks like USB and Ethernet need some more work].

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
23 files changed:
target/linux/ipq40xx/config-5.4
target/linux/ipq40xx/patches-5.4/070-v4.20-soc-qcom-spm-add-SCM-probe-dependency.patch [deleted file]
target/linux/ipq40xx/patches-5.4/071-02-ipq40xx-Fix-booting-secondary-cores.patch
target/linux/ipq40xx/patches-5.4/074-ARM-qcom-Add-IPQ4019-SoC-support.patch
target/linux/ipq40xx/patches-5.4/076-phy-qcom-ipq4019-usb-add-driver-for-QCOM-IPQ4019.patch
target/linux/ipq40xx/patches-5.4/077-qcom-ipq4019-add-USB-devicetree-nodes.patch
target/linux/ipq40xx/patches-5.4/080-ARM-dts-qcom-add-gpio-ranges-property.patch
target/linux/ipq40xx/patches-5.4/081-clk-fix-apss-cpu-overclocking.patch
target/linux/ipq40xx/patches-5.4/086-ipq40xx-fix-high-resolution-timer.patch
target/linux/ipq40xx/patches-5.4/300-clk-qcom-ipq4019-add-ess-reset.patch
target/linux/ipq40xx/patches-5.4/304-mtd-spi-nor-Add-support-for-mx25r3235f.patch
target/linux/ipq40xx/patches-5.4/700-net-add-qualcomm-mdio.patch
target/linux/ipq40xx/patches-5.4/701-dts-ipq4019-add-mdio-node.patch
target/linux/ipq40xx/patches-5.4/702-dts-ipq4019-add-PHY-switch-nodes.patch
target/linux/ipq40xx/patches-5.4/703-net-IPQ4019-needs-rfs-vlan_tag-callbacks-in.patch
target/linux/ipq40xx/patches-5.4/705-net-add-qualcomm-ar40xx-phy.patch
target/linux/ipq40xx/patches-5.4/706-ar40xx-abort-probe-on-missig-phy.patch
target/linux/ipq40xx/patches-5.4/710-net-add-qualcomm-essedma-ethernet-driver.patch
target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch
target/linux/ipq40xx/patches-5.4/721-dts-ipq4019-add-ethernet-essedma-node.patch
target/linux/ipq40xx/patches-5.4/850-soc-add-qualcomm-syscon.patch
target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
target/linux/ipq40xx/patches-5.4/997-device_tree_cmdline.patch

index 9d3ac78e440f97d22dbb0ca20cfcc49e518a43f5..690cb36b68ff119cf224fcb43f899800d1d7dac3 100644 (file)
@@ -1,7 +1,5 @@
 CONFIG_64BIT_TIME=y
 CONFIG_64BIT_TIME=y
-# CONFIG_ADIN_PHY is not set
 CONFIG_ALIGNMENT_TRAP=y
 CONFIG_ALIGNMENT_TRAP=y
-# CONFIG_AL_FIC is not set
 # CONFIG_APQ_GCC_8084 is not set
 # CONFIG_APQ_MMCC_8084 is not set
 CONFIG_AR40XX_PHY=y
 # CONFIG_APQ_GCC_8084 is not set
 # CONFIG_APQ_MMCC_8084 is not set
 CONFIG_AR40XX_PHY=y
@@ -78,27 +76,17 @@ CONFIG_ARM_UNWIND=y
 CONFIG_ARM_VIRT_EXT=y
 CONFIG_AT803X_PHY=y
 CONFIG_AUTO_ZRELADDR=y
 CONFIG_ARM_VIRT_EXT=y
 CONFIG_AT803X_PHY=y
 CONFIG_AUTO_ZRELADDR=y
-# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
 CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BOUNCE=y
 # CONFIG_CACHE_L2X0 is not set
 CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BOUNCE=y
 # CONFIG_CACHE_L2X0 is not set
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_CC_HAS_KASAN_GENERIC=y
-CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
-# CONFIG_CHARGER_LT3651 is not set
-# CONFIG_CHARGER_UCS1002 is not set
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKSRC_QCOM=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_COMMON_CLK=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKSRC_QCOM=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_COMMON_CLK=y
-# CONFIG_COMMON_CLK_FIXED_MMIO is not set
 CONFIG_COMMON_CLK_QCOM=y
 CONFIG_COMMON_CLK_QCOM=y
-# CONFIG_COMMON_CLK_SI5341 is not set
 CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_COMPAT_32BIT_TIME=y
-# CONFIG_COUNTER is not set
 CONFIG_CPUFREQ_DT=y
 CONFIG_CPUFREQ_DT_PLATDEV=y
 CONFIG_CPU_32v6K=y
 CONFIG_CPUFREQ_DT=y
 CONFIG_CPUFREQ_DT_PLATDEV=y
 CONFIG_CPU_32v6K=y
@@ -142,17 +130,14 @@ CONFIG_CRC16=y
 # CONFIG_CRC32_SARWATE is not set
 CONFIG_CRC32_SLICEBY8=y
 CONFIG_CRYPTO_ACOMP2=y
 # CONFIG_CRC32_SARWATE is not set
 CONFIG_CRC32_SLICEBY8=y
 CONFIG_CRYPTO_ACOMP2=y
-# CONFIG_CRYPTO_ADIANTUM is not set
 CONFIG_CRYPTO_AEAD=y
 CONFIG_CRYPTO_AEAD2=y
 CONFIG_CRYPTO_AES_ARM=y
 CONFIG_CRYPTO_AES_ARM_BS=y
 CONFIG_CRYPTO_AEAD=y
 CONFIG_CRYPTO_AEAD2=y
 CONFIG_CRYPTO_AES_ARM=y
 CONFIG_CRYPTO_AES_ARM_BS=y
-CONFIG_CRYPTO_AKCIPHER2=y
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_DES=y
-# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
 CONFIG_CRYPTO_DEV_QCE=y
 # CONFIG_CRYPTO_DEV_QCE_ENABLE_ALL is not set
 # CONFIG_CRYPTO_DEV_QCE_ENABLE_SHA is not set
 CONFIG_CRYPTO_DEV_QCE=y
 # CONFIG_CRYPTO_DEV_QCE_ENABLE_ALL is not set
 # CONFIG_CRYPTO_DEV_QCE_ENABLE_SHA is not set
@@ -163,17 +148,12 @@ CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_DRBG_HMAC=y
 CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_DRBG_HMAC=y
 CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_ECB=y
-# CONFIG_CRYPTO_ECRDSA is not set
-# CONFIG_CRYPTO_ESSIV is not set
-# CONFIG_CRYPTO_GHASH_ARM_CE is not set
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_JITTERENTROPY=y
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_JITTERENTROPY=y
-CONFIG_CRYPTO_KPP2=y
-CONFIG_CRYPTO_LIB_AES=y
 CONFIG_CRYPTO_LIB_DES=y
 CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_LIB_DES=y
 CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LZO=y
@@ -181,26 +161,19 @@ CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_NULL2=y
-# CONFIG_CRYPTO_OFB is not set
 CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
-# CONFIG_CRYPTO_SHA1_ARM_CE is not set
-# CONFIG_CRYPTO_SHA1_ARM_NEON is not set
 CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA256_ARM=y
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA256_ARM=y
 CONFIG_CRYPTO_SIMD=y
-# CONFIG_CRYPTO_STREEBOG is not set
 CONFIG_CRYPTO_XTS=y
 CONFIG_CRYPTO_XTS=y
-# CONFIG_CRYPTO_XXHASH is not set
 CONFIG_CRYPTO_ZSTD=y
 CONFIG_DCACHE_WORD_ACCESS=y
 CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
 CONFIG_DEBUG_MISC=y
 CONFIG_CRYPTO_ZSTD=y
 CONFIG_DCACHE_WORD_ACCESS=y
 CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
 CONFIG_DEBUG_MISC=y
-# CONFIG_DEBUG_PLIST is not set
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEBUG_USER is not set
-# CONFIG_DMABUF_SELFTESTS is not set
 CONFIG_DMADEVICES=y
 CONFIG_DMA_DECLARE_COHERENT=y
 CONFIG_DMA_ENGINE=y
 CONFIG_DMADEVICES=y
 CONFIG_DMA_DECLARE_COHERENT=y
 CONFIG_DMA_ENGINE=y
@@ -214,17 +187,12 @@ CONFIG_DYNAMIC_DEBUG=y
 CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EEPROM_AT24=y
 CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EEPROM_AT24=y
-# CONFIG_EEPROM_EE1004 is not set
 # CONFIG_ENERGY_MODEL is not set
 CONFIG_ESSEDMA=y
 # CONFIG_ENERGY_MODEL is not set
 CONFIG_ESSEDMA=y
-# CONFIG_EXFAT_FS is not set
 CONFIG_EXTCON=y
 CONFIG_EXTCON=y
-# CONFIG_FIELDBUS_DEV is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FIX_EARLYCON_MEM=y
 # CONFIG_FSL_QDMA is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FIX_EARLYCON_MEM=y
 # CONFIG_FSL_QDMA is not set
-# CONFIG_FS_VERITY is not set
-# CONFIG_FW_LOADER_COMPRESS is not set
 CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_GENERIC_BUG=y
 CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_GENERIC_BUG=y
@@ -252,15 +220,10 @@ CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_IRQCHIP=y
 CONFIG_GPIO_74X164=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_IRQCHIP=y
 CONFIG_GPIO_74X164=y
-# CONFIG_GPIO_AMD_FCH is not set
-# CONFIG_GPIO_CADENCE is not set
-# CONFIG_GPIO_GW_PLD is not set
-# CONFIG_GPIO_SAMA5D2_PIOBU is not set
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_WATCHDOG=y
 # CONFIG_GPIO_WATCHDOG_ARCH_INITCALL is not set
 # CONFIG_GVE is not set
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_WATCHDOG=y
 # CONFIG_GPIO_WATCHDOG_ARCH_INITCALL is not set
 # CONFIG_GVE is not set
-# CONFIG_HABANA_AI is not set
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDIRQS_SW_RESEND=y
@@ -280,6 +243,7 @@ CONFIG_HAVE_ARM_SMCCC=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_COPY_THREAD_TLS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
@@ -308,8 +272,6 @@ CONFIG_HAVE_SMP=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_UID16=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_UID16=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
-# CONFIG_HEADERS_INSTALL is not set
-# CONFIG_HEADER_TEST is not set
 CONFIG_HIGHMEM=y
 # CONFIG_HIGHPTE is not set
 CONFIG_HWSPINLOCK=y
 CONFIG_HIGHMEM=y
 # CONFIG_HIGHPTE is not set
 CONFIG_HWSPINLOCK=y
@@ -321,16 +283,8 @@ CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_HELPER_AUTO=y
-# CONFIG_I2C_NVIDIA_GPU is not set
 CONFIG_I2C_QUP=y
 CONFIG_I2C_QUP=y
-# CONFIG_I3C is not set
-# CONFIG_IGC is not set
-# CONFIG_IKHEADERS is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
-# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
-CONFIG_INIT_STACK_NONE=y
-# CONFIG_INTERCONNECT is not set
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
 # CONFIG_IOMMU_IO_PGTABLE_LPAE is not set
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
 # CONFIG_IOMMU_IO_PGTABLE_LPAE is not set
@@ -348,23 +302,15 @@ CONFIG_IRQ_WORK=y
 CONFIG_KASAN_STACK=1
 # CONFIG_KPSS_XCC is not set
 # CONFIG_KRAITCC is not set
 CONFIG_KASAN_STACK=1
 # CONFIG_KPSS_XCC is not set
 # CONFIG_KRAITCC is not set
-# CONFIG_LCD_CLASS_DEVICE is not set
-# CONFIG_LEDS_AN30259A is not set
-# CONFIG_LEDS_LM3532 is not set
 CONFIG_LEDS_LP5562=y
 CONFIG_LEDS_LP55XX_COMMON=y
 CONFIG_LEDS_LP5562=y
 CONFIG_LEDS_LP55XX_COMMON=y
-# CONFIG_LEDS_TRIGGER_AUDIO is not set
-# CONFIG_LEDS_TRIGGER_PATTERN is not set
 CONFIG_LIBFDT=y
 CONFIG_LOCK_DEBUGGING_SUPPORT=y
 CONFIG_LIBFDT=y
 CONFIG_LOCK_DEBUGGING_SUPPORT=y
-# CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_LOCK_SPIN_ON_OWNER=y
 CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity"
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
 CONFIG_MDIO_BITBANG=y
 CONFIG_MDIO_BUS=y
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
 CONFIG_MDIO_BITBANG=y
 CONFIG_MDIO_BUS=y
-# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
 CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_GPIO=y
 CONFIG_MDIO_IPQ40XX=y
 CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_GPIO=y
 CONFIG_MDIO_IPQ40XX=y
@@ -372,19 +318,14 @@ CONFIG_MDIO_IPQ40XX=y
 # CONFIG_MDM_LCC_9615 is not set
 CONFIG_MEMFD_CREATE=y
 # CONFIG_MFD_LOCHNAGAR is not set
 # CONFIG_MDM_LCC_9615 is not set
 CONFIG_MEMFD_CREATE=y
 # CONFIG_MFD_LOCHNAGAR is not set
-# CONFIG_MFD_MAX77650 is not set
 # CONFIG_MFD_QCOM_RPM is not set
 # CONFIG_MFD_ROHM_BD70528 is not set
 # CONFIG_MFD_SPMI_PMIC is not set
 # CONFIG_MFD_QCOM_RPM is not set
 # CONFIG_MFD_ROHM_BD70528 is not set
 # CONFIG_MFD_SPMI_PMIC is not set
-# CONFIG_MFD_STMFX is not set
 # CONFIG_MFD_STPMIC1 is not set
 CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_STPMIC1 is not set
 CONFIG_MFD_SYSCON=y
-# CONFIG_MFD_TQMX86 is not set
 CONFIG_MIGHT_HAVE_CACHE_L2X0=y
 CONFIG_MIGRATION=y
 CONFIG_MIGHT_HAVE_CACHE_L2X0=y
 CONFIG_MIGRATION=y
-# CONFIG_MISC_ALCOR_PCI is not set
 CONFIG_MODULES_USE_ELF_REL=y
 CONFIG_MODULES_USE_ELF_REL=y
-# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 # CONFIG_MSM_GCC_8660 is not set
 # CONFIG_MSM_GCC_8916 is not set
 # CONFIG_MSM_GCC_8960 is not set
 # CONFIG_MSM_GCC_8660 is not set
 # CONFIG_MSM_GCC_8916 is not set
 # CONFIG_MSM_GCC_8960 is not set
@@ -397,9 +338,7 @@ CONFIG_MODULES_USE_ELF_REL=y
 # CONFIG_MSM_MMCC_8974 is not set
 # CONFIG_MSM_MMCC_8996 is not set
 CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MSM_MMCC_8974 is not set
 # CONFIG_MSM_MMCC_8996 is not set
 CONFIG_MTD_CMDLINE_PARTS=y
-# CONFIG_MTD_HYPERBUS is not set
 CONFIG_MTD_NAND_CORE=y
 CONFIG_MTD_NAND_CORE=y
-# CONFIG_MTD_RAW_NAND is not set
 CONFIG_MTD_SPI_NAND=y
 CONFIG_MTD_SPI_NOR=y
 CONFIG_MTD_SPLIT_FIRMWARE=y
 CONFIG_MTD_SPI_NAND=y
 CONFIG_MTD_SPI_NOR=y
 CONFIG_MTD_SPLIT_FIRMWARE=y
@@ -415,36 +354,16 @@ CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEON=y
 CONFIG_NET_DEVLINK=y
 CONFIG_NET_DSA=y
 CONFIG_NEON=y
 CONFIG_NET_DEVLINK=y
 CONFIG_NET_DSA=y
-# CONFIG_NET_DSA_LANTIQ_GSWIP is not set
-# CONFIG_NET_DSA_MICROCHIP_KSZ8795 is not set
-# CONFIG_NET_DSA_MICROCHIP_KSZ9477 is not set
 CONFIG_NET_DSA_QCA8K=y
 CONFIG_NET_DSA_QCA8K=y
-# CONFIG_NET_DSA_SJA1105 is not set
-# CONFIG_NET_DSA_TAG_8021Q is not set
-# CONFIG_NET_DSA_TAG_BRCM is not set
-# CONFIG_NET_DSA_TAG_BRCM_PREPEND is not set
-# CONFIG_NET_DSA_TAG_GSWIP is not set
-# CONFIG_NET_DSA_TAG_KSZ is not set
-# CONFIG_NET_DSA_TAG_LAN9303 is not set
-# CONFIG_NET_DSA_TAG_MTK is not set
 CONFIG_NET_DSA_TAG_QCA=y
 CONFIG_NET_DSA_TAG_QCA=y
-# CONFIG_NET_DSA_TAG_SJA1105 is not set
-# CONFIG_NET_DSA_TAG_TRAILER is not set
-# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
-# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
 CONFIG_NET_FLOW_LIMIT=y
 CONFIG_NET_PTP_CLASSIFY=y
 CONFIG_NET_FLOW_LIMIT=y
 CONFIG_NET_PTP_CLASSIFY=y
-# CONFIG_NET_SCH_TAPRIO is not set
 CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_SWITCHDEV=y
-CONFIG_NET_VENDOR_GOOGLE=y
-CONFIG_NET_VENDOR_PENSANDO=y
-# CONFIG_NI_XGE_MANAGEMENT_ENET is not set
 CONFIG_NLS=y
 CONFIG_NO_HZ=y
 CONFIG_NO_HZ_COMMON=y
 CONFIG_NO_HZ_IDLE=y
 CONFIG_NR_CPUS=4
 CONFIG_NLS=y
 CONFIG_NO_HZ=y
 CONFIG_NO_HZ_COMMON=y
 CONFIG_NO_HZ_IDLE=y
 CONFIG_NR_CPUS=4
-# CONFIG_NULL_TTY is not set
 CONFIG_NVMEM=y
 # CONFIG_NVMEM_REBOOT_MODE is not set
 CONFIG_NVMEM_SYSFS=y
 CONFIG_NVMEM=y
 # CONFIG_NVMEM_REBOOT_MODE is not set
 CONFIG_NVMEM_SYSFS=y
@@ -462,7 +381,6 @@ CONFIG_OLD_SIGACTION=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_OPTEE=y
 CONFIG_OPTEE_SHM_NUM_PRIV_PAGES=1
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_OPTEE=y
 CONFIG_OPTEE_SHM_NUM_PRIV_PAGES=1
-# CONFIG_PACKING is not set
 CONFIG_PADATA=y
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PCI=y
 CONFIG_PADATA=y
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PCI=y
@@ -478,17 +396,10 @@ CONFIG_PCI_DOMAINS_GENERIC=y
 # CONFIG_PCI_MESON is not set
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 # CONFIG_PCI_MESON is not set
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
-# CONFIG_PCI_V3_SEMI is not set
 CONFIG_PERF_USE_VMALLOC=y
 CONFIG_PGTABLE_LEVELS=2
 CONFIG_PHYLIB=y
 CONFIG_PHYLINK=y
 CONFIG_PERF_USE_VMALLOC=y
 CONFIG_PGTABLE_LEVELS=2
 CONFIG_PHYLIB=y
 CONFIG_PHYLINK=y
-# CONFIG_PHY_CADENCE_DP is not set
-# CONFIG_PHY_CADENCE_DPHY is not set
-# CONFIG_PHY_CADENCE_SIERRA is not set
-# CONFIG_PHY_FSL_IMX8MQ_USB is not set
-# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
-# CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_QCOM_APQ8064_SATA is not set
 CONFIG_PHY_QCOM_IPQ4019_USB=y
 # CONFIG_PHY_QCOM_IPQ806X_SATA is not set
 # CONFIG_PHY_QCOM_APQ8064_SATA is not set
 CONFIG_PHY_QCOM_IPQ4019_USB=y
 # CONFIG_PHY_QCOM_IPQ806X_SATA is not set
@@ -510,7 +421,6 @@ CONFIG_PINCTRL_MSM=y
 # CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_MSM8996 is not set
 # CONFIG_PINCTRL_MSM8998 is not set
 # CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_MSM8996 is not set
 # CONFIG_PINCTRL_MSM8998 is not set
-# CONFIG_PINCTRL_OCELOT is not set
 # CONFIG_PINCTRL_QCOM_SPMI_PMIC is not set
 # CONFIG_PINCTRL_QCOM_SSBI_PMIC is not set
 # CONFIG_PINCTRL_QCS404 is not set
 # CONFIG_PINCTRL_QCOM_SPMI_PMIC is not set
 # CONFIG_PINCTRL_QCOM_SSBI_PMIC is not set
 # CONFIG_PINCTRL_QCS404 is not set
@@ -518,17 +428,13 @@ CONFIG_PINCTRL_MSM=y
 # CONFIG_PINCTRL_SDM660 is not set
 # CONFIG_PINCTRL_SDM845 is not set
 # CONFIG_PINCTRL_SM8150 is not set
 # CONFIG_PINCTRL_SDM660 is not set
 # CONFIG_PINCTRL_SDM845 is not set
 # CONFIG_PINCTRL_SM8150 is not set
-# CONFIG_PINCTRL_STMFX is not set
 CONFIG_PM_OPP=y
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_MSM=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_PPS=y
 CONFIG_PM_OPP=y
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_MSM=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_PPS=y
-# CONFIG_PRINTK_CALLER is not set
 CONFIG_PRINTK_TIME=y
 CONFIG_PRINTK_TIME=y
-# CONFIG_PSI is not set
 CONFIG_PTP_1588_CLOCK=y
 CONFIG_PTP_1588_CLOCK=y
-# CONFIG_PVPANIC is not set
 CONFIG_QCOM_A53PLL=y
 CONFIG_QCOM_BAM_DMA=y
 # CONFIG_QCOM_COMMAND_DB is not set
 CONFIG_QCOM_A53PLL=y
 CONFIG_QCOM_BAM_DMA=y
 # CONFIG_QCOM_COMMAND_DB is not set
@@ -554,13 +460,11 @@ CONFIG_QCOM_WDT=y
 # CONFIG_QCS_GCC_404 is not set
 # CONFIG_QCS_TURING_404 is not set
 # CONFIG_QRTR is not set
 # CONFIG_QCS_GCC_404 is not set
 # CONFIG_QCS_TURING_404 is not set
 # CONFIG_QRTR is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
 CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_RCU_NEED_SEGCBLIST=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
 CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_RCU_NEED_SEGCBLIST=y
 CONFIG_RCU_STALL_COMMON=y
-# CONFIG_REED_SOLOMON_TEST is not set
 CONFIG_REFCOUNT_FULL=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REFCOUNT_FULL=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
@@ -587,14 +491,10 @@ CONFIG_RWSEM_SPIN_ON_OWNER=y
 # CONFIG_SDM_VIDEOCC_845 is not set
 CONFIG_SERIAL_8250_FSL=y
 # CONFIG_SERIAL_AMBA_PL011 is not set
 # CONFIG_SDM_VIDEOCC_845 is not set
 CONFIG_SERIAL_8250_FSL=y
 # CONFIG_SERIAL_AMBA_PL011 is not set
-# CONFIG_SERIAL_FSL_LINFLEXUART is not set
 CONFIG_SERIAL_MCTRL_GPIO=y
 CONFIG_SERIAL_MSM=y
 CONFIG_SERIAL_MSM_CONSOLE=y
 CONFIG_SERIAL_MCTRL_GPIO=y
 CONFIG_SERIAL_MSM=y
 CONFIG_SERIAL_MSM_CONSOLE=y
-# CONFIG_SERIAL_SIFIVE is not set
-# CONFIG_SFP is not set
 CONFIG_SGL_ALLOC=y
 CONFIG_SGL_ALLOC=y
-# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
 CONFIG_SMP=y
 CONFIG_SMP_ON_UP=y
 # CONFIG_SM_GCC_8150 is not set
 CONFIG_SMP=y
 CONFIG_SMP_ON_UP=y
 # CONFIG_SM_GCC_8150 is not set
@@ -604,7 +504,6 @@ CONFIG_SPI_BITBANG=y
 CONFIG_SPI_GPIO=y
 CONFIG_SPI_MASTER=y
 CONFIG_SPI_MEM=y
 CONFIG_SPI_GPIO=y
 CONFIG_SPI_MASTER=y
 CONFIG_SPI_MEM=y
-# CONFIG_SPI_MTK_QUADSPI is not set
 # CONFIG_SPI_QCOM_QSPI is not set
 CONFIG_SPI_QUP=y
 CONFIG_SPMI=y
 # CONFIG_SPI_QCOM_QSPI is not set
 CONFIG_SPI_QUP=y
 CONFIG_SPMI=y
@@ -617,13 +516,6 @@ CONFIG_SWPHY=y
 CONFIG_SWP_EMULATE=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_TEE=y
 CONFIG_SWP_EMULATE=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_TEE=y
-# CONFIG_TEST_BLACKHOLE_DEV is not set
-# CONFIG_TEST_MEMCAT_P is not set
-# CONFIG_TEST_MEMINIT is not set
-# CONFIG_TEST_STACKINIT is not set
-# CONFIG_TEST_STRSCPY is not set
-# CONFIG_TEST_VMALLOC is not set
-# CONFIG_TEST_XARRAY is not set
 CONFIG_THERMAL=y
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL=y
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
@@ -633,7 +525,6 @@ CONFIG_THERMAL_OF=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_TIMER_OF=y
 CONFIG_TIMER_PROBE=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_TIMER_OF=y
 CONFIG_TIMER_PROBE=y
-# CONFIG_TI_CPSW_PHY_SEL is not set
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
 # CONFIG_TRUSTED_FOUNDATIONS is not set
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
 # CONFIG_TRUSTED_FOUNDATIONS is not set
@@ -643,26 +534,20 @@ CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_UBIFS_FS_ZSTD=y
 CONFIG_UBSAN_ALIGNMENT=y
 CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_UBIFS_FS_ZSTD=y
 CONFIG_UBSAN_ALIGNMENT=y
-# CONFIG_UDMABUF is not set
 CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
-# CONFIG_UNICODE is not set
 CONFIG_UNIX_SCM=y
 CONFIG_UNWINDER_ARM=y
 # CONFIG_UNWINDER_FRAME_POINTER is not set
 CONFIG_USB=y
 CONFIG_USB_COMMON=y
 CONFIG_UNIX_SCM=y
 CONFIG_UNWINDER_ARM=y
 # CONFIG_UNWINDER_FRAME_POINTER is not set
 CONFIG_USB=y
 CONFIG_USB_COMMON=y
-# CONFIG_USB_CONN_GPIO is not set
 # CONFIG_USB_EHCI_HCD is not set
 CONFIG_USB_SUPPORT=y
 CONFIG_USE_OF=y
 # CONFIG_USB_EHCI_HCD is not set
 CONFIG_USB_SUPPORT=y
 CONFIG_USE_OF=y
-# CONFIG_VALIDATE_FS_PARSER is not set
 CONFIG_VDSO=y
 CONFIG_VFP=y
 CONFIG_VFPv3=y
 CONFIG_WATCHDOG_CORE=y
 CONFIG_VDSO=y
 CONFIG_VFP=y
 CONFIG_VFPv3=y
 CONFIG_WATCHDOG_CORE=y
-CONFIG_WATCHDOG_OPEN_TIMEOUT=0
-# CONFIG_XILINX_SDFEC is not set
 CONFIG_XPS=y
 CONFIG_XXHASH=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XPS=y
 CONFIG_XXHASH=y
 CONFIG_XZ_DEC_ARM=y
diff --git a/target/linux/ipq40xx/patches-5.4/070-v4.20-soc-qcom-spm-add-SCM-probe-dependency.patch b/target/linux/ipq40xx/patches-5.4/070-v4.20-soc-qcom-spm-add-SCM-probe-dependency.patch
deleted file mode 100644 (file)
index d0b520f..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-From 61a3bd10082b0e861b4e1bc451a92e20181a52f5 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Mon, 23 Jul 2018 16:17:35 +0200
-Subject: [PATCH] soc: qcom: spm: add SCM probe dependency
-
-Check for SCM availability before attempting to use SPM. SPM probe will
-fail otherwise.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
-Signed-off-by: John Crispin <john@phrozen.org>
-Signed-off-by: Andy Gross <andy.gross@linaro.org>
----
- drivers/soc/qcom/spm.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/soc/qcom/spm.c
-+++ b/drivers/soc/qcom/spm.c
-@@ -219,6 +219,9 @@ static int __init qcom_cpuidle_init(stru
-       cpumask_t mask;
-       bool use_scm_power_down = false;
-+      if (!qcom_scm_is_available())
-+              return -EPROBE_DEFER;
-+
-       for (i = 0; ; i++) {
-               state_node = of_parse_phandle(cpu_node, "cpu-idle-states", i);
-               if (!state_node)
index d37a8cb6bae83c64f391717548672e521f35f867..631a1307dd7c5c287c0d886496f72c25fb0f5f90 100644 (file)
@@ -15,7 +15,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -132,6 +132,7 @@
+@@ -102,6 +102,7 @@
                L2: l2-cache {
                        compatible = "cache";
                        cache-level = <2>;
                L2: l2-cache {
                        compatible = "cache";
                        cache-level = <2>;
@@ -23,9 +23,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
                };
        };
  
                };
        };
  
-@@ -344,6 +345,12 @@
-                         regulator;
-                 };
+@@ -341,6 +342,12 @@
+                       regulator;
+               };
  
 +              saw_l2: regulator@b012000 {
 +                      compatible = "qcom,saw2";
  
 +              saw_l2: regulator@b012000 {
 +                      compatible = "qcom,saw2";
index 76fcdc6ab11556e793259907873caffda795d2fd..16ac94fd37153942d3d778834a053cdbb92ae808 100644 (file)
@@ -14,7 +14,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 
 --- a/arch/arm/Makefile
 +++ b/arch/arm/Makefile
 
 --- a/arch/arm/Makefile
 +++ b/arch/arm/Makefile
-@@ -150,6 +150,7 @@ textofs-$(CONFIG_ARCH_MSM8X60) := 0x0020
+@@ -156,6 +156,7 @@ textofs-$(CONFIG_ARCH_MSM8X60) := 0x0020
  textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000
  textofs-$(CONFIG_ARCH_MESON) := 0x00208000
  textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000
  textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000
  textofs-$(CONFIG_ARCH_MESON) := 0x00208000
  textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000
@@ -24,7 +24,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  # by CONFIG_* macro name.
 --- a/arch/arm/mach-qcom/Kconfig
 +++ b/arch/arm/mach-qcom/Kconfig
  # by CONFIG_* macro name.
 --- a/arch/arm/mach-qcom/Kconfig
 +++ b/arch/arm/mach-qcom/Kconfig
-@@ -27,4 +27,9 @@ config ARCH_MDM9615
+@@ -28,4 +28,9 @@ config ARCH_MDM9615
        bool "Enable support for MDM9615"
        select CLKSRC_QCOM
  
        bool "Enable support for MDM9615"
        select CLKSRC_QCOM
  
index e7e7a1f89a30445678896e959c061b89da5e2647..6ded0e9badb9297b9d697ac55ac227db830a514f 100644 (file)
@@ -17,7 +17,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 
 --- a/drivers/phy/qualcomm/Kconfig
 +++ b/drivers/phy/qualcomm/Kconfig
 
 --- a/drivers/phy/qualcomm/Kconfig
 +++ b/drivers/phy/qualcomm/Kconfig
-@@ -17,6 +17,13 @@ config PHY_QCOM_APQ8064_SATA
+@@ -18,6 +18,13 @@ config PHY_QCOM_APQ8064_SATA
        depends on OF
        select GENERIC_PHY
  
        depends on OF
        select GENERIC_PHY
  
@@ -230,5 +230,5 @@ Signed-off-by: John Crispin <john@phrozen.org>
  obj-$(CONFIG_PHY_QCOM_APQ8064_SATA)   += phy-qcom-apq8064-sata.o
 +obj-$(CONFIG_PHY_QCOM_IPQ4019_USB)    += phy-qcom-ipq4019-usb.o
  obj-$(CONFIG_PHY_QCOM_IPQ806X_SATA)   += phy-qcom-ipq806x-sata.o
  obj-$(CONFIG_PHY_QCOM_APQ8064_SATA)   += phy-qcom-apq8064-sata.o
 +obj-$(CONFIG_PHY_QCOM_IPQ4019_USB)    += phy-qcom-ipq4019-usb.o
  obj-$(CONFIG_PHY_QCOM_IPQ806X_SATA)   += phy-qcom-ipq806x-sata.o
+ obj-$(CONFIG_PHY_QCOM_PCIE2)          += phy-qcom-pcie2.o
  obj-$(CONFIG_PHY_QCOM_QMP)            += phy-qcom-qmp.o
  obj-$(CONFIG_PHY_QCOM_QMP)            += phy-qcom-qmp.o
- obj-$(CONFIG_PHY_QCOM_QUSB2)          += phy-qcom-qusb2.o
index e02fdf59c23f39b60ba371c6a2edeae1301532d7..fbcbecf080ef024641859c22239c69bb960f6954 100644 (file)
@@ -41,7 +41,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  };
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
  };
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -568,5 +568,79 @@
+@@ -563,5 +563,79 @@
                                          "legacy";
                        status = "disabled";
                };
                                          "legacy";
                        status = "disabled";
                };
index 3a18ffc08f631fc5142d3268c6959426fa1efd44..972bdb74974e949d98cdff51be5800eaa3d9b81f 100644 (file)
@@ -60,7 +60,7 @@ will be executed twice with the same parameters for the same pinctrl.
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -206,6 +206,7 @@
+@@ -201,6 +201,7 @@
                        compatible = "qcom,ipq4019-pinctrl";
                        reg = <0x01000000 0x300000>;
                        gpio-controller;
                        compatible = "qcom,ipq4019-pinctrl";
                        reg = <0x01000000 0x300000>;
                        gpio-controller;
index de997925418e80dea8e28aaeb484e59349612cad..25a2020bd26e07e6742f40221705ff55fb577e27 100644 (file)
@@ -44,7 +44,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 
 --- a/drivers/clk/qcom/gcc-ipq4019.c
 +++ b/drivers/clk/qcom/gcc-ipq4019.c
 
 --- a/drivers/clk/qcom/gcc-ipq4019.c
 +++ b/drivers/clk/qcom/gcc-ipq4019.c
-@@ -1251,6 +1251,29 @@ static const struct clk_fepll_vco gcc_fe
+@@ -1243,6 +1243,29 @@ static const struct clk_fepll_vco gcc_fe
        .reg = 0x2f020,
  };
  
        .reg = 0x2f020,
  };
  
@@ -74,7 +74,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  /*
   * Round rate function for APSS CPU PLL Clock divider.
   * It looks up the frequency table and returns the next higher frequency
  /*
   * Round rate function for APSS CPU PLL Clock divider.
   * It looks up the frequency table and returns the next higher frequency
-@@ -1263,7 +1286,7 @@ static long clk_cpu_div_round_rate(struc
+@@ -1255,7 +1278,7 @@ static long clk_cpu_div_round_rate(struc
        struct clk_hw *p_hw;
        const struct freq_tbl *f;
  
        struct clk_hw *p_hw;
        const struct freq_tbl *f;
  
@@ -83,7 +83,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
        if (!f)
                return -EINVAL;
  
        if (!f)
                return -EINVAL;
  
-@@ -1286,7 +1309,7 @@ static int clk_cpu_div_set_rate(struct c
+@@ -1278,7 +1301,7 @@ static int clk_cpu_div_set_rate(struct c
        u32 mask;
        int ret;
  
        u32 mask;
        int ret;
  
@@ -92,7 +92,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
        if (!f)
                return -EINVAL;
  
        if (!f)
                return -EINVAL;
  
-@@ -1313,6 +1336,7 @@ static unsigned long
+@@ -1305,6 +1328,7 @@ static unsigned long
  clk_cpu_div_recalc_rate(struct clk_hw *hw,
                        unsigned long parent_rate)
  {
  clk_cpu_div_recalc_rate(struct clk_hw *hw,
                        unsigned long parent_rate)
  {
@@ -100,7 +100,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
        struct clk_fepll *pll = to_clk_fepll(hw);
        u32 cdiv, pre_div;
        u64 rate;
        struct clk_fepll *pll = to_clk_fepll(hw);
        u32 cdiv, pre_div;
        u64 rate;
-@@ -1333,7 +1357,11 @@ clk_cpu_div_recalc_rate(struct clk_hw *h
+@@ -1325,7 +1349,11 @@ clk_cpu_div_recalc_rate(struct clk_hw *h
        rate = clk_fepll_vco_calc_rate(pll, parent_rate) * 2;
        do_div(rate, pre_div);
  
        rate = clk_fepll_vco_calc_rate(pll, parent_rate) * 2;
        do_div(rate, pre_div);
  
index b45182271a354eeeb34e09d834a896103ae98f23..3bfd0d99e08b45a281c00633babbe0098ecb7a4a 100644 (file)
@@ -19,7 +19,7 @@ Signed-off-by: Pavel Kubelun <be.dissent@gmail.com>
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -171,6 +171,7 @@
+@@ -166,6 +166,7 @@
                             <1 4 0xf08>,
                             <1 1 0xf08>;
                clock-frequency = <48000000>;
                             <1 4 0xf08>,
                             <1 1 0xf08>;
                clock-frequency = <48000000>;
index 55cd5e43c5f3225b53a08b61daa59bf59c54c3f3..4297f32e0516f5adc9be217a4e6f5d463c8be985 100644 (file)
@@ -11,11 +11,9 @@ Signed-off-by: Ram Chandra Jangir <rjangir@codeaurora.org>
  include/dt-bindings/clock/qcom,gcc-ipq4019.h | 11 +++++++++++
  2 files changed, 22 insertions(+)
 
  include/dt-bindings/clock/qcom,gcc-ipq4019.h | 11 +++++++++++
  2 files changed, 22 insertions(+)
 
-diff --git a/drivers/clk/qcom/gcc-ipq4019.c b/drivers/clk/qcom/gcc-ipq4019.c
-index b2dc68efd5c8..a8672c5870a5 100644
 --- a/drivers/clk/qcom/gcc-ipq4019.c
 +++ b/drivers/clk/qcom/gcc-ipq4019.c
 --- a/drivers/clk/qcom/gcc-ipq4019.c
 +++ b/drivers/clk/qcom/gcc-ipq4019.c
-@@ -1744,6 +1744,17 @@ static const struct qcom_reset_map gcc_ipq4019_resets[] = {
+@@ -1736,6 +1736,17 @@ static const struct qcom_reset_map gcc_i
        [GCC_TCSR_BCR] = {0x22000, 0},
        [GCC_MPM_BCR] = {0x24000, 0},
        [GCC_SPDM_BCR] = {0x25000, 0},
        [GCC_TCSR_BCR] = {0x22000, 0},
        [GCC_MPM_BCR] = {0x24000, 0},
        [GCC_SPDM_BCR] = {0x25000, 0},
@@ -33,8 +31,6 @@ index b2dc68efd5c8..a8672c5870a5 100644
  };
  
  static const struct regmap_config gcc_ipq4019_regmap_config = {
  };
  
  static const struct regmap_config gcc_ipq4019_regmap_config = {
-diff --git a/include/dt-bindings/clock/qcom,gcc-ipq4019.h b/include/dt-bindings/clock/qcom,gcc-ipq4019.h
-index 7e8a7be6dcda..b8f0cdcd9ec0 100644
 --- a/include/dt-bindings/clock/qcom,gcc-ipq4019.h
 +++ b/include/dt-bindings/clock/qcom,gcc-ipq4019.h
 @@ -165,5 +165,16 @@
 --- a/include/dt-bindings/clock/qcom,gcc-ipq4019.h
 +++ b/include/dt-bindings/clock/qcom,gcc-ipq4019.h
 @@ -165,5 +165,16 @@
@@ -54,6 +50,3 @@ index 7e8a7be6dcda..b8f0cdcd9ec0 100644
 +#define ESS_MAC5_CLK_DIS                              82
  
  #endif
 +#define ESS_MAC5_CLK_DIS                              82
  
  #endif
--- 
-2.20.1
-
index 7dee12fedd7c5f45f9b3d02bf3a48b00e762fae4..476673077d5cf1d6456b35c78634223cda133cb9 100644 (file)
@@ -15,7 +15,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1091,6 +1091,8 @@ static const struct flash_info spi_nor_i
+@@ -2286,6 +2286,8 @@ static const struct flash_info spi_nor_i
        { "mx25u6435f",  INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) },
        { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
        { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
        { "mx25u6435f",  INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) },
        { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
        { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
@@ -23,4 +23,4 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
 +                       SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
        { "mx25u12835f", INFO(0xc22538, 0, 64 * 1024, 256,
                         SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
 +                       SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
        { "mx25u12835f", INFO(0xc22538, 0, 64 * 1024, 256,
                         SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-       { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
+       { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512,
index e939597b8e1d199e68403ec0d826839743055613..f4e3f7069e7749bc0840d9666d68d7bb9ffd57b3 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -519,6 +519,13 @@ config XILINX_GMII2RGMII
+@@ -580,6 +580,13 @@ config XILINX_GMII2RGMII
          the Reduced Gigabit Media Independent Interface(RGMII) between
          Ethernet physical media devices and the Gigabit Ethernet controller.
  
          the Reduced Gigabit Media Independent Interface(RGMII) between
          Ethernet physical media devices and the Gigabit Ethernet controller.
  
@@ -16,7 +16,7 @@
  config MICREL_KS8995MA
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
  config MICREL_KS8995MA
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -48,6 +48,7 @@ obj-$(CONFIG_MDIO_CAVIUM)    += mdio-cavium
+@@ -51,6 +51,7 @@ obj-$(CONFIG_MDIO_CAVIUM)    += mdio-cavium
  obj-$(CONFIG_MDIO_GPIO)               += mdio-gpio.o
  obj-$(CONFIG_MDIO_HISI_FEMAC) += mdio-hisi-femac.o
  obj-$(CONFIG_MDIO_I2C)                += mdio-i2c.o
  obj-$(CONFIG_MDIO_GPIO)               += mdio-gpio.o
  obj-$(CONFIG_MDIO_HISI_FEMAC) += mdio-hisi-femac.o
  obj-$(CONFIG_MDIO_I2C)                += mdio-i2c.o
index 316e60f221058baa950706507a7cc0b53aeb9a17..26e55b4021dfded9cd9057cd1168d5fd28686ce9 100644 (file)
@@ -15,7 +15,7 @@ so the info might change.
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -571,6 +571,34 @@
+@@ -566,6 +566,34 @@
                        status = "disabled";
                };
  
                        status = "disabled";
                };
  
index df9569929413f0281ed63cf5b7865296d6c04bf3..03da6c863a8eb4c4de2b0a60850a1e8acc23f628 100644 (file)
@@ -14,7 +14,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -599,6 +599,29 @@
+@@ -594,6 +594,29 @@
                        };
                };
  
                        };
                };
  
index cc7e49736d0ef5d610ded295ce488a78c9dcb90f..970983ea01a5b3af098870d02bb09326d47b3175 100644 (file)
@@ -24,7 +24,7 @@ Reviewed-by: Grant Grundler <grundler@chromium.org>
 
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
 
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -739,6 +739,16 @@ struct xps_map {
+@@ -771,6 +771,16 @@ struct xps_map {
  #define XPS_MIN_MAP_ALLOC ((L1_CACHE_ALIGN(offsetof(struct xps_map, queues[1])) \
         - sizeof(struct xps_map)) / sizeof(u16))
  
  #define XPS_MIN_MAP_ALLOC ((L1_CACHE_ALIGN(offsetof(struct xps_map, queues[1])) \
         - sizeof(struct xps_map)) / sizeof(u16))
  
@@ -41,7 +41,7 @@ Reviewed-by: Grant Grundler <grundler@chromium.org>
  /*
   * This structure holds all XPS maps for device.  Maps are indexed by CPU.
   */
  /*
   * This structure holds all XPS maps for device.  Maps are indexed by CPU.
   */
-@@ -1353,6 +1363,9 @@ struct net_device_ops {
+@@ -1374,6 +1384,9 @@ struct net_device_ops {
                                                     const struct sk_buff *skb,
                                                     u16 rxq_index,
                                                     u32 flow_id);
                                                     const struct sk_buff *skb,
                                                     u16 rxq_index,
                                                     u32 flow_id);
index 5feea6d4e02b4fbc5b82adfe96c1703063d2f846..6df447fcd5e359535a92ed340b3f7786829921af 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -526,6 +526,13 @@ config MDIO_IPQ40XX
+@@ -587,6 +587,13 @@ config MDIO_IPQ40XX
          This driver supports the MDIO interface found in Qualcomm
          Atheros ipq40xx Soc chip.
  
          This driver supports the MDIO interface found in Qualcomm
          Atheros ipq40xx Soc chip.
  
@@ -16,9 +16,9 @@
  config MICREL_KS8995MA
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
  config MICREL_KS8995MA
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -62,6 +62,7 @@ obj-y                                += $(sfp-obj-y) $(sfp-obj-m)
- obj-$(CONFIG_AMD_PHY)         += amd.o
+@@ -70,6 +70,7 @@ ifdef CONFIG_HWMON
+ aquantia-objs                 += aquantia_hwmon.o
+ endif
  obj-$(CONFIG_AQUANTIA_PHY)    += aquantia.o
 +obj-$(CONFIG_AR40XX_PHY)      += ar40xx.o
  obj-$(CONFIG_AX88796B_PHY)    += ax88796b.o
  obj-$(CONFIG_AQUANTIA_PHY)    += aquantia.o
 +obj-$(CONFIG_AR40XX_PHY)      += ar40xx.o
  obj-$(CONFIG_AX88796B_PHY)    += ax88796b.o
index 0ae6b17f8cec27550323b8804e9ded20cda98db5..cda05bfb9f603d5d26b9ee0d34a60803a1783aa2 100644 (file)
@@ -1,7 +1,5 @@
-Index: linux-5.4.11/drivers/net/phy/ar40xx.c
-===================================================================
---- linux-5.4.11.orig/drivers/net/phy/ar40xx.c
-+++ linux-5.4.11/drivers/net/phy/ar40xx.c
+--- a/drivers/net/phy/ar40xx.c
++++ b/drivers/net/phy/ar40xx.c
 @@ -1808,8 +1808,8 @@ ar40xx_phy_probe(struct phy_device *phyd
        if (phydev->mdio.addr == 0)
                ar40xx_priv->phy = phydev;
 @@ -1808,8 +1808,8 @@ ar40xx_phy_probe(struct phy_device *phyd
        if (phydev->mdio.addr == 0)
                ar40xx_priv->phy = phydev;
index 1df0a899518438189e50247234214a1a1bdbbe16..657d81c5c2e87c1c1657a28646a2302efd6628a3 100644 (file)
@@ -9,10 +9,8 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
  drivers/net/ethernet/qualcomm/Makefile | 1 +
  2 files changed, 10 insertions(+)
 
  drivers/net/ethernet/qualcomm/Makefile | 1 +
  2 files changed, 10 insertions(+)
 
-Index: linux-5.4.11/drivers/net/ethernet/qualcomm/Kconfig
-===================================================================
---- linux-5.4.11.orig/drivers/net/ethernet/qualcomm/Kconfig
-+++ linux-5.4.11/drivers/net/ethernet/qualcomm/Kconfig
+--- a/drivers/net/ethernet/qualcomm/Kconfig
++++ b/drivers/net/ethernet/qualcomm/Kconfig
 @@ -62,4 +62,13 @@ config QCOM_EMAC
  
  source "drivers/net/ethernet/qualcomm/rmnet/Kconfig"
 @@ -62,4 +62,13 @@ config QCOM_EMAC
  
  source "drivers/net/ethernet/qualcomm/rmnet/Kconfig"
@@ -27,10 +25,8 @@ Index: linux-5.4.11/drivers/net/ethernet/qualcomm/Kconfig
 +        will be called essedma.ko.
 +
  endif # NET_VENDOR_QUALCOMM
 +        will be called essedma.ko.
 +
  endif # NET_VENDOR_QUALCOMM
-Index: linux-5.4.11/drivers/net/ethernet/qualcomm/Makefile
-===================================================================
---- linux-5.4.11.orig/drivers/net/ethernet/qualcomm/Makefile
-+++ linux-5.4.11/drivers/net/ethernet/qualcomm/Makefile
+--- a/drivers/net/ethernet/qualcomm/Makefile
++++ b/drivers/net/ethernet/qualcomm/Makefile
 @@ -10,5 +10,6 @@ obj-$(CONFIG_QCA7000_UART) += qcauart.o
  qcauart-objs := qca_uart.o
  
 @@ -10,5 +10,6 @@ obj-$(CONFIG_QCA7000_UART) += qcauart.o
  qcauart-objs := qca_uart.o
  
index 8f7627b0486a8441c5ec8f81f9f8697521b47110..8cf65051045deb2da5b0785a4af670fdb88e56d3 100644 (file)
@@ -16,7 +16,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -44,6 +44,8 @@
+@@ -38,6 +38,8 @@
                spi1 = &blsp1_spi2;
                i2c0 = &blsp1_i2c3;
                i2c1 = &blsp1_i2c4;
                spi1 = &blsp1_spi2;
                i2c0 = &blsp1_i2c3;
                i2c1 = &blsp1_i2c4;
@@ -25,7 +25,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
        };
  
        cpus {
        };
  
        cpus {
-@@ -622,6 +624,64 @@
+@@ -617,6 +619,64 @@
                        status = "disabled";
                };
  
                        status = "disabled";
                };
  
index 1d424a31ce53e4b96fb8aad69497c74a4d7b908c..dcc21263c459c8fd76f7728e49c9ae40a6459b8d 100644 (file)
@@ -13,8 +13,8 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -617,6 +618,53 @@
-                       status = "disabled";
+@@ -677,6 +677,53 @@
+                       };
                };
  
 +              gmac: ethernet@c080000 {
                };
  
 +              gmac: ethernet@c080000 {
index 7b4eeff5bbe2efe808cf0939c357af20c4bccea0..17e9047dfb443a57a9f64bc9ea7a5844b3f16069 100644 (file)
@@ -2,9 +2,9 @@ From: Christian Lamparter <chunkeey@googlemail.com>
 Subject: SoC: add qualcomm syscon
 --- a/drivers/soc/qcom/Makefile
 +++ b/drivers/soc/qcom/Makefile
 Subject: SoC: add qualcomm syscon
 --- a/drivers/soc/qcom/Makefile
 +++ b/drivers/soc/qcom/Makefile
-@@ -18,6 +18,7 @@ obj-$(CONFIG_QCOM_SMEM_STATE) += smem_st
- obj-$(CONFIG_QCOM_SMP2P)      += smp2p.o
+@@ -20,6 +20,7 @@ obj-$(CONFIG_QCOM_SMP2P)     += smp2p.o
  obj-$(CONFIG_QCOM_SMSM)       += smsm.o
  obj-$(CONFIG_QCOM_SMSM)       += smsm.o
+ obj-$(CONFIG_QCOM_SOCINFO)    += socinfo.o
  obj-$(CONFIG_QCOM_WCNSS_CTRL) += wcnss_ctrl.o
 +obj-$(CONFIG_QCOM_TCSR)        += qcom_tcsr.o
  obj-$(CONFIG_QCOM_APR) += apr.o
  obj-$(CONFIG_QCOM_WCNSS_CTRL) += wcnss_ctrl.o
 +obj-$(CONFIG_QCOM_TCSR)        += qcom_tcsr.o
  obj-$(CONFIG_QCOM_APR) += apr.o
@@ -12,9 +12,9 @@ Subject: SoC: add qualcomm syscon
  obj-$(CONFIG_QCOM_SDM845_LLCC) += llcc-sdm845.o
 --- a/drivers/soc/qcom/Kconfig
 +++ b/drivers/soc/qcom/Kconfig
  obj-$(CONFIG_QCOM_SDM845_LLCC) += llcc-sdm845.o
 --- a/drivers/soc/qcom/Kconfig
 +++ b/drivers/soc/qcom/Kconfig
-@@ -146,6 +146,13 @@ config QCOM_SMSM
-         Say yes here to support the Qualcomm Shared Memory State Machine.
-         The state machine is represented by bits in shared memory.
+@@ -183,6 +183,13 @@ config QCOM_SOCINFO
+        Say yes here to support the Qualcomm socinfo driver, providing
+        information about the SoC to user space.
  
 +config QCOM_TCSR
 +      tristate "QCOM Top Control and Status Registers"
  
 +config QCOM_TCSR
 +      tristate "QCOM Top Control and Status Registers"
@@ -25,7 +25,7 @@ Subject: SoC: add qualcomm syscon
 +
  config QCOM_WCNSS_CTRL
        tristate "Qualcomm WCNSS control driver"
 +
  config QCOM_WCNSS_CTRL
        tristate "Qualcomm WCNSS control driver"
-       depends on ARCH_QCOM
+       depends on ARCH_QCOM || COMPILE_TEST
 --- /dev/null
 +++ b/drivers/soc/qcom/qcom_tcsr.c
 @@ -0,0 +1,98 @@
 --- /dev/null
 +++ b/drivers/soc/qcom/qcom_tcsr.c
 @@ -0,0 +1,98 @@
index da53220f092568ccd87aea7cc3f8412234cb6815..d49c03c1d01ad43271051c66e25f7dae56c8c8d8 100644 (file)
@@ -10,7 +10,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
 
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -785,11 +785,43 @@ dtb-$(CONFIG_ARCH_QCOM) += \
+@@ -837,11 +837,43 @@ dtb-$(CONFIG_ARCH_QCOM) += \
        qcom-apq8074-dragonboard.dtb \
        qcom-apq8084-ifc6540.dtb \
        qcom-apq8084-mtp.dtb \
        qcom-apq8074-dragonboard.dtb \
        qcom-apq8084-ifc6540.dtb \
        qcom-apq8084-mtp.dtb \
index c1836453bcda8e873f4f26b5594630589643b041..3cc032fdd24bdb1758a821314077e4385f127712 100644 (file)
@@ -1,7 +1,5 @@
-Index: linux-5.4.5/drivers/of/fdt.c
-===================================================================
---- linux-5.4.5.orig/drivers/of/fdt.c
-+++ linux-5.4.5/drivers/of/fdt.c
+--- a/drivers/of/fdt.c
++++ b/drivers/of/fdt.c
 @@ -1059,6 +1059,9 @@ int __init early_init_dt_scan_chosen(uns
        p = of_get_flat_dt_prop(node, "bootargs", &l);
        if (p != NULL && l > 0)
 @@ -1059,6 +1059,9 @@ int __init early_init_dt_scan_chosen(uns
        p = of_get_flat_dt_prop(node, "bootargs", &l);
        if (p != NULL && l > 0)