Enable drivers for Xilinx ZYMQ-MP Ultra96

17 files changed, 41 insertions, 26 deletions

diff --git a/configs/fedora/generic/x86/CONFIG_SPI_CADENCE b/configs/fedora/generic/CONFIG_SPI_CADENCE
index 78e16ec97..78e16ec97 100644
--- a/configs/fedora/generic/x86/CONFIG_SPI_CADENCE
+++ b/configs/fedora/generic/CONFIG_SPI_CADENCE
diff --git a/configs/fedora/generic/arm/CONFIG_CADENCE_WATCHDOG b/configs/fedora/generic/arm/CONFIG_CADENCE_WATCHDOG
index 3892db328..85b4e115d 100644
--- a/configs/fedora/generic/arm/CONFIG_CADENCE_WATCHDOG
+++ b/configs/fedora/generic/arm/CONFIG_CADENCE_WATCHDOG
@@ -1 +1 @@
-# CONFIG_CADENCE_WATCHDOG is not set
+CONFIG_CADENCE_WATCHDOG=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_I2C_CADENCE b/configs/fedora/generic/arm/CONFIG_I2C_CADENCE
index 8e1eefa5c..8e1eefa5c 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_I2C_CADENCE
+++ b/configs/fedora/generic/arm/CONFIG_I2C_CADENCE
diff --git a/configs/fedora/generic/arm/CONFIG_SPI_CADENCE b/configs/fedora/generic/arm/CONFIG_SPI_CADENCE
index 78e16ec97..3a8bb168c 100644
--- a/configs/fedora/generic/arm/CONFIG_SPI_CADENCE
+++ b/configs/fedora/generic/arm/CONFIG_SPI_CADENCE
@@ -1 +1 @@
-# CONFIG_SPI_CADENCE is not set
+CONFIG_SPI_CADENCE=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CADENCE_WATCHDOG b/configs/fedora/generic/arm/armv7/armv7/CONFIG_CADENCE_WATCHDOG
deleted file mode 100644
index 85b4e115d..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CADENCE_WATCHDOG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CADENCE_WATCHDOG=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SPI_CADENCE b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SPI_CADENCE
deleted file mode 100644
index 3a8bb168c..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SPI_CADENCE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI_CADENCE=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index b9fae82b8..6d2a8a713 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -149,7 +149,7 @@ CONFIG_ADAPTEC_STARFIRE=m
 # CONFIG_AF_KCM is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_AHCI_CEVA is not set
+CONFIG_AHCI_CEVA=m
 CONFIG_AHCI_MVEBU=m
 # CONFIG_AHCI_QORIQ is not set
 CONFIG_AHCI_SUNXI=m
@@ -713,7 +713,8 @@ CONFIG_BUILD_DOCSRC=y
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_HISTOGRAM is not set
 CONFIG_CACHEFILES=m
-# CONFIG_CADENCE_WATCHDOG is not set
+CONFIG_CADENCE_TTC_TIMER=y
+CONFIG_CADENCE_WATCHDOG=m
 # CONFIG_CAIF is not set
 CONFIG_CAN_8DEV_USB=m
 CONFIG_CAN_BCM=m
@@ -759,7 +760,7 @@ CONFIG_CAN_SUN4I=m
 # CONFIG_CAN_TSCAN1 is not set
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_VXCAN=m
-# CONFIG_CAN_XILINXCAN is not set
+CONFIG_CAN_XILINXCAN=m
 CONFIG_CAPI_AVM=y
 # CONFIG_CAPI_EICON is not set
 # CONFIG_CAPI_TRACE is not set
@@ -1822,6 +1823,7 @@ CONFIG_GPIO_RASPBERRYPI_EXP=m
 CONFIG_GPIO_TEGRA=y
 CONFIG_GPIO_THUNDERX=m
 # CONFIG_GPIO_TPIC2810 is not set
+CONFIG_GPIO_TPS65086=m
 CONFIG_GPIO_TPS68470=y
 # CONFIG_GPIO_TS4900 is not set
 # CONFIG_GPIO_TS5500 is not set
