forked from ~ljy/RK356X_SDK_RELEASE

hc
2023-12-06 08f87f769b595151be1afeff53e144f543faa614
kernel/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
....@@ -91,15 +91,15 @@
9191 leds {
9292 compatible = "gpio-leds";
9393 pinctrl-names = "default";
94
- pinctrl-0 = <&work_led_gpio>, <&diy_led_gpio>;
94
+ pinctrl-0 = <&work_led_pin>, <&diy_led_pin>;
9595
96
- work-led {
96
+ work_led: led-0 {
9797 label = "work";
9898 default-state = "on";
9999 gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>;
100100 };
101101
102
- diy-led {
102
+ diy_led: led-1 {
103103 label = "diy";
104104 default-state = "off";
105105 gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
....@@ -206,7 +206,7 @@
206206 regulator-name = "vdd_log";
207207 regulator-always-on;
208208 regulator-boot-on;
209
- regulator-min-microvolt = <800000>;
209
+ regulator-min-microvolt = <430000>;
210210 regulator-max-microvolt = <1400000>;
211211 vin-supply = <&vcc_sys>;
212212 };
....@@ -589,11 +589,11 @@
589589 };
590590
591591 pmic {
592
- vsel1_gpio: vsel1-gpio {
592
+ vsel1_pin: vsel1-pin {
593593 rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
594594 };
595595
596
- vsel2_gpio: vsel2-gpio {
596
+ vsel2_pin: vsel2-pin {
597597 rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
598598 };
599599 };
....@@ -622,12 +622,18 @@
622622 };
623623 };
624624
625
+ wifi {
626
+ wifi_host_wake_l: wifi-host-wake-l {
627
+ rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
628
+ };
629
+ };
630
+
625631 leds {
626
- work_led_gpio: work_led-gpio {
632
+ work_led_pin: work-led-pin {
627633 rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
628634 };
629635
630
- diy_led_gpio: diy_led-gpio {
636
+ diy_led_pin: diy-led-pin {
631637 rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
632638 };
633639 };
....@@ -639,8 +645,6 @@
639645
640646 &pwm2 {
641647 status = "okay";
642
- pinctrl-names = "active";
643
- pinctrl-0 = <&pwm2_pin_pull_down>;
644648 };
645649
646650 &saradc {
....@@ -648,6 +652,38 @@
648652 status = "okay";
649653 };
650654
655
+&sdio0 {
656
+ /* WiFi & BT combo module Ampak AP6356S */
657
+ bus-width = <4>;
658
+ cap-sdio-irq;
659
+ cap-sd-highspeed;
660
+ keep-power-in-suspend;
661
+ mmc-pwrseq = <&sdio_pwrseq>;
662
+ non-removable;
663
+ pinctrl-names = "default";
664
+ pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
665
+ sd-uhs-sdr104;
666
+
667
+ /* Power supply */
668
+ vqmmc-supply = <&vcc1v8_s3>; /* IO line */
669
+ vmmc-supply = <&vcc_sdio>; /* card's power */
670
+
671
+ #address-cells = <1>;
672
+ #size-cells = <0>;
673
+ status = "okay";
674
+
675
+ brcmf: wifi@1 {
676
+ reg = <1>;
677
+ compatible = "brcm,bcm4329-fmac";
678
+ interrupt-parent = <&gpio0>;
679
+ interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
680
+ interrupt-names = "host-wake";
681
+ brcm,drive-strength = <5>;
682
+ pinctrl-names = "default";
683
+ pinctrl-0 = <&wifi_host_wake_l>;
684
+ };
685
+};
686
+
651687 &sdmmc {
652688 bus-width = <4>;
653689 cap-mmc-highspeed;