MLK-14326-3 mx6qsabreauto: Enable OF_CONTROL and DM driver
authorYe Li <ye.li@nxp.com>
Mon, 6 Mar 2017 06:43:13 +0000 (14:43 +0800)
committerYe Li <ye.li@nxp.com>
Wed, 5 Apr 2017 06:05:05 +0000 (14:05 +0800)
Enable OF_CONTROL and DM driver on mx6qsabreauto.
1. Add the imx6qsabreauto relevant DTS file for using DTB.
2. Modify PMIC initialization codes to use DM PMIC driver.
3. Modify to use PCA953X DM driver
4. Remove NAND from default, since the default imx6q-sabreauto.dts disabled
   the nand. The pins are conflicted with UART3, while UART3 is enabled.
5. For NAND build configuration, remove the USB, since the imx6q-sabreauto-gpmi-weim.dts
   will have pin conflicts on steer logic.
6. GPIO requests added.

Signed-off-by: Ye Li <ye.li@nxp.com>
14 files changed:
arch/arm/dts/Makefile
arch/arm/dts/imx6q-sabreauto-ecspi.dts [new file with mode: 0644]
arch/arm/dts/imx6q-sabreauto-gpmi-weim.dts [new file with mode: 0644]
arch/arm/dts/imx6q-sabreauto.dts [new file with mode: 0644]
arch/arm/dts/imx6qdl-sabreauto.dtsi [new file with mode: 0644]
board/freescale/mx6qsabreauto/Kconfig
board/freescale/mx6qsabreauto/mx6qsabreauto.c
configs/mx6qsabreauto_defconfig
configs/mx6qsabreauto_eimnor_defconfig
configs/mx6qsabreauto_nand_defconfig
configs/mx6qsabreauto_plugin_defconfig
configs/mx6qsabreauto_sata_defconfig
configs/mx6qsabreauto_spinor_defconfig
include/configs/mx6qsabreauto.h

index 4118faa..a27ffa8 100644 (file)
@@ -319,6 +319,9 @@ dtb-$(CONFIG_MX6) += imx6ull-14x14-evk.dtb \
        imx6dl-sabresd.dtb \
        imx6q-icore.dtb \
        imx6q-icore-rqs.dtb \
+       imx6q-sabreauto.dtb \
+       imx6q-sabreauto-ecspi.dtb \
+       imx6q-sabreauto-gpmi-weim.dtb \
        imx6sx-sabreauto.dtb \
        imx6q-sabresd.dtb \
        imx6qp-sabresd.dtb \
