forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-31 f9004dbfff8a3fbbd7e2a88c8a4327c7f2f8e5b2
kernel/arch/arm/boot/dts/tegra20-harmony.dts
....@@ -613,7 +613,7 @@
613613 status = "okay";
614614 };
615615
616
- sdhci@c8000200 {
616
+ mmc@c8000200 {
617617 status = "okay";
618618 cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
619619 wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
....@@ -621,7 +621,7 @@
621621 bus-width = <4>;
622622 };
623623
624
- sdhci@c8000600 {
624
+ mmc@c8000600 {
625625 status = "okay";
626626 cd-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>;
627627 wp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;
....@@ -640,17 +640,10 @@
640640 default-brightness-level = <6>;
641641 };
642642
643
- clocks {
644
- compatible = "simple-bus";
645
- #address-cells = <1>;
646
- #size-cells = <0>;
647
-
648
- clk32k_in: clock@0 {
649
- compatible = "fixed-clock";
650
- reg = <0>;
651
- #clock-cells = <0>;
652
- clock-frequency = <32768>;
653
- };
643
+ clk32k_in: clock@0 {
644
+ compatible = "fixed-clock";
645
+ clock-frequency = <32768>;
646
+ #clock-cells = <0>;
654647 };
655648
656649 gpio-keys {
....@@ -665,7 +658,7 @@
665658 };
666659
667660 panel: panel {
668
- compatible = "auo,b101aw03", "simple-panel";
661
+ compatible = "auo,b101aw03";
669662
670663 power-supply = <&vdd_pnl_reg>;
671664 enable-gpios = <&gpio TEGRA_GPIO(B, 2) GPIO_ACTIVE_HIGH>;
....@@ -673,79 +666,66 @@
673666 backlight = <&backlight>;
674667 };
675668
676
- regulators {
677
- compatible = "simple-bus";
678
- #address-cells = <1>;
679
- #size-cells = <0>;
669
+ vdd_5v0_reg: regulator@0 {
670
+ compatible = "regulator-fixed";
671
+ regulator-name = "vdd_5v0";
672
+ regulator-min-microvolt = <5000000>;
673
+ regulator-max-microvolt = <5000000>;
674
+ regulator-always-on;
675
+ };
680676
681
- vdd_5v0_reg: regulator@0 {
682
- compatible = "regulator-fixed";
683
- reg = <0>;
684
- regulator-name = "vdd_5v0";
685
- regulator-min-microvolt = <5000000>;
686
- regulator-max-microvolt = <5000000>;
687
- regulator-always-on;
688
- };
677
+ regulator@1 {
678
+ compatible = "regulator-fixed";
679
+ regulator-name = "vdd_1v5";
680
+ regulator-min-microvolt = <1500000>;
681
+ regulator-max-microvolt = <1500000>;
682
+ gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
683
+ };
689684
690
- regulator@1 {
691
- compatible = "regulator-fixed";
692
- reg = <1>;
693
- regulator-name = "vdd_1v5";
694
- regulator-min-microvolt = <1500000>;
695
- regulator-max-microvolt = <1500000>;
696
- gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
697
- };
685
+ regulator@2 {
686
+ compatible = "regulator-fixed";
687
+ regulator-name = "vdd_1v2";
688
+ regulator-min-microvolt = <1200000>;
689
+ regulator-max-microvolt = <1200000>;
690
+ gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
691
+ enable-active-high;
692
+ };
698693
699
- regulator@2 {
700
- compatible = "regulator-fixed";
701
- reg = <2>;
702
- regulator-name = "vdd_1v2";
703
- regulator-min-microvolt = <1200000>;
704
- regulator-max-microvolt = <1200000>;
705
- gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
706
- enable-active-high;
707
- };
694
+ pci_vdd_reg: regulator@3 {
695
+ compatible = "regulator-fixed";
696
+ regulator-name = "vdd_1v05";
697
+ regulator-min-microvolt = <1050000>;
698
+ regulator-max-microvolt = <1050000>;
699
+ gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
700
+ enable-active-high;
701
+ };
708702
709
- pci_vdd_reg: regulator@3 {
710
- compatible = "regulator-fixed";
711
- reg = <3>;
712
- regulator-name = "vdd_1v05";
713
- regulator-min-microvolt = <1050000>;
714
- regulator-max-microvolt = <1050000>;
715
- gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
716
- enable-active-high;
717
- };
703
+ vdd_pnl_reg: regulator@4 {
704
+ compatible = "regulator-fixed";
705
+ regulator-name = "vdd_pnl";
706
+ regulator-min-microvolt = <2800000>;
707
+ regulator-max-microvolt = <2800000>;
708
+ gpio = <&gpio TEGRA_GPIO(C, 6) GPIO_ACTIVE_HIGH>;
709
+ enable-active-high;
710
+ };
718711
719
- vdd_pnl_reg: regulator@4 {
720
- compatible = "regulator-fixed";
721
- reg = <4>;
722
- regulator-name = "vdd_pnl";
723
- regulator-min-microvolt = <2800000>;
724
- regulator-max-microvolt = <2800000>;
725
- gpio = <&gpio TEGRA_GPIO(C, 6) GPIO_ACTIVE_HIGH>;
726
- enable-active-high;
727
- };
712
+ vdd_bl_reg: regulator@5 {
713
+ compatible = "regulator-fixed";
714
+ regulator-name = "vdd_bl";
715
+ regulator-min-microvolt = <2800000>;
716
+ regulator-max-microvolt = <2800000>;
717
+ gpio = <&gpio TEGRA_GPIO(W, 0) GPIO_ACTIVE_HIGH>;
718
+ enable-active-high;
719
+ };
728720
729
- vdd_bl_reg: regulator@5 {
730
- compatible = "regulator-fixed";
731
- reg = <5>;
732
- regulator-name = "vdd_bl";
733
- regulator-min-microvolt = <2800000>;
734
- regulator-max-microvolt = <2800000>;
735
- gpio = <&gpio TEGRA_GPIO(W, 0) GPIO_ACTIVE_HIGH>;
736
- enable-active-high;
737
- };
738
-
739
- vdd_5v0_hdmi: regulator@6 {
740
- compatible = "regulator-fixed";
741
- reg = <6>;
742
- regulator-name = "VDDIO_HDMI";
743
- regulator-min-microvolt = <5000000>;
744
- regulator-max-microvolt = <5000000>;
745
- gpio = <&gpio TEGRA_GPIO(T, 2) GPIO_ACTIVE_HIGH>;
746
- enable-active-high;
747
- vin-supply = <&vdd_5v0_reg>;
748
- };
721
+ vdd_5v0_hdmi: regulator@6 {
722
+ compatible = "regulator-fixed";
723
+ regulator-name = "VDDIO_HDMI";
724
+ regulator-min-microvolt = <5000000>;
725
+ regulator-max-microvolt = <5000000>;
726
+ gpio = <&gpio TEGRA_GPIO(T, 2) GPIO_ACTIVE_HIGH>;
727
+ enable-active-high;
728
+ vin-supply = <&vdd_5v0_reg>;
749729 };
750730
751731 sound {
....@@ -768,7 +748,7 @@
768748
769749 nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
770750 nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2)
771
- GPIO_ACTIVE_HIGH>;
751
+ GPIO_ACTIVE_LOW>;
772752 nvidia,int-mic-en-gpios = <&gpio TEGRA_GPIO(X, 0)
773753 GPIO_ACTIVE_HIGH>;
774754 nvidia,ext-mic-en-gpios = <&gpio TEGRA_GPIO(X, 1)