From: Robby Cai Date: Thu, 25 Sep 2014 12:39:36 +0000 (+0800) Subject: ENGR00333251 dts: imx6dl: epdc: fix dtb build error X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b0cc03e1c9808f67bc3eca398f33d7a93db03097;p=karo-tx-linux.git ENGR00333251 dts: imx6dl: epdc: fix dtb build error ERROR (phandle_references): Reference to non-existent node or label "reg_sensor" ERROR: Input tree has errors, aborting (use -f to force output) make[1]: *** [arch/arm/boot/dts/imx6dl-cubox-i.dtb] Error 2 make[1]: *** Waiting for unfinished jobs.... DTC arch/arm/boot/dts/imx6dl-sabresd-enetirq.dtb ... The label "reg_sensor" is defined in imx6qdl-sabresd.dts, not in imx6dl.dtsi. The patch moves the epdc parts to imx6dl-sabresd.dts, which also sounds better since EPDC module is available not on i.mx6q but i.mx6dl. Signed-off-by: Robby Cai --- diff --git a/arch/arm/boot/dts/imx6dl-sabresd.dts b/arch/arm/boot/dts/imx6dl-sabresd.dts index 3baf979f4ce8..7aa6e1f08841 100644 --- a/arch/arm/boot/dts/imx6dl-sabresd.dts +++ b/arch/arm/boot/dts/imx6dl-sabresd.dts @@ -22,6 +22,113 @@ offset-usb-charger = <1285>; }; +&iomuxc { + epdc { + pinctrl_epdc_0: epdcgrp-0 { + fsl,pins = < + MX6QDL_PAD_EIM_A16__EPDC_DATA00 0x80000000 + MX6QDL_PAD_EIM_DA10__EPDC_DATA01 0x80000000 + MX6QDL_PAD_EIM_DA12__EPDC_DATA02 0x80000000 + MX6QDL_PAD_EIM_DA11__EPDC_DATA03 0x80000000 + MX6QDL_PAD_EIM_LBA__EPDC_DATA04 0x80000000 + MX6QDL_PAD_EIM_EB2__EPDC_DATA05 0x80000000 + MX6QDL_PAD_EIM_CS0__EPDC_DATA06 0x80000000 + MX6QDL_PAD_EIM_RW__EPDC_DATA07 0x80000000 + MX6QDL_PAD_EIM_A21__EPDC_GDCLK 0x80000000 + MX6QDL_PAD_EIM_A22__EPDC_GDSP 0x80000000 + MX6QDL_PAD_EIM_A23__EPDC_GDOE 0x80000000 + MX6QDL_PAD_EIM_A24__EPDC_GDRL 0x80000000 + MX6QDL_PAD_EIM_D31__EPDC_SDCLK_P 0x80000000 + MX6QDL_PAD_EIM_D27__EPDC_SDOE 0x80000000 + MX6QDL_PAD_EIM_DA1__EPDC_SDLE 0x80000000 + MX6QDL_PAD_EIM_EB1__EPDC_SDSHR 0x80000000 + MX6QDL_PAD_EIM_DA2__EPDC_BDR0 0x80000000 + MX6QDL_PAD_EIM_DA4__EPDC_SDCE0 0x80000000 + MX6QDL_PAD_EIM_DA5__EPDC_SDCE1 0x80000000 + MX6QDL_PAD_EIM_DA6__EPDC_SDCE2 0x80000000 + >; + }; + }; +}; + +&epdc { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_epdc_0>; + V3P3-supply = <&V3P3_reg>; + VCOM-supply = <&VCOM_reg>; + DISPLAY-supply = <&DISPLAY_reg>; + status = "okay"; +}; + +&i2c3 { + max17135@48 { + compatible = "maxim,max17135"; + reg = <0x48>; + vneg_pwrup = <1>; + gvee_pwrup = <1>; + vpos_pwrup = <2>; + gvdd_pwrup = <1>; + gvdd_pwrdn = <1>; + vpos_pwrdn = <2>; + gvee_pwrdn = <1>; + vneg_pwrdn = <1>; + SENSOR-supply = <®_sensor>; + gpio_pmic_pwrgood = <&gpio2 21 0>; + gpio_pmic_vcom_ctrl = <&gpio3 17 0>; + gpio_pmic_wakeup = <&gpio3 20 0>; + gpio_pmic_v3p3 = <&gpio2 20 0>; + gpio_pmic_intr = <&gpio2 25 0>; + + regulators { + DISPLAY_reg: DISPLAY { + regulator-name = "DISPLAY"; + }; + + GVDD_reg: GVDD { + /* 20v */ + regulator-name = "GVDD"; + }; + + GVEE_reg: GVEE { + /* -22v */ + regulator-name = "GVEE"; + }; + + HVINN_reg: HVINN { + /* -22v */ + regulator-name = "HVINN"; + }; + + HVINP_reg: HVINP { + /* 20v */ + regulator-name = "HVINP"; + }; + + VCOM_reg: VCOM { + regulator-name = "VCOM"; + /* 2's-compliment, -4325000 */ + regulator-min-microvolt = <0xffbe0178>; + /* 2's-compliment, -500000 */ + regulator-max-microvolt = <0xfff85ee0>; + }; + + VNEG_reg: VNEG { + /* -15v */ + regulator-name = "VNEG"; + }; + + VPOS_reg: VPOS { + /* 15v */ + regulator-name = "VPOS"; + }; + + V3P3_reg: V3P3 { + regulator-name = "V3P3"; + }; + }; + }; +}; + &ldb { lvds-channel@0 { crtc = "ipu1-di0"; diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi index 5d208c4f3272..8d276b96e96c 100644 --- a/arch/arm/boot/dts/imx6dl.dtsi +++ b/arch/arm/boot/dts/imx6dl.dtsi @@ -134,113 +134,6 @@ }; }; -&i2c3 { - max17135@48 { - compatible = "maxim,max17135"; - reg = <0x48>; - vneg_pwrup = <1>; - gvee_pwrup = <1>; - vpos_pwrup = <2>; - gvdd_pwrup = <1>; - gvdd_pwrdn = <1>; - vpos_pwrdn = <2>; - gvee_pwrdn = <1>; - vneg_pwrdn = <1>; - SENSOR-supply = <®_sensor>; - gpio_pmic_pwrgood = <&gpio2 21 0>; - gpio_pmic_vcom_ctrl = <&gpio3 17 0>; - gpio_pmic_wakeup = <&gpio3 20 0>; - gpio_pmic_v3p3 = <&gpio2 20 0>; - gpio_pmic_intr = <&gpio2 25 0>; - - regulators { - DISPLAY_reg: DISPLAY { - regulator-name = "DISPLAY"; - }; - - GVDD_reg: GVDD { - /* 20v */ - regulator-name = "GVDD"; - }; - - GVEE_reg: GVEE { - /* -22v */ - regulator-name = "GVEE"; - }; - - HVINN_reg: HVINN { - /* -22v */ - regulator-name = "HVINN"; - }; - - HVINP_reg: HVINP { - /* 20v */ - regulator-name = "HVINP"; - }; - - VCOM_reg: VCOM { - regulator-name = "VCOM"; - /* 2's-compliment, -4325000 */ - regulator-min-microvolt = <0xffbe0178>; - /* 2's-compliment, -500000 */ - regulator-max-microvolt = <0xfff85ee0>; - }; - - VNEG_reg: VNEG { - /* -15v */ - regulator-name = "VNEG"; - }; - - VPOS_reg: VPOS { - /* 15v */ - regulator-name = "VPOS"; - }; - - V3P3_reg: V3P3 { - regulator-name = "V3P3"; - }; - }; - }; -}; - -&iomuxc { - epdc { - pinctrl_epdc_0: epdcgrp-0 { - fsl,pins = < - MX6QDL_PAD_EIM_A16__EPDC_DATA00 0x80000000 - MX6QDL_PAD_EIM_DA10__EPDC_DATA01 0x80000000 - MX6QDL_PAD_EIM_DA12__EPDC_DATA02 0x80000000 - MX6QDL_PAD_EIM_DA11__EPDC_DATA03 0x80000000 - MX6QDL_PAD_EIM_LBA__EPDC_DATA04 0x80000000 - MX6QDL_PAD_EIM_EB2__EPDC_DATA05 0x80000000 - MX6QDL_PAD_EIM_CS0__EPDC_DATA06 0x80000000 - MX6QDL_PAD_EIM_RW__EPDC_DATA07 0x80000000 - MX6QDL_PAD_EIM_A21__EPDC_GDCLK 0x80000000 - MX6QDL_PAD_EIM_A22__EPDC_GDSP 0x80000000 - MX6QDL_PAD_EIM_A23__EPDC_GDOE 0x80000000 - MX6QDL_PAD_EIM_A24__EPDC_GDRL 0x80000000 - MX6QDL_PAD_EIM_D31__EPDC_SDCLK_P 0x80000000 - MX6QDL_PAD_EIM_D27__EPDC_SDOE 0x80000000 - MX6QDL_PAD_EIM_DA1__EPDC_SDLE 0x80000000 - MX6QDL_PAD_EIM_EB1__EPDC_SDSHR 0x80000000 - MX6QDL_PAD_EIM_DA2__EPDC_BDR0 0x80000000 - MX6QDL_PAD_EIM_DA4__EPDC_SDCE0 0x80000000 - MX6QDL_PAD_EIM_DA5__EPDC_SDCE1 0x80000000 - MX6QDL_PAD_EIM_DA6__EPDC_SDCE2 0x80000000 - >; - }; - }; -}; - -&epdc { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_epdc_0>; - V3P3-supply = <&V3P3_reg>; - VCOM-supply = <&VCOM_reg>; - DISPLAY-supply = <&DISPLAY_reg>; - status = "okay"; -}; - &ldb { compatible = "fsl,imx6dl-ldb", "fsl,imx53-ldb";