diff --git a/arch/arm/dts/imx6q-sabreauto-ecspi.dts b/arch/arm/dts/imx6q-sabreauto-ecspi.dts
new file mode 100644 (file)
index 0000000..3cf99ed
--- /dev/null
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2014 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "imx6q-sabreauto.dts"
+
+&ecspi1 {
+       pinctrl-assert-gpios = <&gpio5 4 GPIO_ACTIVE_LOW>;
+       status = "okay";
+};
+
+&can2 {
+       /* max7310_c on i2c3 is gone */
+       status = "disabled";
+};
+
+&i2c3 {
+       /* pin conflict with ecspi1 */
+       status = "disabled";
+};
+
+&uart3 {
+       /* the uart3 depends on the i2c3, so disable it too. */
+       status = "disabled";
+};
+
+&usbh1 {
+       /* max7310_b on i2c3 is gone */
+       status = "disabled";
+};
+
+&usbotg {
+       /* max7310_c on i2c3 is gone */
+       status = "okay";
+       dr_mode = "peripheral";
+};
diff --git a/arch/arm/dts/imx6q-sabreauto-gpmi-weim.dts b/arch/arm/dts/imx6q-sabreauto-gpmi-weim.dts
new file mode 100644 (file)
index 0000000..579aeb2
--- /dev/null
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2014 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "imx6q-sabreauto.dts"
+
+&ecspi1 {
+       /* pin conflict with weim */
+       status = "disabled";
+};
+
+&can2 {
+       /* max7310_c on i2c3 is gone */
+       status = "disabled";
+};
+
+&gpmi {
+       status = "okay";
+};
+
+&i2c3 {
+       /* pin conflict with weim */
+       status = "disabled";
+};
+
+&uart3 {
+       /* pin conflict with gpmi and weim */
+       status = "disabled";
+};
+
+&usbh1 {
+       /* max7310_b on i2c3 is gone */
+       status = "disabled";
+};
+
+&usbotg {
+       /* max7310_c on i2c3 is gone */
+       status = "okay";
+       dr_mode = "peripheral";
+};
+
+&weim {
+       pinctrl-assert-gpios = <&gpio5 4 GPIO_ACTIVE_LOW>;
+       status = "okay";
+};
diff --git a/arch/arm/dts/imx6q-sabreauto.dts b/arch/arm/dts/imx6q-sabreauto.dts
new file mode 100644 (file)
index 0000000..a321a20
--- /dev/null
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2012-2015 Freescale Semiconductor, Inc.
+ * Copyright 2011 Linaro Ltd.
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+
+#include "imx6q.dtsi"
+#include "imx6qdl-sabreauto.dtsi"
+
+/ {
+       model = "Freescale i.MX6 Quad SABRE Automotive Board";
+       compatible = "fsl,imx6q-sabreauto", "fsl,imx6q";
+};
+
+&ldb {
+       lvds-channel@0 {
+               crtc = "ipu2-di0";
+       };
+       lvds-channel@1 {
+               crtc = "ipu2-di1";
+       };
+};
+&mxcfb1 {
+       status = "okay";
+};
+&mxcfb2 {
+       status = "okay";
+};
+&mxcfb3 {
+       status = "okay";
+};
+&mxcfb4 {
+       status = "okay";
+};
+&sata {
+       status = "okay";
+};
diff --git a/arch/arm/dts/imx6qdl-sabreauto.dtsi b/arch/arm/dts/imx6qdl-sabreauto.dtsi
new file mode 100644 (file)
index 0000000..711cc63
--- /dev/null
@@ -0,0 +1,1147 @@
+/*
+ * Copyright 2012-2015 Freescale Semiconductor, Inc.
+ * Copyright 2011 Linaro Ltd.
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+       aliases {
+               mxcfb0 = &mxcfb1;
+               mxcfb1 = &mxcfb2;
+               mxcfb2 = &mxcfb3;
+               mxcfb3 = &mxcfb4;
+       };
+
+       gpio-keys {
+               compatible = "gpio-keys1";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_gpio_keys>;
+
+               home {
+                       label = "Home";
+                       gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+                       gpio-key,wakeup;
+                       linux,code = <KEY_HOME>;
+               };
+
+               back {
+                       label = "Back";
+                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpio-key,wakeup;
+                       linux,code = <KEY_BACK>;
+               };
+
+               program {
+                       label = "Program";
+                       gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
+                       gpio-key,wakeup;
+                       linux,code = <KEY_PROGRAM>;
+               };
+
+               volume-up {
+                       label = "Volume Up";
+                       gpios = <&gpio2 15 GPIO_ACTIVE_LOW>;
+                       gpio-key,wakeup;
+                       linux,code = <KEY_VOLUMEUP>;
+               };
+
+               volume-down {
+                       label = "Volume Down";
+                       gpios = <&gpio5 14 GPIO_ACTIVE_LOW>;
+                       gpio-key,wakeup;
+                       linux,code = <KEY_VOLUMEDOWN>;
+               };
+       };
+
+       memory: memory {
+               reg = <0x10000000 0x80000000>;
+       };
+
+       leds {
+               compatible = "gpio-leds";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_gpio_leds>;
+
+               user {
+                       label = "debug";
+                       gpios = <&gpio5 15 GPIO_ACTIVE_HIGH>;
+               };
+       };
+
+       regulators {
+               compatible = "simple-bus";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               reg_usb_h1_vbus: regulator@0 {
+                       compatible = "regulator-fixed";
+                       reg = <0>;
+                       regulator-name = "usb_h1_vbus";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       gpio = <&max7310_b 7 GPIO_ACTIVE_HIGH>;
+                       enable-active-high;
+               };
+
+               reg_usb_otg_vbus: regulator@1 {
+                       compatible = "regulator-fixed";
+                       reg = <1>;
+                       regulator-name = "usb_otg_vbus";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       gpio = <&max7310_c 1 GPIO_ACTIVE_HIGH>;
+                       enable-active-high;
+               };
+
+               reg_audio: regulator@2 {
+                       compatible = "regulator-fixed";
+                       reg = <2>;
+                       regulator-name = "cs42888_supply";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       regulator-always-on;
+               };
+
+               reg_3p3v: 3p3v {
+                       compatible = "regulator-fixed";
+                       regulator-name = "3P3V";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       regulator-always-on;
+               };
+
+               reg_si4763_vio1: regulator@3 {
+                       compatible = "regulator-fixed";
+                       reg = <3>;
+                       regulator-name = "vio1";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       regulator-always-on;
+               };
+
+               reg_si4763_vio2: regulator@4 {
+                       compatible = "regulator-fixed";
+                       reg = <4>;
+                       regulator-name = "vio2";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       regulator-always-on;
+               };
+
+               reg_si4763_vd: regulator@5 {
+                       compatible = "regulator-fixed";
+                       reg = <5>;
+                       regulator-name = "vd";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       regulator-always-on;
+               };
+
+               reg_si4763_va: regulator@6 {
+                       compatible = "regulator-fixed";
+                       reg = <6>;
+                       regulator-name = "va";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       regulator-always-on;
+               };
+
+               reg_sd3_vmmc: regulator@7 {
+                       compatible = "regulator-fixed";
+                       regulator-name = "P3V3_SDa_SWITCHED";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       gpio = <&gpio7 8 GPIO_ACTIVE_HIGH>;
+                       enable-active-high;
+                       /* remove below line to enable this regulator */
+                       status = "disabled";
+               };
+
+               reg_can_en: regulator@8 {
+                       compatible = "regulator-fixed";
+                       reg = <8>;
+                       regulator-name = "can-en";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       gpio = <&max7310_b 6 GPIO_ACTIVE_HIGH>;
+                       enable-active-high;
+               };
+
+               reg_can_stby: regulator@9 {
+                       compatible = "regulator-fixed";
+                       reg = <9>;
+                       regulator-name = "can-stby";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       gpio = <&max7310_b 5 GPIO_ACTIVE_HIGH>;
+                       enable-active-high;
+                       vin-supply = <&reg_can_en>;
+               };
+       };
+
+       hannstar_cabc {
+               compatible = "hannstar,cabc";
+
+               lvds_share {
+                       gpios = <&max7310_a 0 GPIO_ACTIVE_HIGH>;
+               };
+       };
+
+       sound-hdmi {
+               compatible = "fsl,imx6q-audio-hdmi",
+                            "fsl,imx-audio-hdmi";
+               model = "imx-audio-hdmi";
+               hdmi-controller = <&hdmi_audio>;
+       };
+
+       mxcfb1: fb@0 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "ldb";
+               interface_pix_fmt = "RGB666";
+               default_bpp = <16>;
+               int_clk = <0>;
+               late_init = <0>;
+               status = "disabled";
+       };
+
+       mxcfb2: fb@1 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "hdmi";
+               interface_pix_fmt = "RGB24";
+               mode_str ="1920x1080M@60";
+               default_bpp = <24>;
+               int_clk = <0>;
+               late_init = <0>;
+               status = "disabled";
+       };
+
+       mxcfb3: fb@2 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "lcd";
+               interface_pix_fmt = "RGB565";
+               mode_str ="CLAA-WVGA";
+               default_bpp = <16>;
+               int_clk = <0>;
+               late_init = <0>;
+               status = "disabled";
+       };
+
+       mxcfb4: fb@3 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "ldb";
+               interface_pix_fmt = "RGB666";
+               default_bpp = <16>;
+               int_clk = <0>;
+               late_init = <0>;
+               status = "disabled";
+       };
+
+       clocks {
+               codec_osc: anaclk2 {
+                       compatible = "fixed-clock";
+                       #clock-cells = <0>;
+                       clock-frequency = <24576000>;
+               };
+       };
+
+       sound-cs42888 {
+               compatible = "fsl,imx6-sabreauto-cs42888",
+                               "fsl,imx-audio-cs42888";
+               model = "imx-cs42888";
+               esai-controller = <&esai>;
+               asrc-controller = <&asrc>;
+               audio-codec = <&codec>;
+       };
+
+       sound-fm {
+               compatible = "fsl,imx-audio-si476x",
+                          "fsl,imx-tuner-si476x";
+               model = "imx-radio-si4763";
+               ssi-controller = <&ssi2>;
+               fm-controller = <&si476x_codec>;
+               mux-int-port = <2>;
+               mux-ext-port = <5>;
+       };
+
+       sound-spdif {
+               compatible = "fsl,imx-audio-spdif",
+                          "fsl,imx-sabreauto-spdif";
+               model = "imx-spdif";
+               spdif-controller = <&spdif>;
+               spdif-in;
+       };
+
+       backlight {
+               compatible = "pwm-backlight";
+               pwms = <&pwm3 0 5000000>;
+               brightness-levels = <0 4 8 16 32 64 128 255>;
+               default-brightness-level = <7>;
+               status = "okay";
+       };
+
+       v4l2_cap_0 {
+               compatible = "fsl,imx6q-v4l2-capture";
+               ipu_id = <0>;
+               csi_id = <0>;
+               mclk_source = <0>;
+               status = "okay";
+       };
+
+       v4l2_out {
+               compatible = "fsl,mxc_v4l2_output";
+               status = "okay";
+       };
+};
+
+&audmux {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_audmux>;
+       status = "okay";
+};
+
+&clks {
+       assigned-clocks = <&clks IMX6QDL_PLL4_BYPASS_SRC>,
+                         <&clks IMX6QDL_PLL4_BYPASS>,
+                         <&clks IMX6QDL_CLK_PLL4_POST_DIV>;
+       assigned-clock-parents = <&clks IMX6QDL_CLK_LVDS2_IN>,
+                               <&clks IMX6QDL_PLL4_BYPASS_SRC>;
+       assigned-clock-rates = <0>, <0>, <24576000>;
+       fsl,ldb-di0-parent = <&clks IMX6QDL_CLK_PLL2_PFD0_352M>;
+       fsl,ldb-di1-parent = <&clks IMX6QDL_CLK_PLL2_PFD0_352M>;
+};
+
+&dcic1 {
+       dcic_id = <0>;
+       dcic_mux = "dcic-hdmi";
+       status = "okay";
+};
+
+&dcic2 {
+       dcic_id = <1>;
+       dcic_mux = "dcic-lvds0";
+       status = "okay";
+};
+
+&ecspi1 {
+       fsl,spi-num-chipselects = <1>;
+       cs-gpios = <&gpio3 19 0>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_ecspi1_cs>;
+       status = "disabled"; /* pin conflict with WEIM NOR */
+
+       flash: m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "st,m25p32";
+               spi-max-frequency = <20000000>;
+               reg = <0>;
+       };
+};
+
+&esai {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_esai>;
+       assigned-clocks = <&clks IMX6QDL_CLK_ESAI_SEL>,
+                         <&clks IMX6QDL_CLK_ESAI_EXTAL>;
+       assigned-clock-parents = <&clks IMX6QDL_CLK_PLL4_AUDIO_DIV>;
+       assigned-clock-rates = <0>, <24576000>;
+       status = "okay";
+};
+
+&fec {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_enet>;
+       phy-mode = "rgmii";
+       fsl,magic-packet;
+       status = "okay";
+};
+
+&can1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_flexcan1>;
+       pinctrl-assert-gpios = <&max7310_b 3 GPIO_ACTIVE_HIGH>; /* TX */
+       xceiver-supply = <&reg_can_stby>;
+       status = "disabled"; /* pin conflict with fec */
+};
+
+&can2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_flexcan2>;
+       xceiver-supply = <&reg_can_stby>;
+       status = "okay";
+};
+
+&gpmi {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_gpmi_nand>;
+       status = "disabled"; /* pin conflict with uart3 */
+       nand-on-flash-bbt;
+};
+
+&hdmi_audio {
+       status = "okay";
+};
+
+&hdmi_cec {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_hdmi_cec>;
+       status = "okay";
+};
+
+&hdmi_core {
+       ipu_id = <0>;
+       disp_id = <1>;
+       status = "okay";
+};
+
+&hdmi_video {
+       fsl,phy_reg_vlev = <0x0294>;
+       fsl,phy_reg_cksymtx = <0x800d>;
+       status = "okay";
+};
+
+&i2c2 {
+       clock-frequency = <100000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c2>;
+       status = "okay";
+
+       egalax_ts@04 {
+               compatible = "eeti,egalax_ts";
+               reg = <0x04>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_egalax_int>;
+               interrupt-parent = <&gpio2>;
+               interrupts = <28 2>;
+               wakeup-gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>;
+       };
+
+       pmic: pfuze100@08 {
+               compatible = "fsl,pfuze100";
+               reg = <0x08>;
+
+               regulators {
+                       sw1a_reg: sw1ab {
+                               regulator-min-microvolt = <300000>;
+                               regulator-max-microvolt = <1875000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                               regulator-ramp-delay = <6250>;
+                       };
+
+                       sw1c_reg: sw1c {
+                               regulator-min-microvolt = <300000>;
+                               regulator-max-microvolt = <1875000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                               regulator-ramp-delay = <6250>;
+                       };
+
+                       sw2_reg: sw2 {
+                               regulator-min-microvolt = <800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       sw3a_reg: sw3a {
+                               regulator-min-microvolt = <400000>;
+                               regulator-max-microvolt = <1975000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       sw3b_reg: sw3b {
+                               regulator-min-microvolt = <400000>;
+                               regulator-max-microvolt = <1975000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       sw4_reg: sw4 {
+                               regulator-min-microvolt = <800000>;
+                               regulator-max-microvolt = <3300000>;
+                       };
+
+                       swbst_reg: swbst {
+                               regulator-min-microvolt = <5000000>;
+                               regulator-max-microvolt = <5150000>;
+                       };
+
+                       snvs_reg: vsnvs {
+                               regulator-min-microvolt = <1000000>;
+                               regulator-max-microvolt = <3000000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       vref_reg: vrefddr {
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       vgen1_reg: vgen1 {
+                               regulator-min-microvolt = <800000>;
+                               regulator-max-microvolt = <1550000>;
+                       };
+
+                       vgen2_reg: vgen2 {
+                               regulator-min-microvolt = <800000>;
+                               regulator-max-microvolt = <1550000>;
+                       };
+
+                       vgen3_reg: vgen3 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                       };
+
+                       vgen4_reg: vgen4 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
+                       };
+
+                       vgen5_reg: vgen5 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
+                       };
+
+                       vgen6_reg: vgen6 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
+                       };
+               };
+       };
+
+       hdmi: edid@50 {
+               compatible = "fsl,imx6-hdmi-i2c";
+               reg = <0x50>;
+       };
+
+       codec: cs42888@48 {
+               compatible = "cirrus,cs42888";
+               reg = <0x48>;
+               clocks = <&codec_osc>;
+               clock-names = "mclk";
+               VA-supply = <&reg_audio>;
+               VD-supply = <&reg_audio>;
+               VLS-supply = <&reg_audio>;
+               VLC-supply = <&reg_audio>;
+        };
+
+       si4763: si4763@63 {
+               compatible = "si4761";
+               reg = <0x63>;
+               va-supply = <&reg_si4763_va>;
+               vd-supply = <&reg_si4763_vd>;
+               vio1-supply = <&reg_si4763_vio1>;
+               vio2-supply = <&reg_si4763_vio2>;
+               revision-a10; /* set to default A10 compatible command set */
+
+               si476x_codec: si476x-codec {
+                       compatible = "si476x-codec";
+               };
+       };
+};
+
+&i2c3 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c3>;
+       status = "okay";
+
+       adv7180: adv7180@21 {
+               compatible = "adv,adv7180";
+               reg = <0x21>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_ipu1_1>;
+               clocks = <&clks IMX6QDL_CLK_CKO>;
+               clock-names = "csi_mclk";
+               DOVDD-supply = <&reg_3p3v>; /* 3.3v, enabled via 2.8 VGEN6 */
+               AVDD-supply = <&reg_3p3v>;  /* 1.8v */
+               DVDD-supply = <&reg_3p3v>;  /* 1.8v */
+               PVDD-supply = <&reg_3p3v>;  /* 1.8v */
+               pwn-gpios = <&max7310_b 2 0>;
+               csi_id = <0>;
+               mclk = <24000000>;
+               mclk_source = <0>;
+               cvbs = <1>;
+       };
+
+       isl29023@44 {
+               compatible = "fsl,isl29023";
+               reg = <0x44>;
+               rext = <499>;
+               interrupt-parent = <&gpio5>;
+               interrupts = <17 2>;
+       };
+
+       max7310_a: gpio@30 {
+               compatible = "maxim,max7310";
+               reg = <0x30>;
+               gpio-controller;
+               #gpio-cells = <2>;
+       };
+
+       max7310_b: gpio@32 {
+               compatible = "maxim,max7310";
+               reg = <0x32>;
+               gpio-controller;
+               #gpio-cells = <2>;
+       };
+
+       max7310_c: gpio@34 {
+               compatible = "maxim,max7310";
+               reg = <0x34>;
+               gpio-controller;
+               #gpio-cells = <2>;
+       };
+
+       mag3110@0e {
+               compatible = "fsl,mag3110";
+               reg = <0x0e>;
+               position = <2>;
+               interrupt-parent = <&gpio2>;
+               interrupts = <29 1>;
+       };
+
+       mma8451@1c {
+               compatible = "fsl,mma8451";
+               reg = <0x1c>;
+               position = <7>;
+               interrupt-parent = <&gpio6>;
+               interrupts = <31 8>;
+               interrupt-route = <1>;
+       };
+};
+
+&iomuxc {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_hog>;
+
+       imx6qdl-sabreauto {
+                pinctrl_audmux: audmux {
+                        fsl,pins = <
+                                MX6QDL_PAD_DISP0_DAT16__AUD5_TXC  0x130b0
+                                MX6QDL_PAD_DISP0_DAT18__AUD5_TXFS 0x130b0
+                                MX6QDL_PAD_DISP0_DAT19__AUD5_RXD  0x130b0
+                        >;
+                };
+
+               pinctrl_hog: hoggrp {
+                       fsl,pins = <
+                               MX6QDL_PAD_NANDF_CS2__GPIO6_IO15 0x1f059
+                               MX6QDL_PAD_SD2_DAT2__GPIO1_IO13  0x80000000
+                               MX6QDL_PAD_GPIO_18__SD3_VSELECT 0x17059
+                               MX6QDL_PAD_EIM_A24__GPIO5_IO04   0x80000000
+                               MX6QDL_PAD_SD2_DAT0__GPIO1_IO15  0x80000000
+                               MX6QDL_PAD_EIM_BCLK__GPIO6_IO31 0x80000000
+                               MX6QDL_PAD_EIM_EB1__GPIO2_IO29  0x80000000
+                               MX6QDL_PAD_DISP0_DAT23__GPIO5_IO17 0x80000000
+                               MX6QDL_PAD_SD3_RST__GPIO7_IO08 0x80000000
+                               MX6QDL_PAD_CSI0_DATA_EN__GPIO5_IO20 0x17059
+                               MX6QDL_PAD_GPIO_1__GPIO1_IO01 0x17059
+                       >;
+               };
+
+               pinctrl_ecspi1: ecspi1grp {
+                       fsl,pins = <
+                               MX6QDL_PAD_EIM_D17__ECSPI1_MISO         0x100b1
+                               MX6QDL_PAD_EIM_D18__ECSPI1_MOSI         0x100b1
+                               MX6QDL_PAD_EIM_D16__ECSPI1_SCLK         0x100b1
+                       >;
+               };
+
+               pinctrl_ecspi1_cs: ecspi1cs {
+                       fsl,pins = <
+                               MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x80000000
+                       >;
+               };
+
+               pinctrl_egalax_int: egalax_intgrp {
+                       fsl,pins = <
+                               MX6QDL_PAD_EIM_EB0__GPIO2_IO28 0x80000000
+                       >;
+               };
+
+               pinctrl_enet: enetgrp {
+                       fsl,pins = <
+                               MX6QDL_PAD_KEY_COL1__ENET_MDIO          0x1b0b0
+                               MX6QDL_PAD_KEY_COL2__ENET_MDC           0x1b0b0
+                               MX6QDL_PAD_RGMII_TXC__RGMII_TXC         0x1b0b0
+                               MX6QDL_PAD_RGMII_TD0__RGMII_TD0         0x1b0b0
+                               MX6QDL_PAD_RGMII_TD1__RGMII_TD1         0x1b0b0
+                               MX6QDL_PAD_RGMII_TD2__RGMII_TD2         0x1b0b0
+                               MX6QDL_PAD_RGMII_TD3__RGMII_TD3         0x1b0b0
+                               MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL   0x1b0b0
+                               MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK    0x1b0b0
+                               MX6QDL_PAD_RGMII_RXC__RGMII_RXC         0x1b0b0
+                               MX6QDL_PAD_RGMII_RD0__RGMII_RD0         0x1b0b0
+                               MX6QDL_PAD_RGMII_RD1__RGMII_RD1         0x1b0b0
+                               MX6QDL_PAD_RGMII_RD2__RGMII_RD2         0x1b0b0
+                               MX6QDL_PAD_RGMII_RD3__RGMII_RD3         0x1b0b0
+                               MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL   0x1b0b0
+                               MX6QDL_PAD_GPIO_16__ENET_REF_CLK        0x4001b0a8
+                       >;
+               };
+
+               pinctrl_enet_irq: enetirqgrp {
+                       fsl,pins = <
+                               MX6QDL_PAD_GPIO_6__ENET_IRQ             0x000b1
+                       >;
+               };
+
+               pinctrl_esai: esaigrp {
+                       fsl,pins = <
+                               MX6QDL_PAD_ENET_CRS_DV__ESAI_TX_CLK 0x1b030
+                               MX6QDL_PAD_ENET_RXD1__ESAI_TX_FS    0x1b030
+                               MX6QDL_PAD_ENET_TX_EN__ESAI_TX3_RX2 0x1b030
+                               MX6QDL_PAD_GPIO_5__ESAI_TX2_RX3     0x1b030
+                               MX6QDL_PAD_ENET_TXD0__ESAI_TX4_RX1  0x1b030
+                               MX6QDL_PAD_ENET_MDC__ESAI_TX5_RX0   0x1b030
+                               MX6QDL_PAD_GPIO_17__ESAI_TX0        0x1b030
+                               MX6QDL_PAD_NANDF_CS3__ESAI_TX1      0x1b030
+                               MX6QDL_PAD_ENET_MDIO__ESAI_RX_CLK   0x1b030
+                               MX6QDL_PAD_GPIO_9__ESAI_RX_FS       0x1b030
+                       >;
+               };
+
+               pinctrl_flexcan1: flexcan1grp {
+                       fsl,pins = <
+                               MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX        0x17059
+                               MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX        0x17059
+                       >;
+               };
+
+               pinctrl_flexcan2: flexcan2grp {
+                       fsl,pins = <
+                               MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX        0x17059
+                               MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX        0x17059
+                       >;
+               };
+
+               pinctrl_gpio_keys: gpio_keysgrp {
+                       fsl,pins = <
+                               MX6QDL_PAD_SD2_CMD__GPIO1_IO11  0x1b0b0
+                               MX6QDL_PAD_SD2_DAT3__GPIO1_IO12 0x1b0b0
+                               MX6QDL_PAD_SD4_DAT4__GPIO2_IO12 0x1b0b0
+                               MX6QDL_PAD_SD4_DAT7__GPIO2_IO15 0x1b0b0
+                               MX6QDL_PAD_DISP0_DAT20__GPIO5_IO14 0x1b0b0
+                       >;
+               };
+
+               pinctrl_gpio_leds: gpioledsgrp {
+                       fsl,pins = <
+                               MX6QDL_PAD_DISP0_DAT21__GPIO5_IO15      0x80000000
+                       >;
+               };
+
+               pinctrl_gpmi_nand: gpminandgrp {
+                       fsl,pins = <
+                               MX6QDL_PAD_NANDF_CLE__NAND_CLE          0xb0b1
+                               MX6QDL_PAD_NANDF_ALE__NAND_ALE          0xb0b1
+                               MX6QDL_PAD_NANDF_WP_B__NAND_WP_B        0xb0b1
+                               MX6QDL_PAD_NANDF_RB0__NAND_READY_B      0xb000
+                               MX6QDL_PAD_NANDF_CS0__NAND_CE0_B        0xb0b1
+                               MX6QDL_PAD_NANDF_CS1__NAND_CE1_B        0xb0b1
+                               MX6QDL_PAD_SD4_CMD__NAND_RE_B           0xb0b1
+                               MX6QDL_PAD_SD4_CLK__NAND_WE_B           0xb0b1
+                               MX6QDL_PAD_NANDF_D0__NAND_DATA00        0xb0b1
+                               MX6QDL_PAD_NANDF_D1__NAND_DATA01        0xb0b1
+                               MX6QDL_PAD_NANDF_D2__NAND_DATA02        0xb0b1
+                               MX6QDL_PAD_NANDF_D3__NAND_DATA03        0xb0b1
+                               MX6QDL_PAD_NANDF_D4__NAND_DATA04        0xb0b1
+                               MX6QDL_PAD_NANDF_D5__NAND_DATA05        0xb0b1
+                               MX6QDL_PAD_NANDF_D6__NAND_DATA06        0xb0b1
+                               MX6QDL_PAD_NANDF_D7__NAND_DATA07        0xb0b1
+                               MX6QDL_PAD_SD4_DAT0__NAND_DQS           0x00b1
+                       >;
+               };
+
+               pinctrl_i2c2: i2c2grp {
+                       fsl,pins = <
+                               MX6QDL_PAD_EIM_EB2__I2C2_SCL    0x4001b8b1
+                               MX6QDL_PAD_KEY_ROW3__I2C2_SDA   0x4001b8b1
+                       >;
+               };
+
+               pinctrl_ipu1_1: ipu1grp-1 { /* parallel port 16-bit */
+                       fsl,pins = <
+                               MX6QDL_PAD_CSI0_DAT4__IPU1_CSI0_DATA04   0x80000000
+                               MX6QDL_PAD_CSI0_DAT5__IPU1_CSI0_DATA05   0x80000000
+                               MX6QDL_PAD_CSI0_DAT6__IPU1_CSI0_DATA06   0x80000000
+                               MX6QDL_PAD_CSI0_DAT7__IPU1_CSI0_DATA07   0x80000000
+                               MX6QDL_PAD_CSI0_DAT8__IPU1_CSI0_DATA08   0x80000000
+                               MX6QDL_PAD_CSI0_DAT9__IPU1_CSI0_DATA09   0x80000000
+                               MX6QDL_PAD_CSI0_DAT10__IPU1_CSI0_DATA10  0x80000000
+                               MX6QDL_PAD_CSI0_DAT11__IPU1_CSI0_DATA11  0x80000000
+                               MX6QDL_PAD_CSI0_DAT12__IPU1_CSI0_DATA12  0x80000000
+                               MX6QDL_PAD_CSI0_DAT13__IPU1_CSI0_DATA13  0x80000000
+                               MX6QDL_PAD_CSI0_DAT14__IPU1_CSI0_DATA14  0x80000000
+                               MX6QDL_PAD_CSI0_DAT15__IPU1_CSI0_DATA15  0x80000000
+                               MX6QDL_PAD_CSI0_DAT16__IPU1_CSI0_DATA16  0x80000000
+                               MX6QDL_PAD_CSI0_DAT17__IPU1_CSI0_DATA17  0x80000000
+                               MX6QDL_PAD_CSI0_DAT18__IPU1_CSI0_DATA18  0x80000000
+                               MX6QDL_PAD_CSI0_DAT19__IPU1_CSI0_DATA19  0x80000000
+                               MX6QDL_PAD_CSI0_PIXCLK__IPU1_CSI0_PIXCLK 0x80000000
+                               MX6QDL_PAD_CSI0_MCLK__IPU1_CSI0_HSYNC    0x80000000
+                               MX6QDL_PAD_CSI0_VSYNC__IPU1_CSI0_VSYNC   0x80000000
+                       >;
+               };
+
+               pinctrl_i2c3: i2c3grp {
+                       fsl,pins = <
+                               MX6QDL_PAD_GPIO_3__I2C3_SCL  0x4001b8b1
+                               MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
+                       >;
+               };
+
+               pinctrl_mlb: mlb {
+                       fsl,pins = <
+                               MX6QDL_PAD_ENET_TXD1__MLB_CLK 0x80000000
+                               MX6QDL_PAD_GPIO_6__MLB_SIG    0x80000000
+                               MX6QDL_PAD_GPIO_2__MLB_DATA   0x80000000
+                       >;
+               };
+
+               pinctrl_pwm3: pwm1grp {
+                       fsl,pins = <
+                               MX6QDL_PAD_SD4_DAT1__PWM3_OUT           0x1b0b1
+                       >;
+               };
+
+               pinctrl_spdif: spdifgrp {
+                       fsl,pins = <
+                               MX6QDL_PAD_KEY_COL3__SPDIF_IN 0x1b0b0
+                       >;
+               };
+
+               pinctrl_uart3_1: uart3grp-1 {
+                       fsl,pins = <
+                               MX6QDL_PAD_SD4_CLK__UART3_RX_DATA       0x1b0b1
+                               MX6QDL_PAD_SD4_CMD__UART3_TX_DATA       0x1b0b1
+                               MX6QDL_PAD_EIM_D30__UART3_CTS_B         0x1b0b1
+                               MX6QDL_PAD_EIM_EB3__UART3_RTS_B         0x1b0b1
+                       >;
+               };
+
+               pinctrl_uart3dte_1: uart3dtegrp-1 {
+                       fsl,pins = <
+                               MX6QDL_PAD_SD4_CLK__UART3_TX_DATA       0x1b0b1
+                               MX6QDL_PAD_SD4_CMD__UART3_RX_DATA       0x1b0b1
+                               MX6QDL_PAD_EIM_D30__UART3_RTS_B         0x1b0b1
+                               MX6QDL_PAD_EIM_EB3__UART3_CTS_B         0x1b0b1
+                       >;
+               };
+
+               pinctrl_uart4: uart4grp {
+                       fsl,pins = <
+                               MX6QDL_PAD_KEY_COL0__UART4_TX_DATA      0x1b0b1
+                               MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA      0x1b0b1
+                       >;
+               };
+
+               pinctrl_usbotg: usbotggrp {
+                       fsl,pins = <
+                               MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059
+                       >;
+               };
+
+               pinctrl_usdhc1: usdhc1grp {
+                       fsl,pins = <
+                               MX6QDL_PAD_SD1_CMD__SD1_CMD             0x17071
+                               MX6QDL_PAD_SD1_CLK__SD1_CLK             0x10071
+                               MX6QDL_PAD_SD1_DAT0__SD1_DATA0          0x17071
+                               MX6QDL_PAD_SD1_DAT1__SD1_DATA1          0x17071
+                               MX6QDL_PAD_SD1_DAT2__SD1_DATA2          0x17071
+                               MX6QDL_PAD_SD1_DAT3__SD1_DATA3          0x17071
+                       >;
+               };
+
+               pinctrl_usdhc3: usdhc3grp {
+                       fsl,pins = <
+                               MX6QDL_PAD_SD3_CMD__SD3_CMD             0x17059
+                               MX6QDL_PAD_SD3_CLK__SD3_CLK             0x10059
+                               MX6QDL_PAD_SD3_DAT0__SD3_DATA0          0x17059
+                               MX6QDL_PAD_SD3_DAT1__SD3_DATA1          0x17059
+                               MX6QDL_PAD_SD3_DAT2__SD3_DATA2          0x17059
+                               MX6QDL_PAD_SD3_DAT3__SD3_DATA3          0x17059
+                               MX6QDL_PAD_SD3_DAT4__SD3_DATA4          0x17059
+                               MX6QDL_PAD_SD3_DAT5__SD3_DATA5          0x17059
+                               MX6QDL_PAD_SD3_DAT6__SD3_DATA6          0x17059
+                               MX6QDL_PAD_SD3_DAT7__SD3_DATA7          0x17059
+                       >;
+               };
+
+               pinctrl_usdhc3_100mhz: usdhc3grp100mhz {
+                       fsl,pins = <
+                               MX6QDL_PAD_SD3_CMD__SD3_CMD             0x170b9
+                               MX6QDL_PAD_SD3_CLK__SD3_CLK             0x100b9
+                               MX6QDL_PAD_SD3_DAT0__SD3_DATA0          0x170b9
+                               MX6QDL_PAD_SD3_DAT1__SD3_DATA1          0x170b9
+                               MX6QDL_PAD_SD3_DAT2__SD3_DATA2          0x170b9
+                               MX6QDL_PAD_SD3_DAT3__SD3_DATA3          0x170b9
+                               MX6QDL_PAD_SD3_DAT4__SD3_DATA4          0x170b9
+                               MX6QDL_PAD_SD3_DAT5__SD3_DATA5          0x170b9
+                               MX6QDL_PAD_SD3_DAT6__SD3_DATA6          0x170b9
+                               MX6QDL_PAD_SD3_DAT7__SD3_DATA7          0x170b9
+                       >;
+               };
+
+               pinctrl_usdhc3_200mhz: usdhc3grp200mhz {
+                       fsl,pins = <
+                               MX6QDL_PAD_SD3_CMD__SD3_CMD             0x170f9
+                               MX6QDL_PAD_SD3_CLK__SD3_CLK             0x100f9
+                               MX6QDL_PAD_SD3_DAT0__SD3_DATA0          0x170f9
+                               MX6QDL_PAD_SD3_DAT1__SD3_DATA1          0x170f9
+                               MX6QDL_PAD_SD3_DAT2__SD3_DATA2          0x170f9
+                               MX6QDL_PAD_SD3_DAT3__SD3_DATA3          0x170f9
+                               MX6QDL_PAD_SD3_DAT4__SD3_DATA4          0x170f9
+                               MX6QDL_PAD_SD3_DAT5__SD3_DATA5          0x170f9
+                               MX6QDL_PAD_SD3_DAT6__SD3_DATA6          0x170f9
+                               MX6QDL_PAD_SD3_DAT7__SD3_DATA7          0x170f9
+                       >;
+               };
+
+               pinctrl_weim_cs0: weimcs0grp {
+                       fsl,pins = <
+                               MX6QDL_PAD_EIM_CS0__EIM_CS0_B           0xb0b1
+                       >;
+               };
+
+               pinctrl_weim_nor: weimnorgrp {
+                       fsl,pins = <
+                               MX6QDL_PAD_EIM_OE__EIM_OE_B             0xb0b1
+                               MX6QDL_PAD_EIM_RW__EIM_RW               0xb0b1
+                               MX6QDL_PAD_EIM_WAIT__EIM_WAIT_B         0xb060
+                               MX6QDL_PAD_EIM_D16__EIM_DATA16          0x1b0b0
+                               MX6QDL_PAD_EIM_D17__EIM_DATA17          0x1b0b0
+                               MX6QDL_PAD_EIM_D18__EIM_DATA18          0x1b0b0
+                               MX6QDL_PAD_EIM_D19__EIM_DATA19          0x1b0b0
+                               MX6QDL_PAD_EIM_D20__EIM_DATA20          0x1b0b0
+                               MX6QDL_PAD_EIM_D21__EIM_DATA21          0x1b0b0
+                               MX6QDL_PAD_EIM_D22__EIM_DATA22          0x1b0b0
+                               MX6QDL_PAD_EIM_D23__EIM_DATA23          0x1b0b0
+                               MX6QDL_PAD_EIM_D24__EIM_DATA24          0x1b0b0
+                               MX6QDL_PAD_EIM_D25__EIM_DATA25          0x1b0b0
+                               MX6QDL_PAD_EIM_D26__EIM_DATA26          0x1b0b0
+                               MX6QDL_PAD_EIM_D27__EIM_DATA27          0x1b0b0
+                               MX6QDL_PAD_EIM_D28__EIM_DATA28          0x1b0b0
+                               MX6QDL_PAD_EIM_D29__EIM_DATA29          0x1b0b0
+                               MX6QDL_PAD_EIM_D30__EIM_DATA30          0x1b0b0
+                               MX6QDL_PAD_EIM_D31__EIM_DATA31          0x1b0b0
+                               MX6QDL_PAD_EIM_A23__EIM_ADDR23          0xb0b1
+                               MX6QDL_PAD_EIM_A22__EIM_ADDR22          0xb0b1
+                               MX6QDL_PAD_EIM_A21__EIM_ADDR21          0xb0b1
+                               MX6QDL_PAD_EIM_A20__EIM_ADDR20          0xb0b1
+                               MX6QDL_PAD_EIM_A19__EIM_ADDR19          0xb0b1
+                               MX6QDL_PAD_EIM_A18__EIM_ADDR18          0xb0b1
+                               MX6QDL_PAD_EIM_A17__EIM_ADDR17          0xb0b1
+                               MX6QDL_PAD_EIM_A16__EIM_ADDR16          0xb0b1
+                               MX6QDL_PAD_EIM_DA15__EIM_AD15           0xb0b1
+                               MX6QDL_PAD_EIM_DA14__EIM_AD14           0xb0b1
+                               MX6QDL_PAD_EIM_DA13__EIM_AD13           0xb0b1
+                               MX6QDL_PAD_EIM_DA12__EIM_AD12           0xb0b1
+                               MX6QDL_PAD_EIM_DA11__EIM_AD11           0xb0b1
+                               MX6QDL_PAD_EIM_DA10__EIM_AD10           0xb0b1
+                               MX6QDL_PAD_EIM_DA9__EIM_AD09            0xb0b1
+                               MX6QDL_PAD_EIM_DA8__EIM_AD08            0xb0b1
+                               MX6QDL_PAD_EIM_DA7__EIM_AD07            0xb0b1
+                               MX6QDL_PAD_EIM_DA6__EIM_AD06            0xb0b1
+                               MX6QDL_PAD_EIM_DA5__EIM_AD05            0xb0b1
+                               MX6QDL_PAD_EIM_DA4__EIM_AD04            0xb0b1
+                               MX6QDL_PAD_EIM_DA3__EIM_AD03            0xb0b1
+                               MX6QDL_PAD_EIM_DA2__EIM_AD02            0xb0b1
+                               MX6QDL_PAD_EIM_DA1__EIM_AD01            0xb0b1
+                               MX6QDL_PAD_EIM_DA0__EIM_AD00            0xb0b1
+                       >;
+               };
+
+               pinctrl_hdmi_cec: hdmicecgrp {
+                       fsl,pins = <
+                               MX6QDL_PAD_EIM_A25__HDMI_TX_CEC_LINE 0x1f8b0
+                       >;
+               };
+       };
+};
+
+&ldb {
+       status = "okay";
+
+       lvds-channel@0 {
+               fsl,data-mapping = "spwg";
+               fsl,data-width = <18>;
+               primary;
+               status = "okay";
+
+               display-timings {
+                       native-mode = <&timing0>;
+                       timing0: hsd100pxn1 {
+                               clock-frequency = <65000000>;
+                               hactive = <1024>;
+                               vactive = <768>;
+                               hback-porch = <220>;
+                               hfront-porch = <40>;
+                               vback-porch = <21>;
+                               vfront-porch = <7>;
+                               hsync-len = <60>;
+                               vsync-len = <10>;
+                       };
+               };
+       };
+
+       lvds-channel@1 {
+               fsl,data-mapping = "spwg";
+               fsl,data-width = <18>;
+               status = "okay";
+
+               display-timings {
+                       native-mode = <&timing1>;
+                       timing1: hsd100pxn1 {
+                               clock-frequency = <65000000>;
+                               hactive = <1024>;
+                               vactive = <768>;
+                               hback-porch = <220>;
+                               hfront-porch = <40>;
+                               vback-porch = <21>;
+                               vfront-porch = <7>;
+                               hsync-len = <60>;
+                               vsync-len = <10>;
+                       };
+               };
+       };
+};
+
+&mlb {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_mlb>;
+       status = "okay";
+};
+
+&pwm3 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_pwm3>;
+       status = "okay";
+};
+
+&pcie {
+       status = "okay";
+};
+
+&spdif {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_spdif>;
+       assigned-clocks = <&clks IMX6QDL_CLK_SPDIF_SEL>,
+                         <&clks IMX6QDL_CLK_SPDIF_PODF>;
+       assigned-clock-parents = <&clks IMX6QDL_CLK_PLL3_PFD3_454M>;
+       assigned-clock-rates = <0>, <227368421>;
+       status = "okay";
+};
+
+&snvs_poweroff {
+       status = "okay";
+};
+
+&ssi2 {
+       assigned-clocks = <&clks IMX6QDL_CLK_SSI2_SEL>;
+       assigned-clock-parents = <&clks IMX6QDL_CLK_PLL4_AUDIO_DIV>;
+       assigned-clock-rates = <0>;
+       fsl,mode = "i2s-master";
+       status = "okay";
+};
+
+&uart3 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart3_1>;
+       pinctrl-assert-gpios = <&max7310_b 4 GPIO_ACTIVE_HIGH>, /* CTS */
+                              <&max7310_c 3 GPIO_ACTIVE_HIGH>; /* RXD and TXD */
+       fsl,uart-has-rtscts;
+       status = "okay";
+       /* for DTE mode, add below change */
+       /* fsl,dte-mode; */
+       /* pinctrl-0 = <&pinctrl_uart3dte_1>; */
+};
+
+&uart4 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart4>;
+       status = "okay";
+};
+
+&usbh1 {
+       vbus-supply = <&reg_usb_h1_vbus>;
+       status = "okay";
+};
+
+&usbotg {
+       vbus-supply = <&reg_usb_otg_vbus>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usbotg>;
+       srp-disable;
+       hnp-disable;
+       adp-disable;
+       status = "okay";
+};
+
+&usdhc1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usdhc1>;
+       cd-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
+       no-1-8-v;
+       keep-power-in-suspend;
+       enable-sdio-wakeup;
+       status = "okay";
+};
+
+&usdhc3 {
+       pinctrl-names = "default", "state_100mhz", "state_200mhz";
+       pinctrl-0 = <&pinctrl_usdhc3>;
+       pinctrl-1 = <&pinctrl_usdhc3_100mhz>;
+       pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
+       cd-gpios = <&gpio6 15 GPIO_ACTIVE_LOW>;
+       wp-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
+       /*
+        * Due to board issue, we can not use external regulator for card slot
+        * by default since the card power is shared with card detect pullup.
+        * Disabling the vmmc regulator will cause unexpected card detect
+        * interrupts.
+        * HW rework is needed to fix this isssue. Remove R695 first, then you
+        * can open below line to enable the using of external regulator.
+        * Then you will be able to power off the card during suspend. This is
+        * especially needed for a SD3.0 card re-enumeration working on UHS mode
+        * Note: reg_sd3_vmmc is also need to be enabled
+        */
+       /* vmmc-supply = <&reg_sd3_vmmc>; */
+       keep-power-in-suspend;
+       enable-sdio-wakeup;
+       status = "okay";
+};
+
+&weim {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_weim_nor &pinctrl_weim_cs0>;
+       #address-cells = <2>;
+       #size-cells = <1>;
+       ranges = <0 0 0x08000000 0x08000000>;
+       status = "disabled"; /* pin conflict with SPI NOR */
+
+       nor@0,0 {
+               compatible = "cfi-flash";
+               reg = <0 0 0x02000000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               bank-width = <2>;
+               fsl,weim-cs-timing = <0x00620081 0x00000001 0x1c022000
+                               0x0000c000 0x1404a38e 0x00000000>;
+       };
+};
index e579c0f..02f6f2d 100644 (file)
@@ -9,4 +9,9 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "mx6qsabreauto"
 
