Skip to content

Commit af3fe47

Browse files
arndbarndb
committed
Merge tag 'sti-dt-for-v4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into next/dt
Pull "STi dts fixes and new STi 96board support" from Patrice Chotard: Add thermal node for STiH407 family boards Add specific nodes for STMicroelectronics 96Board Add new B2260 STi board file = 96Board Fix ahci issue on STiH407 family Fix debugfs/pinctrl kernel warning Update gpio-cells and gpio specifier * tag 'sti-dt-for-v4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti: ARM: dts: STiH41x-b2020: Update gpio specifier ARM: dts: STiH418-B2199: Update gpio specifier ARM: dts: STiH407-pinctrl: Update gpio-cells to 2 ARM: dts: STi: Introduce B2260 board ARM: dts: STiH407-family: Add ports-implemented property in sata nodes ARM: dts: STiH407-pinctrl: Add pinctrl_rgmii1_mdio_1 node ARM: dts: STiH407: Move non-removable property to board file ARM: dts: STiH407-pinctrl: Add i2c2_alt2_1 node ARM: dts: STiH410: Add thermal node ARM: dts: STiH407: Move pio20 node to fix kernel warning
2 parents 3abb0c6 + ba5ba11 commit af3fe47

File tree

8 files changed

+259
-42
lines changed

8 files changed

+259
-42
lines changed

‎arch/arm/boot/dts/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -686,6 +686,7 @@ dtb-$(CONFIG_ARCH_SPEAR6XX) += \
686686
dtb-$(CONFIG_ARCH_STI) += \
687687
stih407-b2120.dtb \
688688
stih410-b2120.dtb \
689+
stih410-b2260.dtb \
689690
stih415-b2000.dtb \
690691
stih415-b2020.dtb \
691692
stih416-b2000.dtb \

‎arch/arm/boot/dts/stih407-family.dtsi

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,6 @@
553553
clock-names = "mmc";
554554
clocks = <&clk_s_c0_flexgen CLK_MMC_0>;
555555
bus-width = <8>;
556-
non-removable;
557556
};
558557

559558
mmc1: sdhci@09080000 {
@@ -608,6 +607,8 @@
608607
clock-names = "ahci_clk";
609608
clocks = <&clk_s_c0_flexgen CLK_ICN_REG>;
610609

610+
ports-implemented = <0x1>;
611+
611612
status = "disabled";
612613
};
613614

@@ -631,6 +632,8 @@
631632
clock-names = "ahci_clk";
632633
clocks = <&clk_s_c0_flexgen CLK_ICN_REG>;
633634

635+
ports-implemented = <0x1>;
636+
634637
status = "disabled";
635638
};
636639

‎arch/arm/boot/dts/stih407-pinctrl.dtsi

Lines changed: 48 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -58,39 +58,39 @@
5858

5959
pio0: gpio@09610000 {
6060
gpio-controller;
61-
#gpio-cells = <1>;
61+
#gpio-cells = <2>;
6262
interrupt-controller;
6363
#interrupt-cells = <2>;
6464
reg = <0x0 0x100>;
6565
st,bank-name = "PIO0";
6666
};
6767
pio1: gpio@09611000 {
6868
gpio-controller;
69-
#gpio-cells = <1>;
69+
#gpio-cells = <2>;
7070
interrupt-controller;
7171
#interrupt-cells = <2>;
7272
reg = <0x1000 0x100>;
7373
st,bank-name = "PIO1";
7474
};
7575
pio2: gpio@09612000 {
7676
gpio-controller;
77-
#gpio-cells = <1>;
77+
#gpio-cells = <2>;
7878
interrupt-controller;
7979
#interrupt-cells = <2>;
8080
reg = <0x2000 0x100>;
8181
st,bank-name = "PIO2";
8282
};
8383
pio3: gpio@09613000 {
8484
gpio-controller;
85-
#gpio-cells = <1>;
85+
#gpio-cells = <2>;
8686
interrupt-controller;
8787
#interrupt-cells = <2>;
8888
reg = <0x3000 0x100>;
8989
st,bank-name = "PIO3";
9090
};
9191
pio4: gpio@09614000 {
9292
gpio-controller;
93-
#gpio-cells = <1>;
93+
#gpio-cells = <2>;
9494
interrupt-controller;
9595
#interrupt-cells = <2>;
9696
reg = <0x4000 0x100>;
@@ -99,7 +99,7 @@
9999

100100
pio5: gpio@09615000 {
101101
gpio-controller;
102-
#gpio-cells = <1>;
102+
#gpio-cells = <2>;
103103
interrupt-controller;
104104
#interrupt-cells = <2>;
105105
reg = <0x5000 0x100>;
@@ -230,6 +230,13 @@
230230
};
231231
};
232232

