Merge tag 'v4.0' into master
ARM64:
- fault.c Fix ESR_EL macros
- zynqmp/sleep.c - Use correct cpuidle.h header
GPIO: Use old GPIO driver till irq part is ported
Defconfig: syncup
DMA: Fix dma drivers by two patches:
"cdma: xilinx: Split device_control
Split the device_control callback of the CDMA driver to make use of the
newly introduced callbacks, that will eventually be used to retrieve slave
capabilities.
Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com>
dma: xilinx: Split device_control
Split the device_control callback of the DMA driver to make use of the
newly introduced callbacks, that will eventually be used to retrieve slave
capabilities.
Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com>
dma: zynqmp: Split device_control
Split the device_control callback of the ZynqMP dma driver to make use
of the
newly introduced callbacks, that will eventually be used to retrieve
slave
capabilities.
Signed-off-by: Punnaiah Choudary Kalluri <punnaia@xilinx.com>
dma: zynqmp: Declare slave capabilities for the generic code
Now that the generic slave caps code can make use of the device assigned
capabilities, instead of relying on a callback to be implemented.
Make use of this code
Signed-off-by: Punnaiah Choudary Kalluri <punnaia@xilinx.com>
dma: xilinx: dpdma: Split and update callbacks
device_control() callback is split into individual callbacks,
and device_slave_caps() callback is embedded into the DMA device
structure as variables. Apply those changes to the DPDMA driver.
Signed-off-by: Hyun Kwon <hyun.kwon@xilinx.com>
"
Based on:
"dmaengine: xilinx: Split device_control"
(sha1:
ba7140462fe0bdf50da50221e3fe143f6a2b33e7)
and
"dmaengine: Remove device_control and device_slave_caps"
(sha1:
2c44ad914c56f4e53ef43285b5e4fe3459109769)
SATA: Port driver to be compatible with v4.0.
"drivers: ata: declare scsi host template with ahci-ceva
Signed-off-by: Suneel Garapati <suneel.garapati@xilinx.com>"
Signed-off-by: Michal Simek <michal.simek@xilinx.com>