+config NOR
+       bool "Support for NOR flash"
+       help
+         The i.MX SoC supports having a NOR flash connected to the WEIM.
+         Need to set this for NOR_BOOT.
 endif
index 04c8f8d..2ae49af 100644 (file)
@@ -109,6 +109,7 @@ static iomux_v3_cfg_t const enet_pads[] = {
        MX6_PAD_GPIO_16__ENET_REF_CLK           | MUX_PAD_CTRL(ENET_PAD_CTRL),
 };
 
+#ifdef CONFIG_SYS_I2C
 /* I2C2 PMIC, iPod, Tuner, Codec, Touch, HDMI EDID, MIPI CSI2 card */
 static struct i2c_pads_info i2c_pad_info1 = {
        .scl = {
@@ -122,6 +123,7 @@ static struct i2c_pads_info i2c_pad_info1 = {
                .gp = IMX_GPIO_NR(4, 13)
        }
 };
+#endif
 
 #ifndef CONFIG_SYS_FLASH_CFI
 /*
@@ -150,6 +152,8 @@ static iomux_v3_cfg_t const port_exp[] = {
        MX6_PAD_SD2_DAT0__GPIO1_IO15            | MUX_PAD_CTRL(NO_PAD_CTRL),
 };
 
+#ifdef CONFIG_PCA953X
+
 /*Define for building port exp gpio, pin starts from 0*/
 #define PORTEXP_IO_NR(chip, pin) \
        ((chip << 5) + pin)
@@ -187,6 +191,7 @@ static int port_exp_direction_output(unsigned gpio, int value)
 
        return 0;
 }
