]> rtime.felk.cvut.cz Git - zynq/linux.git/commit
Merge tag 'v4.19' into master
authorMichal Simek <michal.simek@xilinx.com>
Tue, 27 Nov 2018 13:53:16 +0000 (14:53 +0100)
committerMichal Simek <michal.simek@xilinx.com>
Wed, 9 Jan 2019 08:10:59 +0000 (09:10 +0100)
commit26a8a4d03250e9f72f073ad86f98a8630ccfc699
treed162c6ced1c7ad5e714f867dbe0909c471fa5b47
parentacbe29bb81e3e266ac8f13d3e243611dc85917c4
parent84df9525b0c27f3ebc2ebb1864fa62a97fdedb7d
Merge tag 'v4.19' into master

This is the 4.19 merge.

smc:
- Remove PL35x driver (new version will be used)

nand:
- Remove Arasan raw NAND driver (new version will be used)
- Remove PL35x driver (so many merge issues)

sound:
- Replace Codec to Component as was done
  (sha1: 7c8d90592165601fc7f133e72f06d7348d476579)

remoteproc:
- Use mainline version only - revert all Xilinx changes

dmaengine:
- Adopt new registration as was done by
  (sha1: 7c00be60db5380bf0f7a5371370ea63c4259ae76)

configs:
- Sync with new Kconfig structure (microblaze is not synced)

arm:
- Adopt mainline Spectre fixes for Cortex-A9
  (Checked with Marc Zyngier)

usb:
- Several changes in DWC3 driver

clock:
- Fixes about new divider_recalc_rate() prototype
  - xlnx_vcu_clk.c, clk-xlnx-clock-wizard.c

fpga-zynqmp:
- Use fpga_mgr_create() based on
 "fpga: manager: change api, don't use drvdata"
 (sha1: 7085e2a94f7df5f419e3cfb2fe809ce6564e9629)

media:
- s/drm_mode_connector_attach_encoder/drm_connector_attach_encoder/g
 Based on "drm: drop _mode_ from drm_mode_connector_attach_encoder"
 (sha1: cde4c44d8769c1be16074c097592c46c7d64092b)
- s/drm_mode_connector_update_edid_property/drm_connector_update_edid_property/g
 Based on "drm: drop _mode_ from update_edit_property()"
 (sha1: c555f02371c338b06752577aebf738dbdb6907bd)

can:
- Using mainline version

