forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-31 f9004dbfff8a3fbbd7e2a88c8a4327c7f2f8e5b2
kernel/arch/arm/boot/dts/tegra114.dtsi
....@@ -4,6 +4,7 @@
44 #include <dt-bindings/memory/tegra114-mc.h>
55 #include <dt-bindings/pinctrl/pinctrl-tegra.h>
66 #include <dt-bindings/interrupt-controller/arm-gic.h>
7
+#include <dt-bindings/soc/tegra-pmc.h>
78
89 / {
910 compatible = "nvidia,tegra114";
....@@ -17,11 +18,13 @@
1718 };
1819
1920 host1x@50000000 {
20
- compatible = "nvidia,tegra114-host1x", "simple-bus";
21
+ compatible = "nvidia,tegra114-host1x";
2122 reg = <0x50000000 0x00028000>;
2223 interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>, /* syncpt */
2324 <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; /* general */
25
+ interrupt-names = "syncpt", "host1x";
2426 clocks = <&tegra_car TEGRA114_CLK_HOST1X>;
27
+ clock-names = "host1x";
2528 resets = <&tegra_car 28>;
2629 reset-names = "host1x";
2730 iommus = <&mc TEGRA_SWGROUP_HC>;
....@@ -32,7 +35,7 @@
3235 ranges = <0x54000000 0x54000000 0x01000000>;
3336
3437 gr2d@54140000 {
35
- compatible = "nvidia,tegra114-gr2d", "nvidia,tegra20-gr2d";
38
+ compatible = "nvidia,tegra114-gr2d";
3639 reg = <0x54140000 0x00040000>;
3740 interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
3841 clocks = <&tegra_car TEGRA114_CLK_GR2D>;
....@@ -43,7 +46,7 @@
4346 };
4447
4548 gr3d@54180000 {
46
- compatible = "nvidia,tegra114-gr3d", "nvidia,tegra20-gr3d";
49
+ compatible = "nvidia,tegra114-gr3d";
4750 reg = <0x54180000 0x00040000>;
4851 clocks = <&tegra_car TEGRA114_CLK_GR3D>;
4952 resets = <&tegra_car 24>;
....@@ -53,7 +56,7 @@
5356 };
5457
5558 dc@54200000 {
56
- compatible = "nvidia,tegra114-dc", "nvidia,tegra20-dc";
59
+ compatible = "nvidia,tegra114-dc";
5760 reg = <0x54200000 0x00040000>;
5861 interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
5962 clocks = <&tegra_car TEGRA114_CLK_DISP1>,
....@@ -72,7 +75,7 @@
7275 };
7376
7477 dc@54240000 {
75
- compatible = "nvidia,tegra114-dc", "nvidia,tegra20-dc";
78
+ compatible = "nvidia,tegra114-dc";
7679 reg = <0x54240000 0x00040000>;
7780 interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
7881 clocks = <&tegra_car TEGRA114_CLK_DISP2>,
....@@ -252,14 +255,14 @@
252255
253256 apbmisc@70000800 {
254257 compatible = "nvidia,tegra114-apbmisc", "nvidia,tegra20-apbmisc";
255
- reg = <0x70000800 0x64 /* Chip revision */
256
- 0x70000008 0x04>; /* Strapping options */
258
+ reg = <0x70000800 0x64>, /* Chip revision */
259
+ <0x70000008 0x04>; /* Strapping options */
257260 };
258261
259262 pinmux: pinmux@70000868 {
260263 compatible = "nvidia,tegra114-pinmux";
261
- reg = <0x70000868 0x148 /* Pad control registers */
262
- 0x70003000 0x40c>; /* Mux registers */
264
+ reg = <0x70000868 0x148>, /* Pad control registers */
265
+ <0x70003000 0x40c>; /* Mux registers */
263266 };
264267
265268 /*
....@@ -514,11 +517,12 @@
514517 status = "disabled";
515518 };
516519
517
- pmc@7000e400 {
520
+ tegra_pmc: pmc@7000e400 {
518521 compatible = "nvidia,tegra114-pmc";
519522 reg = <0x7000e400 0x400>;
520523 clocks = <&tegra_car TEGRA114_CLK_PCLK>, <&clk32k_in>;
521524 clock-names = "pclk", "clk32k_in";
525
+ #clock-cells = <1>;
522526 };
523527
524528 fuse@7000f800 {
....@@ -642,41 +646,45 @@
642646 #nvidia,mipi-calibrate-cells = <1>;
643647 };
644648
645
- sdhci@78000000 {
646
- compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";
649
+ mmc@78000000 {
650
+ compatible = "nvidia,tegra114-sdhci";
647651 reg = <0x78000000 0x200>;
648652 interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
649653 clocks = <&tegra_car TEGRA114_CLK_SDMMC1>;
654
+ clock-names = "sdhci";
650655 resets = <&tegra_car 14>;
651656 reset-names = "sdhci";
652657 status = "disabled";
653658 };
654659
655
- sdhci@78000200 {
656
- compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";
660
+ mmc@78000200 {
661
+ compatible = "nvidia,tegra114-sdhci";
657662 reg = <0x78000200 0x200>;
658663 interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
659664 clocks = <&tegra_car TEGRA114_CLK_SDMMC2>;
665
+ clock-names = "sdhci";
660666 resets = <&tegra_car 9>;
661667 reset-names = "sdhci";
662668 status = "disabled";
663669 };
664670
665
- sdhci@78000400 {
666
- compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";
671
+ mmc@78000400 {
672
+ compatible = "nvidia,tegra114-sdhci";
667673 reg = <0x78000400 0x200>;
668674 interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
669675 clocks = <&tegra_car TEGRA114_CLK_SDMMC3>;
676
+ clock-names = "sdhci";
670677 resets = <&tegra_car 69>;
671678 reset-names = "sdhci";
672679 status = "disabled";
673680 };
674681
675
- sdhci@78000600 {
676
- compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";
682
+ mmc@78000600 {
683
+ compatible = "nvidia,tegra114-sdhci";
677684 reg = <0x78000600 0x200>;
678685 interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
679686 clocks = <&tegra_car TEGRA114_CLK_SDMMC4>;
687
+ clock-names = "sdhci";
680688 resets = <&tegra_car 15>;
681689 reset-names = "sdhci";
682690 status = "disabled";
....@@ -696,7 +704,8 @@
696704
697705 phy1: usb-phy@7d000000 {
698706 compatible = "nvidia,tegra114-usb-phy", "nvidia,tegra30-usb-phy";
699
- reg = <0x7d000000 0x4000 0x7d000000 0x4000>;
707
+ reg = <0x7d000000 0x4000>,
708
+ <0x7d000000 0x4000>;
700709 phy_type = "utmi";
701710 clocks = <&tegra_car TEGRA114_CLK_USBD>,
702711 <&tegra_car TEGRA114_CLK_PLL_U>,
....@@ -704,6 +713,7 @@
704713 clock-names = "reg", "pll_u", "utmi-pads";
705714 resets = <&tegra_car 22>, <&tegra_car 22>;
706715 reset-names = "usb", "utmi-pads";
716
+ #phy-cells = <0>;
707717 nvidia,hssync-start-delay = <0>;
708718 nvidia,idle-wait-delay = <17>;
709719 nvidia,elastic-limit = <16>;
....@@ -732,7 +742,8 @@
732742
733743 phy3: usb-phy@7d008000 {
734744 compatible = "nvidia,tegra114-usb-phy", "nvidia,tegra30-usb-phy";
735
- reg = <0x7d008000 0x4000 0x7d000000 0x4000>;
745
+ reg = <0x7d008000 0x4000>,
746
+ <0x7d000000 0x4000>;
736747 phy_type = "utmi";
737748 clocks = <&tegra_car TEGRA114_CLK_USB3>,
738749 <&tegra_car TEGRA114_CLK_PLL_U>,
....@@ -740,6 +751,7 @@
740751 clock-names = "reg", "pll_u", "utmi-pads";
741752 resets = <&tegra_car 59>, <&tegra_car 22>;
742753 reset-names = "usb", "utmi-pads";
754
+ #phy-cells = <0>;
743755 nvidia,hssync-start-delay = <0>;
744756 nvidia,idle-wait-delay = <17>;
745757 nvidia,elastic-limit = <16>;