aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Stuebner <heiko@sntech.de>2014-09-10 10:28:02 -0400
committerHeiko Stuebner <heiko@sntech.de>2014-09-13 14:28:13 -0400
commit39c2bd782a2c50c51bced96ad3f2c97d4997d949 (patch)
tree35b08466012771a3c34375f1d06d3ef79337853a
parentf1c8547f56f1da9db51fe3281479c823e949a9fd (diff)
ARM: dts: rockchip: add Cortex-A9 SPI controller nodes
This adds basic spi nodes and pinctrl settings to the rk3066 and rk3188 devicetree files. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
-rw-r--r--arch/arm/boot/dts/rk3066a.dtsi46
-rw-r--r--arch/arm/boot/dts/rk3188.dtsi48
-rw-r--r--arch/arm/boot/dts/rk3xxx.dtsi24
3 files changed, 118 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi
index 879a818fba51..8021eed21e39 100644
--- a/arch/arm/boot/dts/rk3066a.dtsi
+++ b/arch/arm/boot/dts/rk3066a.dtsi
@@ -238,6 +238,42 @@
238 }; 238 };
239 }; 239 };
240 240
241 spi0 {
242 spi0_clk: spi0-clk {
243 rockchip,pins = <RK_GPIO1 5 RK_FUNC_2 &pcfg_pull_default>;
244 };
245 spi0_cs0: spi0-cs0 {
246 rockchip,pins = <RK_GPIO1 4 RK_FUNC_2 &pcfg_pull_default>;
247 };
248 spi0_tx: spi0-tx {
249 rockchip,pins = <RK_GPIO1 7 RK_FUNC_2 &pcfg_pull_default>;
250 };
251 spi0_rx: spi0-rx {
252 rockchip,pins = <RK_GPIO1 6 RK_FUNC_2 &pcfg_pull_default>;
253 };
254 spi0_cs1: spi0-cs1 {
255 rockchip,pins = <RK_GPIO4 15 RK_FUNC_1 &pcfg_pull_default>;
256 };
257 };
258
259 spi1 {
260 spi1_clk: spi1-clk {
261 rockchip,pins = <RK_GPIO2 19 RK_FUNC_2 &pcfg_pull_default>;
262 };
263 spi1_cs0: spi1-cs0 {
264 rockchip,pins = <RK_GPIO2 20 RK_FUNC_2 &pcfg_pull_default>;
265 };
266 spi1_rx: spi1-rx {
267 rockchip,pins = <RK_GPIO2 22 RK_FUNC_2 &pcfg_pull_default>;
268 };
269 spi1_tx: spi1-tx {
270 rockchip,pins = <RK_GPIO2 21 RK_FUNC_2 &pcfg_pull_default>;
271 };
272 spi1_cs1: spi1-cs1 {
273 rockchip,pins = <RK_GPIO2 23 RK_FUNC_2 &pcfg_pull_default>;
274 };
275 };
276
241 uart0 { 277 uart0 {
242 uart0_xfer: uart0-xfer { 278 uart0_xfer: uart0-xfer {
243 rockchip,pins = <RK_GPIO1 0 RK_FUNC_1 &pcfg_pull_default>, 279 rockchip,pins = <RK_GPIO1 0 RK_FUNC_1 &pcfg_pull_default>,
@@ -406,6 +442,16 @@
406 pinctrl-0 = <&pwm3_out>; 442 pinctrl-0 = <&pwm3_out>;
407}; 443};
408 444
445&spi0 {
446 pinctrl-names = "default";
447 pinctrl-0 = <&spi0_clk &spi0_tx &spi0_rx &spi0_cs0>;
448};
449
450&spi1 {
451 pinctrl-names = "default";
452 pinctrl-0 = <&spi1_clk &spi1_tx &spi1_rx &spi1_cs0>;
453};
454
409&uart0 { 455&uart0 {
410 pinctrl-names = "default"; 456 pinctrl-names = "default";
411 pinctrl-0 = <&uart0_xfer>; 457 pinctrl-0 = <&uart0_xfer>;
diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
index ee801a9c6b74..573ef6129fb4 100644
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -206,6 +206,42 @@
206 }; 206 };
207 }; 207 };
208 208
209 spi0 {
210 spi0_clk: spi0-clk {
211 rockchip,pins = <RK_GPIO1 6 RK_FUNC_2 &pcfg_pull_up>;
212 };
213 spi0_cs0: spi0-cs0 {
214 rockchip,pins = <RK_GPIO1 7 RK_FUNC_2 &pcfg_pull_up>;
215 };
216 spi0_tx: spi0-tx {
217 rockchip,pins = <RK_GPIO1 5 RK_FUNC_2 &pcfg_pull_up>;
218 };
219 spi0_rx: spi0-rx {
220 rockchip,pins = <RK_GPIO1 4 RK_FUNC_2 &pcfg_pull_up>;
221 };
222 spi0_cs1: spi0-cs1 {
223 rockchip,pins = <RK_GPIO1 15 RK_FUNC_1 &pcfg_pull_up>;
224 };
225 };
226
227 spi1 {
228 spi1_clk: spi1-clk {
229 rockchip,pins = <RK_GPIO0 30 RK_FUNC_1 &pcfg_pull_up>;
230 };
231 spi1_cs0: spi1-cs0 {
232 rockchip,pins = <RK_GPIO0 31 RK_FUNC_1 &pcfg_pull_up>;
233 };
234 spi1_rx: spi1-rx {
235 rockchip,pins = <RK_GPIO0 28 RK_FUNC_1 &pcfg_pull_up>;
236 };
237 spi1_tx: spi1-tx {
238 rockchip,pins = <RK_GPIO0 29 RK_FUNC_1 &pcfg_pull_up>;
239 };
240 spi1_cs1: spi1-cs1 {
241 rockchip,pins = <RK_GPIO1 14 RK_FUNC_2 &pcfg_pull_up>;
242 };
243 };
244
209 uart0 { 245 uart0 {
210 uart0_xfer: uart0-xfer { 246 uart0_xfer: uart0-xfer {
211 rockchip,pins = <RK_GPIO1 0 RK_FUNC_1 &pcfg_pull_up>, 247 rockchip,pins = <RK_GPIO1 0 RK_FUNC_1 &pcfg_pull_up>,
@@ -381,6 +417,18 @@
381 pinctrl-0 = <&pwm3_out>; 417 pinctrl-0 = <&pwm3_out>;
382}; 418};
383 419
420&spi0 {
421 compatible = "rockchip,rk3188-spi", "rockchip,rk3066-spi";
422 pinctrl-names = "default";
423 pinctrl-0 = <&spi0_clk &spi0_tx &spi0_rx &spi0_cs0>;
424};
425
426&spi1 {
427 compatible = "rockchip,rk3188-spi", "rockchip,rk3066-spi";
428 pinctrl-names = "default";
429 pinctrl-0 = <&spi1_clk &spi1_tx &spi1_rx &spi1_cs0>;
430};
431
384&uart0 { 432&uart0 {
385 pinctrl-names = "default"; 433 pinctrl-names = "default";
386 pinctrl-0 = <&uart0_xfer>; 434 pinctrl-0 = <&uart0_xfer>;
diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi
index c873624af6aa..7bcd69855052 100644
--- a/arch/arm/boot/dts/rk3xxx.dtsi
+++ b/arch/arm/boot/dts/rk3xxx.dtsi
@@ -26,6 +26,8 @@
26 i2c2 = &i2c2; 26 i2c2 = &i2c2;
27 i2c3 = &i2c3; 27 i2c3 = &i2c3;
28 i2c4 = &i2c4; 28 i2c4 = &i2c4;
29 spi0 = &spi0;
30 spi1 = &spi1;
29 }; 31 };
30 32
31 xin24m: oscillator { 33 xin24m: oscillator {
@@ -291,4 +293,26 @@
291 clock-names = "saradc", "apb_pclk"; 293 clock-names = "saradc", "apb_pclk";
292 status = "disabled"; 294 status = "disabled";
293 }; 295 };
296
297 spi0: spi@20070000 {
298 compatible = "rockchip,rk3066-spi";
299 clocks = <&cru SCLK_SPI0>, <&cru PCLK_SPI0>;
300 clock-names = "spiclk", "apb_pclk";
301 interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
302 reg = <0x20070000 0x1000>;
303 #address-cells = <1>;
304 #size-cells = <0>;
305 status = "disabled";
306 };
307
308 spi1: spi@20074000 {
309 compatible = "rockchip,rk3066-spi";
310 clocks = <&cru SCLK_SPI1>, <&cru PCLK_SPI1>;
311 clock-names = "spiclk", "apb_pclk";
312 interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
313 reg = <0x20074000 0x1000>;
314 #address-cells = <1>;
315 #size-cells = <0>;
316 status = "disabled";
317 };
294}; 318};