233+
pinctrl_rgmii1_mdio_1: rgmii1-mdio-1 {
234+
st,pins {
235+
mdio = <&pio1 0 ALT1 OUT BYPASS 0>;
236+
mdc = <&pio1 1 ALT1 OUT NICLK 0 CLK_A>;
237+
};
238+
};
239+
233240
pinctrl_mii1: mii1 {
234241
st,pins {
235242
txd0 = <&pio0 0 ALT1 OUT SE_NICLK_IO 0 CLK_A>;
@@ -373,79 +380,79 @@
373380

374381
pio10: pio@09200000 {
375382
gpio-controller;
376-
#gpio-cells = <1>;
383+
#gpio-cells = <2>;
377384
interrupt-controller;
378385
#interrupt-cells = <2>;
379386
reg = <0x0 0x100>;
380387
st,bank-name = "PIO10";
381388
};
382389
pio11: pio@09201000 {
383390
gpio-controller;
384-
#gpio-cells = <1>;
391+
#gpio-cells = <2>;
385392
interrupt-controller;
386393
#interrupt-cells = <2>;
387394
reg = <0x1000 0x100>;
388395
st,bank-name = "PIO11";
389396
};
390397
pio12: pio@09202000 {
391398
gpio-controller;
392-
#gpio-cells = <1>;
399+
#gpio-cells = <2>;
393400
interrupt-controller;
394401
#interrupt-cells = <2>;
395402
reg = <0x2000 0x100>;
396403
st,bank-name = "PIO12";
397404
};
398405
pio13: pio@09203000 {
399406
gpio-controller;
400-
#gpio-cells = <1>;
407+
#gpio-cells = <2>;
401408
interrupt-controller;
402409
#interrupt-cells = <2>;
403410
reg = <0x3000 0x100>;
404411
st,bank-name = "PIO13";
405412
};
406413
pio14: pio@09204000 {
407414
gpio-controller;
408-
#gpio-cells = <1>;
415+
#gpio-cells = <2>;
409416
interrupt-controller;
410417
#interrupt-cells = <2>;
411418
reg = <0x4000 0x100>;
412419
st,bank-name = "PIO14";
413420
};
414421
pio15: pio@09205000 {
415422
gpio-controller;
416-
#gpio-cells = <1>;
423+
#gpio-cells = <2>;
417424
interrupt-controller;
418425
#interrupt-cells = <2>;
419426
reg = <0x5000 0x100>;
420427
st,bank-name = "PIO15";
421428
};
422429
pio16: pio@09206000 {
423430
gpio-controller;
424-
#gpio-cells = <1>;
431+
#gpio-cells = <2>;
425432
interrupt-controller;
426433
#interrupt-cells = <2>;
427434
reg = <0x6000 0x100>;
428435
st,bank-name = "PIO16";
429436
};
430437
pio17: pio@09207000 {
431438
gpio-controller;
432-
#gpio-cells = <1>;
439+
#gpio-cells = <2>;
433440
interrupt-controller;
434441
#interrupt-cells = <2>;
435442
reg = <0x7000 0x100>;
436443
st,bank-name = "PIO17";
437444
};
438445
pio18: pio@09208000 {
439446
gpio-controller;
440-
#gpio-cells = <1>;
447+
#gpio-cells = <2>;
441448
interrupt-controller;
442449
#interrupt-cells = <2>;
443450
reg = <0x8000 0x100>;
444451
st,bank-name = "PIO18";
445452
};
446453
pio19: pio@09209000 {
447454
gpio-controller;
448-
#gpio-cells = <1>;
455+
#gpio-cells = <2>;
449456
interrupt-controller;
450457
#interrupt-cells = <2>;
451458
reg = <0x9000 0x100>;
@@ -523,6 +530,13 @@
523530
scl = <&pio15 5 ALT2 BIDIR>;
524531
};
525532
};
533+
534+
pinctrl_i2c2_alt2_1: i2c2-alt2-1 {
535+
st,pins {
536+
sda = <&pio12 6 ALT2 BIDIR>;
537+
scl = <&pio12 5 ALT2 BIDIR>;
538+
};
539+
};
526540
};
527541