+#endif
 
 #ifdef CONFIG_MTD_NOR_FLASH
 static iomux_v3_cfg_t const eimnor_pads[] = {
@@ -388,12 +393,14 @@ int board_mmc_init(bd_t *bis)
                case 0:
                        imx_iomux_v3_setup_multiple_pads(
                                usdhc1_pads, ARRAY_SIZE(usdhc1_pads));
+                       gpio_request(USDHC1_CD_GPIO, "usdhc1 cd");
                        gpio_direction_input(USDHC1_CD_GPIO);
                        usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
                        break;
                case 1:
                        imx_iomux_v3_setup_multiple_pads(
                                usdhc3_pads, ARRAY_SIZE(usdhc3_pads));
+                       gpio_request(USDHC3_CD_GPIO, "usdhc3 cd");
                        gpio_direction_input(USDHC3_CD_GPIO);
                        usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
                        break;
@@ -607,6 +614,7 @@ iomux_v3_cfg_t const backlight_pads[] = {
 
 static void setup_iomux_backlight(void)
 {
+       gpio_request(IMX_GPIO_NR(2, 9), "backlight");
        gpio_direction_output(IMX_GPIO_NR(2, 9), 1);
        imx_iomux_v3_setup_multiple_pads(backlight_pads,
                                         ARRAY_SIZE(backlight_pads));
@@ -690,6 +698,8 @@ void setup_spinor(void)
 {
        imx_iomux_v3_setup_multiple_pads(ecspi1_pads,
                                         ARRAY_SIZE(ecspi1_pads));
+
+       gpio_request(IMX_GPIO_NR(3, 19), "escpi cs");
        gpio_direction_output(IMX_GPIO_NR(5, 4), 0);
        gpio_direction_output(IMX_GPIO_NR(3, 19), 0);
 }
@@ -700,6 +710,108 @@ int board_spi_cs_gpio(unsigned bus, unsigned cs)
 }
 #endif
 
+#ifdef CONFIG_USB_EHCI_MX6
+
+iomux_v3_cfg_t const usb_otg_pads[] = {
+       MX6_PAD_ENET_RX_ER__USB_OTG_ID | MUX_PAD_CTRL(OTG_ID_PAD_CTRL),
+};
+
+static void setup_usb(void)
+{
+       imx_iomux_v3_setup_multiple_pads(usb_otg_pads,
+                       ARRAY_SIZE(usb_otg_pads));
+
+       /*
+         * Set daisy chain for otg_pin_id on 6q.
+        *  For 6dl, this bit is reserved.
+        */
+       imx_iomux_set_gpr_register(1, 13, 1, 0);
+
+#ifdef CONFIG_DM_PCA953X
+       struct gpio_desc desc;
+       int ret;
+       
+       ret = dm_gpio_lookup_name("gpio@32_7", &desc);
+       if (ret)
+               return;
+
+       ret = dm_gpio_request(&desc, "usb_host1_pwr");
+       if (ret)
+               return;
+
+       dm_gpio_set_dir_flags(&desc, GPIOD_IS_OUT);
+
+       ret = dm_gpio_lookup_name("gpio@34_1", &desc);
+       if (ret)
+               return;
+
+       ret = dm_gpio_request(&desc, "usb_otg_pwr");
+       if (ret)
+               return;
+
+       dm_gpio_set_dir_flags(&desc, GPIOD_IS_OUT);
+#endif
+
+}
+
+int board_ehci_power(int port, int on)
+{
+#ifdef CONFIG_PCA953X
+
+#define USB_HOST1_PWR     PORTEXP_IO_NR(0x32, 7)
+#define USB_OTG_PWR       PORTEXP_IO_NR(0x34, 1)
+
+       switch (port) {
+       case 0:
+               if (on)
+                       port_exp_direction_output(USB_OTG_PWR, 1);
+               else
+                       port_exp_direction_output(USB_OTG_PWR, 0);
+               break;
+       case 1:
+               if (on)
+                       port_exp_direction_output(USB_HOST1_PWR, 1);
+               else
+                       port_exp_direction_output(USB_HOST1_PWR, 0);
+               break;
+       default:
+               printf("MXC USB port %d not yet supported\n", port);
+               return -EINVAL;
+       }
+#elif defined(CONFIG_DM_PCA953X)
+       struct gpio_desc desc;
+       int ret;
+
+       switch (port) {
+       case 0:         
+               ret = dm_gpio_lookup_name("gpio@34_1", &desc);
+               if (ret)
+                       return ret;
+               
+               if (on)
+                       dm_gpio_set_value(&desc, 1);
+               else
+                       dm_gpio_set_value(&desc, 0);
+               break;
+       case 1:
+               ret = dm_gpio_lookup_name("gpio@32_7", &desc);
+               if (ret)
+                       return ret;
+               
+               if (on)
+                       dm_gpio_set_value(&desc, 1);
+               else
+                       dm_gpio_set_value(&desc, 0);
+               break;
+       default:
+               printf("MXC USB port %d not yet supported\n", port);
+               return -EINVAL;
+       }       
+#endif
+       return 0;
+}
+#endif
+
 int board_early_init_f(void)
 {
        setup_iomux_uart();
@@ -716,14 +828,21 @@ int board_init(void)
        /* address of boot parameters */
        gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
+#ifdef CONFIG_SYS_I2C
        /* I2C 2 and 3 setup - I2C 3 hw mux with EIM */
        setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1);
+#endif
+
        /* I2C 3 Steer */
+       gpio_request(IMX_GPIO_NR(5, 4), "steer logic");
        gpio_direction_output(IMX_GPIO_NR(5, 4), 1);
        imx_iomux_v3_setup_multiple_pads(i2c3_pads, ARRAY_SIZE(i2c3_pads));
+       
 #ifndef CONFIG_SYS_FLASH_CFI
        setup_i2c(2, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info2);
 #endif
+
+       gpio_request(IMX_GPIO_NR(1, 15), "expander en");
        gpio_direction_output(IMX_GPIO_NR(1, 15), 1);
        imx_iomux_v3_setup_multiple_pads(port_exp, ARRAY_SIZE(port_exp));
 
@@ -751,9 +870,14 @@ int board_init(void)
        setup_fec();
 #endif
 
+#ifdef CONFIG_USB_EHCI_MX6
+       setup_usb();
+#endif
+
        return 0;
 }
 
+#ifdef CONFIG_POWER
 int power_init_board(void)
 {
        struct pmic *pfuze;
@@ -824,8 +948,80 @@ int power_init_board(void)
 
        return 0;
 }
+#elif defined(CONFIG_DM_PMIC_PFUZE100)
+int power_init_board(void)
+{
+       struct udevice *dev;
+       unsigned int reg;
+       int ret;
+
+       dev = pfuze_common_init();
+       if (!dev)
+               return -ENODEV;
+
+       if (is_mx6dqp())
+               ret = pfuze_mode_init(dev, APS_APS);
+       else
+               ret = pfuze_mode_init(dev, APS_PFM);
+       if (ret < 0)
+               return ret;
+
+       if (is_mx6dqp()) {
+               /* set SW1C staby volatage 1.075V*/
+               reg = pmic_reg_read(dev, PFUZE100_SW1CSTBY);
+               reg &= ~0x3f;
+               reg |= 0x1f;
+               pmic_reg_write(dev, PFUZE100_SW1CSTBY, reg);
+
+               /* set SW1C/VDDSOC step ramp up time to from 16us to 4us/25mV */
+               reg = pmic_reg_read(dev, PFUZE100_SW1CCONF);
+               reg &= ~0xc0;
+               reg |= 0x40;
+               pmic_reg_write(dev, PFUZE100_SW1CCONF, reg);
+
+               /* set SW2/VDDARM staby volatage 0.975V*/
+               reg = pmic_reg_read(dev, PFUZE100_SW2STBY);
+               reg &= ~0x3f;
+               reg |= 0x17;
+               pmic_reg_write(dev, PFUZE100_SW2STBY, reg);
+
+               /* set SW2/VDDARM step ramp up time to from 16us to 4us/25mV */
+               reg = pmic_reg_read(dev, PFUZE100_SW2CONF);
+               reg &= ~0xc0;
+               reg |= 0x40;
+               pmic_reg_write(dev, PFUZE100_SW2CONF, reg);
+       } else {
+               /* set SW1AB staby volatage 0.975V*/
+               reg = pmic_reg_read(dev, PFUZE100_SW1ABSTBY);
+               reg &= ~0x3f;
+               reg |= 0x1b;
+               pmic_reg_write(dev, PFUZE100_SW1ABSTBY, reg);
+
+               /* set SW1AB/VDDARM step ramp up time from 16us to 4us/25mV */
+               reg = pmic_reg_read(dev, PFUZE100_SW1ABCONF);
+               reg &= ~0xc0;
+               reg |= 0x40;
+               pmic_reg_write(dev, PFUZE100_SW1ABCONF, reg);
+
+               /* set SW1C staby volatage 0.975V*/
+               reg = pmic_reg_read(dev, PFUZE100_SW1CSTBY);
+               reg &= ~0x3f;
+               reg |= 0x1b;
+               pmic_reg_write(dev, PFUZE100_SW1CSTBY, reg);
+
+               /* set SW1C/VDDSOC step ramp up time to from 16us to 4us/25mV */
+               reg = pmic_reg_read(dev, PFUZE100_SW1CCONF);
+               reg &= ~0xc0;
+               reg |= 0x40;
+               pmic_reg_write(dev, PFUZE100_SW1CCONF, reg);
+       }
+
+       return 0;
+}
+#endif
 
 #ifdef CONFIG_LDO_BYPASS_CHECK
+#ifdef CONFIG_POWER
 void ldo_mode_set(int ldo_bypass)
 {
        unsigned int value;
@@ -861,6 +1057,35 @@ void ldo_mode_set(int ldo_bypass)
                pmic_reg_write(p, PFUZE100_SW1CVOL, value);
        }
 }
