OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Only display areas with differences – Ignore whitespace
Rev 2 Rev 3
1 /* 1 /*
2 * BSD LICENSE 2 * BSD LICENSE
3 * 3 *
4 * Copyright(c) 2017 Kristian Evensen <kristian.evensen@gmail.com>. 4 * Copyright(c) 2017 Kristian Evensen <kristian.evensen@gmail.com>.
5 * Copyright(c) 2017 Piotr Dymacz <pepe2k@gmail.com>. 5 * Copyright(c) 2017 Piotr Dymacz <pepe2k@gmail.com>.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 11 *
12 * * Redistributions of source code must retain the above copyright 12 * * Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * * Redistributions in binary form must reproduce the above copyright 14 * * Redistributions in binary form must reproduce the above copyright
15 * notice, this list of conditions and the following disclaimer in 15 * notice, this list of conditions and the following disclaimer in
16 * the documentation and/or other materials provided with the 16 * the documentation and/or other materials provided with the
17 * distribution. 17 * distribution.
18 * * Neither the name of Broadcom Corporation nor the names of its 18 * * Neither the name of Broadcom Corporation nor the names of its
19 * contributors may be used to endorse or promote products derived 19 * contributors may be used to endorse or promote products derived
20 * from this software without specific prior written permission. 20 * from this software without specific prior written permission.
21 * 21 *
22 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 22 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
23 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 23 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
24 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 24 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
25 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 25 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
26 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 26 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
27 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 27 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
28 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 28 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
29 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 29 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
30 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 30 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
32 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 32 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33 */ 33 */
34   34  
35 /dts-v1/; 35 /dts-v1/;
36   36  
37 #include "U7621-06.dtsi" 37 #include "U7621-06.dtsi"
38   38  
39 #include <dt-bindings/gpio/gpio.h> 39 #include <dt-bindings/gpio/gpio.h>
40 #include <dt-bindings/input/input.h> 40 #include <dt-bindings/input/input.h>
41   41  
42 / { 42 / {
43 compatible = "unielec,u7621-06-256m-16m", "unielec,u7621-06", "mediatek,mt7621-soc"; 43 compatible = "unielec,u7621-06-256m-16m", "unielec,u7621-06", "mediatek,mt7621-soc";
44 model = "UniElec U7621-06 (256M RAM/16M flash)"; 44 model = "UniElec U7621-06 (256M RAM/16M flash)";
45   45  
46 memory@0 { 46 memory@0 {
47 device_type = "memory"; 47 device_type = "memory";
48 reg = <0x0 0x10000000>; 48 reg = <0x0 0x10000000>;
49 }; 49 };
50 }; 50 };
51   51  
52 &spi0 { 52 &spi0 {
53 status = "okay"; 53 status = "okay";
54   54  
55 m25p80@0 { 55 m25p80@0 {
-   56 #address-cells = <1>;
-   57 #size-cells = <1>;
56 compatible = "jedec,spi-nor"; 58 compatible = "jedec,spi-nor";
57 reg = <0>; 59 reg = <0>;
58 spi-max-frequency = <14000000>; 60 spi-max-frequency = <14000000>;
-   61 m25p,chunked-io = <32>;
59   -  
60 partitions { -  
61 compatible = "fixed-partitions"; -  
62 #address-cells = <1>; -  
63 #size-cells = <1>; -  
64   62  
65 partition@0 { 63 partition@0 {
66 label = "bootloader"; 64 label = "bootloader";
67 reg = <0x0 0x30000>; 65 reg = <0x0 0x30000>;
68 read-only; 66 read-only;
69 }; 67 };
70   68  
71 partition@30000 { 69 partition@30000 {
72 label = "config"; 70 label = "config";
73 reg = <0x30000 0x10000>; 71 reg = <0x30000 0x10000>;
74 read-only; 72 read-only;
75 }; 73 };
76   74  
77 factory: partition@40000 { 75 factory: partition@40000 {
78 label = "factory"; 76 label = "factory";
79 reg = <0x40000 0x10000>; 77 reg = <0x40000 0x10000>;
80 read-only; -  
81 }; 78 read-only;
82   79 };
83 firmware: partition@50000 { -  
84 compatible = "denx,uimage"; 80  
85 label = "firmware"; 81 firmware: partition@50000 {
86 reg = <0x50000 0xfb0000>; 82 label = "firmware";
87 }; 83 reg = <0x50000 0xfb0000>;
88 }; 84 };
89 }; 85 };
90 }; 86 };
91   87