Skip to content

Commit 8980c30

Browse files
hsinyi527AngeloGioacchino Del Regno
hsinyi527
authored and
AngeloGioacchino Del Regno
committed
arm64: dts: mt8183: kukui: Fix underscores in node names
Replace underscores with hyphens in pinctrl node names both for consistency and to adhere to the bindings. Cc: stable@vger.kernel.org Fixes: cd894e2 ("arm64: dts: mt8183: Add krane-sku176 board") Fixes: 1652dbf ("arm64: dts: mt8183: add scp node") Fixes: 27eaf34 ("arm64: dts: mt8183: config dsi node") Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Link: https://lore.kernel.org/r/20231026191343.3345279-2-hsinyi@chromium.org Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
1 parent 5a60d63 commit 8980c30

2 files changed

Lines changed: 50 additions & 50 deletions

File tree

‎arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -441,20 +441,20 @@
441441
};
442442

443443
touchscreen_pins: touchscreen-pins {
444-
touch_int_odl {
444+
touch-int-odl {
445445
pinmux = <PINMUX_GPIO155__FUNC_GPIO155>;
446446
input-enable;
447447
bias-pull-up;
448448
};
449449

450-
touch_rst_l {
450+
touch-rst-l {
451451
pinmux = <PINMUX_GPIO156__FUNC_GPIO156>;
452452
output-high;
453453
};
454454
};
455455

456456
trackpad_pins: trackpad-pins {
457-
trackpad_int {
457+
trackpad-int {
458458
pinmux = <PINMUX_GPIO7__FUNC_GPIO7>;
459459
input-enable;
460460
bias-disable; /* pulled externally */

‎arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@
460460

461461
&pio {
462462
aud_pins_default: audiopins {
463-
pins_bus {
463+
pins-bus {
464464
pinmux = <PINMUX_GPIO97__FUNC_I2S2_MCK>,
465465
<PINMUX_GPIO98__FUNC_I2S2_BCK>,
466466
<PINMUX_GPIO101__FUNC_I2S2_LRCK>,
@@ -482,7 +482,7 @@
482482
};
483483

484484
aud_pins_tdm_out_on: audiotdmouton {
485-
pins_bus {
485+
pins-bus {
486486
pinmux = <PINMUX_GPIO169__FUNC_TDM_BCK_2ND>,
487487
<PINMUX_GPIO170__FUNC_TDM_LRCK_2ND>,
488488
<PINMUX_GPIO171__FUNC_TDM_DATA0_2ND>,
@@ -494,7 +494,7 @@
494494
};
495495

496496
aud_pins_tdm_out_off: audiotdmoutoff {
497-
pins_bus {
497+
pins-bus {
498498
pinmux = <PINMUX_GPIO169__FUNC_GPIO169>,
499499
<PINMUX_GPIO170__FUNC_GPIO170>,
500500
<PINMUX_GPIO171__FUNC_GPIO171>,
@@ -508,29 +508,29 @@
508508
};
509509

510510
bt_pins: bt-pins {
511-
pins_bt_en {
511+
pins-bt-en {
512512
pinmux = <PINMUX_GPIO120__FUNC_GPIO120>;
513513
output-low;
514514
};
515515
};
516516

517-
ec_ap_int_odl: ec_ap_int_odl {
517+
ec_ap_int_odl: ec-ap-int-odl {
518518
pins1 {
519519
pinmux = <PINMUX_GPIO151__FUNC_GPIO151>;
520520
input-enable;
521521
bias-pull-up;
522522
};
523523
};
524524

525-
h1_int_od_l: h1_int_od_l {
525+
h1_int_od_l: h1-int-od-l {
526526
pins1 {
527527
pinmux = <PINMUX_GPIO153__FUNC_GPIO153>;
528528
input-enable;
529529
};
530530
};
531531

532532
i2c0_pins: i2c0 {
533-
pins_bus {
533+
pins-bus {
534534
pinmux = <PINMUX_GPIO82__FUNC_SDA0>,
535535
<PINMUX_GPIO83__FUNC_SCL0>;
536536
mediatek,pull-up-adv = <3>;
@@ -539,7 +539,7 @@
539539
};
540540

541541
i2c1_pins: i2c1 {
542-
pins_bus {
542+
pins-bus {
543543
pinmux = <PINMUX_GPIO81__FUNC_SDA1>,
544544
<PINMUX_GPIO84__FUNC_SCL1>;
545545
mediatek,pull-up-adv = <3>;
@@ -548,7 +548,7 @@
548548
};
549549

550550
i2c2_pins: i2c2 {
551-
pins_bus {
551+
pins-bus {
552552
pinmux = <PINMUX_GPIO103__FUNC_SCL2>,
553553
<PINMUX_GPIO104__FUNC_SDA2>;
554554
bias-disable;
@@ -557,7 +557,7 @@
557557
};
558558

559559
i2c3_pins: i2c3 {
560-
pins_bus {
560+
pins-bus {
561561
pinmux = <PINMUX_GPIO50__FUNC_SCL3>,
562562
<PINMUX_GPIO51__FUNC_SDA3>;
563563
mediatek,pull-up-adv = <3>;
@@ -566,7 +566,7 @@
566566
};
567567

568568
i2c4_pins: i2c4 {
569-
pins_bus {
569+
pins-bus {
570570
pinmux = <PINMUX_GPIO105__FUNC_SCL4>,
571571
<PINMUX_GPIO106__FUNC_SDA4>;
572572
bias-disable;
@@ -575,7 +575,7 @@
575575
};
576576

577577
i2c5_pins: i2c5 {
578-
pins_bus {
578+
pins-bus {
579579
pinmux = <PINMUX_GPIO48__FUNC_SCL5>,
580580
<PINMUX_GPIO49__FUNC_SDA5>;
581581
mediatek,pull-up-adv = <3>;
@@ -584,15 +584,15 @@
584584
};
585585

586586
i2c6_pins: i2c6 {
587-
pins_bus {
587+
pins-bus {
588588
pinmux = <PINMUX_GPIO11__FUNC_SCL6>,
589589
<PINMUX_GPIO12__FUNC_SDA6>;
590590
bias-disable;
591591
};
592592
};
593593

594594
mmc0_pins_default: mmc0-pins-default {
595-
pins_cmd_dat {
595+
pins-cmd-dat {
596596
pinmux = <PINMUX_GPIO123__FUNC_MSDC0_DAT0>,
597597
<PINMUX_GPIO128__FUNC_MSDC0_DAT1>,
598598
<PINMUX_GPIO125__FUNC_MSDC0_DAT2>,
@@ -607,21 +607,21 @@
607607
mediatek,pull-up-adv = <01>;
608608
};
609609

610-
pins_clk {
610+
pins-clk {
611611
pinmux = <PINMUX_GPIO124__FUNC_MSDC0_CLK>;
612612
drive-strength = <MTK_DRIVE_14mA>;
613613
mediatek,pull-down-adv = <10>;
614614
};
615615

616-
pins_rst {
616+
pins-rst {
617617
pinmux = <PINMUX_GPIO133__FUNC_MSDC0_RSTB>;
618618
drive-strength = <MTK_DRIVE_14mA>;
619619
mediatek,pull-down-adv = <01>;
620620
};
621621
};
622622

623623
mmc0_pins_uhs: mmc0-pins-uhs {
624-
pins_cmd_dat {
624+
pins-cmd-dat {
625625
pinmux = <PINMUX_GPIO123__FUNC_MSDC0_DAT0>,
626626
<PINMUX_GPIO128__FUNC_MSDC0_DAT1>,
627627
<PINMUX_GPIO125__FUNC_MSDC0_DAT2>,
@@ -636,27 +636,27 @@
636636
mediatek,pull-up-adv = <01>;
637637
};
638638

639-
pins_clk {
639+
pins-clk {
640640
pinmux = <PINMUX_GPIO124__FUNC_MSDC0_CLK>;
641641
drive-strength = <MTK_DRIVE_14mA>;
642642
mediatek,pull-down-adv = <10>;
643643
};
644644

645-
pins_ds {
645+
pins-ds {
646646
pinmux = <PINMUX_GPIO131__FUNC_MSDC0_DSL>;
647647
drive-strength = <MTK_DRIVE_14mA>;
648648
mediatek,pull-down-adv = <10>;
649649
};
650650

651-
pins_rst {
651+
pins-rst {
652652
pinmux = <PINMUX_GPIO133__FUNC_MSDC0_RSTB>;
653653
drive-strength = <MTK_DRIVE_14mA>;
654654
mediatek,pull-up-adv = <01>;
655655
};
656656
};
657657

658658
mmc1_pins_default: mmc1-pins-default {
659-
pins_cmd_dat {
659+
pins-cmd-dat {
660660
pinmux = <PINMUX_GPIO31__FUNC_MSDC1_CMD>,
661661
<PINMUX_GPIO32__FUNC_MSDC1_DAT0>,
662662
<PINMUX_GPIO34__FUNC_MSDC1_DAT1>,
@@ -666,15 +666,15 @@
666666
mediatek,pull-up-adv = <10>;
667667
};
668668

669-
pins_clk {
669+
pins-clk {
670670
pinmux = <PINMUX_GPIO29__FUNC_MSDC1_CLK>;
671671
input-enable;
672672
mediatek,pull-down-adv = <10>;
673673
};
674674
};
675675

676676
mmc1_pins_uhs: mmc1-pins-uhs {
677-
pins_cmd_dat {
677+
pins-cmd-dat {
678678
pinmux = <PINMUX_GPIO31__FUNC_MSDC1_CMD>,
679679
<PINMUX_GPIO32__FUNC_MSDC1_DAT0>,
680680
<PINMUX_GPIO34__FUNC_MSDC1_DAT1>,
@@ -685,23 +685,23 @@
685685
mediatek,pull-up-adv = <10>;
686686
};
687687

688-
pins_clk {
688+
pins-clk {
689689
pinmux = <PINMUX_GPIO29__FUNC_MSDC1_CLK>;
690690
drive-strength = <MTK_DRIVE_8mA>;
691691
mediatek,pull-down-adv = <10>;
692692
input-enable;
693693
};
694694
};
695695

696-
panel_pins_default: panel_pins_default {
697-
panel_reset {
696+
panel_pins_default: panel-pins-default {
697+
panel-reset {
698698
pinmux = <PINMUX_GPIO45__FUNC_GPIO45>;
699699
output-low;
700700
bias-pull-up;
701701
};
702702
};
703703

704-
pwm0_pin_default: pwm0_pin_default {
704+
pwm0_pin_default: pwm0-pin-default {
705705
pins1 {
706706
pinmux = <PINMUX_GPIO176__FUNC_GPIO176>;
707707
output-high;
@@ -713,14 +713,14 @@
713713
};
714714

715715
scp_pins: scp {
716-
pins_scp_uart {
716+
pins-scp-uart {
717717
pinmux = <PINMUX_GPIO110__FUNC_TP_URXD1_AO>,
718718
<PINMUX_GPIO112__FUNC_TP_UTXD1_AO>;
719719
};
720720
};
721721

722722
spi0_pins: spi0 {
723-
pins_spi {
723+
pins-spi {
724724
pinmux = <PINMUX_GPIO85__FUNC_SPI0_MI>,
725725
<PINMUX_GPIO86__FUNC_GPIO86>,
726726
<PINMUX_GPIO87__FUNC_SPI0_MO>,
@@ -730,7 +730,7 @@
730730
};
731731

732732
spi1_pins: spi1 {
733-
pins_spi {
733+
pins-spi {
734734
pinmux = <PINMUX_GPIO161__FUNC_SPI1_A_MI>,
735735
<PINMUX_GPIO162__FUNC_SPI1_A_CSB>,
736736
<PINMUX_GPIO163__FUNC_SPI1_A_MO>,
@@ -740,20 +740,20 @@
740740
};
741741

742742
spi2_pins: spi2 {
743-
pins_spi {
743+
pins-spi {
744744
pinmux = <PINMUX_GPIO0__FUNC_SPI2_CSB>,
745745
<PINMUX_GPIO1__FUNC_SPI2_MO>,
746746
<PINMUX_GPIO2__FUNC_SPI2_CLK>;
747747
bias-disable;
748748
};
749-
pins_spi_mi {
749+
pins-spi-mi {
750750
pinmux = <PINMUX_GPIO94__FUNC_SPI2_MI>;
751751
mediatek,pull-down-adv = <00>;
752752
};
753753
};
754754

755755
spi3_pins: spi3 {
756-
pins_spi {
756+
pins-spi {
757757
pinmux = <PINMUX_GPIO21__FUNC_SPI3_MI>,
758758
<PINMUX_GPIO22__FUNC_SPI3_CSB>,
759759
<PINMUX_GPIO23__FUNC_SPI3_MO>,
@@ -763,7 +763,7 @@
763763
};
764764

765765
spi4_pins: spi4 {
766-
pins_spi {
766+
pins-spi {
767767
pinmux = <PINMUX_GPIO17__FUNC_SPI4_MI>,
768768
<PINMUX_GPIO18__FUNC_SPI4_CSB>,
769769
<PINMUX_GPIO19__FUNC_SPI4_MO>,
@@ -773,7 +773,7 @@
773773
};
774774

775775
spi5_pins: spi5 {
776-
pins_spi {
776+
pins-spi {
777777
pinmux = <PINMUX_GPIO13__FUNC_SPI5_MI>,
778778
<PINMUX_GPIO14__FUNC_SPI5_CSB>,
779779
<PINMUX_GPIO15__FUNC_SPI5_MO>,
@@ -783,63 +783,63 @@
783783
};
784784

785785
uart0_pins_default: uart0-pins-default {
786-
pins_rx {
786+
pins-rx {
787787
pinmux = <PINMUX_GPIO95__FUNC_URXD0>;
788788
input-enable;
789789
bias-pull-up;
790790
};
791-
pins_tx {
791+
pins-tx {
792792
pinmux = <PINMUX_GPIO96__FUNC_UTXD0>;
793793
};
794794
};
795795

796796
uart1_pins_default: uart1-pins-default {
797-
pins_rx {
797+
pins-rx {
798798
pinmux = <PINMUX_GPIO121__FUNC_URXD1>;
799799
input-enable;
800800
bias-pull-up;
801801
};
802-
pins_tx {
802+
pins-tx {
803803
pinmux = <PINMUX_GPIO115__FUNC_UTXD1>;
804804
};
805-
pins_rts {
805+
pins-rts {
806806
pinmux = <PINMUX_GPIO47__FUNC_URTS1>;
807807
output-enable;
808808
};
809-
pins_cts {
809+
pins-cts {
810810
pinmux = <PINMUX_GPIO46__FUNC_UCTS1>;
811811
input-enable;
812812
};
813813
};
814814

815815
uart1_pins_sleep: uart1-pins-sleep {
816-
pins_rx {
816+
pins-rx {
817817
pinmux = <PINMUX_GPIO121__FUNC_GPIO121>;
818818
input-enable;
819819
bias-pull-up;
820820
};
821-
pins_tx {
821+
pins-tx {
822822
pinmux = <PINMUX_GPIO115__FUNC_UTXD1>;
823823
};
824-
pins_rts {
824+
pins-rts {
825825
pinmux = <PINMUX_GPIO47__FUNC_URTS1>;
826826
output-enable;
827827
};
828-
pins_cts {
828+
pins-cts {
829829
pinmux = <PINMUX_GPIO46__FUNC_UCTS1>;
830830
input-enable;
831831
};
832832
};
833833

834834
wifi_pins_pwrseq: wifi-pins-pwrseq {
835-
pins_wifi_enable {
835+
pins-wifi-enable {
836836
pinmux = <PINMUX_GPIO119__FUNC_GPIO119>;
837837
output-low;
838838
};
839839
};
840840

841841
wifi_pins_wakeup: wifi-pins-wakeup {
842-
pins_wifi_wakeup {
842+
pins-wifi-wakeup {
843843
pinmux = <PINMUX_GPIO113__FUNC_GPIO113>;
844844
input-enable;
845845
};

0 commit comments

Comments
 (0)