diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2013-04-02 01:15:16 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2013-04-09 10:53:38 -0400 |
commit | 082d33d08fe4bc8f73854d7692384905ec1cfcff (patch) | |
tree | aa7b9e612875ac545e153499cc94bf0afaf4fcd3 /arch/arm | |
parent | 21e59123a8737544bfdc547e6fbb63aef2f9d284 (diff) |
ARM: dts: imx: make sabreauto and sabresd common
The sabreauto and sabresd boards are common for imx6q and imx6dl.
Create imx6qdl-sabreauto.dtsi and imx6qdl-sabresd.dtsi for those
common parts.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/boot/dts/imx6q-sabreauto.dts | 27 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6q-sabresd.dts | 78 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 38 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 87 |
4 files changed, 130 insertions, 100 deletions
diff --git a/arch/arm/boot/dts/imx6q-sabreauto.dts b/arch/arm/boot/dts/imx6q-sabreauto.dts index 5e273eca3f19..49d6f2831ec9 100644 --- a/arch/arm/boot/dts/imx6q-sabreauto.dts +++ b/arch/arm/boot/dts/imx6q-sabreauto.dts | |||
@@ -11,15 +11,13 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | /dts-v1/; | 13 | /dts-v1/; |
14 | |||
14 | #include "imx6q.dtsi" | 15 | #include "imx6q.dtsi" |
16 | #include "imx6qdl-sabreauto.dtsi" | ||
15 | 17 | ||
16 | / { | 18 | / { |
17 | model = "Freescale i.MX6 Quad SABRE Automotive Board"; | 19 | model = "Freescale i.MX6 Quad SABRE Automotive Board"; |
18 | compatible = "fsl,imx6q-sabreauto", "fsl,imx6q"; | 20 | compatible = "fsl,imx6q-sabreauto", "fsl,imx6q"; |
19 | |||
20 | memory { | ||
21 | reg = <0x10000000 0x80000000>; | ||
22 | }; | ||
23 | }; | 21 | }; |
24 | 22 | ||
25 | &iomuxc { | 23 | &iomuxc { |
@@ -35,24 +33,3 @@ | |||
35 | }; | 33 | }; |
36 | }; | 34 | }; |
37 | }; | 35 | }; |
38 | |||
39 | &uart4 { | ||
40 | pinctrl-names = "default"; | ||
41 | pinctrl-0 = <&pinctrl_uart4_1>; | ||
42 | status = "okay"; | ||
43 | }; | ||
44 | |||
45 | &fec { | ||
46 | pinctrl-names = "default"; | ||
47 | pinctrl-0 = <&pinctrl_enet_2>; | ||
48 | phy-mode = "rgmii"; | ||
49 | status = "okay"; | ||
50 | }; | ||
51 | |||
52 | &usdhc3 { | ||
53 | pinctrl-names = "default"; | ||
54 | pinctrl-0 = <&pinctrl_usdhc3_1>; | ||
55 | cd-gpios = <&gpio6 15 0>; | ||
56 | wp-gpios = <&gpio1 13 0>; | ||
57 | status = "okay"; | ||
58 | }; | ||
diff --git a/arch/arm/boot/dts/imx6q-sabresd.dts b/arch/arm/boot/dts/imx6q-sabresd.dts index 9b96885f9bc9..442051350225 100644 --- a/arch/arm/boot/dts/imx6q-sabresd.dts +++ b/arch/arm/boot/dts/imx6q-sabresd.dts | |||
@@ -11,50 +11,13 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | /dts-v1/; | 13 | /dts-v1/; |
14 | |||
14 | #include "imx6q.dtsi" | 15 | #include "imx6q.dtsi" |
16 | #include "imx6qdl-sabresd.dtsi" | ||
15 | 17 | ||
16 | / { | 18 | / { |
17 | model = "Freescale i.MX6Q SABRE Smart Device Board"; | 19 | model = "Freescale i.MX6 Quad SABRE Smart Device Board"; |
18 | compatible = "fsl,imx6q-sabresd", "fsl,imx6q"; | 20 | compatible = "fsl,imx6q-sabresd", "fsl,imx6q"; |
19 | |||
20 | memory { | ||
21 | reg = <0x10000000 0x40000000>; | ||
22 | }; | ||
23 | |||
24 | regulators { | ||
25 | compatible = "simple-bus"; | ||
26 | |||
27 | reg_usb_otg_vbus: usb_otg_vbus { | ||
28 | compatible = "regulator-fixed"; | ||
29 | regulator-name = "usb_otg_vbus"; | ||
30 | regulator-min-microvolt = <5000000>; | ||
31 | regulator-max-microvolt = <5000000>; | ||
32 | gpio = <&gpio3 22 0>; | ||
33 | enable-active-high; | ||
34 | }; | ||
35 | }; | ||
36 | |||
37 | gpio-keys { | ||
38 | compatible = "gpio-keys"; | ||
39 | |||
40 | volume-up { | ||
41 | label = "Volume Up"; | ||
42 | gpios = <&gpio1 4 0>; | ||
43 | linux,code = <115>; /* KEY_VOLUMEUP */ | ||
44 | }; | ||
45 | |||
46 | volume-down { | ||
47 | label = "Volume Down"; | ||
48 | gpios = <&gpio1 5 0>; | ||
49 | linux,code = <114>; /* KEY_VOLUMEDOWN */ | ||
50 | }; | ||
51 | }; | ||
52 | }; | ||
53 | |||
54 | &uart1 { | ||
55 | pinctrl-names = "default"; | ||
56 | pinctrl-0 = <&pinctrl_uart1_1>; | ||
57 | status = "okay"; | ||
58 | }; | 21 | }; |
59 | 22 | ||
60 | &iomuxc { | 23 | &iomuxc { |
@@ -74,38 +37,3 @@ | |||
74 | }; | 37 | }; |
75 | }; | 38 | }; |
76 | }; | 39 | }; |
77 | |||
78 | &usbotg { | ||
79 | vbus-supply = <®_usb_otg_vbus>; | ||
80 | pinctrl-names = "default"; | ||
81 | pinctrl-0 = <&pinctrl_usbotg_2>; | ||
82 | disable-over-current; | ||
83 | status = "okay"; | ||
84 | }; | ||
85 | |||
86 | &usbh1 { | ||
87 | status = "okay"; | ||
88 | }; | ||
89 | |||
90 | &fec { | ||
91 | pinctrl-names = "default"; | ||
92 | pinctrl-0 = <&pinctrl_enet_1>; | ||
93 | phy-mode = "rgmii"; | ||
94 | status = "okay"; | ||
95 | }; | ||
96 | |||
97 | &usdhc2 { | ||
98 | pinctrl-names = "default"; | ||
99 | pinctrl-0 = <&pinctrl_usdhc2_1>; | ||
100 | cd-gpios = <&gpio2 2 0>; | ||
101 | wp-gpios = <&gpio2 3 0>; | ||
102 | status = "okay"; | ||
103 | }; | ||
104 | |||
105 | &usdhc3 { | ||
106 | pinctrl-names = "default"; | ||
107 | pinctrl-0 = <&pinctrl_usdhc3_1>; | ||
108 | cd-gpios = <&gpio2 0 0>; | ||
109 | wp-gpios = <&gpio2 1 0>; | ||
110 | status = "okay"; | ||
111 | }; | ||
diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi new file mode 100644 index 000000000000..4d237cffcc41 --- /dev/null +++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | |||
@@ -0,0 +1,38 @@ | |||
1 | /* | ||
2 | * Copyright 2012 Freescale Semiconductor, Inc. | ||
3 | * Copyright 2011 Linaro Ltd. | ||
4 | * | ||
5 | * The code contained herein is licensed under the GNU General Public | ||
6 | * License. You may obtain a copy of the GNU General Public License | ||
7 | * Version 2 or later at the following locations: | ||
8 | * | ||
9 | * http://www.opensource.org/licenses/gpl-license.html | ||
10 | * http://www.gnu.org/copyleft/gpl.html | ||
11 | */ | ||
12 | |||
13 | / { | ||
14 | memory { | ||
15 | reg = <0x10000000 0x80000000>; | ||
16 | }; | ||
17 | }; | ||
18 | |||
19 | &fec { | ||
20 | pinctrl-names = "default"; | ||
21 | pinctrl-0 = <&pinctrl_enet_2>; | ||
22 | phy-mode = "rgmii"; | ||
23 | status = "okay"; | ||
24 | }; | ||
25 | |||
26 | &uart4 { | ||
27 | pinctrl-names = "default"; | ||
28 | pinctrl-0 = <&pinctrl_uart4_1>; | ||
29 | status = "okay"; | ||
30 | }; | ||
31 | |||
32 | &usdhc3 { | ||
33 | pinctrl-names = "default"; | ||
34 | pinctrl-0 = <&pinctrl_usdhc3_1>; | ||
35 | cd-gpios = <&gpio6 15 0>; | ||
36 | wp-gpios = <&gpio1 13 0>; | ||
37 | status = "okay"; | ||
38 | }; | ||
diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi new file mode 100644 index 000000000000..e21f6a89cf0f --- /dev/null +++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi | |||
@@ -0,0 +1,87 @@ | |||
1 | /* | ||
2 | * Copyright 2012 Freescale Semiconductor, Inc. | ||
3 | * Copyright 2011 Linaro Ltd. | ||
4 | * | ||
5 | * The code contained herein is licensed under the GNU General Public | ||
6 | * License. You may obtain a copy of the GNU General Public License | ||
7 | * Version 2 or later at the following locations: | ||
8 | * | ||
9 | * http://www.opensource.org/licenses/gpl-license.html | ||
10 | * http://www.gnu.org/copyleft/gpl.html | ||
11 | */ | ||
12 | |||
13 | / { | ||
14 | memory { | ||
15 | reg = <0x10000000 0x40000000>; | ||
16 | }; | ||
17 | |||
18 | regulators { | ||
19 | compatible = "simple-bus"; | ||
20 | |||
21 | reg_usb_otg_vbus: usb_otg_vbus { | ||
22 | compatible = "regulator-fixed"; | ||
23 | regulator-name = "usb_otg_vbus"; | ||
24 | regulator-min-microvolt = <5000000>; | ||
25 | regulator-max-microvolt = <5000000>; | ||
26 | gpio = <&gpio3 22 0>; | ||
27 | enable-active-high; | ||
28 | }; | ||
29 | }; | ||
30 | |||
31 | gpio-keys { | ||
32 | compatible = "gpio-keys"; | ||
33 | |||
34 | volume-up { | ||
35 | label = "Volume Up"; | ||
36 | gpios = <&gpio1 4 0>; | ||
37 | linux,code = <115>; /* KEY_VOLUMEUP */ | ||
38 | }; | ||
39 | |||
40 | volume-down { | ||
41 | label = "Volume Down"; | ||
42 | gpios = <&gpio1 5 0>; | ||
43 | linux,code = <114>; /* KEY_VOLUMEDOWN */ | ||
44 | }; | ||
45 | }; | ||
46 | }; | ||
47 | |||
48 | &fec { | ||
49 | pinctrl-names = "default"; | ||
50 | pinctrl-0 = <&pinctrl_enet_1>; | ||
51 | phy-mode = "rgmii"; | ||
52 | status = "okay"; | ||
53 | }; | ||
54 | |||
55 | &uart1 { | ||
56 | pinctrl-names = "default"; | ||
57 | pinctrl-0 = <&pinctrl_uart1_1>; | ||
58 | status = "okay"; | ||
59 | }; | ||
60 | |||
61 | &usbh1 { | ||
62 | status = "okay"; | ||
63 | }; | ||
64 | |||
65 | &usbotg { | ||
66 | vbus-supply = <®_usb_otg_vbus>; | ||
67 | pinctrl-names = "default"; | ||
68 | pinctrl-0 = <&pinctrl_usbotg_2>; | ||
69 | disable-over-current; | ||
70 | status = "okay"; | ||
71 | }; | ||
72 | |||
73 | &usdhc2 { | ||
74 | pinctrl-names = "default"; | ||
75 | pinctrl-0 = <&pinctrl_usdhc2_1>; | ||
76 | cd-gpios = <&gpio2 2 0>; | ||
77 | wp-gpios = <&gpio2 3 0>; | ||
78 | status = "okay"; | ||
79 | }; | ||
80 | |||
81 | &usdhc3 { | ||
82 | pinctrl-names = "default"; | ||
83 | pinctrl-0 = <&pinctrl_usdhc3_1>; | ||
84 | cd-gpios = <&gpio2 0 0>; | ||
85 | wp-gpios = <&gpio2 1 0>; | ||
86 | status = "okay"; | ||
87 | }; | ||