aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/media
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2020-01-16 10:48:34 -0800
committerOlof Johansson <olof@lixom.net>2020-01-16 10:48:35 -0800
commit485e35e4b5e6a3f35ea88d298f5e0241c069ae85 (patch)
tree718d0557b5145162394da98179543addc885b939 /Documentation/devicetree/bindings/media
parentMerge tag 'mvebu-dt64-5.6-1' of git://git.infradead.org/linux-mvebu into arm/dt (diff)
parentdt-bindings: arm: fsl: Add Gateworks Ventana i.MX6DL/Q compatibles (diff)
downloadlinux-dev-485e35e4b5e6a3f35ea88d298f5e0241c069ae85.tar.xz
linux-dev-485e35e4b5e6a3f35ea88d298f5e0241c069ae85.zip
Merge tag 'imx-bindings-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt
i.MX DT bindings update for 5.6: - Add compatibles for boards: i.MX6 SoloX SDB Rev-A Board i.MX7 SabreSD Rev-A Board i.MX6SL based Tolino Shine 3 eBook reader i.MX7ULP Embedded Artists COM Board i.MX8MQ Thor96 Board i.MX8MQ based Google Coral Edge TPU i.MX6Q/DL based Gateworks Ventana Boards LX2160A based QDS and RDB Boards - Add missing imx6sll into fsl-pxp bindings. - Add i.MX8MQ LCDIF compatible into mxsfb bindings. * tag 'imx-bindings-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: dt-bindings: arm: fsl: Add Gateworks Ventana i.MX6DL/Q compatibles dt-bindings: arm: Add devicetree binding for Thor96 Board dt-bindings: arm: Add Google Coral Edge TPU entry bindings: fsl: document compatibles of lx2160a boards media: dt-bindings: media: fsl-pxp: add missing imx6sll dt-bindings: arm: fsl: Document i.MX7ULP Embedded Artists COM board dt-bindings: mxsfb: Add compatible for iMX8MQ dt-bindings: arm: fsl: add compatible string for Tolino Shine 3 dt-bindings: arm: imx: Add the i.MX7D-SDB Rev-A board dt-bindings: arm: imx: Add the i.MX6SX-SDB Rev-A board Link: https://lore.kernel.org/r/20200113034006.17430-3-shawnguo@kernel.org Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/devicetree/bindings/media')
-rw-r--r--Documentation/devicetree/bindings/media/fsl-pxp.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/media/fsl-pxp.txt b/Documentation/devicetree/bindings/media/fsl-pxp.txt
index 2477e7f87381..f8090e06530d 100644
--- a/Documentation/devicetree/bindings/media/fsl-pxp.txt
+++ b/Documentation/devicetree/bindings/media/fsl-pxp.txt
@@ -8,7 +8,7 @@ i.MX SoCs from i.MX23 to i.MX7.
Required properties:
- compatible: should be "fsl,<soc>-pxp", where SoC can be one of imx23, imx28,
- imx6dl, imx6sl, imx6ul, imx6sx, imx6ull, or imx7d.
+ imx6dl, imx6sl, imx6sll, imx6ul, imx6sx, imx6ull, or imx7d.
- reg: the register base and size for the device registers
- interrupts: the PXP interrupt, two interrupts for imx6ull and imx7d.
- clock-names: should be "axi"