Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit e899dbaf4898efdaf6d1a02ed4ac205d35f54df8

Authored by Peter Rosin
Committed by Olof Johansson
1 parent f7efdad025
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

ARM: at91/dt: Fix sama5d3x typos 

Some DT files had a typo with a missing "5" in sama5d3x first compatible string.

Signed-off-by: Peter Rosin <peda@axentia.se>
[nicolas.ferre@atmel.com: modify commit log]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Signed-off-by: Olof Johansson <olof@lixom.net>

Showing 6 changed files with 6 additions and 6 deletions Inline Diff

arch/arm/boot/dts/sama5d31.dtsi
Diff comments   View file @ e899dba
1 /* 1 /*
2 * sama5d31.dtsi - Device Tree Include file for SAMA5D31 SoC 2 * sama5d31.dtsi - Device Tree Include file for SAMA5D31 SoC
3 * 3 *
4 * Copyright (C) 2013 Boris BREZILLON <b.brezillon@overkiz.com> 4 * Copyright (C) 2013 Boris BREZILLON <b.brezillon@overkiz.com>
5 * 5 *
6 * Licensed under GPLv2 or later. 6 * Licensed under GPLv2 or later.
7 */ 7 */
8 #include "sama5d3.dtsi" 8 #include "sama5d3.dtsi"
9 #include "sama5d3_lcd.dtsi" 9 #include "sama5d3_lcd.dtsi"
10 #include "sama5d3_emac.dtsi" 10 #include "sama5d3_emac.dtsi"
11 #include "sama5d3_mci2.dtsi" 11 #include "sama5d3_mci2.dtsi"
12 #include "sama5d3_uart.dtsi" 12 #include "sama5d3_uart.dtsi"
13 13
14 / { 14 / {
15 compatible = "atmel,samad31", "atmel,sama5d3", "atmel,sama5"; 15 compatible = "atmel,sama5d31", "atmel,sama5d3", "atmel,sama5";
16 }; 16 };
17 17
arch/arm/boot/dts/sama5d33.dtsi
Diff comments   View file @ e899dba
1 /* 1 /*
2 * sama5d33.dtsi - Device Tree Include file for SAMA5D33 SoC 2 * sama5d33.dtsi - Device Tree Include file for SAMA5D33 SoC
3 * 3 *
4 * Copyright (C) 2013 Boris BREZILLON <b.brezillon@overkiz.com> 4 * Copyright (C) 2013 Boris BREZILLON <b.brezillon@overkiz.com>
5 * 5 *
6 * Licensed under GPLv2 or later. 6 * Licensed under GPLv2 or later.
7 */ 7 */
8 #include "sama5d3.dtsi" 8 #include "sama5d3.dtsi"
9 #include "sama5d3_lcd.dtsi" 9 #include "sama5d3_lcd.dtsi"
10 #include "sama5d3_gmac.dtsi" 10 #include "sama5d3_gmac.dtsi"
11 11
12 / { 12 / {
13 compatible = "atmel,samad33", "atmel,sama5d3", "atmel,sama5"; 13 compatible = "atmel,sama5d33", "atmel,sama5d3", "atmel,sama5";
14 }; 14 };
15 15
arch/arm/boot/dts/sama5d34.dtsi
Diff comments   View file @ e899dba
1 /* 1 /*
2 * sama5d34.dtsi - Device Tree Include file for SAMA5D34 SoC 2 * sama5d34.dtsi - Device Tree Include file for SAMA5D34 SoC
3 * 3 *
4 * Copyright (C) 2013 Boris BREZILLON <b.brezillon@overkiz.com> 4 * Copyright (C) 2013 Boris BREZILLON <b.brezillon@overkiz.com>
5 * 5 *
6 * Licensed under GPLv2 or later. 6 * Licensed under GPLv2 or later.
7 */ 7 */
8 #include "sama5d3.dtsi" 8 #include "sama5d3.dtsi"
9 #include "sama5d3_lcd.dtsi" 9 #include "sama5d3_lcd.dtsi"
10 #include "sama5d3_gmac.dtsi" 10 #include "sama5d3_gmac.dtsi"
11 #include "sama5d3_can.dtsi" 11 #include "sama5d3_can.dtsi"
12 #include "sama5d3_mci2.dtsi" 12 #include "sama5d3_mci2.dtsi"
13 13
14 / { 14 / {
15 compatible = "atmel,samad34", "atmel,sama5d3", "atmel,sama5"; 15 compatible = "atmel,sama5d34", "atmel,sama5d3", "atmel,sama5";
16 }; 16 };
17 17
arch/arm/boot/dts/sama5d35.dtsi
Diff comments   View file @ e899dba
1 /* 1 /*
2 * sama5d35.dtsi - Device Tree Include file for SAMA5D35 SoC 2 * sama5d35.dtsi - Device Tree Include file for SAMA5D35 SoC
3 * 3 *
4 * Copyright (C) 2013 Boris BREZILLON <b.brezillon@overkiz.com> 4 * Copyright (C) 2013 Boris BREZILLON <b.brezillon@overkiz.com>
5 * 5 *
6 * Licensed under GPLv2 or later. 6 * Licensed under GPLv2 or later.
7 */ 7 */
8 #include "sama5d3.dtsi" 8 #include "sama5d3.dtsi"
9 #include "sama5d3_gmac.dtsi" 9 #include "sama5d3_gmac.dtsi"
10 #include "sama5d3_emac.dtsi" 10 #include "sama5d3_emac.dtsi"
11 #include "sama5d3_can.dtsi" 11 #include "sama5d3_can.dtsi"
12 #include "sama5d3_mci2.dtsi" 12 #include "sama5d3_mci2.dtsi"
13 #include "sama5d3_uart.dtsi" 13 #include "sama5d3_uart.dtsi"
14 #include "sama5d3_tcb1.dtsi" 14 #include "sama5d3_tcb1.dtsi"
15 15
16 / { 16 / {
17 compatible = "atmel,samad35", "atmel,sama5d3", "atmel,sama5"; 17 compatible = "atmel,sama5d35", "atmel,sama5d3", "atmel,sama5";
18 }; 18 };
19 19
arch/arm/boot/dts/sama5d36.dtsi
Diff comments   View file @ e899dba
1 /* 1 /*
2 * sama5d36.dtsi - Device Tree Include file for SAMA5D36 SoC 2 * sama5d36.dtsi - Device Tree Include file for SAMA5D36 SoC
3 * 3 *
4 * Copyright (C) 2013 Atmel, 4 * Copyright (C) 2013 Atmel,
5 * 2013 Josh Wu <josh.wu@atmel.com> 5 * 2013 Josh Wu <josh.wu@atmel.com>
6 * 6 *
7 * Licensed under GPLv2 or later. 7 * Licensed under GPLv2 or later.
8 */ 8 */
9 #include "sama5d3.dtsi" 9 #include "sama5d3.dtsi"
10 #include "sama5d3_can.dtsi" 10 #include "sama5d3_can.dtsi"
11 #include "sama5d3_gmac.dtsi" 11 #include "sama5d3_gmac.dtsi"
12 #include "sama5d3_emac.dtsi" 12 #include "sama5d3_emac.dtsi"
13 #include "sama5d3_lcd.dtsi" 13 #include "sama5d3_lcd.dtsi"
14 #include "sama5d3_mci2.dtsi" 14 #include "sama5d3_mci2.dtsi"
15 #include "sama5d3_tcb1.dtsi" 15 #include "sama5d3_tcb1.dtsi"
16 #include "sama5d3_uart.dtsi" 16 #include "sama5d3_uart.dtsi"
17 17
18 / { 18 / {
19 compatible = "atmel,samad36", "atmel,sama5d3", "atmel,sama5"; 19 compatible = "atmel,sama5d36", "atmel,sama5d3", "atmel,sama5";
20 }; 20 };
21 21
arch/arm/boot/dts/sama5d3xcm.dtsi
Diff comments   View file @ e899dba
1 /* 1 /*
2 * sama5d3xcm.dtsi - Device Tree Include file for SAMA5D3x CPU Module 2 * sama5d3xcm.dtsi - Device Tree Include file for SAMA5D3x CPU Module
3 * 3 *
4 * Copyright (C) 2013 Atmel, 4 * Copyright (C) 2013 Atmel,
5 * 2013 Ludovic Desroches <ludovic.desroches@atmel.com> 5 * 2013 Ludovic Desroches <ludovic.desroches@atmel.com>
6 * 6 *
7 * Licensed under GPLv2 or later. 7 * Licensed under GPLv2 or later.
8 */ 8 */
9 9
10 / { 10 / {
11 compatible = "atmel,samad3xcm", "atmel,sama5d3", "atmel,sama5"; 11 compatible = "atmel,sama5d3xcm", "atmel,sama5d3", "atmel,sama5";
12 12
13 chosen { 13 chosen {
14 bootargs = "console=ttyS0,115200 rootfstype=ubifs ubi.mtd=5 root=ubi0:rootfs"; 14 bootargs = "console=ttyS0,115200 rootfstype=ubifs ubi.mtd=5 root=ubi0:rootfs";
15 }; 15 };
16 16
17 memory { 17 memory {
18 reg = <0x20000000 0x20000000>; 18 reg = <0x20000000 0x20000000>;
19 }; 19 };
20 20
21 clocks { 21 clocks {
22 slow_xtal { 22 slow_xtal {
23 clock-frequency = <32768>; 23 clock-frequency = <32768>;
24 }; 24 };
25 25
26 main_xtal { 26 main_xtal {
27 clock-frequency = <12000000>; 27 clock-frequency = <12000000>;
28 }; 28 };
29 }; 29 };
30 30
31 ahb { 31 ahb {
32 apb { 32 apb {
33 spi0: spi@f0004000 { 33 spi0: spi@f0004000 {
34 cs-gpios = <&pioD 13 0>, <0>, <0>, <0>; 34 cs-gpios = <&pioD 13 0>, <0>, <0>, <0>;
35 }; 35 };
36 36
37 macb0: ethernet@f0028000 { 37 macb0: ethernet@f0028000 {
38 phy-mode = "rgmii"; 38 phy-mode = "rgmii";
39 #address-cells = <1>; 39 #address-cells = <1>;
40 #size-cells = <0>; 40 #size-cells = <0>;
41 41
42 ethernet-phy@1 { 42 ethernet-phy@1 {
43 reg = <0x1>; 43 reg = <0x1>;
44 interrupt-parent = <&pioB>; 44 interrupt-parent = <&pioB>;
45 interrupts = <25 IRQ_TYPE_EDGE_FALLING>; 45 interrupts = <25 IRQ_TYPE_EDGE_FALLING>;
46 txen-skew-ps = <800>; 46 txen-skew-ps = <800>;
47 txc-skew-ps = <3000>; 47 txc-skew-ps = <3000>;
48 rxdv-skew-ps = <400>; 48 rxdv-skew-ps = <400>;
49 rxc-skew-ps = <3000>; 49 rxc-skew-ps = <3000>;
50 rxd0-skew-ps = <400>; 50 rxd0-skew-ps = <400>;
51 rxd1-skew-ps = <400>; 51 rxd1-skew-ps = <400>;
52 rxd2-skew-ps = <400>; 52 rxd2-skew-ps = <400>;
53 rxd3-skew-ps = <400>; 53 rxd3-skew-ps = <400>;
54 }; 54 };
55 55
56 ethernet-phy@7 { 56 ethernet-phy@7 {
57 reg = <0x7>; 57 reg = <0x7>;
58 interrupt-parent = <&pioB>; 58 interrupt-parent = <&pioB>;
59 interrupts = <25 IRQ_TYPE_EDGE_FALLING>; 59 interrupts = <25 IRQ_TYPE_EDGE_FALLING>;
60 txen-skew-ps = <800>; 60 txen-skew-ps = <800>;
61 txc-skew-ps = <3000>; 61 txc-skew-ps = <3000>;
62 rxdv-skew-ps = <400>; 62 rxdv-skew-ps = <400>;
63 rxc-skew-ps = <3000>; 63 rxc-skew-ps = <3000>;
64 rxd0-skew-ps = <400>; 64 rxd0-skew-ps = <400>;
65 rxd1-skew-ps = <400>; 65 rxd1-skew-ps = <400>;
66 rxd2-skew-ps = <400>; 66 rxd2-skew-ps = <400>;
67 rxd3-skew-ps = <400>; 67 rxd3-skew-ps = <400>;
68 }; 68 };
69 }; 69 };
70 70
71 pmc: pmc@fffffc00 { 71 pmc: pmc@fffffc00 {
72 main: mainck { 72 main: mainck {
73 clock-frequency = <12000000>; 73 clock-frequency = <12000000>;
74 }; 74 };
75 }; 75 };
76 }; 76 };
77 77
78 nand0: nand@60000000 { 78 nand0: nand@60000000 {
79 nand-bus-width = <8>; 79 nand-bus-width = <8>;
80 nand-ecc-mode = "hw"; 80 nand-ecc-mode = "hw";
81 atmel,has-pmecc; 81 atmel,has-pmecc;
82 atmel,pmecc-cap = <4>; 82 atmel,pmecc-cap = <4>;
83 atmel,pmecc-sector-size = <512>; 83 atmel,pmecc-sector-size = <512>;
84 nand-on-flash-bbt; 84 nand-on-flash-bbt;
85 status = "okay"; 85 status = "okay";
86 86
87 at91bootstrap@0 { 87 at91bootstrap@0 {
88 label = "at91bootstrap"; 88 label = "at91bootstrap";
89 reg = <0x0 0x40000>; 89 reg = <0x0 0x40000>;
90 }; 90 };
91 91
92 bootloader@40000 { 92 bootloader@40000 {
93 label = "bootloader"; 93 label = "bootloader";
94 reg = <0x40000 0x80000>; 94 reg = <0x40000 0x80000>;
95 }; 95 };
96 96
97 bootloaderenv@c0000 { 97 bootloaderenv@c0000 {
98 label = "bootloader env"; 98 label = "bootloader env";
99 reg = <0xc0000 0xc0000>; 99 reg = <0xc0000 0xc0000>;
100 }; 100 };
101 101
102 dtb@180000 { 102 dtb@180000 {
103 label = "device tree"; 103 label = "device tree";
104 reg = <0x180000 0x80000>; 104 reg = <0x180000 0x80000>;
105 }; 105 };
106 106
107 kernel@200000 { 107 kernel@200000 {
108 label = "kernel"; 108 label = "kernel";
109 reg = <0x200000 0x600000>; 109 reg = <0x200000 0x600000>;
110 }; 110 };
111 111
112 rootfs@800000 { 112 rootfs@800000 {
113 label = "rootfs"; 113 label = "rootfs";
114 reg = <0x800000 0x0f800000>; 114 reg = <0x800000 0x0f800000>;
115 }; 115 };
116 }; 116 };
117 }; 117 };
118 118
119 leds { 119 leds {
120 compatible = "gpio-leds"; 120 compatible = "gpio-leds";
121 121
122 d2 { 122 d2 {
123 label = "d2"; 123 label = "d2";
124 gpios = <&pioE 25 GPIO_ACTIVE_LOW>; /* PE25, conflicts with A25, RXD2 */ 124 gpios = <&pioE 25 GPIO_ACTIVE_LOW>; /* PE25, conflicts with A25, RXD2 */
125 }; 125 };
126 }; 126 };
127 }; 127 };
128 128