+#elif defined(CONFIG_DM_PMIC_PFUZE100)
+void ldo_mode_set(int ldo_bypass)
+{
+       struct udevice *dev;
+       int ret;
+
+       ret = pmic_get("pfuze100", &dev);
+       if (ret == -ENODEV) {
+               printf("No PMIC found!\n");
+               return;
+       }
+
+       /* increase VDDARM/VDDSOC to support 1.2G chip */
+       if (check_1_2G()) {
+               ldo_bypass = 0; /* ldo_enable on 1.2G chip */
+               printf("1.2G chip, increase VDDARM_IN/VDDSOC_IN\n");
+               
+               if (is_mx6dqp()) {
+                       /* increase VDDARM to 1.425V */
+                       pmic_clrsetbits(dev, PFUZE100_SW2VOL, 0x3f, 0x29);
+               } else {
+                       /* increase VDDARM to 1.425V */
+                       pmic_clrsetbits(dev, PFUZE100_SW1ABVOL, 0x3f, 0x2d);
+               }
+               /* increase VDDSOC to 1.425V */
+               pmic_clrsetbits(dev, PFUZE100_SW1CVOL, 0x3f, 0x2d);
+       }
+}
+#endif
 #endif
 
 #ifdef CONFIG_CMD_BMODE
@@ -914,57 +1139,3 @@ int checkboard(void)
 
        return 0;
 }
