]> rtime.felk.cvut.cz Git - zynq/linux.git/commit
Merge tag 'v4.0' into master
authorMichal Simek <michal.simek@xilinx.com>
Mon, 8 Jun 2015 11:00:23 +0000 (13:00 +0200)
committerMichal Simek <michal.simek@xilinx.com>
Mon, 15 Jun 2015 05:47:42 +0000 (07:47 +0200)
commit7aaad3af48aecef823ed2eb72b09863d9ca80593
treec198056b5af7b33da2c760ac80c71addd9c480cc
parenta86dd6f045c09facfbec7301f2836365cde7fbb1
parent39a8804455fb23f09157341d3ba7db6d7ae6ee76
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>
69 files changed:
Documentation/devicetree/bindings/vendor-prefixes.txt
arch/arm/Kconfig
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/zynq-7000.dtsi
arch/arm/boot/dts/zynq-zc702.dts
arch/arm/boot/dts/zynq-zc706.dts
arch/arm/configs/xilinx_zynq_defconfig
arch/arm/mach-zynq/Kconfig
arch/arm/mach-zynq/common.c
arch/arm/mach-zynq/pm.c
arch/arm/mach-zynq/slcr.c
arch/arm64/Kconfig
arch/arm64/include/asm/cpufeature.h
arch/arm64/include/asm/processor.h
arch/arm64/kernel/entry.S
arch/arm64/mm/fault.c
arch/powerpc/kernel/entry_32.S
arch/powerpc/kernel/traps.c
arch/powerpc/platforms/44x/Kconfig
drivers/ata/ahci_ceva.c
drivers/char/Kconfig
drivers/dma/Kconfig
drivers/dma/dmatest.c
drivers/dma/xilinx/xilinx_axicdma.c
drivers/dma/xilinx/xilinx_axidma.c
drivers/dma/xilinx/xilinx_dpdma.c
drivers/dma/xilinx/zynqmp_dma.c
drivers/edac/Kconfig
drivers/edac/Makefile
drivers/gpio/Kconfig
drivers/gpu/drm/Kconfig
drivers/gpu/drm/Makefile
drivers/gpu/drm/drm_modes.c
drivers/i2c/busses/Kconfig
drivers/i2c/muxes/i2c-mux-pca954x.c
drivers/irqchip/Makefile
drivers/irqchip/irq-gic.c
drivers/media/i2c/adv7604.c
drivers/media/platform/Kconfig
drivers/media/platform/Makefile
drivers/media/v4l2-core/v4l2-ioctl.c
drivers/media/v4l2-core/v4l2-subdev.c
drivers/mtd/nand/Kconfig
drivers/mtd/nand/Makefile
drivers/mtd/nand/nand_base.c
drivers/mtd/spi-nor/spi-nor.c
drivers/net/ethernet/cadence/macb.c
drivers/net/ethernet/cadence/macb.h
drivers/rpmsg/virtio_rpmsg_bus.c
drivers/soc/xilinx/zynqmp/sleep.c
drivers/spi/Kconfig
drivers/spi/Makefile
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/tty/serial/of_serial.c
drivers/uio/Kconfig
drivers/uio/Makefile
drivers/usb/gadget/udc/udc-xilinx.c
drivers/watchdog/Kconfig
include/linux/mtd/mtd.h
include/linux/mtd/spi-nor.h
include/linux/spi/spi.h
include/media/v4l2-subdev.h
include/uapi/linux/Kbuild
kernel/power/suspend.c
kernel/time/timekeeping.c
scripts/Makefile.lib
sound/soc/Kconfig
sound/soc/Makefile