528542
i2c3 {
@@ -916,6 +930,15 @@
916930
interrupt-names = "irqmux";
917931
ranges = <0 0x09210000 0x10000>;
918932

933+
pio20: pio@09210000 {
934+
gpio-controller;
935+
#gpio-cells = <2>;
936+
interrupt-controller;
937+
#interrupt-cells = <2>;
938+
reg = <0x0 0x100>;
939+
st,bank-name = "PIO20";
940+
};
941+
919942
tsin4 {
920943
pinctrl_tsin4_serial_alt1: tsin4_serial_alt1 {
921944
st,pins {
@@ -927,15 +950,6 @@
927950
};
928951
};
929952
};
930-
931-
pio20: pio@09210000 {
932-
gpio-controller;
933-
#gpio-cells = <1>;
934-
interrupt-controller;
935-
#interrupt-cells = <2>;
936-
reg = <0x0 0x100>;
937-
st,bank-name = "PIO20";
938-
};
939953
};
940954

941955
pin-controller-rear {
@@ -951,47 +965,47 @@
951965

952966
pio30: gpio@09220000 {
953967
gpio-controller;
954-
#gpio-cells = <1>;
968+
#gpio-cells = <2>;
955969
interrupt-controller;
956970
#interrupt-cells = <2>;
957971
reg = <0x0 0x100>;
958972
st,bank-name = "PIO30";
959973
};
960974
pio31: gpio@09221000 {
961975
gpio-controller;
962-
#gpio-cells = <1>;
976+
#gpio-cells = <2>;
963977
interrupt-controller;
964978
#interrupt-cells = <2>;
965979
reg = <0x1000 0x100>;
966980
st,bank-name = "PIO31";
967981
};
968982
pio32: gpio@09222000 {
969983
gpio-controller;
970-
#gpio-cells = <1>;
984+
#gpio-cells = <2>;
971985
interrupt-controller;
972986
#interrupt-cells = <2>;
973987
reg = <0x2000 0x100>;
974988
st,bank-name = "PIO32";
975989
};
976990
pio33: gpio@09223000 {
977991
gpio-controller;
978-
#gpio-cells = <1>;
992+
#gpio-cells = <2>;
979993
interrupt-controller;
980994
#interrupt-cells = <2>;
981995
reg = <0x3000 0x100>;
982996
st,bank-name = "PIO33";
983997
};
984998
pio34: gpio@09224000 {
985999
gpio-controller;
986-
#gpio-cells = <1>;
1000+
#gpio-cells = <2>;
9871001
interrupt-controller;
9881002
#interrupt-cells = <2>;
9891003
reg = <0x4000 0x100>;
9901004
st,bank-name = "PIO34";
9911005
};
9921006
pio35: gpio@09225000 {
9931007
gpio-controller;
994-
#gpio-cells = <1>;
1008+
#gpio-cells = <2>;
9951009
interrupt-controller;
9961010
#interrupt-cells = <2>;
9971011
reg = <0x5000 0x100>;
@@ -1090,23 +1104,23 @@
10901104

10911105
pio40: gpio@09230000 {
10921106
gpio-controller;
1093-
#gpio-cells = <1>;
1107+
#gpio-cells = <2>;
10941108
interrupt-controller;
10951109
#interrupt-cells = <2>;
10961110
reg = <0 0x100>;
10971111
st,bank-name = "PIO40";
10981112
};
10991113
pio41: gpio@09231000 {
11001114
gpio-controller;
1101-
#gpio-cells = <1>;
1115+
#gpio-cells = <2>;
11021116
interrupt-controller;
11031117
#interrupt-cells = <2>;
11041118
reg = <0x1000 0x100>;
11051119
st,bank-name = "PIO41";
11061120
};
11071121
pio42: gpio@09232000 {
11081122
gpio-controller;
1109-
#gpio-cells = <1>;
1123+
#gpio-cells = <2>;
11101124
interrupt-controller;
11111125
#interrupt-cells = <2>;
11121126
reg = <0x2000 0x100>;

0 commit comments

Comments
 (0)