Merge branch 'async-scsi-resume' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / arch / arm / boot / dts / imx53-qsb.dts

diff --git a/arch/arm/boot/dts/imx53-qsb.dts b/arch/arm/boot/dts/imx53-qsb.dts
index 8b254289344ff44ed189e3d148c3c995060990e5..dec4b073ceb138e93a545815f0dce636cf7f6092 100644 (file)
--- a/arch/arm/boot/dts/imx53-qsb.dts
+++ b/arch/arm/boot/dts/imx53-qsb.dts
@@ -11,202 +11,14 @@
  */
 
 /dts-v1/;
-#include "imx53.dtsi"
+#include "imx53-qsb-common.dtsi"
 
 / {
        model = "Freescale i.MX53 Quick Start Board";
        compatible = "fsl,imx53-qsb", "fsl,imx53";
-
-       memory {
-               reg = <0x70000000 0x40000000>;
-       };
-
-       display0: display@di0 {
-               compatible = "fsl,imx-parallel-display";
-               interface-pix-fmt = "rgb565";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_ipu_disp0_1>;
-               status = "disabled";
-               display-timings {
-                       claawvga {
-                               native-mode;
-                               clock-frequency = <27000000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <40>;
-                               hfront-porch = <60>;
-                               vback-porch = <10>;
-                               vfront-porch = <10>;
-                               hsync-len = <20>;
-                               vsync-len = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-               };
-
-               port {
-                       display0_in: endpoint {
-                               remote-endpoint = <&ipu_di0_disp0>;
-                       };
-               };
-       };
-
-       gpio-keys {
-               compatible = "gpio-keys";
-
-               power {
-                       label = "Power Button";
-                       gpios = <&gpio1 8 0>;
-                       linux,code = <116>; /* KEY_POWER */
-               };
-
-               volume-up {
-                       label = "Volume Up";
-                       gpios = <&gpio2 14 0>;
-                       linux,code = <115>; /* KEY_VOLUMEUP */
-                       gpio-key,wakeup;
-               };
-
-               volume-down {
-                       label = "Volume Down";
-                       gpios = <&gpio2 15 0>;
-                       linux,code = <114>; /* KEY_VOLUMEDOWN */
-                       gpio-key,wakeup;
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-               pinctrl-names = "default";
-               pinctrl-0 = <&led_pin_gpio7_7>;
-
-               user {
-                       label = "Heartbeat";
-                       gpios = <&gpio7 7 0>;
-                       linux,default-trigger = "heartbeat";
-               };
-       };
-
-       regulators {
-               compatible = "simple-bus";
-
-               reg_3p2v: 3p2v {
-                       compatible = "regulator-fixed";
-                       regulator-name = "3P2V";
-                       regulator-min-microvolt = <3200000>;
-                       regulator-max-microvolt = <3200000>;
-                       regulator-always-on;
-               };
-
-               reg_usb_vbus: usb_vbus {
-                       compatible = "regulator-fixed";
-                       regulator-name = "usb_vbus";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       gpio = <&gpio7 8 0>;
-                       enable-active-high;
-               };
-       };
-
-       sound {
-               compatible = "fsl,imx53-qsb-sgtl5000",
-                            "fsl,imx-audio-sgtl5000";
-               model = "imx53-qsb-sgtl5000";
-               ssi-controller = <&ssi2>;
-               audio-codec = <&sgtl5000>;
-               audio-routing =
-                       "MIC_IN", "Mic Jack",
-                       "Mic Jack", "Mic Bias",
-                       "Headphone Jack", "HP_OUT";
-               mux-int-port = <2>;
-               mux-ext-port = <5>;
-       };
-};
-
-&esdhc1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_esdhc1_1>;
-       status = "okay";
-};
-
-&ipu_di0_disp0 {
-       remote-endpoint = <&display0_in>;
-};
-
-&ssi2 {
-       fsl,mode = "i2s-slave";
-       status = "okay";
-};
-
-&esdhc3 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_esdhc3_1>;
-       cd-gpios = <&gpio3 11 0>;
-       wp-gpios = <&gpio3 12 0>;
-       bus-width = <8>;
-       status = "okay";
-};
-
-&iomuxc {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_hog>;
-
-       hog {
-               pinctrl_hog: hoggrp {
-                       fsl,pins = <
-                               MX53_PAD_GPIO_0__CCM_SSI_EXT1_CLK 0x80000000
-                               MX53_PAD_GPIO_8__GPIO1_8          0x80000000
-                               MX53_PAD_PATA_DATA14__GPIO2_14    0x80000000
-                               MX53_PAD_PATA_DATA15__GPIO2_15    0x80000000
-                               MX53_PAD_EIM_DA11__GPIO3_11       0x80000000
-                               MX53_PAD_EIM_DA12__GPIO3_12       0x80000000
-                               MX53_PAD_PATA_DA_0__GPIO7_6       0x80000000
-                               MX53_PAD_PATA_DA_2__GPIO7_8       0x80000000
-                               MX53_PAD_GPIO_16__GPIO7_11        0x80000000
-                       >;
-               };
-
-               led_pin_gpio7_7: led_gpio7_7@0 {
-                       fsl,pins = <
-                               MX53_PAD_PATA_DA_1__GPIO7_7 0x80000000
-                       >;
-               };
-       };
-
-};
-
-&uart1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart1_1>;
-       status = "okay";
-};
-
-&i2c2 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c2_1>;
-       status = "okay";
-
-       sgtl5000: codec@0a {
-               compatible = "fsl,sgtl5000";
-               reg = <0x0a>;
-               VDDA-supply = <&reg_3p2v>;
-               VDDIO-supply = <&reg_3p2v>;
-               clocks = <&clks 150>;
-       };
 };
 
 &i2c1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c1_1>;
-       status = "okay";
-
-       accelerometer: mma8450@1c {
-               compatible = "fsl,mma8450";
-               reg = <0x1c>;
-       };
-
        pmic: dialog@48 {
                compatible = "dlg,da9053-aa", "dlg,da9052";
                reg = <0x48>;
@@ -301,32 +113,3 @@
                };
        };
 };
-
-&audmux {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_audmux_1>;
-       status = "okay";
-};
-
-&fec {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_fec_1>;
-       phy-mode = "rmii";
-       phy-reset-gpios = <&gpio7 6 0>;
-       status = "okay";
-};
-
-&vpu {
-       status = "okay";
-};
-
-&usbh1 {
-       vbus-supply = <&reg_usb_vbus>;
-       phy_type = "utmi";
-       status = "okay";
-};
-
-&usbotg {
-       dr_mode = "peripheral";
-       status = "okay";
-};