@@ -2069,7 +2071,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=m
 # CONFIG_I2C_BCM2048 is not set
 CONFIG_I2C_BCM2835=m
 CONFIG_I2C_BOARDINFO=y
-# CONFIG_I2C_CADENCE is not set
+CONFIG_I2C_CADENCE=m
 # CONFIG_I2C_CBUS_GPIO is not set
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_COMPAT=y
@@ -2212,7 +2214,7 @@ CONFIG_IMA_LSM_RULES=y
 CONFIG_IMA_MEASURE_PCR_IDX=10
 # CONFIG_IMG_ASCII_LCD is not set
 # CONFIG_IMX_IPUV3_CORE is not set
-# CONFIG_INA2XX_ADC is not set
+CONFIG_INA2XX_ADC=m
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_ESP_OFFLOAD=m
@@ -3094,7 +3096,7 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TI_LP87565 is not set
 # CONFIG_MFD_TIMBERDALE is not set
-# CONFIG_MFD_TPS65086 is not set
+CONFIG_MFD_TPS65086=m
 # CONFIG_MFD_TPS65090 is not set
 # CONFIG_MFD_TPS65217 is not set
 # CONFIG_MFD_TPS65218 is not set
@@ -4479,6 +4481,7 @@ CONFIG_REGULATOR_RK808=m
 # CONFIG_REGULATOR_TPS62360 is not set
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
+CONFIG_REGULATOR_TPS65086=m
 # CONFIG_REGULATOR_TPS65132 is not set
 # CONFIG_REGULATOR_TPS6524X is not set
 CONFIG_REGULATOR_USERSPACE_CONSUMER=m
@@ -5102,7 +5105,8 @@ CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SERIAL_TEGRA=y
 # CONFIG_SERIAL_TIMBERDALE is not set
 # CONFIG_SERIAL_UARTLITE is not set
-# CONFIG_SERIAL_XILINX_PS_UART is not set
+CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
+CONFIG_SERIAL_XILINX_PS_UART=y
 CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_AMBAKMI=m
 # CONFIG_SERIO_APBPS2 is not set
@@ -5527,7 +5531,7 @@ CONFIG_SPI_BCM2835=m
 # CONFIG_SPI_BCM_QSPI is not set
 CONFIG_SPI_BITBANG=m
 # CONFIG_SPI_BUTTERFLY is not set
-# CONFIG_SPI_CADENCE is not set
+CONFIG_SPI_CADENCE=m
 # CONFIG_SPI_DEBUG is not set
 CONFIG_SPI_DESIGNWARE=m
 # CONFIG_SPI_DW_MID_DMA is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index a4de54412..133e05b90 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -149,7 +149,7 @@ CONFIG_ADAPTEC_STARFIRE=m
 # CONFIG_AF_KCM is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_AHCI_CEVA is not set
+CONFIG_AHCI_CEVA=m
 CONFIG_AHCI_MVEBU=m
 # CONFIG_AHCI_QORIQ is not set
 CONFIG_AHCI_SUNXI=m
@@ -713,7 +713,8 @@ CONFIG_BUILD_DOCSRC=y
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_HISTOGRAM is not set
 CONFIG_CACHEFILES=m
-# CONFIG_CADENCE_WATCHDOG is not set
+CONFIG_CADENCE_TTC_TIMER=y
+CONFIG_CADENCE_WATCHDOG=m
 # CONFIG_CAIF is not set
 CONFIG_CAN_8DEV_USB=m
 CONFIG_CAN_BCM=m
@@ -759,7 +760,7 @@ CONFIG_CAN_SUN4I=m
 # CONFIG_CAN_TSCAN1 is not set
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_VXCAN=m
-# CONFIG_CAN_XILINXCAN is not set
+CONFIG_CAN_XILINXCAN=m
 CONFIG_CAPI_AVM=y
 # CONFIG_CAPI_EICON is not set
 # CONFIG_CAPI_TRACE is not set
