diff options
author | Jason Liu <jason.hui.liu@nxp.com> | 2022-03-10 17:31:56 +0800 |
---|---|---|
committer | Jason Liu <jason.hui.liu@nxp.com> | 2022-03-11 11:41:22 +0800 |
commit | f74fe3b339a96b16c18ed7dba37d7ceedeb462fb (patch) | |
tree | 28ba56a9cdb5a40950a4b2a902925835cb3e0ed0 /Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml | |
parent | c1084c2773fc1005ed140db625399d5334d94a28 (diff) | |
parent | efe3167e52a5833ec20ee6214be9b99b378564a8 (diff) |
Merge tag 'v5.15.27' into lf-5.15.y
This is the 5.15.27 stable release
* tag 'v5.15.27': (3069 commits)
Linux 5.15.27
hamradio: fix macro redefine warning
KVM: x86/mmu: Passing up the error state of mmu_alloc_shadow_roots()
...
Signed-off-by: Jason Liu <jason.hui.liu@nxp.com>
Conflicts:
arch/arm/boot/dts/imx7ulp.dtsi
arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
arch/arm64/boot/dts/freescale/imx8mq.dtsi
drivers/dma-buf/heaps/cma_heap.c
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
drivers/gpu/drm/mxsfb/mxsfb_kms.c
drivers/mmc/host/sdhci-esdhc-imx.c
drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
drivers/rpmsg/rpmsg_char.c
drivers/soc/imx/gpcv2.c
drivers/thermal/imx_thermal.c
Diffstat (limited to 'Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml')
-rw-r--r-- | Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml b/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml index 851cb0781217..047fd69e0377 100644 --- a/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml +++ b/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml @@ -78,6 +78,10 @@ properties: interrupts: maxItems: 1 + amlogic,canvas: + description: should point to a canvas provider node + $ref: /schemas/types.yaml#/definitions/phandle + power-domains: maxItems: 1 description: phandle to the associated power domain @@ -106,6 +110,7 @@ required: - port@1 - "#address-cells" - "#size-cells" + - amlogic,canvas additionalProperties: false @@ -118,6 +123,7 @@ examples: interrupts = <3>; #address-cells = <1>; #size-cells = <0>; + amlogic,canvas = <&canvas>; /* CVBS VDAC output port */ port@0 { |