summaryrefslogtreecommitdiff
path: root/drivers/gpu/imx/ipu-v3/ipu-ic.c
AgeCommit message (Collapse)Author
2019-12-18Merge tag 'v4.14.159' into 4.14-2.0.x-imxMarcel Ziswiler
This is the 4.14.159 stable release Conflicts: arch/arm/Kconfig.debug arch/arm/boot/dts/imx7s.dtsi arch/arm/mach-imx/cpuidle-imx6sx.c drivers/crypto/caam/caamalg.c drivers/crypto/mxs-dcp.c drivers/dma/imx-sdma.c drivers/input/keyboard/imx_keypad.c drivers/net/can/flexcan.c drivers/net/can/rx-offload.c drivers/net/wireless/ath/ath10k/pci.c drivers/pci/dwc/pci-imx6.c drivers/spi/spi-fsl-lpspi.c drivers/usb/dwc3/gadget.c
2019-02-12MLK-15001-11 gpu: Move ipuv3 and dpu to imx folderLiu Ying
IPUv3 and DPU are both i.MX display processing units. To organize the driver code better, let's introduce the imx folder for them. Later, we may put more drivers into this folder, e.g., the prefetch engines. Signed-off-by: Liu Ying <victor.liu@nxp.com>