@@ -1804,6 +1805,7 @@ CONFIG_GPIO_RASPBERRYPI_EXP=m
 CONFIG_GPIO_TEGRA=y
 CONFIG_GPIO_THUNDERX=m
 # CONFIG_GPIO_TPIC2810 is not set
+CONFIG_GPIO_TPS65086=m
 CONFIG_GPIO_TPS68470=y
 # CONFIG_GPIO_TS4900 is not set
 # CONFIG_GPIO_TS5500 is not set
@@ -2051,7 +2053,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=m
 # CONFIG_I2C_BCM2048 is not set
 CONFIG_I2C_BCM2835=m
 CONFIG_I2C_BOARDINFO=y
-# CONFIG_I2C_CADENCE is not set
+CONFIG_I2C_CADENCE=m
 # CONFIG_I2C_CBUS_GPIO is not set
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_COMPAT=y
@@ -2194,7 +2196,7 @@ CONFIG_IMA_LSM_RULES=y
 CONFIG_IMA_MEASURE_PCR_IDX=10
 # CONFIG_IMG_ASCII_LCD is not set
 # CONFIG_IMX_IPUV3_CORE is not set
-# CONFIG_INA2XX_ADC is not set
+CONFIG_INA2XX_ADC=m
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_ESP_OFFLOAD=m
@@ -3073,7 +3075,7 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TI_LP87565 is not set
 # CONFIG_MFD_TIMBERDALE is not set
-# CONFIG_MFD_TPS65086 is not set
+CONFIG_MFD_TPS65086=m
 # CONFIG_MFD_TPS65090 is not set
 # CONFIG_MFD_TPS65217 is not set
 # CONFIG_MFD_TPS65218 is not set
@@ -4456,6 +4458,7 @@ CONFIG_REGULATOR_RK808=m
 # CONFIG_REGULATOR_TPS62360 is not set
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
+CONFIG_REGULATOR_TPS65086=m
 # CONFIG_REGULATOR_TPS65132 is not set
 # CONFIG_REGULATOR_TPS6524X is not set
 CONFIG_REGULATOR_USERSPACE_CONSUMER=m
@@ -5079,7 +5082,8 @@ CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SERIAL_TEGRA=y
 # CONFIG_SERIAL_TIMBERDALE is not set
 # CONFIG_SERIAL_UARTLITE is not set
-# CONFIG_SERIAL_XILINX_PS_UART is not set
+CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
+CONFIG_SERIAL_XILINX_PS_UART=y
 CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_AMBAKMI=m
 # CONFIG_SERIO_APBPS2 is not set
@@ -5503,7 +5507,7 @@ CONFIG_SPI_BCM2835=m
 # CONFIG_SPI_BCM_QSPI is not set
 CONFIG_SPI_BITBANG=m
 # CONFIG_SPI_BUTTERFLY is not set
-# CONFIG_SPI_CADENCE is not set
+CONFIG_SPI_CADENCE=m
 # CONFIG_SPI_DEBUG is not set
 CONFIG_SPI_DESIGNWARE=m
 # CONFIG_SPI_DW_MID_DMA is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index f2afff953..2d105f611 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -725,7 +725,7 @@ CONFIG_CACHEFILES=m
 CONFIG_CACHE_L2X0_PMU=y
 CONFIG_CACHE_L2X0=y
 CONFIG_CACHE_TAUROS2=y
-# CONFIG_CADENCE_WATCHDOG is not set
+CONFIG_CADENCE_WATCHDOG=m
 # CONFIG_CAIF is not set
 CONFIG_CAN_8DEV_USB=m
 CONFIG_CAN_BCM=m
@@ -2079,7 +2079,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=m
 # CONFIG_I2C_BCM2048 is not set
 CONFIG_I2C_BCM2835=m
 CONFIG_I2C_BOARDINFO=y