reset-zynqnp:
- Add missing of.h header

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
218 files changed:
Documentation/devicetree/bindings/ata/ahci-ceva.txt
Documentation/devicetree/bindings/gpio/gpio-xilinx.txt
Documentation/devicetree/bindings/iio/adc/xilinx-xadc.txt
Documentation/devicetree/bindings/media/xilinx/xlnx,v-tpg.txt
Documentation/devicetree/bindings/mmc/arasan,sdhci.txt
Documentation/devicetree/bindings/net/macb.txt
Documentation/devicetree/bindings/soc/xilinx/xlnx,vcu.txt
Documentation/devicetree/bindings/spi/spi-xilinx.txt
Documentation/devicetree/bindings/spi/spi-zynqmp-qspi.txt
Documentation/devicetree/bindings/usb/dwc3.txt
Documentation/devicetree/bindings/xilinx.txt
Documentation/driver-api/dmaengine/provider.rst
Documentation/media/uapi/v4l/subdev-formats.rst
MAINTAINERS
arch/arm/boot/dts/zynq-cc108.dts
arch/arm/boot/dts/zynq-zc702.dts
arch/arm/boot/dts/zynq-zc706.dts
arch/arm/boot/dts/zynq-zc770-xm010.dts
arch/arm/boot/dts/zynq-zc770-xm011.dts
arch/arm/boot/dts/zynq-zc770-xm012.dts
arch/arm/boot/dts/zynq-zc770-xm013.dts
arch/arm/boot/dts/zynq-zed.dts
arch/arm/boot/dts/zynq-zybo.dts
arch/arm/configs/xilinx_zynq_defconfig
arch/arm/include/asm/smp.h
arch/arm/kernel/machine_kexec.c
arch/arm/kernel/smp.c
arch/arm64/Kconfig.platforms
arch/arm64/boot/dts/xilinx/Makefile
arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts
arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts
arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts
arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts
arch/arm64/boot/dts/xilinx/zynqmp.dtsi
arch/arm64/configs/xilinx_zynqmp_defconfig
arch/microblaze/Kconfig
arch/microblaze/include/asm/Kbuild
arch/microblaze/kernel/head.S
arch/microblaze/pci/pci-common.c
crypto/af_alg.c
crypto/algif_skcipher.c
crypto/blkcipher.c
crypto/skcipher.c
drivers/bluetooth/hci_ll.c
drivers/clk/Kconfig
drivers/clk/Makefile
drivers/clk/clk-fixed-factor.c
drivers/clk/clk.c
drivers/crypto/Kconfig
drivers/crypto/Makefile
drivers/crypto/ccp/ccp-dmaengine.c
drivers/dma/Kconfig
drivers/dma/at_hdmac.c
drivers/dma/dmaengine.c
drivers/dma/dmatest.c
drivers/dma/fsldma.c
drivers/dma/mv_xor.c
drivers/dma/nbpfaxi.c
drivers/dma/ste_dma40.c
drivers/dma/xilinx/zynqmp_dma.c
drivers/edac/Kconfig
drivers/edac/Makefile
drivers/firmware/Kconfig
drivers/firmware/Makefile
drivers/fpga/Kconfig
drivers/fpga/Makefile
drivers/fpga/fpga-bridge.c
drivers/fpga/fpga-mgr.c
drivers/fpga/fpga-region.c
drivers/fpga/zynqmp-fpga.c
drivers/gpio/gpio-xilinx.c
drivers/gpio/gpio-zynq.c
drivers/gpu/drm/Kconfig
drivers/gpu/drm/Makefile
drivers/gpu/drm/drm_fb_cma_helper.c
drivers/gpu/drm/drm_fourcc.c
drivers/gpu/drm/drm_framebuffer.c
drivers/gpu/drm/i2c/Kconfig
drivers/gpu/drm/i2c/Makefile
drivers/gpu/drm/i2c/adv7511.c
drivers/gpu/drm/panel/panel-simple.c
drivers/gpu/drm/xilinx/xilinx_drm_connector.c
drivers/gpu/drm/xilinx/xilinx_drm_dp.c
drivers/gpu/drm/xilinx/xilinx_drm_dsi.c
drivers/gpu/drm/xilinx/xilinx_drm_sdi.c
drivers/gpu/drm/xlnx/xlnx_dsi.c
drivers/gpu/drm/xlnx/xlnx_sdi.c
drivers/gpu/drm/xlnx/zynqmp_dp.c
drivers/i2c/busses/i2c-cadence.c
drivers/i2c/busses/i2c-xiic.c
drivers/iio/adc/Kconfig
drivers/iio/adc/Makefile
drivers/iio/adc/xilinx-ams.c
drivers/iio/adc/xilinx-xadc-core.c
drivers/irqchip/Kconfig
drivers/irqchip/irq-gic.c
drivers/mailbox/Kconfig
drivers/mailbox/Makefile
drivers/media/i2c/adv7511.c
drivers/media/i2c/imx274.c
drivers/media/media-entity.c
drivers/media/platform/xilinx/xilinx-dma.c
drivers/media/platform/xilinx/xilinx-vipp.c
drivers/media/usb/uvc/uvc_isight.c
drivers/media/usb/uvc/uvc_queue.c
drivers/media/usb/uvc/uvc_video.c
drivers/media/usb/uvc/uvcvideo.h
drivers/media/v4l2-core/v4l2-ioctl.c
drivers/media/v4l2-core/v4l2-subdev.c
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/mmc/core/sd.c
drivers/mmc/host/sdhci-of-arasan.c
drivers/mmc/host/sdhci.c
drivers/mmc/host/sdhci.h
drivers/mtd/chips/cfi_probe.c
drivers/mtd/devices/m25p80.c
drivers/mtd/nand/raw/nand_base.c
drivers/mtd/spi-nor/spi-nor.c
drivers/net/ethernet/cadence/macb.h
drivers/net/ethernet/cadence/macb_main.c
drivers/net/ethernet/cadence/macb_ptp.c
drivers/net/ethernet/xilinx/Kconfig
drivers/net/ethernet/xilinx/xilinx_axienet_main.c
drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
drivers/net/ethernet/xilinx/xilinx_emaclite.c
drivers/net/phy/Kconfig
drivers/net/phy/Makefile
drivers/net/phy/dp83867.c
drivers/nvmem/Kconfig
drivers/nvmem/Makefile
drivers/of/Kconfig
drivers/of/Makefile
drivers/of/base.c
drivers/of/configfs.c
drivers/of/dynamic.c
drivers/pci/Kconfig
drivers/pci/controller/Kconfig
drivers/pci/controller/Makefile
drivers/pci/controller/pcie-xdma-pl.c
drivers/pci/controller/pcie-xilinx-nwl.c
drivers/pinctrl/Kconfig
drivers/pinctrl/Makefile
drivers/remoteproc/Kconfig
drivers/remoteproc/Makefile
drivers/remoteproc/zynqmp_r5_remoteproc.c
drivers/reset/Kconfig
drivers/reset/Makefile
drivers/reset/reset-zynqmp.c
drivers/rtc/rtc-zynqmp.c
drivers/soc/xilinx/xlnx_vcu_clk.c
drivers/spi/Kconfig
drivers/spi/Makefile
drivers/spi/spi-xilinx.c
drivers/spi/spi-zynqmp-gqspi.c
drivers/spi/spi.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c
drivers/tty/hvc/hvc_dcc.c
drivers/tty/serial/8250/8250_of.c
drivers/tty/serial/Kconfig
drivers/tty/serial/uartlite.c
drivers/tty/serial/xilinx_uartps.c
drivers/usb/chipidea/ci_hdrc_usb2.c
drivers/usb/chipidea/host.c
drivers/usb/chipidea/otg_fsm.c
drivers/usb/dwc3/Makefile
drivers/usb/dwc3/core.c
drivers/usb/dwc3/core.h
drivers/usb/dwc3/debugfs.c
drivers/usb/dwc3/dwc3-of-simple.c
drivers/usb/dwc3/ep0.c
drivers/usb/dwc3/gadget.c
drivers/usb/dwc3/gadget.h
drivers/usb/dwc3/gadget_hibernation.c
drivers/usb/dwc3/host.c
drivers/usb/gadget/configfs.c
drivers/usb/gadget/function/f_tcm.c
drivers/usb/gadget/function/uvc_video.c
drivers/usb/gadget/udc/udc-xilinx.c
drivers/usb/host/ehci-xilinx-of.c
drivers/usb/host/xhci-hub.c
drivers/usb/host/xhci-mem.c
drivers/usb/host/xhci-plat.c
drivers/usb/host/xhci-ring.c
drivers/usb/host/xhci.c
drivers/usb/host/xhci.h
drivers/usb/phy/Kconfig
drivers/usb/phy/phy-ulpi.c
drivers/usb/storage/uas.c
drivers/usb/storage/unusual_uas.h
include/crypto/if_alg.h
include/crypto/skcipher.h
include/drm/drm_fourcc.h
include/dt-bindings/phy/phy.h
include/linux/clk-provider.h
include/linux/crypto.h
include/linux/dmaengine.h
include/linux/fpga/fpga-mgr.h
include/linux/irqchip/arm-gic.h
include/linux/mtd/mtd.h
include/linux/mtd/spi-nor.h
include/linux/of.h
include/linux/spi/spi.h
include/media/media-entity.h
include/media/v4l2-subdev.h
include/uapi/drm/drm_fourcc.h
include/uapi/drm/drm_mode.h
include/uapi/linux/media-bus-format.h
include/uapi/linux/v4l2-mediabus.h
include/uapi/linux/v4l2-subdev.h
include/uapi/linux/videodev2.h
mm/page_alloc.c
sound/soc/Kconfig
sound/soc/Makefile
sound/soc/xilinx/xilinx-dp-codec.c
sound/soc/xilinx/xlnx_formatter_pcm.c