From f31444b9dfff5327365840b88924aeffc1f25a80 Mon Sep 17 00:00:00 2001 From: Robby Cai Date: Mon, 12 Aug 2013 15:07:18 +0800 Subject: [PATCH] ENGR00274412-2 ARM: dts: enable ePxP for imx6dl_sd and imx6sl_evk Enable ePxP in DTS for imx6 duallite sabresd and imx6 sololite evk board. Signed-off-by: Robby Cai --- .../devicetree/bindings/video/fsl,pxp.txt | 30 +++++++++++++++++++ arch/arm/boot/dts/imx6dl-sabresd.dts | 17 +++++++++++ arch/arm/boot/dts/imx6dl.dtsi | 4 +++ arch/arm/boot/dts/imx6sl-evk.dts | 4 +++ arch/arm/boot/dts/imx6sl.dtsi | 4 +++ 5 files changed, 59 insertions(+) create mode 100644 Documentation/devicetree/bindings/video/fsl,pxp.txt diff --git a/Documentation/devicetree/bindings/video/fsl,pxp.txt b/Documentation/devicetree/bindings/video/fsl,pxp.txt new file mode 100644 index 000000000000..5b9ea4032e89 --- /dev/null +++ b/Documentation/devicetree/bindings/video/fsl,pxp.txt @@ -0,0 +1,30 @@ +* Freescale PxP Controller for i.MX6DL, i.MX6SL + +Required properties for PxP controller: +- compatible: should be "fsl,-pxp-dma" +- reg: contains pxp register base address and range +- interrupts: where type is an interrupt type, num is the + interrupt number and flag is a field that level/trigger information for + the interrupt. +- clocks: the clock sources that pxp depends on. +- clock-names: the name is related to the clock source + +Required properties for pxp on specified board: +- status: should be set to "okay" if want to use PxP + +Examples: +for SOC imx6dl.dtsi: + pxp@020f0000 { + compatible = "fsl,imx6dl-pxp-dma"; + reg = <0x020f0000 0x4000>; + interrupts = <0 98 0x04>; + clocks = <&clks 133>; + clock-names = "pxp-axi"; + status = "disabled"; + }; + + +for board imx6dl-sabresd.dts: + &pxp { + status = "okay"; + }; diff --git a/arch/arm/boot/dts/imx6dl-sabresd.dts b/arch/arm/boot/dts/imx6dl-sabresd.dts index 1e45f2f9d0b6..42a6bc165cac 100644 --- a/arch/arm/boot/dts/imx6dl-sabresd.dts +++ b/arch/arm/boot/dts/imx6dl-sabresd.dts @@ -15,3 +15,20 @@ model = "Freescale i.MX6 DualLite SABRE Smart Device Board"; compatible = "fsl,imx6dl-sabresd", "fsl,imx6dl"; }; + +&ldb { + ipu_id = <0>; + sec_ipu_id = <0>; +}; + +&pxp { + status = "okay"; +}; + +&mxcfb1 { + status = "okay"; +}; + +&mxcfb2 { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi index 95e6bbc5280c..aae4b369ff71 100644 --- a/arch/arm/boot/dts/imx6dl.dtsi +++ b/arch/arm/boot/dts/imx6dl.dtsi @@ -88,8 +88,12 @@ }; pxp: pxp@020f0000 { + compatible = "fsl,imx6dl-pxp-dma"; reg = <0x020f0000 0x4000>; interrupts = <0 98 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clks 133>; + clock-names = "pxp-axi"; + status = "disabled"; }; epdc: epdc@020f4000 { diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-evk.dts index a8d9a93fab85..2b71fea982cd 100644 --- a/arch/arm/boot/dts/imx6sl-evk.dts +++ b/arch/arm/boot/dts/imx6sl-evk.dts @@ -529,3 +529,7 @@ cd-gpios = <&gpio3 22 0>; status = "okay"; }; + +&pxp { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi index 57d4abe03a94..76a0a8e8508f 100644 --- a/arch/arm/boot/dts/imx6sl.dtsi +++ b/arch/arm/boot/dts/imx6sl.dtsi @@ -619,8 +619,12 @@ }; pxp: pxp@020f0000 { + compatible = "fsl,imx6sl-pxp-dma", "fsl,imx6dl-pxp-dma"; reg = <0x020f0000 0x4000>; interrupts = <0 98 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clks 111>; + clock-names = "pxp-axi"; + status = "disabled"; }; epdc: epdc@020f4000 { -- 2.39.2