Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 6462cdedc20b08ff5aa402a991ec89b3255ba51d

Authored by Masahiro Yamada
1 parent 79cee3cf5e
Exists in v2017.01-smarct4x and in 37 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

ARM: UniPhier: adjust device trees for business transfer 

Panasonic's System LSI products, UniPhier SoC family, have been
transferred to Socionext Inc.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Showing 16 changed files with 97 additions and 83 deletions Side-by-side Diff

arch/arm/dts/uniphier-ph1-ld4-ref.dts
Diff comments   View file @ 6462cde
... ... @@ -2,7 +2,8 @@
2 2 * Device Tree Source for UniPhier PH1-LD4 Reference Board
3 3 *
4 4 * Copyright (C) 2014-2015 Panasonic Corporation
5   - * Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
  5 + * Copyright (C) 2015 Socionext Inc.
  6 + * Author: Masahiro Yamada <yamada.masahiro@socionext.com>
6 7 *
7 8 * SPDX-License-Identifier: GPL-2.0+
8 9 */
... ... @@ -12,8 +13,8 @@
12 13 /include/ "uniphier-ref-daughter.dtsi"
13 14  
14 15 / {
15   - model = "Panasonic UniPhier PH1-LD4 Reference Board";
16   - compatible = "panasonic,ph1-ld4-ref", "panasonic,ph1-ld4";
  16 + model = "UniPhier PH1-LD4 Reference Board";
  17 + compatible = "socionext,ph1-ld4-ref", "socionext,ph1-ld4";
17 18  
18 19 memory {
19 20 device_type = "memory";
arch/arm/dts/uniphier-ph1-ld4.dtsi
Diff comments   View file @ 6462cde
... ... @@ -2,7 +2,8 @@
2 2 * Device Tree Source for UniPhier PH1-LD4 SoC
3 3 *
4 4 * Copyright (C) 2014-2015 Panasonic Corporation
5   - * Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
  5 + * Copyright (C) 2015 Socionext Inc.
  6 + * Author: Masahiro Yamada <yamada.masahiro@socionext.com>
6 7 *
7 8 * SPDX-License-Identifier: GPL-2.0+
8 9 */
... ... @@ -10,7 +11,7 @@
10 11 /include/ "skeleton.dtsi"
11 12  
12 13 / {
13   - compatible = "panasonic,ph1-ld4";
  14 + compatible = "socionext,ph1-ld4";
14 15  
15 16 cpus {
16 17 #address-cells = <1>;
17 18  
18 19  
19 20  
20 21  
... ... @@ -30,35 +31,35 @@
30 31 ranges;
31 32  
32 33 uart0: serial@54006800 {
33   - compatible = "panasonic,uniphier-uart";
  34 + compatible = "socionext,uniphier-uart";
34 35 status = "disabled";
35 36 reg = <0x54006800 0x20>;
36 37 clock-frequency = <36864000>;
37 38 };
38 39  
39 40 uart1: serial@54006900 {
40   - compatible = "panasonic,uniphier-uart";
  41 + compatible = "socionext,uniphier-uart";
41 42 status = "disabled";
42 43 reg = <0x54006900 0x20>;
43 44 clock-frequency = <36864000>;
44 45 };
45 46  
46 47 uart2: serial@54006a00 {
47   - compatible = "panasonic,uniphier-uart";
  48 + compatible = "socionext,uniphier-uart";
48 49 status = "disabled";
49 50 reg = <0x54006a00 0x20>;
50 51 clock-frequency = <36864000>;
51 52 };
52 53  
53 54 uart3: serial@54006b00 {
54   - compatible = "panasonic,uniphier-uart";
  55 + compatible = "socionext,uniphier-uart";
55 56 status = "disabled";
56 57 reg = <0x54006b00 0x20>;
57 58 clock-frequency = <36864000>;
58 59 };
59 60  
60 61 i2c0: i2c@58400000 {
61   - compatible = "panasonic,uniphier-i2c";
  62 + compatible = "socionext,uniphier-i2c";
62 63 #address-cells = <1>;
63 64 #size-cells = <0>;
64 65 reg = <0x58400000 0x40>;
... ... @@ -67,7 +68,7 @@
67 68 };
68 69  
69 70 i2c1: i2c@58480000 {
70   - compatible = "panasonic,uniphier-i2c";
  71 + compatible = "socionext,uniphier-i2c";
71 72 #address-cells = <1>;
72 73 #size-cells = <0>;
73 74 reg = <0x58480000 0x40>;
... ... @@ -76,7 +77,7 @@
76 77 };
77 78  
78 79 i2c2: i2c@58500000 {
79   - compatible = "panasonic,uniphier-i2c";
  80 + compatible = "socionext,uniphier-i2c";
80 81 #address-cells = <1>;
81 82 #size-cells = <0>;
82 83 reg = <0x58500000 0x40>;
... ... @@ -85,7 +86,7 @@
85 86 };
86 87  
87 88 i2c3: i2c@58580000 {
88   - compatible = "panasonic,uniphier-i2c";
  89 + compatible = "socionext,uniphier-i2c";
89 90 #address-cells = <1>;
90 91 #size-cells = <0>;
91 92 reg = <0x58580000 0x40>;
92 93  
93 94  
... ... @@ -94,19 +95,19 @@
94 95 };
95 96  
96 97 usb0: usb@5a800100 {
97   - compatible = "panasonic,uniphier-ehci", "generic-ehci";
  98 + compatible = "socionext,uniphier-ehci", "generic-ehci";
98 99 status = "disabled";
99 100 reg = <0x5a800100 0x100>;
100 101 };
101 102  
102 103 usb1: usb@5a810100 {
103   - compatible = "panasonic,uniphier-ehci", "generic-ehci";
  104 + compatible = "socionext,uniphier-ehci", "generic-ehci";
104 105 status = "disabled";
105 106 reg = <0x5a810100 0x100>;
106 107 };
107 108  
108 109 usb2: usb@5a820100 {
109   - compatible = "panasonic,uniphier-ehci", "generic-ehci";
  110 + compatible = "socionext,uniphier-ehci", "generic-ehci";
110 111 status = "disabled";
111 112 reg = <0x5a820100 0x100>;
112 113 };
arch/arm/dts/uniphier-ph1-pro4-ref.dts
Diff comments   View file @ 6462cde
... ... @@ -2,7 +2,8 @@
2 2 * Device Tree Source for UniPhier PH1-Pro4 Reference Board
3 3 *
4 4 * Copyright (C) 2014-2015 Panasonic Corporation
5   - * Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
  5 + * Copyright (C) 2015 Socionext Inc.
  6 + * Author: Masahiro Yamada <yamada.masahiro@socionext.com>
6 7 *
7 8 * SPDX-License-Identifier: GPL-2.0+
8 9 */
... ... @@ -12,8 +13,8 @@
12 13 /include/ "uniphier-ref-daughter.dtsi"
13 14  
14 15 / {
15   - model = "Panasonic UniPhier PH1-Pro4 Reference Board";
16   - compatible = "panasonic,ph1-pro4-ref", "panasonic,ph1-pro4";
  16 + model = "UniPhier PH1-Pro4 Reference Board";
  17 + compatible = "socionext,ph1-pro4-ref", "socionext,ph1-pro4";
17 18  
18 19 memory {
19 20 device_type = "memory";
arch/arm/dts/uniphier-ph1-pro4.dtsi
Diff comments   View file @ 6462cde
... ... @@ -2,7 +2,8 @@
2 2 * Device Tree Source for UniPhier PH1-Pro4 SoC
3 3 *
4 4 * Copyright (C) 2014-2015 Panasonic Corporation
5   - * Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
  5 + * Copyright (C) 2015 Socionext Inc.
  6 + * Author: Masahiro Yamada <yamada.masahiro@socionext.com>
6 7 *
7 8 * SPDX-License-Identifier: GPL-2.0+
8 9 */
... ... @@ -10,7 +11,7 @@
10 11 /include/ "skeleton.dtsi"
11 12  
12 13 / {
13   - compatible = "panasonic,ph1-pro4";
  14 + compatible = "socionext,ph1-pro4";
14 15  
15 16 cpus {
16 17 #address-cells = <1>;
17 18  
18 19  
19 20  
20 21  
... ... @@ -36,35 +37,35 @@
36 37 ranges;
37 38  
38 39 uart0: serial@54006800 {
39   - compatible = "panasonic,uniphier-uart";
  40 + compatible = "socionext,uniphier-uart";
40 41 status = "disabled";
41 42 reg = <0x54006800 0x20>;
42 43 clock-frequency = <73728000>;
43 44 };
44 45  
45 46 uart1: serial@54006900 {
46   - compatible = "panasonic,uniphier-uart";
  47 + compatible = "socionext,uniphier-uart";
47 48 status = "disabled";
48 49 reg = <0x54006900 0x20>;
49 50 clock-frequency = <73728000>;
50 51 };
51 52  
52 53 uart2: serial@54006a00 {
53   - compatible = "panasonic,uniphier-uart";
  54 + compatible = "socionext,uniphier-uart";
54 55 status = "disabled";
55 56 reg = <0x54006a00 0x20>;
56 57 clock-frequency = <73728000>;
57 58 };
58 59  
59 60 uart3: serial@54006b00 {
60   - compatible = "panasonic,uniphier-uart";
  61 + compatible = "socionext,uniphier-uart";
61 62 status = "disabled";
62 63 reg = <0x54006b00 0x20>;
63 64 clock-frequency = <73728000>;
64 65 };
65 66  
66 67 i2c0: i2c@58780000 {
67   - compatible = "panasonic,uniphier-fi2c";
  68 + compatible = "socionext,uniphier-fi2c";
68 69 #address-cells = <1>;
69 70 #size-cells = <0>;
70 71 reg = <0x58780000 0x80>;
... ... @@ -73,7 +74,7 @@
73 74 };
74 75  
75 76 i2c1: i2c@58781000 {
76   - compatible = "panasonic,uniphier-fi2c";
  77 + compatible = "socionext,uniphier-fi2c";
77 78 #address-cells = <1>;
78 79 #size-cells = <0>;
79 80 reg = <0x58781000 0x80>;
... ... @@ -82,7 +83,7 @@
82 83 };
83 84  
84 85 i2c2: i2c@58782000 {
85   - compatible = "panasonic,uniphier-fi2c";
  86 + compatible = "socionext,uniphier-fi2c";
86 87 #address-cells = <1>;
87 88 #size-cells = <0>;
88 89 reg = <0x58782000 0x80>;
... ... @@ -91,7 +92,7 @@
91 92 };
92 93  
93 94 i2c3: i2c@58783000 {
94   - compatible = "panasonic,uniphier-fi2c";
  95 + compatible = "socionext,uniphier-fi2c";
95 96 #address-cells = <1>;
96 97 #size-cells = <0>;
97 98 reg = <0x58783000 0x80>;
... ... @@ -102,7 +103,7 @@
102 103 /* i2c4 does not exist */
103 104  
104 105 i2c5: i2c@58785000 {
105   - compatible = "panasonic,uniphier-fi2c";
  106 + compatible = "socionext,uniphier-fi2c";
106 107 #address-cells = <1>;
107 108 #size-cells = <0>;
108 109 reg = <0x58785000 0x80>;
... ... @@ -111,7 +112,7 @@
111 112 };
112 113  
113 114 i2c6: i2c@58786000 {
114   - compatible = "panasonic,uniphier-fi2c";
  115 + compatible = "socionext,uniphier-fi2c";
115 116 #address-cells = <1>;
116 117 #size-cells = <0>;
117 118 reg = <0x58786000 0x80>;
118 119  
119 120  
120 121  
... ... @@ -120,25 +121,25 @@
120 121 };
121 122  
122 123 usb2: usb@5a800100 {
123   - compatible = "panasonic,uniphier-ehci", "generic-ehci";
  124 + compatible = "socionext,uniphier-ehci", "generic-ehci";
124 125 status = "disabled";
125 126 reg = <0x5a800100 0x100>;
126 127 };
127 128  
128 129 usb3: usb@5a810100 {
129   - compatible = "panasonic,uniphier-ehci", "generic-ehci";
  130 + compatible = "socionext,uniphier-ehci", "generic-ehci";
130 131 status = "disabled";
131 132 reg = <0x5a810100 0x100>;
132 133 };
133 134  
134 135 usb0: usb@65a00000 {
135   - compatible = "panasonic,uniphier-xhci", "generic-xhci";
  136 + compatible = "socionext,uniphier-xhci", "generic-xhci";
136 137 status = "disabled";
137 138 reg = <0x65a00000 0x100>;
138 139 };
139 140  
140 141 usb1: usb@65c00000 {
141   - compatible = "panasonic,uniphier-xhci", "generic-xhci";
  142 + compatible = "socionext,uniphier-xhci", "generic-xhci";
142 143 status = "disabled";
143 144 reg = <0x65c00000 0x100>;
144 145 };
arch/arm/dts/uniphier-ph1-sld3-ref.dts
Diff comments   View file @ 6462cde
... ... @@ -2,7 +2,8 @@
2 2 * Device Tree Source for UniPhier PH1-sLD3 Reference Board
3 3 *
4 4 * Copyright (C) 2014-2015 Panasonic Corporation
5   - * Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
  5 + * Copyright (C) 2015 Socionext Inc.
  6 + * Author: Masahiro Yamada <yamada.masahiro@socionext.com>
6 7 *
7 8 * SPDX-License-Identifier: GPL-2.0+
8 9 */
... ... @@ -12,8 +13,8 @@
12 13 /include/ "uniphier-ref-daughter.dtsi"
13 14  
14 15 / {
15   - model = "Panasonic UniPhier PH1-sLD3 Reference Board";
16   - compatible = "panasonic,ph1-sld3-ref", "panasonic,ph1-sld3";
  16 + model = "UniPhier PH1-sLD3 Reference Board";
  17 + compatible = "socionext,ph1-sld3-ref", "socionext,ph1-sld3";
17 18  
18 19 memory {
19 20 device_type = "memory";
arch/arm/dts/uniphier-ph1-sld3.dtsi
Diff comments   View file @ 6462cde
... ... @@ -2,7 +2,8 @@
2 2 * Device Tree Source for UniPhier PH1-sLD3 SoC
3 3 *
4 4 * Copyright (C) 2014-2015 Panasonic Corporation
5   - * Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
  5 + * Copyright (C) 2015 Socionext Inc.
  6 + * Author: Masahiro Yamada <yamada.masahiro@socionext.com>
6 7 *
7 8 * SPDX-License-Identifier: GPL-2.0+
8 9 */
... ... @@ -10,7 +11,7 @@
10 11 /include/ "skeleton.dtsi"
11 12  
12 13 / {
13   - compatible = "panasonic,ph1-sld3";
  14 + compatible = "socionext,ph1-sld3";
14 15  
15 16 cpus {
16 17 #address-cells = <1>;
17 18  
18 19  
19 20  
... ... @@ -36,28 +37,28 @@
36 37 ranges;
37 38  
38 39 uart0: serial@54006800 {
39   - compatible = "panasonic,uniphier-uart";
  40 + compatible = "socionext,uniphier-uart";
40 41 status = "disabled";
41 42 reg = <0x54006800 0x20>;
42 43 clock-frequency = <36864000>;
43 44 };
44 45  
45 46 uart1: serial@54006900 {
46   - compatible = "panasonic,uniphier-uart";
  47 + compatible = "socionext,uniphier-uart";
47 48 status = "disabled";
48 49 reg = <0x54006900 0x20>;
49 50 clock-frequency = <36864000>;
50 51 };
51 52  
52 53 uart2: serial@54006a00 {
53   - compatible = "panasonic,uniphier-uart";
  54 + compatible = "socionext,uniphier-uart";
54 55 status = "disabled";
55 56 reg = <0x54006a00 0x20>;
56 57 clock-frequency = <36864000>;
57 58 };
58 59  
59 60 i2c0: i2c@58400000 {
60   - compatible = "panasonic,uniphier-i2c";
  61 + compatible = "socionext,uniphier-i2c";
61 62 #address-cells = <1>;
62 63 #size-cells = <0>;
63 64 reg = <0x58400000 0x40>;
... ... @@ -66,7 +67,7 @@
66 67 };
67 68  
68 69 i2c1: i2c@58480000 {
69   - compatible = "panasonic,uniphier-i2c";
  70 + compatible = "socionext,uniphier-i2c";
70 71 #address-cells = <1>;
71 72 #size-cells = <0>;
72 73 reg = <0x58480000 0x40>;
... ... @@ -75,7 +76,7 @@
75 76 };
76 77  
77 78 i2c2: i2c@58500000 {
78   - compatible = "panasonic,uniphier-i2c";
  79 + compatible = "socionext,uniphier-i2c";
79 80 #address-cells = <1>;
80 81 #size-cells = <0>;
81 82 reg = <0x58500000 0x40>;
... ... @@ -84,7 +85,7 @@
84 85 };
85 86  
86 87 i2c3: i2c@58580000 {
87   - compatible = "panasonic,uniphier-i2c";
  88 + compatible = "socionext,uniphier-i2c";
88 89 #address-cells = <1>;
89 90 #size-cells = <0>;
90 91 reg = <0x58580000 0x40>;
91 92  
92 93  
93 94  
... ... @@ -93,25 +94,25 @@
93 94 };
94 95  
95 96 usb0: usb@5a800100 {
96   - compatible = "panasonic,uniphier-ehci", "generic-ehci";
  97 + compatible = "socionext,uniphier-ehci", "generic-ehci";
97 98 status = "disabled";
98 99 reg = <0x5a800100 0x100>;
99 100 };
100 101  
101 102 usb1: usb@5a810100 {
102   - compatible = "panasonic,uniphier-ehci", "generic-ehci";
  103 + compatible = "socionext,uniphier-ehci", "generic-ehci";
103 104 status = "disabled";
104 105 reg = <0x5a810100 0x100>;
105 106 };
106 107  
107 108 usb2: usb@5a820100 {
108   - compatible = "panasonic,uniphier-ehci", "generic-ehci";
  109 + compatible = "socionext,uniphier-ehci", "generic-ehci";
109 110 status = "disabled";
110 111 reg = <0x5a820100 0x100>;
111 112 };
112 113  
113 114 usb3: usb@5a830100 {
114   - compatible = "panasonic,uniphier-ehci", "generic-ehci";
  115 + compatible = "socionext,uniphier-ehci", "generic-ehci";
115 116 status = "disabled";
116 117 reg = <0x5a830100 0x100>;
117 118 };
arch/arm/dts/uniphier-ph1-sld8-ref.dts
Diff comments   View file @ 6462cde
... ... @@ -2,7 +2,8 @@
2 2 * Device Tree Source for UniPhier PH1-sLD8 Reference Board
3 3 *
4 4 * Copyright (C) 2014-2015 Panasonic Corporation
5   - * Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
  5 + * Copyright (C) 2015 Socionext Inc.
  6 + * Author: Masahiro Yamada <yamada.masahiro@socionext.com>
6 7 *
7 8 * SPDX-License-Identifier: GPL-2.0+
8 9 */
... ... @@ -12,8 +13,8 @@
12 13 /include/ "uniphier-ref-daughter.dtsi"
13 14  
14 15 / {
15   - model = "Panasonic UniPhier PH1-sLD8 Reference Board";
16   - compatible = "panasonic,ph1-sld8-ref", "panasonic,ph1-sld8";
  16 + model = "UniPhier PH1-sLD8 Reference Board";
  17 + compatible = "socionext,ph1-sld8-ref", "socionext,ph1-sld8";
17 18  
18 19 memory {
19 20 device_type = "memory";
arch/arm/dts/uniphier-ph1-sld8.dtsi
Diff comments   View file @ 6462cde
... ... @@ -2,7 +2,8 @@
2 2 * Device Tree Source for UniPhier PH1-sLD8 SoC
3 3 *
4 4 * Copyright (C) 2014-2015 Panasonic Corporation
5   - * Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
  5 + * Copyright (C) 2015 Socionext Inc.
  6 + * Author: Masahiro Yamada <yamada.masahiro@socionext.com>
6 7 *
7 8 * SPDX-License-Identifier: GPL-2.0+
8 9 */
... ... @@ -10,7 +11,7 @@
10 11 /include/ "skeleton.dtsi"
11 12  
12 13 / {
13   - compatible = "panasonic,ph1-sld8";
  14 + compatible = "socionext,ph1-sld8";
14 15  
15 16 cpus {
16 17 #address-cells = <1>;
17 18  
18 19  
19 20  
20 21  
... ... @@ -30,35 +31,35 @@
30 31 ranges;
31 32  
32 33 uart0: serial@54006800 {
33   - compatible = "panasonic,uniphier-uart";
  34 + compatible = "socionext,uniphier-uart";
34 35 status = "disabled";
35 36 reg = <0x54006800 0x20>;
36 37 clock-frequency = <80000000>;
37 38 };
38 39  
39 40 uart1: serial@54006900 {
40   - compatible = "panasonic,uniphier-uart";
  41 + compatible = "socionext,uniphier-uart";
41 42 status = "disabled";
42 43 reg = <0x54006900 0x20>;
43 44 clock-frequency = <80000000>;
44 45 };
45 46  
46 47 uart2: serial@54006a00 {
47   - compatible = "panasonic,uniphier-uart";
  48 + compatible = "socionext,uniphier-uart";
48 49 status = "disabled";
49 50 reg = <0x54006a00 0x20>;
50 51 clock-frequency = <80000000>;
51 52 };
52 53  
53 54 uart3: serial@54006b00 {
54   - compatible = "panasonic,uniphier-uart";
  55 + compatible = "socionext,uniphier-uart";
55 56 status = "disabled";
56 57 reg = <0x54006b00 0x20>;
57 58 clock-frequency = <80000000>;
58 59 };
59 60  
60 61 i2c0: i2c@58400000 {
61   - compatible = "panasonic,uniphier-i2c";
  62 + compatible = "socionext,uniphier-i2c";
62 63 #address-cells = <1>;
63 64 #size-cells = <0>;
64 65 reg = <0x58400000 0x40>;
... ... @@ -67,7 +68,7 @@
67 68 };
68 69  
69 70 i2c1: i2c@58480000 {
70   - compatible = "panasonic,uniphier-i2c";
  71 + compatible = "socionext,uniphier-i2c";
71 72 #address-cells = <1>;
72 73 #size-cells = <0>;
73 74 reg = <0x58480000 0x40>;
... ... @@ -76,7 +77,7 @@
76 77 };
77 78  
78 79 i2c2: i2c@58500000 {
79   - compatible = "panasonic,uniphier-i2c";
  80 + compatible = "socionext,uniphier-i2c";
80 81 #address-cells = <1>;
81 82 #size-cells = <0>;
82 83 reg = <0x58500000 0x40>;
... ... @@ -85,7 +86,7 @@
85 86 };
86 87  
87 88 i2c3: i2c@58580000 {
88   - compatible = "panasonic,uniphier-i2c";
  89 + compatible = "socionext,uniphier-i2c";
89 90 #address-cells = <1>;
90 91 #size-cells = <0>;
91 92 reg = <0x58580000 0x40>;
92 93  
93 94  
... ... @@ -94,19 +95,19 @@
94 95 };
95 96  
96 97 usb0: usb@5a800100 {
97   - compatible = "panasonic,uniphier-ehci", "generic-ehci";
  98 + compatible = "socionext,uniphier-ehci", "generic-ehci";
98 99 status = "disabled";
99 100 reg = <0x5a800100 0x100>;
100 101 };
101 102  
102 103 usb1: usb@5a810100 {
103   - compatible = "panasonic,uniphier-ehci", "generic-ehci";
  104 + compatible = "socionext,uniphier-ehci", "generic-ehci";
104 105 status = "disabled";
105 106 reg = <0x5a810100 0x100>;
106 107 };
107 108  
108 109 usb2: usb@5a820100 {
109   - compatible = "panasonic,uniphier-ehci", "generic-ehci";
  110 + compatible = "socionext,uniphier-ehci", "generic-ehci";
110 111 status = "disabled";
111 112 reg = <0x5a820100 0x100>;
112 113 };
arch/arm/dts/uniphier-ref-daughter.dtsi
Diff comments   View file @ 6462cde
... ... @@ -2,7 +2,8 @@
2 2 * Device Tree Source for UniPhier Reference Daughter Board
3 3 *
4 4 * Copyright (C) 2014-2015 Panasonic Corporation
5   - * Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
  5 + * Copyright (C) 2015 Socionext Inc.
  6 + * Author: Masahiro Yamada <yamada.masahiro@socionext.com>
6 7 *
7 8 * SPDX-License-Identifier: GPL-2.0+
8 9 */
drivers/i2c/i2c-uniphier-f.c
Diff comments   View file @ 6462cde
1 1 /*
2 2 * Copyright (C) 2014 Panasonic Corporation
3   - * Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
  3 + * Copyright (C) 2015 Socionext Inc.
  4 + * Author: Masahiro Yamada <yamada.masahiro@socionext.com>
4 5 *
5 6 * SPDX-License-Identifier: GPL-2.0+
6 7 */
... ... @@ -352,8 +353,8 @@
352 353 };
353 354  
354 355 static const struct udevice_id uniphier_fi2c_of_match[] = {
355   - { .compatible = "panasonic,uniphier-fi2c" },
356   - {},
  356 + { .compatible = "socionext,uniphier-fi2c" },
  357 + { /* sentinel */ }
357 358 };
358 359  
359 360 U_BOOT_DRIVER(uniphier_fi2c) = {
drivers/i2c/i2c-uniphier.c
Diff comments   View file @ 6462cde
1 1 /*
2 2 * Copyright (C) 2014 Panasonic Corporation
3   - * Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
  3 + * Copyright (C) 2015 Socionext Inc.
  4 + * Author: Masahiro Yamada <yamada.masahiro@socionext.com>
4 5 *
5 6 * SPDX-License-Identifier: GPL-2.0+
6 7 */
... ... @@ -212,8 +213,8 @@
212 213 };
213 214  
214 215 static const struct udevice_id uniphier_i2c_of_match[] = {
215   - { .compatible = "panasonic,uniphier-i2c" },
216   - {},
  216 + { .compatible = "socionext,uniphier-i2c" },
  217 + { /* sentinel */ }
217 218 };
218 219  
219 220 U_BOOT_DRIVER(uniphier_i2c) = {
drivers/serial/serial_uniphier.c
Diff comments   View file @ 6462cde
1 1 /*
2 2 * Copyright (C) 2012-2015 Panasonic Corporation
3   - * Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
  3 + * Copyright (C) 2015 Socionext Inc.
  4 + * Author: Masahiro Yamada <yamada.masahiro@socionext.com>
4 5 *
5 6 * SPDX-License-Identifier: GPL-2.0+
6 7 */
... ... @@ -115,8 +116,8 @@
115 116  
116 117 #ifdef CONFIG_OF_CONTROL
117 118 static const struct udevice_id uniphier_uart_of_match[] = {
118   - { .compatible = "panasonic,uniphier-uart" },
119   - {},
  119 + { .compatible = "socionext,uniphier-uart" },
  120 + { /* sentinel */ }
120 121 };
121 122  
122 123 static int uniphier_serial_ofdata_to_platdata(struct udevice *dev)
drivers/usb/host/ehci-uniphier.c
Diff comments   View file @ 6462cde
1 1 /*
2 2 * Copyright (C) 2014 Panasonic Corporation
3   - * Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
  3 + * Copyright (C) 2015 Socionext Inc.
  4 + * Author: Masahiro Yamada <yamada.masahiro@socionext.com>
4 5 *
5 6 * SPDX-License-Identifier: GPL-2.0+
6 7 */
... ... @@ -16,7 +17,7 @@
16 17 DECLARE_GLOBAL_DATA_PTR;
17 18  
18 19 #define FDT gd->fdt_blob
19   -#define COMPAT "panasonic,uniphier-ehci"
  20 +#define COMPAT "socionext,uniphier-ehci"
20 21  
21 22 static int get_uniphier_ehci_base(int index, struct ehci_hccr **base)
22 23 {
drivers/usb/host/xhci-uniphier.c
Diff comments   View file @ 6462cde
1 1 /*
2 2 * Copyright (C) 2015 Panasonic Corporation
3   - * Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
  3 + * Copyright (C) 2015 Socionext Inc.
  4 + * Author: Masahiro Yamada <yamada.masahiro@socionext.com>
4 5 *
5 6 * SPDX-License-Identifier: GPL-2.0+
6 7 */
... ... @@ -19,7 +20,7 @@
19 20 int count;
20 21  
21 22 count = fdtdec_find_aliases_for_id(gd->fdt_blob, "usb",
22   - COMPAT_PANASONIC_XHCI, node_list,
  23 + COMPAT_SOCIONEXT_XHCI, node_list,
23 24 ARRAY_SIZE(node_list));
24 25  
25 26 if (index >= count)
... ... @@ -168,7 +168,7 @@
168 168 COMPAT_AMS_AS3722, /* AMS AS3722 PMIC */
169 169 COMPAT_INTEL_ICH_SPI, /* Intel ICH7/9 SPI controller */
170 170 COMPAT_INTEL_QRK_MRC, /* Intel Quark MRC */
171   - COMPAT_PANASONIC_XHCI, /* Panasonic UniPhier xHCI */
  171 + COMPAT_SOCIONEXT_XHCI, /* Socionext UniPhier xHCI */
172 172  
173 173 COMPAT_COUNT,
174 174 };
... ... @@ -76,7 +76,7 @@
76 76 COMPAT(AMS_AS3722, "ams,as3722"),
77 77 COMPAT(INTEL_ICH_SPI, "intel,ich-spi"),
78 78 COMPAT(INTEL_QRK_MRC, "intel,quark-mrc"),
79   - COMPAT(PANASONIC_XHCI, "panasonic,uniphier-xhci"),
  79 + COMPAT(SOCIONEXT_XHCI, "socionext,uniphier-xhci"),
80 80 };
81 81  
82 82 const char *fdtdec_get_compatible(enum fdt_compat_id id)