-
-#ifdef CONFIG_USB_EHCI_MX6
-#define USB_HOST1_PWR     PORTEXP_IO_NR(0x32, 7)
-#define USB_OTG_PWR       PORTEXP_IO_NR(0x34, 1)
-
-iomux_v3_cfg_t const usb_otg_pads[] = {
-       MX6_PAD_ENET_RX_ER__USB_OTG_ID | MUX_PAD_CTRL(OTG_ID_PAD_CTRL),
-};
-
-int board_ehci_hcd_init(int port)
-{
-       switch (port) {
-       case 0:
-               imx_iomux_v3_setup_multiple_pads(usb_otg_pads,
-                       ARRAY_SIZE(usb_otg_pads));
-
-               /*
-                 * Set daisy chain for otg_pin_id on 6q.
-                *  For 6dl, this bit is reserved.
-                */
-               imx_iomux_set_gpr_register(1, 13, 1, 0);
-               break;
-       case 1:
-               break;
-       default:
-               printf("MXC USB port %d not yet supported\n", port);
-               return -EINVAL;
-       }
-       return 0;
-}
-
-int board_ehci_power(int port, int on)
-{
-       switch (port) {
-       case 0:
-               if (on)
-                       port_exp_direction_output(USB_OTG_PWR, 1);
-               else
-                       port_exp_direction_output(USB_OTG_PWR, 0);
-               break;
-       case 1:
-               if (on)
-                       port_exp_direction_output(USB_HOST1_PWR, 1);
-               else
-                       port_exp_direction_output(USB_HOST1_PWR, 0);
-               break;
-       default:
-               printf("MXC USB port %d not yet supported\n", port);
-               return -EINVAL;
-       }
-
-       return 0;
-}
-#endif
index 151a341..77767ca 100644 (file)
@@ -37,4 +37,23 @@ CONFIG_G_DNL_MANUFACTURER="FSL"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 # CONFIG_VIDEO_SW_CURSOR is not set
-CONFIG_OF_LIBFDT=y
+# CONFIG_OF_LIBFDT=y
+
+CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabreauto"
+CONFIG_OF_CONTROL=y
+# CONFIG_BLK is not set
+CONFIG_DM_GPIO=y
+CONFIG_DM_PCA953X=y
+CONFIG_DM_I2C=y
+CONFIG_DM_MMC=y
+# CONFIG_DM_MMC_OPS is not set
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_IMX6=y
+CONFIG_DM_PMIC=y
+CONFIG_DM_PMIC_PFUZE100=y
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_PFUZE100=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_DM_ETH=y
+CONFIG_DM_USB=y
index 24bc406..d26209e 100644 (file)
@@ -3,6 +3,7 @@ CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6QSABREAUTO=y
 CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q"