-# CONFIG_I2C_CADENCE is not set
+CONFIG_I2C_CADENCE=m
 # CONFIG_I2C_CBUS_GPIO is not set
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_COMPAT=y
@@ -5585,7 +5585,7 @@ CONFIG_SPI_BCM2835=m
 # CONFIG_SPI_BCM_QSPI is not set
 CONFIG_SPI_BITBANG=m
 # CONFIG_SPI_BUTTERFLY is not set
-# CONFIG_SPI_CADENCE is not set
+CONFIG_SPI_CADENCE=m
 # CONFIG_SPI_CADENCE_QUADSPI is not set
 CONFIG_SPI_DAVINCI=m
 # CONFIG_SPI_DEBUG is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 2ffe20394..b6856efda 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -724,7 +724,7 @@ CONFIG_CACHEFILES=m
 CONFIG_CACHE_L2X0_PMU=y
 CONFIG_CACHE_L2X0=y
 CONFIG_CACHE_TAUROS2=y
-# CONFIG_CADENCE_WATCHDOG is not set
+CONFIG_CADENCE_WATCHDOG=m
 # CONFIG_CAIF is not set
 CONFIG_CAN_8DEV_USB=m
 CONFIG_CAN_BCM=m
@@ -2061,7 +2061,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=m
 # CONFIG_I2C_BCM2048 is not set
 CONFIG_I2C_BCM2835=m
 CONFIG_I2C_BOARDINFO=y
-# CONFIG_I2C_CADENCE is not set
+CONFIG_I2C_CADENCE=m
 # CONFIG_I2C_CBUS_GPIO is not set
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_COMPAT=y
@@ -5561,7 +5561,7 @@ CONFIG_SPI_BCM2835=m
 # CONFIG_SPI_BCM_QSPI is not set
 CONFIG_SPI_BITBANG=m
 # CONFIG_SPI_BUTTERFLY is not set
-# CONFIG_SPI_CADENCE is not set
+CONFIG_SPI_CADENCE=m
 # CONFIG_SPI_CADENCE_QUADSPI is not set
 CONFIG_SPI_DAVINCI=m
 # CONFIG_SPI_DEBUG is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index c4724301d..fb0c89ac3 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -4998,6 +4998,7 @@ CONFIG_SPARSE_RCU_POINTER=y
 # CONFIG_SPI_AXI_SPI_ENGINE is not set
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
 CONFIG_SPI_FSL_LPSPI=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 88f3e7a9d..ff348860d 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -4973,6 +4973,7 @@ CONFIG_SPARSE_RCU_POINTER=y
 # CONFIG_SPI_AXI_SPI_ENGINE is not set
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
 CONFIG_SPI_FSL_LPSPI=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index edd684756..fa42fc631 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -4926,6 +4926,7 @@ CONFIG_SPARSE_RCU_POINTER=y
 # CONFIG_SPI_AXI_SPI_ENGINE is not set
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
 CONFIG_SPI_FSL_LPSPI=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 435e71b86..b79306d9a 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -4901,6 +4901,7 @@ CONFIG_SPARSE_RCU_POINTER=y
 # CONFIG_SPI_AXI_SPI_ENGINE is not set
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
 CONFIG_SPI_FSL_LPSPI=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index ac2ca753b..312ab50fe 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -4821,6 +4821,7 @@ CONFIG_SPARSE_RCU_POINTER=y
 # CONFIG_SPI_AXI_SPI_ENGINE is not set
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
 CONFIG_SPI_FSL_LPSPI=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 5a8166637..d40aa520f 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -4796,6 +4796,7 @@ CONFIG_SPARSE_RCU_POINTER=y
 # CONFIG_SPI_AXI_SPI_ENGINE is not set
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
 CONFIG_SPI_FSL_LPSPI=m
diff --git a/kernel.spec b/kernel.spec
index 2a506a580..d088d62c1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1901,6 +1901,9 @@ fi
 #
 #
 %changelog
+* Tue Apr 17 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Enable drivers for Xilinx ZYMQ-MP Ultra96
+
 * Mon Apr 16 2018 Laura Abbott <labbott@fedoraproject.org>
 - Fix for hang on removal of macsec module (rhbz 1566410)