hc
2023-12-11 1f93a7dfd1f8d5ff7a5c53246c7534fe2332d6f4
kernel/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts
....@@ -93,9 +93,8 @@
9393 vdd-supply = <&pm8058_l14>; // 2.85V
9494 aset-gpios = <&pm8058_gpio 35 GPIO_ACTIVE_LOW>;
9595 capella,aset-resistance-ohms = <100000>;
96
- /* GPIO34 has interrupt 225 on the PM8058 */
9796 /* Trig on both edges - getting close or far away */
98
- interrupts-extended = <&pm8058 225 IRQ_TYPE_EDGE_BOTH>;
97
+ interrupts-extended = <&pm8058_gpio 34 IRQ_TYPE_EDGE_BOTH>;
9998 /* MPP05 analog input to the XOADC */
10099 io-channels = <&xoadc 0x00 0x05>;
101100 io-channel-names = "aout";
....@@ -515,9 +514,8 @@
515514 ak8975@c {
516515 compatible = "asahi-kasei,ak8975";
517516 reg = <0x0c>;
518
- /* FIXME: GPIO33 has interrupt 224 on the PM8058 */
519
- interrupt-parent = <&pm8058>;
520
- interrupts = <224 IRQ_TYPE_EDGE_RISING>;
517
+ interrupt-parent = <&pm8058_gpio>;
518
+ interrupts = <33 IRQ_TYPE_EDGE_RISING>;
521519 pinctrl-names = "default";
522520 pinctrl-0 = <&dragon_ak8975_gpios>;
523521 vid-supply = <&pm8058_lvs0>; // 1.8V
....@@ -526,9 +524,8 @@
526524 bmp085@77 {
527525 compatible = "bosch,bmp085";
528526 reg = <0x77>;
529
- /* FIXME: GPIO16 has interrupt 207 on the PM8058 */
530
- interrupt-parent = <&pm8058>;
531
- interrupts = <207 IRQ_TYPE_EDGE_RISING>;
527
+ interrupt-parent = <&pm8058_gpio>;
528
+ interrupts = <16 IRQ_TYPE_EDGE_RISING>;
532529 reset-gpios = <&tlmm 86 GPIO_ACTIVE_LOW>;
533530 pinctrl-names = "default";
534531 pinctrl-0 = <&dragon_bmp085_gpios>;
....@@ -539,12 +536,11 @@
539536 compatible = "invensense,mpu3050";
540537 reg = <0x68>;
541538 /*
542
- * GPIO17 has interrupt 208 on the
543
- * PM8058, it is pulled high by a 10k
539
+ * GPIO17 is pulled high by a 10k
544540 * resistor to VLOGIC so needs to be
545541 * active low/falling edge.
546542 */
547
- interrupts-extended = <&pm8058 208 IRQ_TYPE_EDGE_FALLING>;
543
+ interrupts-extended = <&pm8058_gpio 17 IRQ_TYPE_EDGE_FALLING>;
548544 pinctrl-names = "default";
549545 pinctrl-0 = <&dragon_mpu3050_gpios>;
550546 vlogic-supply = <&pm8058_lvs0>; // 1.8V
....@@ -589,11 +585,10 @@
589585 compatible = "smsc,lan9221", "smsc,lan9115";
590586 reg = <2 0x0 0x100>;
591587 /*
592
- * GPIO7 has interrupt 198 on the PM8058
593588 * The second interrupt is the PME interrupt
594589 * for network wakeup, connected to the TLMM.
595590 */
596
- interrupts-extended = <&pm8058 198 IRQ_TYPE_EDGE_FALLING>,
591
+ interrupts-extended = <&pm8058_gpio 7 IRQ_TYPE_EDGE_FALLING>,
597592 <&tlmm 29 IRQ_TYPE_EDGE_RISING>;
598593 reset-gpios = <&tlmm 30 GPIO_ACTIVE_LOW>;
599594 vdd33a-supply = <&dragon_veth>;