+CONFIG_NOR=y
 CONFIG_NOR_BOOT=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
@@ -11,7 +12,6 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
-# CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_I2C=y
@@ -26,4 +26,22 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 # CONFIG_VIDEO_SW_CURSOR is not set
-CONFIG_OF_LIBFDT=y
+# CONFIG_OF_LIBFDT=y
+
+CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabreauto-gpmi-weim"
+CONFIG_OF_CONTROL=y
+# CONFIG_BLK is not set
+CONFIG_DM_GPIO=y
+CONFIG_DM_PCA953X=y
+CONFIG_DM_I2C=y
+CONFIG_DM_MMC=y
+# CONFIG_DM_MMC_OPS is not set
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_IMX6=y
+CONFIG_DM_PMIC=y
+CONFIG_DM_PMIC_PFUZE100=y
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_PFUZE100=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_DM_ETH=y
index afc2436..cc3ccaa 100644 (file)
@@ -15,9 +15,6 @@ CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_I2C=y
-CONFIG_CMD_USB=y
-CONFIG_CMD_DFU=y
-CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
@@ -28,14 +25,22 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
-CONFIG_DFU_MMC=y
-CONFIG_USB=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_GADGET=y
-CONFIG_CI_UDC=y
-CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="FSL"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 # CONFIG_VIDEO_SW_CURSOR is not set
-CONFIG_OF_LIBFDT=y
+# CONFIG_OF_LIBFDT=y
+
+CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabreauto-gpmi-weim"
+CONFIG_OF_CONTROL=y
+# CONFIG_BLK is not set
+CONFIG_DM_GPIO=y
+CONFIG_DM_I2C=y
+CONFIG_DM_MMC=y
+# CONFIG_DM_MMC_OPS is not set
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_IMX6=y
+CONFIG_DM_PMIC=y
+CONFIG_DM_PMIC_PFUZE100=y
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_PFUZE100=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_DM_ETH=y
index 0612788..85eb1d5 100644 (file)
@@ -38,4 +38,23 @@ CONFIG_G_DNL_MANUFACTURER="FSL"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 # CONFIG_VIDEO_SW_CURSOR is not set
-CONFIG_OF_LIBFDT=y
+# CONFIG_OF_LIBFDT=y
+
+CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabreauto"
+CONFIG_OF_CONTROL=y
+# CONFIG_BLK is not set
+CONFIG_DM_GPIO=y
+CONFIG_DM_PCA953X=y
+CONFIG_DM_I2C=y
+CONFIG_DM_MMC=y
+# CONFIG_DM_MMC_OPS is not set
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_IMX6=y
+CONFIG_DM_PMIC=y
+CONFIG_DM_PMIC_PFUZE100=y
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_PFUZE100=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_DM_ETH=y
+CONFIG_DM_USB=y
index 80fde53..ce0e325 100644 (file)
@@ -38,4 +38,23 @@ CONFIG_G_DNL_MANUFACTURER="FSL"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 # CONFIG_VIDEO_SW_CURSOR is not set
-CONFIG_OF_LIBFDT=y
+# CONFIG_OF_LIBFDT=y
+
+CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabreauto"
+CONFIG_OF_CONTROL=y
+# CONFIG_BLK is not set
+CONFIG_DM_GPIO=y
+CONFIG_DM_PCA953X=y
+CONFIG_DM_I2C=y
+CONFIG_DM_MMC=y
+# CONFIG_DM_MMC_OPS is not set
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_IMX6=y
+CONFIG_DM_PMIC=y
+CONFIG_DM_PMIC_PFUZE100=y
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_PFUZE100=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_DM_ETH=y
+CONFIG_DM_USB=y
index bc22ae0..662a87b 100644 (file)
@@ -26,4 +26,22 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 # CONFIG_VIDEO_SW_CURSOR is not set
-CONFIG_OF_LIBFDT=y
+# CONFIG_OF_LIBFDT=y
+
+CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabreauto-ecspi"
+CONFIG_OF_CONTROL=y
+# CONFIG_BLK is not set
+CONFIG_DM_GPIO=y
+CONFIG_DM_PCA953X=y
+CONFIG_DM_I2C=y
+CONFIG_DM_MMC=y
+# CONFIG_DM_MMC_OPS is not set
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_IMX6=y
+CONFIG_DM_PMIC=y
+CONFIG_DM_PMIC_PFUZE100=y
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_PFUZE100=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_DM_ETH=y
index e71fac1..d7d5875 100644 (file)
 #define PHYS_SDRAM_SIZE                (1u * 1024 * 1024 * 1024)
 #endif
 
