diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | drivers/spi/cadence_qspi_apb.c | 3 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 99 |
3 files changed, 4 insertions, 100 deletions
@@ -3,7 +3,7 @@ VERSION = 2021 PATCHLEVEL = 10 SUBLEVEL = -EXTRAVERSION = -rc5 +EXTRAVERSION = NAME = # *DOCUMENTATION* diff --git a/drivers/spi/cadence_qspi_apb.c b/drivers/spi/cadence_qspi_apb.c index c36a652211..429ee335db 100644 --- a/drivers/spi/cadence_qspi_apb.c +++ b/drivers/spi/cadence_qspi_apb.c @@ -219,6 +219,9 @@ static unsigned int cadence_qspi_calc_dummy(const struct spi_mem_op *op, { unsigned int dummy_clk; + if (!op->dummy.nbytes || !op->dummy.buswidth) + return 0; + dummy_clk = op->dummy.nbytes * (8 / op->dummy.buswidth); if (dtr) dummy_clk /= 2; diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 61ae682dcd..5bcd2c26c4 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -5,12 +5,10 @@ CONFIG_88F5182 CONFIG_A003399_NOR_WORKAROUND CONFIG_A008044_WORKAROUND CONFIG_AEABI -CONFIG_AEMIF_CNTRL_BASE CONFIG_AM335X_USB0 CONFIG_AM335X_USB0_MODE CONFIG_AM335X_USB1 CONFIG_AM335X_USB1_MODE -CONFIG_AM437X_USB2PHY2_HOST CONFIG_ANDES_PCU CONFIG_ANDES_PCU_BASE CONFIG_ARCH_ADPAG101P @@ -21,7 +19,6 @@ CONFIG_ARCH_OMAP4 CONFIG_ARCH_RMOBILE_EXTRAM_BOOT CONFIG_ARCH_USE_BUILTIN_BSWAP CONFIG_ARC_MMU_VER -CONFIG_ARMADA100 CONFIG_ARMV7_SECURE_BASE CONFIG_ARMV7_SECURE_MAX_SIZE CONFIG_ARMV7_SECURE_RESERVE_SIZE @@ -66,7 +63,6 @@ CONFIG_BL2_OFFSET CONFIG_BL2_SIZE CONFIG_BOARDDIR CONFIG_BOARDNAME -CONFIG_BOARDNAME_LOCAL CONFIG_BOARD_COMMON CONFIG_BOARD_ECC_SUPPORT CONFIG_BOARD_IS_OPENRD_BASE @@ -142,9 +138,6 @@ CONFIG_CM_INIT CONFIG_CM_MULTIPLE_SSRAM CONFIG_CM_REMAP CONFIG_CM_SPD_DETECT -CONFIG_CM_T335 -CONFIG_CM_T3X -CONFIG_CM_T43 CONFIG_CM_TCRAM CONFIG_COLDFIRE CONFIG_COMMANDS @@ -291,8 +284,6 @@ CONFIG_ESDHC_DETECT_QUIRK CONFIG_ESDHC_HC_BLK_ADDR CONFIG_ESPRESSO7420 CONFIG_ET1100_BASE -CONFIG_ETH1ADDR -CONFIG_ETH2ADDR CONFIG_ETHADDR CONFIG_ETHBASE CONFIG_ETHPRIME @@ -379,7 +370,6 @@ CONFIG_FSL_ISBC_KEY_EXT CONFIG_FSL_LBC CONFIG_FSL_MEMAC CONFIG_FSL_NGPIXIS -CONFIG_FSL_PCI_INIT CONFIG_FSL_PMIC_BITLEN CONFIG_FSL_PMIC_BUS CONFIG_FSL_PMIC_CLK @@ -648,8 +638,6 @@ CONFIG_IOMUX_SHARE_CONF_REG CONFIG_IOS CONFIG_IO_TRACE CONFIG_IPADDR -CONFIG_IPADDR1 -CONFIG_IPADDR2 CONFIG_IPROC CONFIG_IRAM_BASE CONFIG_IRAM_END @@ -668,12 +656,7 @@ CONFIG_JRSTARTR_JR0 CONFIG_JTAG_CONSOLE CONFIG_KEEP_SERVERADDR CONFIG_KEYBOARD -CONFIG_KEYSTONE_NAND_MAX_RBL_PAGE -CONFIG_KEYSTONE_NAND_MAX_RBL_SIZE -CONFIG_KEYSTONE_RBL_NAND CONFIG_KEY_REVOCATION -CONFIG_KGDB_BAUDRATE -CONFIG_KGDB_SER_INDEX CONFIG_KIRKWOOD_EGIGA_INIT CONFIG_KIRKWOOD_GPIO CONFIG_KIRKWOOD_PCIE_INIT @@ -707,32 +690,6 @@ CONFIG_KM_UBI_PARTITION_NAME_BOOT CONFIG_KM_UBI_PART_BOOT_OPTS CONFIG_KM_UIMAGE_NAME CONFIG_KM_UPDATE_UBOOT -CONFIG_KSNAV_NETCP_PDMA_CTRL_BASE -CONFIG_KSNAV_NETCP_PDMA_RX_BASE -CONFIG_KSNAV_NETCP_PDMA_RX_CH_NUM -CONFIG_KSNAV_NETCP_PDMA_RX_FLOW_BASE -CONFIG_KSNAV_NETCP_PDMA_RX_FLOW_NUM -CONFIG_KSNAV_NETCP_PDMA_RX_FREE_QUEUE -CONFIG_KSNAV_NETCP_PDMA_RX_RCV_QUEUE -CONFIG_KSNAV_NETCP_PDMA_SCHED_BASE -CONFIG_KSNAV_NETCP_PDMA_TX_BASE -CONFIG_KSNAV_NETCP_PDMA_TX_CH_NUM -CONFIG_KSNAV_NETCP_PDMA_TX_SND_QUEUE -CONFIG_KSNAV_PKTDMA_NETCP -CONFIG_KSNAV_QM_BASE_ADDRESS -CONFIG_KSNAV_QM_CONF_BASE -CONFIG_KSNAV_QM_DESC_SETUP_BASE -CONFIG_KSNAV_QM_INTD_CONF_BASE -CONFIG_KSNAV_QM_LINK_RAM_BASE -CONFIG_KSNAV_QM_MANAGER_QUEUES_BASE -CONFIG_KSNAV_QM_MANAGER_Q_PROXY_BASE -CONFIG_KSNAV_QM_PDSP1_CMD_BASE -CONFIG_KSNAV_QM_PDSP1_CTRL_BASE -CONFIG_KSNAV_QM_PDSP1_IRAM_BASE -CONFIG_KSNAV_QM_QPOOL_NUM -CONFIG_KSNAV_QM_QUEUE_STATUS_BASE -CONFIG_KSNAV_QM_REGION_NUM -CONFIG_KSNAV_QM_STATUS_RAM_BASE CONFIG_KSNET_CPSW_NUM_PORTS CONFIG_KSNET_MAC_ID_BASE CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE @@ -800,12 +757,10 @@ CONFIG_M41T94_SPI_CS CONFIG_M520x CONFIG_M5301x CONFIG_MACB_SEARCH_PHY -CONFIG_MACH_OMAPL138_LCDK CONFIG_MACRESET_TIMEOUT CONFIG_MALLOC_F_ADDR CONFIG_MALTA CONFIG_MARCO_MEMSET -CONFIG_MARVELL_MFP CONFIG_MASK_AER_AO CONFIG_MAX_DSP_CPUS CONFIG_MAX_FPGA_DEVICES @@ -843,7 +798,6 @@ CONFIG_MPC83XX_GPIO_0_INIT_VALUE CONFIG_MPC83XX_GPIO_1_INIT_DIRECTION CONFIG_MPC83XX_GPIO_1_INIT_OPEN_DRAIN CONFIG_MPC83XX_GPIO_1_INIT_VALUE -CONFIG_MPC83XX_PCI2 CONFIG_MPC85XX_FEC CONFIG_MPC85XX_FEC_NAME CONFIG_MPC8xxx_DISABLE_BPTR @@ -871,15 +825,10 @@ CONFIG_MVS CONFIG_MV_ETH_RXQ CONFIG_MV_I2C_NUM CONFIG_MV_I2C_REG -CONFIG_MX25_CLK32 -CONFIG_MX25_HCLK_FREQ CONFIG_MX27 CONFIG_MX27_CLK32 CONFIG_MX27_TIMER_HIGH_PRECISION CONFIG_MX28_FEC_MAC_IN_OCOTP -CONFIG_MX35 -CONFIG_MX35_CLK32 -CONFIG_MX35_HCLK_FREQ CONFIG_MXC_EPDC CONFIG_MXC_GPT_HCLK CONFIG_MXC_NAND_HWECC @@ -944,11 +893,6 @@ CONFIG_NUM_PAMU CONFIG_ODROID_REV_AIN CONFIG_OFF_PADCONF CONFIG_OF_ -CONFIG_OMAP_EHCI_PHY1_RESET_GPIO -CONFIG_OMAP_EHCI_PHY2_RESET_GPIO -CONFIG_OMAP_EHCI_PHY3_RESET_GPIO -CONFIG_OMAP_USB2PHY2_HOST -CONFIG_OMAP_USB3PHY1_HOST CONFIG_ORIGEN CONFIG_OTHBOOTARGS CONFIG_OVERWRITE_ETHADDR_ONCE @@ -969,14 +913,12 @@ CONFIG_PCIE4 CONFIG_PCIE_IMX CONFIG_PCIE_IMX_PERST_GPIO CONFIG_PCIE_IMX_POWER_GPIO -CONFIG_PCISLAVE CONFIG_PCI_BOOTDELAY CONFIG_PCI_CLK_FREQ CONFIG_PCI_CONFIG_HOST_BRIDGE CONFIG_PCI_EHCI_DEVICE CONFIG_PCI_EHCI_DEVNO CONFIG_PCI_GT64120 -CONFIG_PCI_INDIRECT_BRIDGE CONFIG_PCI_IO_BUS CONFIG_PCI_IO_PHYS CONFIG_PCI_IO_SIZE @@ -1007,7 +949,6 @@ CONFIG_PIXIS_SGMII_CMD CONFIG_PL011_CLOCK CONFIG_PL011_SERIAL_RLCR CONFIG_PL01x_PORTS -CONFIG_PLATFORM_ENV_SETTINGS CONFIG_PM CONFIG_PMC_BR_PRELIM CONFIG_PMC_OR_PRELIM @@ -1063,7 +1004,6 @@ CONFIG_QSPI CONFIG_QUOTA CONFIG_RAMBOOTCOMMAND CONFIG_RAMBOOT_NAND -CONFIG_RAMBOOT_SDCARD CONFIG_RAMBOOT_SPIFLASH CONFIG_RAMBOOT_TEXT_BASE CONFIG_RAMDISKFILE @@ -1170,7 +1110,6 @@ CONFIG_SH73A0 CONFIG_SH7751_PCI CONFIG_SHARP_LM8V31 CONFIG_SHEEVA_88SV131 -CONFIG_SHEEVA_88SV331xV5 CONFIG_SH_CMT_CLK_FREQ CONFIG_SH_DSP CONFIG_SH_ETHER_ALIGNE_SIZE @@ -1214,11 +1153,6 @@ CONFIG_SMSTP7_ENA CONFIG_SMSTP8_ENA CONFIG_SMSTP9_ENA CONFIG_SOCRATES -CONFIG_SOC_K2E -CONFIG_SOC_K2G -CONFIG_SOC_K2HK -CONFIG_SOC_K2L -CONFIG_SOC_KEYSTONE CONFIG_SOC_OMAP3430 CONFIG_SOFT_I2C_GPIO_SCL CONFIG_SOFT_I2C_GPIO_SDA @@ -1727,12 +1661,10 @@ CONFIG_SYS_FLASH1 CONFIG_SYS_FLASH1_BASE_PHYS CONFIG_SYS_FLASH1_BASE_PHYS_EARLY CONFIG_SYS_FLASHBOOT -CONFIG_SYS_FLASH_ADDR_BASE CONFIG_SYS_FLASH_AMD_CHECK_DQ7 CONFIG_SYS_FLASH_AUTOPROTECT_LIST CONFIG_SYS_FLASH_BANKS_LIST CONFIG_SYS_FLASH_BANKS_SIZES -CONFIG_SYS_FLASH_BANK_SIZE CONFIG_SYS_FLASH_BASE CONFIG_SYS_FLASH_BASE0 CONFIG_SYS_FLASH_BASE1 @@ -2157,14 +2089,12 @@ CONFIG_SYS_I2C_EXPANDER_ADDR CONFIG_SYS_I2C_FPGA_ADDR CONFIG_SYS_I2C_FRAM CONFIG_SYS_I2C_G762_ADDR -CONFIG_SYS_I2C_IDT6V49205B CONFIG_SYS_I2C_IFDR_DIV CONFIG_SYS_I2C_INIT_BOARD CONFIG_SYS_I2C_LDI_ADDR CONFIG_SYS_I2C_LPC32XX_SLAVE CONFIG_SYS_I2C_LPC32XX_SPEED CONFIG_SYS_I2C_MAX_HOPS -CONFIG_SYS_I2C_NCT72_ADDR CONFIG_SYS_I2C_NOPROBES CONFIG_SYS_I2C_PCA953X_ADDR CONFIG_SYS_I2C_PCA953X_WIDTH @@ -2574,19 +2504,7 @@ CONFIG_SYS_PCI1_MEM_BUS CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_SIZE CONFIG_SYS_PCI1_MEM_VIRT -CONFIG_SYS_PCI1_MMIO_BASE -CONFIG_SYS_PCI1_MMIO_PHYS -CONFIG_SYS_PCI1_MMIO_SIZE CONFIG_SYS_PCI2_ADDR -CONFIG_SYS_PCI2_IO_BASE -CONFIG_SYS_PCI2_IO_PHYS -CONFIG_SYS_PCI2_IO_SIZE -CONFIG_SYS_PCI2_MEM_BASE -CONFIG_SYS_PCI2_MEM_PHYS -CONFIG_SYS_PCI2_MEM_SIZE -CONFIG_SYS_PCI2_MMIO_BASE -CONFIG_SYS_PCI2_MMIO_PHYS -CONFIG_SYS_PCI2_MMIO_SIZE CONFIG_SYS_PCI64_MEMORY_BUS CONFIG_SYS_PCIE CONFIG_SYS_PCIE1_ADDR @@ -2594,12 +2512,10 @@ CONFIG_SYS_PCIE1_BASE CONFIG_SYS_PCIE1_CFG_BASE CONFIG_SYS_PCIE1_CFG_SIZE CONFIG_SYS_PCIE1_IO_BASE -CONFIG_SYS_PCIE1_IO_BUS CONFIG_SYS_PCIE1_IO_PHYS CONFIG_SYS_PCIE1_IO_SIZE CONFIG_SYS_PCIE1_IO_VIRT CONFIG_SYS_PCIE1_MEM_BASE -CONFIG_SYS_PCIE1_MEM_BUS CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_SIZE CONFIG_SYS_PCIE1_MEM_VIRT @@ -2613,12 +2529,10 @@ CONFIG_SYS_PCIE2_BASE CONFIG_SYS_PCIE2_CFG_BASE CONFIG_SYS_PCIE2_CFG_SIZE CONFIG_SYS_PCIE2_IO_BASE -CONFIG_SYS_PCIE2_IO_BUS CONFIG_SYS_PCIE2_IO_PHYS CONFIG_SYS_PCIE2_IO_SIZE CONFIG_SYS_PCIE2_IO_VIRT CONFIG_SYS_PCIE2_MEM_BASE -CONFIG_SYS_PCIE2_MEM_BUS CONFIG_SYS_PCIE2_MEM_PHYS CONFIG_SYS_PCIE2_MEM_SIZE CONFIG_SYS_PCIE2_MEM_VIRT @@ -2772,7 +2686,6 @@ CONFIG_SYS_RCAR_I2C0_BASE CONFIG_SYS_RCAR_I2C1_BASE CONFIG_SYS_RCAR_I2C2_BASE CONFIG_SYS_RCAR_I2C3_BASE -CONFIG_SYS_RCWH_PCIHOST CONFIG_SYS_READ_SPD CONFIG_SYS_RESET_ADDR CONFIG_SYS_RESET_ADDRESS @@ -2903,8 +2816,6 @@ CONFIG_SYS_SMC0_PULSE0_VAL CONFIG_SYS_SMC0_SETUP0_VAL CONFIG_SYS_SMC_CSR0_VAL CONFIG_SYS_SPCR_OPT -CONFIG_SYS_SPCR_TSEC1EP -CONFIG_SYS_SPCR_TSEC2EP CONFIG_SYS_SPD_BUS_NUM CONFIG_SYS_SPI_ARGS_OFFS CONFIG_SYS_SPI_ARGS_SIZE @@ -2943,7 +2854,6 @@ CONFIG_SYS_STATUS_OK CONFIG_SYS_SXCNFG_VAL CONFIG_SYS_TBIPA_VALUE CONFIG_SYS_TCLK -CONFIG_SYS_TEXT_BASE_NOR CONFIG_SYS_TIMERBASE CONFIG_SYS_TIMER_BASE CONFIG_SYS_TIMER_COUNTER @@ -2957,9 +2867,7 @@ CONFIG_SYS_TMRINTR_PEND CONFIG_SYS_TMRINTR_PRI CONFIG_SYS_TMRPND_REG CONFIG_SYS_TMR_BASE -CONFIG_SYS_TSEC1 CONFIG_SYS_TSEC1_OFFSET -CONFIG_SYS_TSEC2 CONFIG_SYS_TSEC2_OFFSET CONFIG_SYS_TSEC3_OFFSET CONFIG_SYS_TX_ETH_BUFFER @@ -3002,7 +2910,6 @@ CONFIG_SYS_USE_DATAFLASH_CS3 CONFIG_SYS_USE_FLASH CONFIG_SYS_USE_MAIN_OSCILLATOR CONFIG_SYS_USE_MMC -CONFIG_SYS_USE_MPC834XSYS_USB_PHY CONFIG_SYS_USE_NAND CONFIG_SYS_USE_NANDFLASH CONFIG_SYS_USE_NORFLASH @@ -3067,7 +2974,6 @@ CONFIG_THOR_RESET_OFF CONFIG_THUNDERX CONFIG_TIMESTAMP CONFIG_TIZEN -CONFIG_TI_KSNAV CONFIG_TMU_TIMER CONFIG_TPL_PAD_TO CONFIG_TPM_TIS_BASE_ADDRESS @@ -3092,11 +2998,8 @@ CONFIG_UBIFS_VOLUME CONFIG_UBI_PART CONFIG_UBI_SIZE CONFIG_UBOOTPATH -CONFIG_UBOOT_ENABLE_PADS_ALL CONFIG_UBOOT_SECTOR_COUNT CONFIG_UBOOT_SECTOR_START -CONFIG_UCP1020 -CONFIG_UCP1020_REV_1_3 CONFIG_UDP_CHECKSUM CONFIG_UEC_ETH CONFIG_UEC_ETH1 @@ -3144,7 +3047,6 @@ CONFIG_USB_EHCI_BASE_LIST CONFIG_USB_EHCI_EXYNOS CONFIG_USB_EHCI_FARADAY CONFIG_USB_EHCI_KIRKWOOD -CONFIG_USB_EHCI_MXC CONFIG_USB_EHCI_MXS CONFIG_USB_EHCI_TXFIFO_THRESH CONFIG_USB_ETH_QMULT @@ -3183,7 +3085,6 @@ CONFIG_USB_TTY CONFIG_USB_TUSB_OMAP_DMA CONFIG_USB_ULPI_TIMEOUT CONFIG_USB_XHCI_EXYNOS -CONFIG_USB_XHCI_OMAP CONFIG_USER_LOWLEVEL_INIT CONFIG_USE_INTERRUPT CONFIG_USE_ONENAND_BOARD_INIT |