tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'tegra-for-5.16-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/dt

ARM: tegra: Device tree changes for v5.16-rc1

This contains various cleanup patches to 32-bit ARM Tegra device trees
and enables USB OTG mode on the Nexus 7.

* tag 'tegra-for-5.16-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
ARM: tegra: Remove useless usb-ehci compatible string
ARM: tegra: Remove unused backlight-boot-off property
ARM: tegra: nexus7: Enable USB OTG mode
ARM: tegra: Add new properties to USB PHY device-tree nodes
ARM: tegra: Update Broadcom Bluetooth device-tree nodes
ARM: tegra: acer-a500: Correct compatible of ak8975 magnetometer

Link: https://lore.kernel.org/r/20211008201132.1678814-6-thierry.reding@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann 86d3858e 2a9c7b90

+69 -20
+6 -2
arch/arm/boot/dts/tegra114.dtsi
··· 691 691 }; 692 692 693 693 usb@7d000000 { 694 - compatible = "nvidia,tegra114-ehci", "nvidia,tegra30-ehci", "usb-ehci"; 694 + compatible = "nvidia,tegra114-ehci", "nvidia,tegra30-ehci"; 695 695 reg = <0x7d000000 0x4000>; 696 696 interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; 697 697 phy_type = "utmi"; ··· 706 706 compatible = "nvidia,tegra114-usb-phy", "nvidia,tegra30-usb-phy"; 707 707 reg = <0x7d000000 0x4000>, 708 708 <0x7d000000 0x4000>; 709 + interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; 709 710 phy_type = "utmi"; 710 711 clocks = <&tegra_car TEGRA114_CLK_USBD>, 711 712 <&tegra_car TEGRA114_CLK_PLL_U>, ··· 726 725 nvidia,hsdiscon-level = <5>; 727 726 nvidia,xcvr-hsslew = <12>; 728 727 nvidia,has-utmi-pad-registers; 728 + nvidia,pmc = <&tegra_pmc 0>; 729 729 status = "disabled"; 730 730 }; 731 731 732 732 usb@7d008000 { 733 - compatible = "nvidia,tegra114-ehci", "nvidia,tegra30-ehci", "usb-ehci"; 733 + compatible = "nvidia,tegra114-ehci", "nvidia,tegra30-ehci"; 734 734 reg = <0x7d008000 0x4000>; 735 735 interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>; 736 736 phy_type = "utmi"; ··· 746 744 compatible = "nvidia,tegra114-usb-phy", "nvidia,tegra30-usb-phy"; 747 745 reg = <0x7d008000 0x4000>, 748 746 <0x7d000000 0x4000>; 747 + interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>; 749 748 phy_type = "utmi"; 750 749 clocks = <&tegra_car TEGRA114_CLK_USB3>, 751 750 <&tegra_car TEGRA114_CLK_PLL_U>, ··· 765 762 nvidia,hssquelch-level = <2>; 766 763 nvidia,hsdiscon-level = <5>; 767 764 nvidia,xcvr-hsslew = <12>; 765 + nvidia,pmc = <&tegra_pmc 2>; 768 766 status = "disabled"; 769 767 }; 770 768
+9 -3
arch/arm/boot/dts/tegra124.dtsi
··· 1079 1079 }; 1080 1080 1081 1081 usb@7d000000 { 1082 - compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci", "usb-ehci"; 1082 + compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci"; 1083 1083 reg = <0x0 0x7d000000 0x0 0x4000>; 1084 1084 interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; 1085 1085 phy_type = "utmi"; ··· 1094 1094 compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy"; 1095 1095 reg = <0x0 0x7d000000 0x0 0x4000>, 1096 1096 <0x0 0x7d000000 0x0 0x4000>; 1097 + interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; 1097 1098 phy_type = "utmi"; 1098 1099 clocks = <&tegra_car TEGRA124_CLK_USBD>, 1099 1100 <&tegra_car TEGRA124_CLK_PLL_U>, ··· 1114 1113 nvidia,hsdiscon-level = <5>; 1115 1114 nvidia,xcvr-hsslew = <12>; 1116 1115 nvidia,has-utmi-pad-registers; 1116 + nvidia,pmc = <&tegra_pmc 0>; 1117 1117 status = "disabled"; 1118 1118 }; 1119 1119 1120 1120 usb@7d004000 { 1121 - compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci", "usb-ehci"; 1121 + compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci"; 1122 1122 reg = <0x0 0x7d004000 0x0 0x4000>; 1123 1123 interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>; 1124 1124 phy_type = "utmi"; ··· 1134 1132 compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy"; 1135 1133 reg = <0x0 0x7d004000 0x0 0x4000>, 1136 1134 <0x0 0x7d000000 0x0 0x4000>; 1135 + interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>; 1137 1136 phy_type = "utmi"; 1138 1137 clocks = <&tegra_car TEGRA124_CLK_USB2>, 1139 1138 <&tegra_car TEGRA124_CLK_PLL_U>, ··· 1153 1150 nvidia,hssquelch-level = <2>; 1154 1151 nvidia,hsdiscon-level = <5>; 1155 1152 nvidia,xcvr-hsslew = <12>; 1153 + nvidia,pmc = <&tegra_pmc 1>; 1156 1154 status = "disabled"; 1157 1155 }; 1158 1156 1159 1157 usb@7d008000 { 1160 - compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci", "usb-ehci"; 1158 + compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci"; 1161 1159 reg = <0x0 0x7d008000 0x0 0x4000>; 1162 1160 interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>; 1163 1161 phy_type = "utmi"; ··· 1173 1169 compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy"; 1174 1170 reg = <0x0 0x7d008000 0x0 0x4000>, 1175 1171 <0x0 0x7d000000 0x0 0x4000>; 1172 + interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>; 1176 1173 phy_type = "utmi"; 1177 1174 clocks = <&tegra_car TEGRA124_CLK_USB3>, 1178 1175 <&tegra_car TEGRA124_CLK_PLL_U>, ··· 1192 1187 nvidia,hssquelch-level = <2>; 1193 1188 nvidia,hsdiscon-level = <5>; 1194 1189 nvidia,xcvr-hsslew = <12>; 1190 + nvidia,pmc = <&tegra_pmc 2>; 1195 1191 status = "disabled"; 1196 1192 }; 1197 1193
+5 -2
arch/arm/boot/dts/tegra20-acer-a500-picasso.dts
··· 393 393 bluetooth { 394 394 compatible = "brcm,bcm4329-bt"; 395 395 396 + interrupt-parent = <&gpio>; 397 + interrupts = <TEGRA_GPIO(U, 6) IRQ_TYPE_EDGE_RISING>; 398 + interrupt-names = "host-wakeup"; 399 + 396 400 /* PLLP 216MHz / 16 / 4 */ 397 401 max-speed = <3375000>; 398 402 ··· 407 403 vddio-supply = <&vdd_1v8_sys>; 408 404 409 405 device-wakeup-gpios = <&gpio TEGRA_GPIO(U, 1) GPIO_ACTIVE_HIGH>; 410 - host-wakeup-gpios = <&gpio TEGRA_GPIO(U, 6) GPIO_ACTIVE_HIGH>; 411 406 shutdown-gpios = <&gpio TEGRA_GPIO(U, 0) GPIO_ACTIVE_HIGH>; 412 407 }; 413 408 }; ··· 546 543 status = "okay"; 547 544 548 545 magnetometer@c { 549 - compatible = "ak,ak8975"; 546 + compatible = "asahi-kasei,ak8975"; 550 547 reg = <0x0c>; 551 548 552 549 interrupt-parent = <&gpio>;
-2
arch/arm/boot/dts/tegra20-paz00.dts
··· 573 573 574 574 brightness-levels = <0 16 32 48 64 80 96 112 128 144 160 176 192 208 224 240 255>; 575 575 default-brightness-level = <10>; 576 - 577 - backlight-boot-off; 578 576 }; 579 577 580 578 clk32k_in: clock@0 {
+9 -4
arch/arm/boot/dts/tegra20.dtsi
··· 744 744 }; 745 745 746 746 usb@c5000000 { 747 - compatible = "nvidia,tegra20-ehci", "usb-ehci"; 747 + compatible = "nvidia,tegra20-ehci"; 748 748 reg = <0xc5000000 0x4000>; 749 749 interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; 750 750 phy_type = "utmi"; 751 - nvidia,has-legacy-mode; 752 751 clocks = <&tegra_car TEGRA20_CLK_USBD>; 753 752 resets = <&tegra_car 22>; 754 753 reset-names = "usb"; ··· 760 761 compatible = "nvidia,tegra20-usb-phy"; 761 762 reg = <0xc5000000 0x4000>, 762 763 <0xc5000000 0x4000>; 764 + interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; 763 765 phy_type = "utmi"; 764 766 clocks = <&tegra_car TEGRA20_CLK_USBD>, 765 767 <&tegra_car TEGRA20_CLK_PLL_U>, ··· 779 779 nvidia,xcvr-lsfslew = <1>; 780 780 nvidia,xcvr-lsrslew = <1>; 781 781 nvidia,has-utmi-pad-registers; 782 + nvidia,pmc = <&tegra_pmc 0>; 782 783 status = "disabled"; 783 784 }; 784 785 785 786 usb@c5004000 { 786 - compatible = "nvidia,tegra20-ehci", "usb-ehci"; 787 + compatible = "nvidia,tegra20-ehci"; 787 788 reg = <0xc5004000 0x4000>; 788 789 interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>; 789 790 phy_type = "ulpi"; ··· 798 797 phy2: usb-phy@c5004000 { 799 798 compatible = "nvidia,tegra20-usb-phy"; 800 799 reg = <0xc5004000 0x4000>; 800 + interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>; 801 801 phy_type = "ulpi"; 802 802 clocks = <&tegra_car TEGRA20_CLK_USB2>, 803 803 <&tegra_car TEGRA20_CLK_PLL_U>, ··· 807 805 resets = <&tegra_car 58>, <&tegra_car 22>; 808 806 reset-names = "usb", "utmi-pads"; 809 807 #phy-cells = <0>; 808 + nvidia,pmc = <&tegra_pmc 1>; 810 809 status = "disabled"; 811 810 }; 812 811 813 812 usb@c5008000 { 814 - compatible = "nvidia,tegra20-ehci", "usb-ehci"; 813 + compatible = "nvidia,tegra20-ehci"; 815 814 reg = <0xc5008000 0x4000>; 816 815 interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>; 817 816 phy_type = "utmi"; ··· 827 824 compatible = "nvidia,tegra20-usb-phy"; 828 825 reg = <0xc5008000 0x4000>, 829 826 <0xc5000000 0x4000>; 827 + interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>; 830 828 phy_type = "utmi"; 831 829 clocks = <&tegra_car TEGRA20_CLK_USB3>, 832 830 <&tegra_car TEGRA20_CLK_PLL_U>, ··· 844 840 nvidia,xcvr-setup = <9>; 845 841 nvidia,xcvr-lsfslew = <2>; 846 842 nvidia,xcvr-lsrslew = <2>; 843 + nvidia,pmc = <&tegra_pmc 2>; 847 844 status = "disabled"; 848 845 }; 849 846
+27 -3
arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi
··· 819 819 bluetooth { 820 820 compatible = "brcm,bcm4330-bt"; 821 821 822 + interrupt-parent = <&gpio>; 823 + interrupts = <TEGRA_GPIO(U, 6) IRQ_TYPE_EDGE_RISING>; 824 + interrupt-names = "host-wakeup"; 825 + 822 826 max-speed = <4000000>; 823 827 824 828 clocks = <&tegra_pmc TEGRA_PMC_CLK_BLINK>; ··· 832 828 vddio-supply = <&vdd_1v8>; 833 829 834 830 device-wakeup-gpios = <&gpio TEGRA_GPIO(U, 1) GPIO_ACTIVE_HIGH>; 835 - host-wakeup-gpios = <&gpio TEGRA_GPIO(U, 6) GPIO_ACTIVE_HIGH>; 836 831 shutdown-gpios = <&gpio TEGRA_GPIO(U, 0) GPIO_ACTIVE_HIGH>; 837 832 }; 838 833 }; ··· 944 941 interrupts = <TEGRA_GPIO(V, 1) IRQ_TYPE_EDGE_BOTH>; 945 942 946 943 summit,enable-charge-control = <SMB3XX_CHG_ENABLE_PIN_ACTIVE_LOW>; 944 + summit,inok-polarity = <SMB3XX_SYSOK_INOK_ACTIVE_LOW>; 947 945 summit,enable-usb-charging; 948 946 949 947 monitored-battery = <&battery_cell>; 948 + 949 + usb_vbus: usb-vbus { 950 + regulator-name = "usb_vbus"; 951 + regulator-min-microvolt = <5000000>; 952 + regulator-max-microvolt = <5000000>; 953 + regulator-min-microamp = <750000>; 954 + regulator-max-microamp = <750000>; 955 + 956 + /* 957 + * SMB347 INOK input pin is connected to PMIC's 958 + * ACOK output, which is fixed to ACTIVE_LOW as 959 + * long as battery voltage is in a good range. 960 + * 961 + * Active INOK disables SMB347 output, so polarity 962 + * needs to be toggled when we want to get the 963 + * output. 964 + */ 965 + summit,needs-inok-toggle; 966 + }; 950 967 }; 951 968 }; 952 969 ··· 1039 1016 usb@7d000000 { 1040 1017 compatible = "nvidia,tegra30-udc"; 1041 1018 status = "okay"; 1042 - dr_mode = "peripheral"; 1019 + dr_mode = "otg"; 1020 + vbus-supply = <&usb_vbus>; 1043 1021 }; 1044 1022 1045 1023 usb-phy@7d000000 { 1046 1024 status = "okay"; 1047 - dr_mode = "peripheral"; 1025 + dr_mode = "otg"; 1048 1026 nvidia,hssync-start-delay = <0>; 1049 1027 nvidia,xcvr-lsfslew = <2>; 1050 1028 nvidia,xcvr-lsrslew = <2>;
+4 -1
arch/arm/boot/dts/tegra30-ouya.dts
··· 93 93 bluetooth { 94 94 compatible = "brcm,bcm4330-bt"; 95 95 96 + interrupt-parent = <&gpio>; 97 + interrupts = <TEGRA_GPIO(U, 6) IRQ_TYPE_EDGE_RISING>; 98 + interrupt-names = "host-wakeup"; 99 + 96 100 max-speed = <4000000>; 97 101 98 102 clocks = <&tegra_pmc TEGRA_PMC_CLK_BLINK>; ··· 107 103 108 104 shutdown-gpios = <&gpio TEGRA_GPIO(U, 0) GPIO_ACTIVE_HIGH>; 109 105 device-wakeup-gpios = <&gpio TEGRA_GPIO(U, 1) GPIO_ACTIVE_HIGH>; 110 - host-wakeup-gpios = <&gpio TEGRA_GPIO(U, 6) GPIO_ACTIVE_HIGH>; 111 106 }; 112 107 }; 113 108
+9 -3
arch/arm/boot/dts/tegra30.dtsi
··· 958 958 }; 959 959 960 960 usb@7d000000 { 961 - compatible = "nvidia,tegra30-ehci", "usb-ehci"; 961 + compatible = "nvidia,tegra30-ehci"; 962 962 reg = <0x7d000000 0x4000>; 963 963 interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; 964 964 phy_type = "utmi"; ··· 974 974 compatible = "nvidia,tegra30-usb-phy"; 975 975 reg = <0x7d000000 0x4000>, 976 976 <0x7d000000 0x4000>; 977 + interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; 977 978 phy_type = "utmi"; 978 979 clocks = <&tegra_car TEGRA30_CLK_USBD>, 979 980 <&tegra_car TEGRA30_CLK_PLL_U>, ··· 995 994 nvidia,hssquelch-level = <2>; 996 995 nvidia,hsdiscon-level = <5>; 997 996 nvidia,has-utmi-pad-registers; 997 + nvidia,pmc = <&tegra_pmc 0>; 998 998 status = "disabled"; 999 999 }; 1000 1000 1001 1001 usb@7d004000 { 1002 - compatible = "nvidia,tegra30-ehci", "usb-ehci"; 1002 + compatible = "nvidia,tegra30-ehci"; 1003 1003 reg = <0x7d004000 0x4000>; 1004 1004 interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>; 1005 1005 phy_type = "utmi"; ··· 1015 1013 compatible = "nvidia,tegra30-usb-phy"; 1016 1014 reg = <0x7d004000 0x4000>, 1017 1015 <0x7d000000 0x4000>; 1016 + interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>; 1018 1017 phy_type = "utmi"; 1019 1018 clocks = <&tegra_car TEGRA30_CLK_USB2>, 1020 1019 <&tegra_car TEGRA30_CLK_PLL_U>, ··· 1035 1032 nvidia,xcvr-hsslew = <32>; 1036 1033 nvidia,hssquelch-level = <2>; 1037 1034 nvidia,hsdiscon-level = <5>; 1035 + nvidia,pmc = <&tegra_pmc 2>; 1038 1036 status = "disabled"; 1039 1037 }; 1040 1038 1041 1039 usb@7d008000 { 1042 - compatible = "nvidia,tegra30-ehci", "usb-ehci"; 1040 + compatible = "nvidia,tegra30-ehci"; 1043 1041 reg = <0x7d008000 0x4000>; 1044 1042 interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>; 1045 1043 phy_type = "utmi"; ··· 1055 1051 compatible = "nvidia,tegra30-usb-phy"; 1056 1052 reg = <0x7d008000 0x4000>, 1057 1053 <0x7d000000 0x4000>; 1054 + interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>; 1058 1055 phy_type = "utmi"; 1059 1056 clocks = <&tegra_car TEGRA30_CLK_USB3>, 1060 1057 <&tegra_car TEGRA30_CLK_PLL_U>, ··· 1075 1070 nvidia,xcvr-hsslew = <32>; 1076 1071 nvidia,hssquelch-level = <2>; 1077 1072 nvidia,hsdiscon-level = <5>; 1073 + nvidia,pmc = <&tegra_pmc 1>; 1078 1074 status = "disabled"; 1079 1075 }; 1080 1076