-/*Since the pin conflicts on EIM D18, disable the USB host if the NOR flash is enabled */
-#if !defined(CONFIG_CMD_SF) && !defined(CONFIG_MTD_NOR_FLASH)
-/* USB Configs */
-#define CONFIG_USB_EHCI
-#define CONFIG_USB_EHCI_MX6
-#define CONFIG_USB_HOST_ETHER
-#define CONFIG_USB_ETHER_ASIX
-#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET       /* For OTG port */
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
-
-#define CONFIG_PCA953X
-#define CONFIG_SYS_I2C_PCA953X_WIDTH   { {0x30, 8}, {0x32, 8}, {0x34, 8} }
-#endif
-
-#define CONFIG_CMD_NAND
-
 #include "mx6sabre_common.h"
 
 #undef MFG_NAND_PARTITION
 #define CONFIG_SF_DEFAULT_CS   1
 #endif
 
+/*Since the pin conflicts on EIM D18, disable the USB host if the NOR flash is enabled */
+#ifdef CONFIG_USB
+/* USB Configs */
+#define CONFIG_USB_EHCI
+#define CONFIG_USB_EHCI_MX6
+#define CONFIG_USB_HOST_ETHER
+#define CONFIG_USB_ETHER_ASIX
+#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
+#define CONFIG_EHCI_HCD_INIT_AFTER_RESET       /* For OTG port */
+#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CONFIG_MXC_USB_FLAGS   0
+
+#if !defined(CONFIG_DM_PCA953X) && defined(CONFIG_SYS_I2C)
+#define CONFIG_PCA953X
+#define CONFIG_SYS_I2C_PCA953X_WIDTH   { {0x30, 8}, {0x32, 8}, {0x34, 8} }
+#endif
+
+#endif
+
 #endif                         /* __MX6QSABREAUTO_CONFIG_H */