diff options
author | Stefan Agner <stefan@agner.ch> | 2014-11-02 15:36:47 -0500 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2014-11-23 02:08:10 -0500 |
commit | e1bf86ace4d2ac915e130699aefe6e9d9bc7164d (patch) | |
tree | 1600ee58f3b7fbfc92cb137a0f376ff85ee3eaee | |
parent | efb45b305fff1fe08bbd1e16591de71e7963cc58 (diff) |
ARM: dts: vf500-colibri: add Colibri VF50 support
Add Colibri VF50 device tree files vf500-colibri.dtsi and
vf500-colibri-eval-v3.dts, in line with the Colibri VF61 device tree
files. However, to minimize dupplication we also add vf-colibri.dtsi
and vf-colibri-eval-v3.dtsi which contain the common device tree
nodes.
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r-- | arch/arm/boot/dts/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 54 | ||||
-rw-r--r-- | arch/arm/boot/dts/vf-colibri.dtsi | 142 | ||||
-rw-r--r-- | arch/arm/boot/dts/vf500-colibri-eval-v3.dts | 17 | ||||
-rw-r--r-- | arch/arm/boot/dts/vf500-colibri.dtsi | 20 | ||||
-rw-r--r-- | arch/arm/boot/dts/vf610-colibri-eval-v3.dts | 47 | ||||
-rw-r--r-- | arch/arm/boot/dts/vf610-colibri.dtsi | 149 |
7 files changed, 237 insertions, 193 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 60773abcfb33..4600499089da 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile | |||
@@ -253,6 +253,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ | |||
253 | imx6sx-sdb.dtb \ | 253 | imx6sx-sdb.dtb \ |
254 | ls1021a-qds.dtb \ | 254 | ls1021a-qds.dtb \ |
255 | ls1021a-twr.dtb \ | 255 | ls1021a-twr.dtb \ |
256 | vf500-colibri-eval-v3.dtb \ | ||
256 | vf610-colibri-eval-v3.dtb \ | 257 | vf610-colibri-eval-v3.dtb \ |
257 | vf610-cosmic.dtb \ | 258 | vf610-cosmic.dtb \ |
258 | vf610-twr.dtb | 259 | vf610-twr.dtb |
diff --git a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi new file mode 100644 index 000000000000..80e8fbc6b0aa --- /dev/null +++ b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | |||
@@ -0,0 +1,54 @@ | |||
1 | /* | ||
2 | * Copyright 2014 Toradex AG | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License as published by | ||
6 | * the Free Software Foundation; either version 2 of the License, or | ||
7 | * (at your option) any later version. | ||
8 | */ | ||
9 | |||
10 | / { | ||
11 | chosen { | ||
12 | bootargs = "console=ttyLP0,115200"; | ||
13 | }; | ||
14 | }; | ||
15 | |||
16 | &bl { | ||
17 | brightness-levels = <0 4 8 16 32 64 128 255>; | ||
18 | default-brightness-level = <6>; | ||
19 | status = "okay"; | ||
20 | }; | ||
21 | |||
22 | &esdhc1 { | ||
23 | pinctrl-names = "default"; | ||
24 | pinctrl-0 = <&pinctrl_esdhc1>; | ||
25 | bus-width = <4>; | ||
26 | status = "okay"; | ||
27 | }; | ||
28 | |||
29 | &fec1 { | ||
30 | phy-mode = "rmii"; | ||
31 | pinctrl-names = "default"; | ||
32 | pinctrl-0 = <&pinctrl_fec1>; | ||
33 | status = "okay"; | ||
34 | }; | ||
35 | |||
36 | &pwm0 { | ||
37 | status = "okay"; | ||
38 | }; | ||
39 | |||
40 | &pwm1 { | ||
41 | status = "okay"; | ||
42 | }; | ||
43 | |||
44 | &uart0 { | ||
45 | status = "okay"; | ||
46 | }; | ||
47 | |||
48 | &uart1 { | ||
49 | status = "okay"; | ||
50 | }; | ||
51 | |||
52 | &uart2 { | ||
53 | status = "okay"; | ||
54 | }; \ No newline at end of file | ||
diff --git a/arch/arm/boot/dts/vf-colibri.dtsi b/arch/arm/boot/dts/vf-colibri.dtsi new file mode 100644 index 000000000000..ab403679e6f3 --- /dev/null +++ b/arch/arm/boot/dts/vf-colibri.dtsi | |||
@@ -0,0 +1,142 @@ | |||
1 | /* | ||
2 | * Copyright 2014 Toradex AG | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License as published by | ||
6 | * the Free Software Foundation; either version 2 of the License, or | ||
7 | * (at your option) any later version. | ||
8 | */ | ||
9 | |||
10 | / { | ||
11 | bl: backlight { | ||
12 | compatible = "pwm-backlight"; | ||
13 | pwms = <&pwm0 0 5000000 0>; | ||
14 | status = "disabled"; | ||
15 | }; | ||
16 | }; | ||
17 | |||
18 | &adc0 { | ||
19 | status = "okay"; | ||
20 | }; | ||
21 | |||
22 | &adc1 { | ||
23 | status = "okay"; | ||
24 | }; | ||
25 | |||
26 | &edma0 { | ||
27 | status = "okay"; | ||
28 | }; | ||
29 | |||
30 | &esdhc1 { | ||
31 | pinctrl-names = "default"; | ||
32 | pinctrl-0 = <&pinctrl_esdhc1>; | ||
33 | bus-width = <4>; | ||
34 | }; | ||
35 | |||
36 | &fec1 { | ||
37 | phy-mode = "rmii"; | ||
38 | pinctrl-names = "default"; | ||
39 | pinctrl-0 = <&pinctrl_fec1>; | ||
40 | }; | ||
41 | |||
42 | &pwm0 { | ||
43 | pinctrl-names = "default"; | ||
44 | pinctrl-0 = <&pinctrl_pwm0>; | ||
45 | }; | ||
46 | |||
47 | &pwm1 { | ||
48 | pinctrl-names = "default"; | ||
49 | pinctrl-0 = <&pinctrl_pwm1>; | ||
50 | }; | ||
51 | |||
52 | &uart0 { | ||
53 | pinctrl-names = "default"; | ||
54 | pinctrl-0 = <&pinctrl_uart0>; | ||
55 | }; | ||
56 | |||
57 | &uart1 { | ||
58 | pinctrl-names = "default"; | ||
59 | pinctrl-0 = <&pinctrl_uart1>; | ||
60 | }; | ||
61 | |||
62 | &uart2 { | ||
63 | pinctrl-names = "default"; | ||
64 | pinctrl-0 = <&pinctrl_uart2>; | ||
65 | }; | ||
66 | |||
67 | &usbdev0 { | ||
68 | disable-over-current; | ||
69 | status = "okay"; | ||
70 | }; | ||
71 | |||
72 | &usbh1 { | ||
73 | disable-over-current; | ||
74 | status = "okay"; | ||
75 | }; | ||
76 | |||
77 | &iomuxc { | ||
78 | vf610-colibri { | ||
79 | pinctrl_esdhc1: esdhc1grp { | ||
80 | fsl,pins = < | ||
81 | VF610_PAD_PTA24__ESDHC1_CLK 0x31ef | ||
82 | VF610_PAD_PTA25__ESDHC1_CMD 0x31ef | ||
83 | VF610_PAD_PTA26__ESDHC1_DAT0 0x31ef | ||
84 | VF610_PAD_PTA27__ESDHC1_DAT1 0x31ef | ||
85 | VF610_PAD_PTA28__ESDHC1_DATA2 0x31ef | ||
86 | VF610_PAD_PTA29__ESDHC1_DAT3 0x31ef | ||
87 | VF610_PAD_PTB20__GPIO_42 0x219d | ||
88 | >; | ||
89 | }; | ||
90 | |||
91 | pinctrl_fec1: fec1grp { | ||
92 | fsl,pins = < | ||
93 | VF610_PAD_PTC9__ENET_RMII1_MDC 0x30d2 | ||
94 | VF610_PAD_PTC10__ENET_RMII1_MDIO 0x30d3 | ||
95 | VF610_PAD_PTC11__ENET_RMII1_CRS 0x30d1 | ||
96 | VF610_PAD_PTC12__ENET_RMII_RXD1 0x30d1 | ||
97 | VF610_PAD_PTC13__ENET_RMII1_RXD0 0x30d1 | ||
98 | VF610_PAD_PTC14__ENET_RMII1_RXER 0x30d1 | ||
99 | VF610_PAD_PTC15__ENET_RMII1_TXD1 0x30d2 | ||
100 | VF610_PAD_PTC16__ENET_RMII1_TXD0 0x30d2 | ||
101 | VF610_PAD_PTC17__ENET_RMII1_TXEN 0x30d2 | ||
102 | >; | ||
103 | }; | ||
104 | |||
105 | pinctrl_pwm0: pwm0grp { | ||
106 | fsl,pins = < | ||
107 | VF610_PAD_PTB0__FTM0_CH0 0x1182 | ||
108 | VF610_PAD_PTB1__FTM0_CH1 0x1182 | ||
109 | >; | ||
110 | }; | ||
111 | |||
112 | pinctrl_pwm1: pwm1grp { | ||
113 | fsl,pins = < | ||
114 | VF610_PAD_PTB8__FTM1_CH0 0x1182 | ||
115 | VF610_PAD_PTB9__FTM1_CH1 0x1182 | ||
116 | >; | ||
117 | }; | ||
118 | |||
119 | pinctrl_uart0: uart0grp { | ||
120 | fsl,pins = < | ||
121 | VF610_PAD_PTB10__UART0_TX 0x21a2 | ||
122 | VF610_PAD_PTB11__UART0_RX 0x21a1 | ||
123 | >; | ||
124 | }; | ||
125 | |||
126 | pinctrl_uart1: uart1grp { | ||
127 | fsl,pins = < | ||
128 | VF610_PAD_PTB4__UART1_TX 0x21a2 | ||
129 | VF610_PAD_PTB5__UART1_RX 0x21a1 | ||
130 | >; | ||
131 | }; | ||
132 | |||
133 | pinctrl_uart2: uart2grp { | ||
134 | fsl,pins = < | ||
135 | VF610_PAD_PTD0__UART2_TX 0x21a2 | ||
136 | VF610_PAD_PTD1__UART2_RX 0x21a1 | ||
137 | VF610_PAD_PTD2__UART2_RTS 0x21a2 | ||
138 | VF610_PAD_PTD3__UART2_CTS 0x21a1 | ||
139 | >; | ||
140 | }; | ||
141 | }; | ||
142 | }; | ||
diff --git a/arch/arm/boot/dts/vf500-colibri-eval-v3.dts b/arch/arm/boot/dts/vf500-colibri-eval-v3.dts new file mode 100644 index 000000000000..7fc782c4fc52 --- /dev/null +++ b/arch/arm/boot/dts/vf500-colibri-eval-v3.dts | |||
@@ -0,0 +1,17 @@ | |||
1 | /* | ||
2 | * Copyright 2014 Toradex AG | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License as published by | ||
6 | * the Free Software Foundation; either version 2 of the License, or | ||
7 | * (at your option) any later version. | ||
8 | */ | ||
9 | |||
10 | /dts-v1/; | ||
11 | #include "vf500-colibri.dtsi" | ||
12 | #include "vf-colibri-eval-v3.dtsi" | ||
13 | |||
14 | / { | ||
15 | model = "Toradex Colibri VF50 on Colibri Evaluation Board"; | ||
16 | compatible = "toradex,vf500-colibri_vf50-on-eval", "toradex,vf500-colibri_vf50", "fsl,vf500"; | ||
17 | }; | ||
diff --git a/arch/arm/boot/dts/vf500-colibri.dtsi b/arch/arm/boot/dts/vf500-colibri.dtsi new file mode 100644 index 000000000000..cee34a32f25b --- /dev/null +++ b/arch/arm/boot/dts/vf500-colibri.dtsi | |||
@@ -0,0 +1,20 @@ | |||
1 | /* | ||
2 | * Copyright 2014 Toradex AG | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License as published by | ||
6 | * the Free Software Foundation; either version 2 of the License, or | ||
7 | * (at your option) any later version. | ||
8 | */ | ||
9 | |||
10 | #include "vf500.dtsi" | ||
11 | #include "vf-colibri.dtsi" | ||
12 | |||
13 | / { | ||
14 | model = "Toradex Colibri VF50 COM"; | ||
15 | compatible = "toradex,vf610-colibri_vf50", "fsl,vf500"; | ||
16 | |||
17 | memory { | ||
18 | reg = <0x80000000 0x8000000>; | ||
19 | }; | ||
20 | }; | ||
diff --git a/arch/arm/boot/dts/vf610-colibri-eval-v3.dts b/arch/arm/boot/dts/vf610-colibri-eval-v3.dts index 711cf823e794..10ebe99e2751 100644 --- a/arch/arm/boot/dts/vf610-colibri-eval-v3.dts +++ b/arch/arm/boot/dts/vf610-colibri-eval-v3.dts | |||
@@ -9,52 +9,9 @@ | |||
9 | 9 | ||
10 | /dts-v1/; | 10 | /dts-v1/; |
11 | #include "vf610-colibri.dtsi" | 11 | #include "vf610-colibri.dtsi" |
12 | #include "vf-colibri-eval-v3.dtsi" | ||
12 | 13 | ||
13 | / { | 14 | / { |
14 | model = "Toradex Colibri VF61 on Colibri Evaluation Board"; | 15 | model = "Toradex Colibri VF61 on Colibri Evaluation Board"; |
15 | compatible = "toradex,vf610-colibri_vf61-on-eval", "toradex,vf610-colibri_vf61", "fsl,vf610"; | 16 | compatible = "toradex,vf610-colibri_vf61-on-eval", "toradex,vf610-colibri_vf61", "fsl,vf610"; |
16 | 17 | }; \ No newline at end of file | |
17 | chosen { | ||
18 | bootargs = "console=ttyLP0,115200"; | ||
19 | }; | ||
20 | }; | ||
21 | |||
22 | &bl { | ||
23 | brightness-levels = <0 4 8 16 32 64 128 255>; | ||
24 | default-brightness-level = <6>; | ||
25 | status = "okay"; | ||
26 | }; | ||
27 | |||
28 | &esdhc1 { | ||
29 | pinctrl-names = "default"; | ||
30 | pinctrl-0 = <&pinctrl_esdhc1>; | ||
31 | bus-width = <4>; | ||
32 | status = "okay"; | ||
33 | }; | ||
34 | |||
35 | &fec1 { | ||
36 | phy-mode = "rmii"; | ||
37 | pinctrl-names = "default"; | ||
38 | pinctrl-0 = <&pinctrl_fec1>; | ||
39 | status = "okay"; | ||
40 | }; | ||
41 | |||
42 | &pwm0 { | ||
43 | status = "okay"; | ||
44 | }; | ||
45 | |||
46 | &pwm1 { | ||
47 | status = "okay"; | ||
48 | }; | ||
49 | |||
50 | &uart0 { | ||
51 | status = "okay"; | ||
52 | }; | ||
53 | |||
54 | &uart1 { | ||
55 | status = "okay"; | ||
56 | }; | ||
57 | |||
58 | &uart2 { | ||
59 | status = "okay"; | ||
60 | }; | ||
diff --git a/arch/arm/boot/dts/vf610-colibri.dtsi b/arch/arm/boot/dts/vf610-colibri.dtsi index 2bcee5a54d42..19fe045b8334 100644 --- a/arch/arm/boot/dts/vf610-colibri.dtsi +++ b/arch/arm/boot/dts/vf610-colibri.dtsi | |||
@@ -8,6 +8,7 @@ | |||
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include "vf610.dtsi" | 10 | #include "vf610.dtsi" |
11 | #include "vf-colibri.dtsi" | ||
11 | 12 | ||
12 | / { | 13 | / { |
13 | model = "Toradex Colibri VF61 COM"; | 14 | model = "Toradex Colibri VF61 COM"; |
@@ -16,157 +17,9 @@ | |||
16 | memory { | 17 | memory { |
17 | reg = <0x80000000 0x10000000>; | 18 | reg = <0x80000000 0x10000000>; |
18 | }; | 19 | }; |
19 | |||
20 | clocks { | ||
21 | enet_ext { | ||
22 | compatible = "fixed-clock"; | ||
23 | #clock-cells = <0>; | ||
24 | clock-frequency = <50000000>; | ||
25 | }; | ||
26 | }; | ||
27 | |||
28 | bl: backlight { | ||
29 | compatible = "pwm-backlight"; | ||
30 | pwms = <&pwm0 0 5000000 0>; | ||
31 | status = "disabled"; | ||
32 | }; | ||
33 | }; | ||
34 | |||
35 | &adc0 { | ||
36 | status = "okay"; | ||
37 | }; | ||
38 | |||
39 | &adc1 { | ||
40 | status = "okay"; | ||
41 | }; | ||
42 | |||
43 | &edma0 { | ||
44 | status = "okay"; | ||
45 | }; | ||
46 | |||
47 | &esdhc1 { | ||
48 | pinctrl-names = "default"; | ||
49 | pinctrl-0 = <&pinctrl_esdhc1>; | ||
50 | bus-width = <4>; | ||
51 | }; | ||
52 | |||
53 | &fec1 { | ||
54 | phy-mode = "rmii"; | ||
55 | pinctrl-names = "default"; | ||
56 | pinctrl-0 = <&pinctrl_fec1>; | ||
57 | }; | 20 | }; |
58 | 21 | ||
59 | &L2 { | 22 | &L2 { |
60 | arm,data-latency = <2 1 2>; | 23 | arm,data-latency = <2 1 2>; |
61 | arm,tag-latency = <3 2 3>; | 24 | arm,tag-latency = <3 2 3>; |
62 | }; | 25 | }; |
63 | |||
64 | &pwm0 { | ||
65 | pinctrl-names = "default"; | ||
66 | pinctrl-0 = <&pinctrl_pwm0>; | ||
67 | }; | ||
68 | |||
69 | &pwm1 { | ||
70 | pinctrl-names = "default"; | ||
71 | pinctrl-0 = <&pinctrl_pwm1>; | ||
72 | }; | ||
73 | |||
74 | &uart0 { | ||
75 | pinctrl-names = "default"; | ||
76 | pinctrl-0 = <&pinctrl_uart0>; | ||
77 | }; | ||
78 | |||
79 | &uart1 { | ||
80 | pinctrl-names = "default"; | ||
81 | pinctrl-0 = <&pinctrl_uart1>; | ||
82 | }; | ||
83 | |||
84 | &uart2 { | ||
85 | pinctrl-names = "default"; | ||
86 | pinctrl-0 = <&pinctrl_uart2>; | ||
87 | }; | ||
88 | |||
89 | &usbdev0 { | ||
90 | disable-over-current; | ||
91 | status = "okay"; | ||
92 | }; | ||
93 | |||
94 | &usbh1 { | ||
95 | disable-over-current; | ||
96 | status = "okay"; | ||
97 | }; | ||
98 | |||
99 | &usbphy0 { | ||
100 | status = "okay"; | ||
101 | }; | ||
102 | |||
103 | &usbphy1 { | ||
104 | status = "okay"; | ||
105 | }; | ||
106 | |||
107 | &iomuxc { | ||
108 | vf610-colibri { | ||
109 | pinctrl_esdhc1: esdhc1grp { | ||
110 | fsl,pins = < | ||
111 | VF610_PAD_PTA24__ESDHC1_CLK 0x31ef | ||
112 | VF610_PAD_PTA25__ESDHC1_CMD 0x31ef | ||
113 | VF610_PAD_PTA26__ESDHC1_DAT0 0x31ef | ||
114 | VF610_PAD_PTA27__ESDHC1_DAT1 0x31ef | ||
115 | VF610_PAD_PTA28__ESDHC1_DATA2 0x31ef | ||
116 | VF610_PAD_PTA29__ESDHC1_DAT3 0x31ef | ||
117 | VF610_PAD_PTB20__GPIO_42 0x219d | ||
118 | >; | ||
119 | }; | ||
120 | |||
121 | pinctrl_fec1: fec1grp { | ||
122 | fsl,pins = < | ||
123 | VF610_PAD_PTC9__ENET_RMII1_MDC 0x30d2 | ||
124 | VF610_PAD_PTC10__ENET_RMII1_MDIO 0x30d3 | ||
125 | VF610_PAD_PTC11__ENET_RMII1_CRS 0x30d1 | ||
126 | VF610_PAD_PTC12__ENET_RMII_RXD1 0x30d1 | ||
127 | VF610_PAD_PTC13__ENET_RMII1_RXD0 0x30d1 | ||
128 | VF610_PAD_PTC14__ENET_RMII1_RXER 0x30d1 | ||
129 | VF610_PAD_PTC15__ENET_RMII1_TXD1 0x30d2 | ||
130 | VF610_PAD_PTC16__ENET_RMII1_TXD0 0x30d2 | ||
131 | VF610_PAD_PTC17__ENET_RMII1_TXEN 0x30d2 | ||
132 | >; | ||
133 | }; | ||
134 | |||
135 | pinctrl_pwm0: pwm0grp { | ||
136 | fsl,pins = < | ||
137 | VF610_PAD_PTB0__FTM0_CH0 0x1182 | ||
138 | VF610_PAD_PTB1__FTM0_CH1 0x1182 | ||
139 | >; | ||
140 | }; | ||
141 | |||
142 | pinctrl_pwm1: pwm1grp { | ||
143 | fsl,pins = < | ||
144 | VF610_PAD_PTB8__FTM1_CH0 0x1182 | ||
145 | VF610_PAD_PTB9__FTM1_CH1 0x1182 | ||
146 | >; | ||
147 | }; | ||
148 | |||
149 | pinctrl_uart0: uart0grp { | ||
150 | fsl,pins = < | ||
151 | VF610_PAD_PTB10__UART0_TX 0x21a2 | ||
152 | VF610_PAD_PTB11__UART0_RX 0x21a1 | ||
153 | >; | ||
154 | }; | ||
155 | |||
156 | pinctrl_uart1: uart1grp { | ||
157 | fsl,pins = < | ||
158 | VF610_PAD_PTB4__UART1_TX 0x21a2 | ||
159 | VF610_PAD_PTB5__UART1_RX 0x21a1 | ||
160 | >; | ||
161 | }; | ||
162 | |||
163 | pinctrl_uart2: uart2grp { | ||
164 | fsl,pins = < | ||
165 | VF610_PAD_PTD0__UART2_TX 0x21a2 | ||
166 | VF610_PAD_PTD1__UART2_RX 0x21a1 | ||
167 | VF610_PAD_PTD2__UART2_RTS 0x21a2 | ||
168 | VF610_PAD_PTD3__UART2_CTS 0x21a1 | ||
169 | >; | ||
170 | }; | ||
171 | }; | ||
172 | }; | ||