summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Calianu <adrian.calianu@enea.com>2017-09-19 15:10:42 +0200
committerMartin Borg <martin.borg@enea.com>2017-09-20 17:46:30 +0200
commitae3f51df465f5450db9ef2f63793d39cf0501a75 (patch)
tree3b95353463dd1acbcb33a4386516abbcae8653a9
parent116cbd42e44dec3caca3d9c68c99bdddcff2302b (diff)
downloadmeta-enea-bsp-arm-ae3f51df465f5450db9ef2f63793d39cf0501a75.tar.gz
linux-cavium: upgrade to SDK 6.1.0_p3
Signed-off-by: Adrian Calianu <adrian.calianu@enea.com> Signed-off-by: Martin Borg <martin.borg@enea.com>
-rw-r--r--recipes-kernel/linux/linux-cavium/dts/cn81xx-linux.dtsi32
-rw-r--r--recipes-kernel/linux/linux-cavium/dts/cn83xx-linux.dtsi40
-rw-r--r--recipes-kernel/linux/linux-cavium/dts/ebb8004-linux.dts15
-rw-r--r--recipes-kernel/linux/linux-cavium/dts/ebb8104-linux.dts15
-rw-r--r--recipes-kernel/linux/linux-cavium/dts/ebb8304-linux.dts15
-rw-r--r--recipes-kernel/linux/linux-cavium/dts/nas8104-linux.dts19
-rw-r--r--recipes-kernel/linux/linux-cavium/dts/rbd8030-linux.dts19
-rw-r--r--recipes-kernel/linux/linux-cavium/dts/sff8104-linux.dts46
-rw-r--r--recipes-kernel/linux/linux-cavium/dts/sff8304-linux.dts241
-rw-r--r--recipes-kernel/linux/linux-cavium/dts/xpliant-cn83xx-linux.dts138
-rw-r--r--recipes-kernel/linux/linux-cavium_4.9.inc6
11 files changed, 511 insertions, 75 deletions
diff --git a/recipes-kernel/linux/linux-cavium/dts/cn81xx-linux.dtsi b/recipes-kernel/linux/linux-cavium/dts/cn81xx-linux.dtsi
index 7a36ea4..b76f096 100644
--- a/recipes-kernel/linux/linux-cavium/dts/cn81xx-linux.dtsi
+++ b/recipes-kernel/linux/linux-cavium/dts/cn81xx-linux.dtsi
@@ -133,6 +133,16 @@
133 interrupts = <1 7 4>; 133 interrupts = <1 7 4>;
134 }; 134 };
135 135
136 mmc_supply_3v3: mmc_supply_3v3 {
137 compatible = "regulator-fixed";
138 regulator-name = "mmc_supply_3v3";
139 regulator-min-microvolt = <3300000>;
140 regulator-max-microvolt = <3300000>;
141
142 gpio = <&gpio_6_0 8 0>;
143 enable-active-high;
144 };
145
136 gic0: interrupt-controller@801000000000 { 146 gic0: interrupt-controller@801000000000 {
137 compatible = "arm,gic-v3"; 147 compatible = "arm,gic-v3";
138 #interrupt-cells = <3>; 148 #interrupt-cells = <3>;
@@ -192,6 +202,24 @@
192 uboot,skip-init; 202 uboot,skip-init;
193 }; 203 };
194 204
205 uaa2: serial@87e02a000000 {
206 compatible = "arm,pl011", "arm,primecell";
207 reg = <0x87e0 0x2a000000 0x0 0x1000>;
208 interrupts = <0 7 4>;
209 clocks = <&refclkuaa>;
210 clock-names = "apb_pclk";
211 uboot,skip-init;
212 };
213
214 uaa3: serial@87e02b000000 {
215 compatible = "arm,pl011", "arm,primecell";
216 reg = <0x87e0 0x2b000000 0x0 0x1000>;
217 interrupts = <0 8 4>;
218 clocks = <&refclkuaa>;
219 clock-names = "apb_pclk";
220 uboot,skip-init;
221 };
222
195 watch-dog@8440000a0000 { 223 watch-dog@8440000a0000 {
196 compatible = "arm,sbsa-gwdt"; 224 compatible = "arm,sbsa-gwdt";
197 reg = <0x8440 0xa0000 0x0 0x1000>, <0x8440 0xb0000 0x0 0x1000>; 225 reg = <0x8440 0xa0000 0x0 0x1000>, <0x8440 0xb0000 0x0 0x1000>;
@@ -244,7 +272,7 @@
244 ranges = <0x03000000 0x8010 0x00000000 0x8010 0x00000000 0x080 0x00000000>, /* mem ranges */ 272 ranges = <0x03000000 0x8010 0x00000000 0x8010 0x00000000 0x080 0x00000000>, /* mem ranges */
245 <0x03000000 0x8100 0x00000000 0x8100 0x00000000 0x80 0x00000000>, /* SATA */ 273 <0x03000000 0x8100 0x00000000 0x8100 0x00000000 0x80 0x00000000>, /* SATA */
246 <0x03000000 0x8680 0x00000000 0x8680 0x00000000 0x160 0x28000000>, /* UARTs */ 274 <0x03000000 0x8680 0x00000000 0x8680 0x00000000 0x160 0x28000000>, /* UARTs */
247 <0x03000000 0x87e0 0x2a000000 0x87e0 0x2a000000 0x000 0x96000000>, /* PEMs */ 275 <0x03000000 0x87e0 0x2c000000 0x87e0 0x2c000000 0x000 0x94000000>, /* PEMs */
248 <0x03000000 0x8400 0x00000000 0x8400 0x00000000 0x010 0x00000000>, /* RNM */ 276 <0x03000000 0x8400 0x00000000 0x8400 0x00000000 0x010 0x00000000>, /* RNM */
249 <0x03000000 0x8430 0x00000000 0x8430 0x00000000 0x02 0x00000000>, /* NIC0*/ 277 <0x03000000 0x8430 0x00000000 0x8430 0x00000000 0x02 0x00000000>, /* NIC0*/
250 <0x03000000 0x87e0 0xc6000000 0x87e0 0xc6000000 0x01f 0x3a000000>; 278 <0x03000000 0x87e0 0xc6000000 0x87e0 0xc6000000 0x01f 0x3a000000>;
@@ -450,6 +478,8 @@
450 aliases { 478 aliases {
451 serial0 = &uaa0; 479 serial0 = &uaa0;
452 serial1 = &uaa1; 480 serial1 = &uaa1;
481 serial2 = &uaa2;
482 serial3 = &uaa3;
453 i2c0 = &i2c_9_0; 483 i2c0 = &i2c_9_0;
454 i2c1 = &i2c_9_1; 484 i2c1 = &i2c_9_1;
455 spi0 = &spi_7_0; 485 spi0 = &spi_7_0;
diff --git a/recipes-kernel/linux/linux-cavium/dts/cn83xx-linux.dtsi b/recipes-kernel/linux/linux-cavium/dts/cn83xx-linux.dtsi
index 8cb10ec..a523ea6 100644
--- a/recipes-kernel/linux/linux-cavium/dts/cn83xx-linux.dtsi
+++ b/recipes-kernel/linux/linux-cavium/dts/cn83xx-linux.dtsi
@@ -353,6 +353,16 @@
353 interrupts = <1 7 4>; 353 interrupts = <1 7 4>;
354 }; 354 };
355 355
356 mmc_supply_3v3: mmc_supply_3v3 {
357 compatible = "regulator-fixed";
358 regulator-name = "mmc_supply_3v3";
359 regulator-min-microvolt = <3300000>;
360 regulator-max-microvolt = <3300000>;
361
362 gpio = <&gpio_6_0 8 0>;
363 enable-active-high;
364 };
365
356 gic0: interrupt-controller@801000000000 { 366 gic0: interrupt-controller@801000000000 {
357 compatible = "arm,gic-v3"; 367 compatible = "arm,gic-v3";
358 #interrupt-cells = <3>; 368 #interrupt-cells = <3>;
@@ -412,12 +422,38 @@
412 uboot,skip-init; 422 uboot,skip-init;
413 }; 423 };
414 424
425 uaa2: serial@87e02a000000 {
426 compatible = "arm,pl011", "arm,primecell";
427 reg = <0x87e0 0x2a000000 0x0 0x1000>;
428 interrupts = <0 7 4>;
429 clocks = <&refclkuaa>;
430 clock-names = "apb_pclk";
431 uboot,skip-init;
432 };
433
434 uaa3: serial@87e02b000000 {
435 compatible = "arm,pl011", "arm,primecell";
436 reg = <0x87e0 0x2b000000 0x0 0x1000>;
437 interrupts = <0 8 4>;
438 clocks = <&refclkuaa>;
439 clock-names = "apb_pclk";
440 uboot,skip-init;
441 };
442
415 watch-dog@8440000a0000 { 443 watch-dog@8440000a0000 {
416 compatible = "arm,sbsa-gwdt"; 444 compatible = "arm,sbsa-gwdt";
417 reg = <0x8440 0xa0000 0x0 0x1000>, <0x8440 0xb0000 0x0 0x1000>; 445 reg = <0x8440 0xa0000 0x0 0x1000>, <0x8440 0xb0000 0x0 0x1000>;
418 interrupts = <0 9 4>; 446 interrupts = <0 9 4>;
419 }; 447 };
420 448
449 pbus0: nor@0 {
450 compatible = "cfi-flash";
451 reg = <0x8000 0x0 0x0 0x800000>;
452 device-width = <1>;
453 bank-width = <1>;
454 clocks = <&sclk>;
455 };
456
421 smmu0@830000000000 { 457 smmu0@830000000000 {
422 compatible = "cavium,smmu-v2"; 458 compatible = "cavium,smmu-v2";
423 reg = <0x8300 0x0 0x0 0x2000000>; 459 reg = <0x8300 0x0 0x0 0x2000000>;
@@ -747,13 +783,15 @@
747 aliases { 783 aliases {
748 serial0 = &uaa0; 784 serial0 = &uaa0;
749 serial1 = &uaa1; 785 serial1 = &uaa1;
786 serial2 = &uaa2;
787 serial3 = &uaa3;
750 }; 788 };
751 789
752 chosen { 790 chosen {
753 stdout-path = &uaa0; 791 stdout-path = &uaa0;
754 }; 792 };
755 793
756 memory@00000000 { 794 memory@0 {
757 device_type = "memory"; 795 device_type = "memory";
758 reg = <0x0 0x02800000 0x0 0x7EC00000>; 796 reg = <0x0 0x02800000 0x0 0x7EC00000>;
759 /* socket 0 */ 797 /* socket 0 */
diff --git a/recipes-kernel/linux/linux-cavium/dts/ebb8004-linux.dts b/recipes-kernel/linux/linux-cavium/dts/ebb8004-linux.dts
index cc80f31..94f5e88 100644
--- a/recipes-kernel/linux/linux-cavium/dts/ebb8004-linux.dts
+++ b/recipes-kernel/linux/linux-cavium/dts/ebb8004-linux.dts
@@ -418,15 +418,12 @@
418}; 418};
419 419
420&mmc_1_4 { 420&mmc_1_4 {
421 /* Power on GPIO 8, active high, shared */
422 power-gpios = <&gpio_6_0 8 0>;
423
424 mmc-slot@0 { 421 mmc-slot@0 {
425 compatible = "cavium,thunder-8890-mmc-slot"; 422 compatible = "mmc-slot";
426 reg = <0>; 423 reg = <0>;
427 /* Only 3.3v is supported */ 424 vmmc-supply = <&mmc_supply_3v3>;
428 voltage-ranges = <3300 3300>;
429 max-frequency = <26000000>; 425 max-frequency = <26000000>;
426 mmc-ddr-3_3v;
430 /* 1.8v is not supported */ 427 /* 1.8v is not supported */
431 no-1-8-v; 428 no-1-8-v;
432 /* Bus width is only 8 bits maximum */ 429 /* Bus width is only 8 bits maximum */
@@ -443,11 +440,11 @@
443 cap-mmc-highspeed; 440 cap-mmc-highspeed;
444 }; 441 };
445 mmc-slot@1 { 442 mmc-slot@1 {
446 compatible = "cavium,thunder-8890-mmc-slot"; 443 compatible = "mmc-slot";
447 reg = <1>; 444 reg = <1>;
448 /* Only 3.3v is supported */ 445 vmmc-supply = <&mmc_supply_3v3>;
449 voltage-ranges = <3300 3300>;
450 max-frequency = <26000000>; 446 max-frequency = <26000000>;
447 mmc-ddr-3_3v;
451 /* 1.8v is not supported */ 448 /* 1.8v is not supported */
452 no-1-8-v; 449 no-1-8-v;
453 /* Bus width is only 8 bits maximum */ 450 /* Bus width is only 8 bits maximum */
diff --git a/recipes-kernel/linux/linux-cavium/dts/ebb8104-linux.dts b/recipes-kernel/linux/linux-cavium/dts/ebb8104-linux.dts
index e39bded..84922d1 100644
--- a/recipes-kernel/linux/linux-cavium/dts/ebb8104-linux.dts
+++ b/recipes-kernel/linux/linux-cavium/dts/ebb8104-linux.dts
@@ -533,15 +533,12 @@
533}; 533};
534 534
535&mmc_1_4 { 535&mmc_1_4 {
536 /* Power on GPIO 8, active high, shared */
537 power-gpios = <&gpio_6_0 8 0>;
538
539 mmc-slot@0 { 536 mmc-slot@0 {
540 compatible = "cavium,thunder-8890-mmc-slot"; 537 compatible = "mmc-slot";
541 reg = <0>; 538 reg = <0>;
542 /* Only 3.3v is supported */ 539 vmmc-supply = <&mmc_supply_3v3>;
543 voltage-ranges = <3300 3300>;
544 max-frequency = <26000000>; 540 max-frequency = <26000000>;
541 mmc-ddr-3_3v;
545 /* 1.8v is not supported */ 542 /* 1.8v is not supported */
546 no-1-8-v; 543 no-1-8-v;
547 /* Bus width is only 8 bits maximum */ 544 /* Bus width is only 8 bits maximum */
@@ -558,11 +555,11 @@
558 cap-mmc-highspeed; 555 cap-mmc-highspeed;
559 }; 556 };
560 mmc-slot@1 { 557 mmc-slot@1 {
561 compatible = "cavium,thunder-8890-mmc-slot"; 558 compatible = "mmc-slot";
562 reg = <1>; 559 reg = <1>;
563 /* Only 3.3v is supported */ 560 vmmc-supply = <&mmc_supply_3v3>;
564 voltage-ranges = <3300 3300>;
565 max-frequency = <26000000>; 561 max-frequency = <26000000>;
562 mmc-ddr-3_3v;
566 /* 1.8v is not supported */ 563 /* 1.8v is not supported */
567 no-1-8-v; 564 no-1-8-v;
568 /* Bus width is only 8 bits maximum */ 565 /* Bus width is only 8 bits maximum */
diff --git a/recipes-kernel/linux/linux-cavium/dts/ebb8304-linux.dts b/recipes-kernel/linux/linux-cavium/dts/ebb8304-linux.dts
index 38edad8..3570620 100644
--- a/recipes-kernel/linux/linux-cavium/dts/ebb8304-linux.dts
+++ b/recipes-kernel/linux/linux-cavium/dts/ebb8304-linux.dts
@@ -927,15 +927,12 @@
927}; 927};
928 928
929&mmc_1_4 { 929&mmc_1_4 {
930 /* Power on GPIO 8, active high, shared */
931 power-gpios = <&gpio_6_0 8 0>;
932
933 mmc-slot@0 { 930 mmc-slot@0 {
934 compatible = "cavium,thunder-8890-mmc-slot"; 931 compatible = "mmc-slot";
935 reg = <0>; 932 reg = <0>;
936 /* Only 3.3v is supported */ 933 vmmc-supply = <&mmc_supply_3v3>;
937 voltage-ranges = <3300 3300>;
938 max-frequency = <26000000>; 934 max-frequency = <26000000>;
935 mmc-ddr-3_3v;
939 /* 1.8v is not supported */ 936 /* 1.8v is not supported */
940 no-1-8-v; 937 no-1-8-v;
941 /* Bus width is only 8 bits maximum */ 938 /* Bus width is only 8 bits maximum */
@@ -952,11 +949,11 @@
952 cap-mmc-highspeed; 949 cap-mmc-highspeed;
953 }; 950 };
954 mmc-slot@1 { 951 mmc-slot@1 {
955 compatible = "cavium,thunder-8890-mmc-slot"; 952 compatible = "mmc-slot";
956 reg = <1>; 953 reg = <1>;
957 /* Only 3.3v is supported */ 954 vmmc-supply = <&mmc_supply_3v3>;
958 voltage-ranges = <3300 3300>;
959 max-frequency = <26000000>; 955 max-frequency = <26000000>;
956 mmc-ddr-3_3v;
960 /* 1.8v is not supported */ 957 /* 1.8v is not supported */
961 no-1-8-v; 958 no-1-8-v;
962 /* Bus width is only 8 bits maximum */ 959 /* Bus width is only 8 bits maximum */
diff --git a/recipes-kernel/linux/linux-cavium/dts/nas8104-linux.dts b/recipes-kernel/linux/linux-cavium/dts/nas8104-linux.dts
index 96e6bdf..5541daa 100644
--- a/recipes-kernel/linux/linux-cavium/dts/nas8104-linux.dts
+++ b/recipes-kernel/linux/linux-cavium/dts/nas8104-linux.dts
@@ -108,14 +108,10 @@
108 * Unfortunately there does not appear to be any way to read the 108 * Unfortunately there does not appear to be any way to read the
109 * position of SW2-7 in software. 109 * position of SW2-7 in software.
110 */ 110 */
111 /* Power on GPIO 8, active high, shared */
112 power-gpios = <&gpio_6_0 8 0>;
113
114 mmc-slot@0 { 111 mmc-slot@0 {
115 compatible = "cavium,thunder-8890-mmc-slot"; 112 compatible = "mmc-slot";
116 reg = <0>; 113 reg = <0>;
117 /* Only 3.3v is supported */ 114 vmmc-supply = <&mmc_supply_3v3>;
118 voltage-ranges = <3300 3300>;
119 max-frequency = <26000000>; 115 max-frequency = <26000000>;
120 /* 1.8v is not supported */ 116 /* 1.8v is not supported */
121 no-1-8-v; 117 no-1-8-v;
@@ -125,20 +121,15 @@
125 disable-wp; 121 disable-wp;
126 /* There is no card detection available; polling must be used. */ 122 /* There is no card detection available; polling must be used. */
127 broken-cd; 123 broken-cd;
128 /* SD UHS SDR25 is supported */
129 sd-uhs-sdr25;
130 /* SD UHS SDR50 is supported */
131 sd-uhs-ddr50;
132 /* SD UHS DDR50 is supported */
133 sd-uhs-sdr50;
134 /* High-speed mode is supported */ 124 /* High-speed mode is supported */
135 cap-sd-highspeed; 125 cap-sd-highspeed;
136 }; 126 };
137 mmc-slot@1 { 127 mmc-slot@1 {
138 compatible = "cavium,thunder-8890-mmc-slot"; 128 compatible = "mmc-slot";
139 reg = <1>; 129 reg = <1>;
140 voltage-ranges = <3300 3300>; 130 vmmc-supply = <&mmc_supply_3v3>;
141 max-frequency = <26000000>; 131 max-frequency = <26000000>;
132 mmc-ddr-3_3v;
142 /* 1.8v is not supported */ 133 /* 1.8v is not supported */
143 no-1-8-v; 134 no-1-8-v;
144 /* Bus width is only 8 bits maximum */ 135 /* Bus width is only 8 bits maximum */
diff --git a/recipes-kernel/linux/linux-cavium/dts/rbd8030-linux.dts b/recipes-kernel/linux/linux-cavium/dts/rbd8030-linux.dts
index 238abe1..2289707 100644
--- a/recipes-kernel/linux/linux-cavium/dts/rbd8030-linux.dts
+++ b/recipes-kernel/linux/linux-cavium/dts/rbd8030-linux.dts
@@ -129,14 +129,10 @@
129 * Unfortunately there does not appear to be any way to read the 129 * Unfortunately there does not appear to be any way to read the
130 * position of SW2-7 in software. 130 * position of SW2-7 in software.
131 */ 131 */
132 /* Power on GPIO 8, active high, shared */
133 power-gpios = <&gpio_6_0 8 0>;
134
135 mmc-slot@0 { 132 mmc-slot@0 {
136 compatible = "cavium,thunder-8890-mmc-slot"; 133 compatible = "mmc-slot";
137 reg = <0>; 134 reg = <0>;
138 /* Only 3.3v is supported */ 135 vmmc-supply = <&mmc_supply_3v3>;
139 voltage-ranges = <3300 3300>;
140 max-frequency = <26000000>; 136 max-frequency = <26000000>;
141 /* 1.8v is not supported */ 137 /* 1.8v is not supported */
142 no-1-8-v; 138 no-1-8-v;
@@ -146,12 +142,6 @@
146 disable-wp; 142 disable-wp;
147 /* There is no card detection available; polling must be used. */ 143 /* There is no card detection available; polling must be used. */
148 broken-cd; 144 broken-cd;
149 /* SD UHS SDR25 is supported */
150 sd-uhs-sdr25;
151 /* SD UHS SDR50 is supported */
152 sd-uhs-ddr50;
153 /* SD UHS DDR50 is supported */
154 sd-uhs-sdr50;
155 /* High-speed mode is supported */ 145 /* High-speed mode is supported */
156 cap-sd-highspeed; 146 cap-sd-highspeed;
157 /* speed up device probing */ 147 /* speed up device probing */
@@ -159,10 +149,11 @@
159 no-mmc; 149 no-mmc;
160 }; 150 };
161 mmc-slot@1 { 151 mmc-slot@1 {
162 compatible = "cavium,thunder-8890-mmc-slot"; 152 compatible = "mmc-slot";
163 reg = <1>; 153 reg = <1>;
164 voltage-ranges = <3300 3300>; 154 vmmc-supply = <&mmc_supply_3v3>;
165 max-frequency = <26000000>; 155 max-frequency = <26000000>;
156 mmc-ddr-3_3v;
166 /* 1.8v is not supported */ 157 /* 1.8v is not supported */
167 no-1-8-v; 158 no-1-8-v;
168 /* Bus width is only 8 bits maximum */ 159 /* Bus width is only 8 bits maximum */
diff --git a/recipes-kernel/linux/linux-cavium/dts/sff8104-linux.dts b/recipes-kernel/linux/linux-cavium/dts/sff8104-linux.dts
index 0190995..1f45e25 100644
--- a/recipes-kernel/linux/linux-cavium/dts/sff8104-linux.dts
+++ b/recipes-kernel/linux/linux-cavium/dts/sff8104-linux.dts
@@ -156,14 +156,10 @@
156 * Unfortunately there does not appear to be any way to read the 156 * Unfortunately there does not appear to be any way to read the
157 * position of SW2-7 in software. 157 * position of SW2-7 in software.
158 */ 158 */
159 /* Power on GPIO 8, active high, shared */
160 power-gpios = <&gpio_6_0 8 0>;
161
162 mmc-slot@0 { 159 mmc-slot@0 {
163 compatible = "cavium,thunder-8890-mmc-slot"; 160 compatible = "mmc-slot";
164 reg = <0>; 161 reg = <0>;
165 /* Only 3.3v is supported */ 162 vmmc-supply = <&mmc_supply_3v3>;
166 voltage-ranges = <3300 3300>;
167 max-frequency = <26000000>; 163 max-frequency = <26000000>;
168 /* 1.8v is not supported */ 164 /* 1.8v is not supported */
169 no-1-8-v; 165 no-1-8-v;
@@ -173,12 +169,6 @@
173 disable-wp; 169 disable-wp;
174 /* There is no card detection available; polling must be used. */ 170 /* There is no card detection available; polling must be used. */
175 broken-cd; 171 broken-cd;
176 /* SD UHS SDR25 is supported */
177 sd-uhs-sdr25;
178 /* SD UHS SDR50 is supported */
179 sd-uhs-ddr50;
180 /* SD UHS DDR50 is supported */
181 sd-uhs-sdr50;
182 /* High-speed mode is supported */ 172 /* High-speed mode is supported */
183 cap-sd-highspeed; 173 cap-sd-highspeed;
184 /* speed up device probing */ 174 /* speed up device probing */
@@ -186,10 +176,11 @@
186 no-mmc; 176 no-mmc;
187 }; 177 };
188 mmc-slot@1 { 178 mmc-slot@1 {
189 compatible = "cavium,thunder-8890-mmc-slot"; 179 compatible = "mmc-slot";
190 reg = <1>; 180 reg = <1>;
191 voltage-ranges = <3300 3300>; 181 vmmc-supply = <&mmc_supply_3v3>;
192 max-frequency = <26000000>; 182 max-frequency = <26000000>;
183 mmc-ddr-3_3v;
193 /* 1.8v is not supported */ 184 /* 1.8v is not supported */
194 no-1-8-v; 185 no-1-8-v;
195 /* Bus width is only 8 bits maximum */ 186 /* Bus width is only 8 bits maximum */
@@ -231,6 +222,31 @@
231 n_gpios = <16>; // deprecated, driver required 222 n_gpios = <16>; // deprecated, driver required
232 #gpio-cells = <2>; 223 #gpio-cells = <2>;
233 }; 224 };
225
226 mux@70 {
227 compatible = "nxp,pca9546";
228 reg = <0x70>;
229 #address-cells = <1>;
230 #size-cells = <0>;
231
232 i2c@0 {
233 #address-cells = <1>;
234 #size-cells = <0>;
235 reg = <0>;
236 };
237
238 i2c@1 {
239 #address-cells = <1>;
240 #size-cells = <0>;
241 reg = <1>;
242 };
243
244 i2c@2 {
245 #address-cells = <1>;
246 #size-cells = <0>;
247 reg = <2>;
248 };
249 };
234}; 250};
235 251
236&i2c_9_1 { 252&i2c_9_1 {
@@ -259,7 +275,7 @@
259&nfc { 275&nfc {
260 nand@1 { 276 nand@1 {
261 reg = <0x1>; 277 reg = <0x1>;
262 nand-ecc-mode = "hw"; 278 nand-ecc-mode = "none";
263 }; 279 };
264}; 280};
265 281
diff --git a/recipes-kernel/linux/linux-cavium/dts/sff8304-linux.dts b/recipes-kernel/linux/linux-cavium/dts/sff8304-linux.dts
new file mode 100644
index 0000000..705e712
--- /dev/null
+++ b/recipes-kernel/linux/linux-cavium/dts/sff8304-linux.dts
@@ -0,0 +1,241 @@
1/*
2 * Cavium Thunder DTS file - Thunder board description
3 *
4 * Copyright (C) 2017, Cavium Inc.
5 *
6 * This file is dual-licensed: you can use it either under the terms
7 * of the GPL or the X11 license, at your option. Note that this dual
8 * licensing only applies to this file, and not this project as a
9 * whole.
10 *
11 * a) This library is free software; you can redistribute it and/or
12 * modify it under the terms of the GNU General Public License as
13 * published by the Free Software Foundation; either version 2 of the
14 * License, or (at your option) any later version.
15 *
16 * This library is distributed in the hope that it will be useful,
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19 * GNU General Public License for more details.
20 *
21 * You should have received a copy of the GNU General Public
22 * License along with this library; if not, write to the Free
23 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
24 * MA 02110-1301 USA
25 *
26 * Or, alternatively,
27 *
28 * b) Permission is hereby granted, free of charge, to any person
29 * obtaining a copy of this software and associated documentation
30 * files (the "Software"), to deal in the Software without
31 * restriction, including without limitation the rights to use,
32 * copy, modify, merge, publish, distribute, sublicense, and/or
33 * sell copies of the Software, and to permit persons to whom the
34 * Software is furnished to do so, subject to the following
35 * conditions:
36 *
37 * The above copyright notice and this permission notice shall be
38 * included in all copies or substantial portions of the Software.
39 *
40 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
41 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
42 * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
43 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
44 * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
45 * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
46 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
47 * OTHER DEALINGS IN THE SOFTWARE.
48 */
49
50/dts-v1/;
51
52/include/ "cn83xx-linux.dtsi"
53
54&mrml_bridge {
55 bgx0 {
56 /* typename+qlm+typenumber eg :
57 sgmii+bgx0+sgmmi0
58 */
59 xfi00 {
60 reg = <0x0>;
61 qlm-mode = "0x000,xfi";
62 local-mac-address = [00 00 00 00 00 00];
63 };
64 xfi01 {
65 reg = <0x1>;
66 qlm-mode = "0x001,xfi";
67 local-mac-address = [00 00 00 00 00 00];
68 };
69 xfi02 {
70 reg = <0x2>;
71 qlm-mode = "0x002,xfi";
72 local-mac-address = [00 00 00 00 00 00];
73 };
74 xfi03 {
75 reg = <0x3>;
76 qlm-mode = "0x003,xfi";
77 local-mac-address = [00 00 00 00 00 00];
78 };
79 };
80 bgx1 {
81 xfi-10g-kr10 {
82 reg = <0x0>;
83 qlm-mode = "0x010,xfi-10g-kr";
84 local-mac-address = [00 00 00 00 00 00];
85 };
86 xfi-10g-kr11 {
87 reg = <0x1>;
88 qlm-mode = "0x011,xfi-10g-kr";
89 local-mac-address = [00 00 00 00 00 00];
90 };
91 xfi-10g-kr12 {
92 reg = <0x2>;
93 qlm-mode = "0x012,xfi-10g-kr";
94 local-mac-address = [00 00 00 00 00 00];
95 };
96 xfi-10g-kr13 {
97 reg = <0x3>;
98 qlm-mode = "0x013,xfi-10g-kr";
99 local-mac-address = [00 00 00 00 00 00];
100 };
101
102 };
103};
104
105&mmc_1_4 {
106 /* Power on GPIO 8, active high, shared */
107 power-gpios = <&gpio_6_0 8 0>;
108
109 mmc-slot@0 {
110 compatible = "mmc-slot";
111 reg = <0>;
112 vmmc-supply = <&mmc_supply_3v3>;
113 max-frequency = <26000000>;
114 mmc-ddr-3_3v;
115 /* 1.8v is not supported */
116 no-1-8-v;
117 /* Bus width is only 4 bits maximum */
118 bus-width = <4>;
119 /* No write-protect switch is present */
120 disable-wp;
121 /* There is no card detection available; polling must be used. */
122 broken-cd;
123 /* High-speed mode is supported */
124 cap-sd-highspeed;
125 /* speed up device probing */
126 no-sdio;
127 no-mmc;
128 };
129 mmc-slot@1 {
130 compatible = "mmc-slot";
131 reg = <1>;
132 vmmc-supply = <&mmc_supply_3v3>;
133 max-frequency = <26000000>;
134 mmc-ddr-3_3v;
135 /* 1.8v is not supported */
136 no-1-8-v;
137 /* Bus width is only 8 bits maximum */
138 bus-width = <8>;
139 /* No write-protect switch is present */
140 disable-wp;
141 /* There is no card detection available; polling must be used. */
142 broken-cd;
143 /* High-speed mode is supported */
144 cap-mmc-highspeed;
145 /* eMMC device is soldered onto the board */
146 non-removable;
147 /* speed up device probing */
148 no-sdio;
149 no-sd;
150 };
151};
152
153&i2c_9_0 {
154 rtc@68 {
155 compatible = "dallas,ds1337";
156 reg = <0x68>;
157 rtcmodel = <1>;
158 };
159 mux@70 {
160 compatible = "nxp,pca9547";
161 reg = <0x70>;
162 #address-cells = <1>;
163 #size-cells = <0>;
164
165 i2c@0 {
166 #address-cells = <1>;
167 #size-cells = <0>;
168 reg = <0>;
169 eeprom@54 {
170 compatible = "atmel,24c256";
171 reg = <0x54>;
172 pagesize = <64>;
173 };
174 };
175
176 i2c@1 {
177 #address-cells = <1>;
178 #size-cells = <0>;
179 reg = <1>;
180 eeprom@54 {
181 compatible = "atmel,24c256";
182 reg = <0x54>;
183 pagesize = <64>;
184 };
185 };
186
187 i2c@2 {
188 #address-cells = <1>;
189 #size-cells = <0>;
190 reg = <2>;
191 eeprom@54 {
192 compatible = "atmel,24c256";
193 reg = <0x54>;
194 pagesize = <64>;
195 };
196 };
197
198 i2c@3 {
199 #address-cells = <1>;
200 #size-cells = <0>;
201 reg = <3>;
202 eeprom@54 {
203 compatible = "atmel,24c256";
204 reg = <0x54>;
205 pagesize = <64>;
206 };
207 };
208
209 i2c@4 {
210 #address-cells = <1>;
211 #size-cells = <0>;
212 reg = <4>;
213 eeprom@54 {
214 compatible = "atmel,24c256";
215 reg = <0x54>;
216 pagesize = <64>;
217 };
218 };
219
220 i2c@5 {
221 #address-cells = <1>;
222 #size-cells = <0>;
223 reg = <5>;
224 eeprom@54 {
225 compatible = "atmel,24c256";
226 reg = <0x54>;
227 pagesize = <64>;
228 };
229 };
230 };
231};
232
233&spi_7_0 {
234 flash@0 {
235 compatible = "jedec,spi-nor", "spi-flash";
236 reg = <0x0>;
237 spi-max-frequency = <16000000>;
238 #address-cells = <1>;
239 #size-cells = <1>;
240 };
241};
diff --git a/recipes-kernel/linux/linux-cavium/dts/xpliant-cn83xx-linux.dts b/recipes-kernel/linux/linux-cavium/dts/xpliant-cn83xx-linux.dts
new file mode 100644
index 0000000..e11bc9d
--- /dev/null
+++ b/recipes-kernel/linux/linux-cavium/dts/xpliant-cn83xx-linux.dts
@@ -0,0 +1,138 @@
1/*
2 * Cavium Thunder DTS file - Thunder board description
3 *
4 * Copyright (C) 2017, Cavium Inc.
5 *
6 * This file is dual-licensed: you can use it either under the terms
7 * of the GPL or the X11 license, at your option. Note that this dual
8 * licensing only applies to this file, and not this project as a
9 * whole.
10 *
11 * a) This library is free software; you can redistribute it and/or
12 * modify it under the terms of the GNU General Public License as
13 * published by the Free Software Foundation; either version 2 of the
14 * License, or (at your option) any later version.
15 *
16 * This library is distributed in the hope that it will be useful,
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19 * GNU General Public License for more details.
20 *
21 * You should have received a copy of the GNU General Public
22 * License along with this library; if not, write to the Free
23 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
24 * MA 02110-1301 USA
25 *
26 * Or, alternatively,
27 *
28 * b) Permission is hereby granted, free of charge, to any person
29 * obtaining a copy of this software and associated documentation
30 * files (the "Software"), to deal in the Software without
31 * restriction, including without limitation the rights to use,
32 * copy, modify, merge, publish, distribute, sublicense, and/or
33 * sell copies of the Software, and to permit persons to whom the
34 * Software is furnished to do so, subject to the following
35 * conditions:
36 *
37 * The above copyright notice and this permission notice shall be
38 * included in all copies or substantial portions of the Software.
39 *
40 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
41 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
42 * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
43 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
44 * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
45 * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
46 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
47 * OTHER DEALINGS IN THE SOFTWARE.
48 */
49
50/dts-v1/;
51
52/include/ "cn83xx-linux.dtsi"
53
54&mrml_bridge {
55 mdio-nexus@1,3 {
56 mdio0@87e005003800 {
57 sgmii20: sgmii20 {
58 qlm-mode = "0x020,sgmii";
59 reg = <0x1f>;
60 compatible = "broadcom,bcm54616", "ethernet-phy-ieee802.3-c45";
61 reset = <&gpio_6_0 34 0>;
62 };
63 };
64 };
65
66 bgx2 {
67 /* typename+qlm+typenumber eg :
68 sgmii+bgx0+sgmmi0
69 */
70 sgmii20 {
71 reg = <0>;
72 qlm-mode = "0x020,sgmii";
73 local-mac-address = [00 00 00 00 00 00];
74 phy-handle = <&sgmii20>;
75 };
76 };
77 bgx3 {
78 xfi30 {
79 reg = <0>;
80 qlm-mode = "0x030,xfi";
81 local-mac-address = [00 00 00 00 00 00];
82 };
83 };
84};
85
86&mmc_1_4 {
87 mmc-slot@0 {
88 compatible = "mmc-slot";
89 reg = <0>;
90 vmmc-supply = <&mmc_supply_3v3>;
91 max-frequency = <26000000>;
92 /* 1.8v is not supported */
93 no-1-8-v;
94 /* Bus width is only 4 bits maximum */
95 bus-width = <4>;
96 /* No write-protect switch is present */
97 disable-wp;
98 /* There is no card detection available; polling must be used. */
99 broken-cd;
100 /* High-speed mode is supported */
101 cap-sd-highspeed;
102 /* speed up device probing */
103 no-sdio;
104 no-mmc;
105 };
106 mmc-slot@1 {
107 compatible = "mmc-slot";
108 reg = <1>;
109 vmmc-supply = <&mmc_supply_3v3>;
110 max-frequency = <26000000>;
111 mmc-ddr-3_3v;
112 /* 1.8v is not supported */
113 no-1-8-v;
114 /* Bus width is only 8 bits maximum */
115 bus-width = <8>;
116 /* No write-protect switch is present */
117 disable-wp;
118 /* There is no card detection available; polling must be used. */
119 broken-cd;
120 /* High-speed mode is supported */
121 cap-mmc-highspeed;
122 /* eMMC device is soldered onto the board */
123 non-removable;
124 /* speed up device probing */
125 no-sdio;
126 no-sd;
127 };
128};
129
130&spi_7_0 {
131 flash@0 {
132 compatible = "micron,n25q1024", "jedec,spi-nor", "spi-flash";
133 reg = <0x0>;
134 spi-max-frequency = <16000000>;
135 #address-cells = <1>;
136 #size-cells = <1>;
137 };
138};
diff --git a/recipes-kernel/linux/linux-cavium_4.9.inc b/recipes-kernel/linux/linux-cavium_4.9.inc
index 1077e48..feb37da 100644
--- a/recipes-kernel/linux/linux-cavium_4.9.inc
+++ b/recipes-kernel/linux/linux-cavium_4.9.inc
@@ -7,8 +7,8 @@ require recipes-kernel/linux/linux-deploy-kconfig.inc
7KBRANCH_cn8304 ?= "cavium-4.9" 7KBRANCH_cn8304 ?= "cavium-4.9"
8KBRANCH_qemuarm64 ?= "cavium-4.9" 8KBRANCH_qemuarm64 ?= "cavium-4.9"
9 9
10SRCREV_machine_cn8304 ?= "3804edd9db9c0d3e0e8301f13bdc569bcc0ebd09" 10SRCREV_machine_cn8304 ?= "972d2791f326533d1d03fe561da667ce150319b4"
11SRCREV_machine_qemuarm64 ?= "3804edd9db9c0d3e0e8301f13bdc569bcc0ebd09" 11SRCREV_machine_qemuarm64 ?= "972d2791f326533d1d03fe561da667ce150319b4"
12SRCREV_metaenea ?= "85a500385477e07d144fc3fcfa4ec62e6aabc8e8" 12SRCREV_metaenea ?= "85a500385477e07d144fc3fcfa4ec62e6aabc8e8"
13KENEABRANCH = "cavium-4.9" 13KENEABRANCH = "cavium-4.9"
14 14
@@ -20,7 +20,7 @@ SRC_URI = "git://git@git.enea.com/linux/linux-cavium.git;protocol=ssh;name=machi
20LINUX_KERNEL_TYPE = "tiny" 20LINUX_KERNEL_TYPE = "tiny"
21LINUX_VERSION ?= "4.9.0" 21LINUX_VERSION ?= "4.9.0"
22LINUX_VERSION_EXTENSION = "-cavium-${LINUX_KERNEL_TYPE}" 22LINUX_VERSION_EXTENSION = "-cavium-${LINUX_KERNEL_TYPE}"
23PV = "4.9-octeontx.sdk.6.1.0.p2.build.17" 23PV = "4.9-octeontx.sdk.6.1.0.p3.build.22"
24 24
25KERNEL_DEVICETREE_cn8304 = "cavium/ebb8304-linux.dtb" 25KERNEL_DEVICETREE_cn8304 = "cavium/ebb8304-linux.dtb"
26 26