tegra: enable required nx modules

Change-Id: Ie9d0a1a44deb576c82045a8e0821089d2d8f68b8
2026-08-14 16:43:01 -05:00
3 changed files with 67 additions and 71 deletions
@@ -13,8 +13,8 @@ load("@bazel_skylib//rules:common_settings.bzl", "string_flag")

 string_flag(
    name = "kernel_version",
-    build_setting_default = "mainline",
-    values = ["6.12", "6.18", "mainline"],
+    build_setting_default = "6.12",
+    values = ["6.12", "6.18"],
 )
 config_setting(
    name = "kernel_612",
@@ -24,10 +24,6 @@ config_setting(
    name = "kernel_618",
    flag_values = {":kernel_version": "6.18"},
 )
-config_setting(
-    name = "kernel_mainline",
-    flag_values = {":kernel_version": "mainline"},
-)

 _TEGRA_MODULES_LIST = [
    # keep sorted
@@ -81,8 +77,7 @@ _TEGRA_MODULES_LIST = [
    "drivers/iio/common/inv_sensors/inv_sensors_timestamp.ko",
    "drivers/iio/imu/inv_mpu6050/inv-mpu6050.ko",
    "drivers/iio/imu/inv_mpu6050/inv-mpu6050-i2c.ko",
-    "drivers/input/misc/max77620-onoff.ko",
-    "drivers/input/touchscreen/stmfts.ko",
+    "drivers/input/touchscreen/stm/ftm4.ko",
    "drivers/iommu/arm/arm-smmu/arm_smmu.ko",
    "drivers/media/cec/platform/tegra/tegra_cec.ko",
    "drivers/mfd/max77620.ko",
@@ -100,7 +95,6 @@ _TEGRA_MODULES_LIST = [
    "drivers/net/ethernet/stmicro/stmmac/stmmac.ko",
    "drivers/net/ethernet/stmicro/stmmac/stmmac-platform.ko",
    "drivers/net/pcs/pcs_xpcs.ko",
-    "drivers/net/phy/phy_package.ko",
    "drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/brcmfmac-bca.ko",
    "drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/brcmfmac-cyw.ko",
    "drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/brcmfmac-wcc.ko",
@@ -126,7 +120,6 @@ _TEGRA_MODULES_LIST = [
    "drivers/power/supply/bq24190_charger.ko",
    "drivers/power/supply/bq27xxx_battery.ko",
    "drivers/power/supply/bq27xxx_battery_i2c.ko",
-    "drivers/power/supply/max17042_battery.ko",
    "drivers/pwm/pwm-tegra.ko",
    "drivers/regulator/max77620-regulator.ko",
    "drivers/regulator/max77812-regulator.ko",
@@ -134,7 +127,6 @@ _TEGRA_MODULES_LIST = [
    "drivers/regulator/pwm-regulator.ko",
    "drivers/rtc/rtc-max77686.ko",
    "drivers/rtc/rtc-tegra.ko",
-    "drivers/soc/tegra/r2p-tegra.ko",
    "drivers/spi/spi-tegra114.ko",
    "drivers/spi/spi-tegra210-quad.ko",
    "drivers/thermal/tegra/tegra-bpmp-thermal.ko",
@@ -146,6 +138,8 @@ _TEGRA_MODULES_LIST = [
    "drivers/usb/typec/ucsi/ucsi_ccg.ko",
    "drivers/usb/host/xhci-tegra.ko",
    "drivers/video/backlight/pwm_bl.ko",
+    "net/mac80211/mac80211.ko",
+    "net/wireless/cfg80211.ko",
    "sound/soc/codecs/snd-soc-rl6231.ko",
    "sound/soc/codecs/snd-soc-rt5659.ko",
    "sound/soc/codecs/snd-soc-rt5640.ko",
@@ -187,41 +181,52 @@ _TEGRA_K618_MODULES_LIST = [
    "sound/hda/core/snd-hda-core.ko",
 ]

-_TEGRA_MAINLINE_MODULES_LIST = [
+_TEGRA_DTB_LIST = [
    # keep sorted
-    "drivers/net/phy/realtek/realtek.ko",
-    "sound/hda/codecs/hdmi/snd-hda-codec-hdmi.ko",
-    "sound/hda/codecs/hdmi/snd-hda-codec-tegrahdmi.ko",
-    "sound/hda/common/snd-hda-codec.ko",
-    "sound/hda/controllers/snd-hda-tegra.ko",
-    "sound/hda/core/snd-hda-core.ko",
+    "tegra186-quill-p3310-1000-c03-00-base.dtb",
+    "tegra186-p3636-0001-p3509-0000-a01-android.dtb",
+    "tegra194-p2888-0001-p2822-0000.dtb",
+    "tegra194-p3668-0000-p3509-0000-android.dtb",
+    "tegra194-p3668-0001-p3509-0000-android.dtb",
+    "tegra210-baracus.dtb",
+    "tegra210-darcy-p2894-0000-a00-00.dtb",
+    "tegra210-darcy-p2894-0050-a04-00.dtb",
+    "tegra210-darcy-p2894-0050-a08-00.dtb",
+    "tegra210-darcy-p2894-0052-a08-00.dtb",
+    "tegra210-foster-e-hdd-cpc-p2530-0933-e03-00.dtb",
+    "tegra210-foster-e-hdd-p2530-0932-e01-00.dtb",
+    "tegra210-foster-e-hdd-p2530-0932-e02-00.dtb",
+    "tegra210-foster-e-p2530-0930-e01-00.dtb",
+    "tegra210-foster-e-p2530-0930-e02-00.dtb",
+    "tegra210-jetson-tx1-p2597-2180-a01-android-devkit.dtb",
+    "tegra210-loki-e-p2530-0030-e01-00.dtb",
+    "tegra210-loki-e-p2530-0030-e02-00.dtb",
+    "tegra210-loki-e-p2530-0030-e03-00.dtb",
+    "tegra210-loki-e-p2530-0031-e01-00.dtb",
+    "tegra210-loki-e-p2530-0031-e02-00.dtb",
+    "tegra210-loki-e-p2530-0031-e03-00.dtb",
+    "tegra210-p3448-0000-p3449-0000-a02-android-devkit.dtb",
+    "tegra210-p3448-0000-p3449-0000-b00-android-devkit.dtb",
+    "tegra210-p3448-0002-p3449-0000-a02-android-devkit.dtb",
+    "tegra210-p3448-0002-p3449-0000-b00-android-devkit.dtb",
+    "tegra210-p3448-0003-p3542-0000-android-devkit.dtb",
+    "tegra210b01-darcy-p2894-0050-a08-00.dtb",
+    "tegra210b01-darcy-p2894-2551-b00-00.dtb",
+    "tegra210b01-darcy-p2894-3551-b03-00.dtb",
+    "tegra210b01-sif-p3425-0500-a01.dtb",
+    "tegra210b01-sif-p3425-0500-a02.dtb",
+    "tegra210b01-sif-p3425-0500-a04.dtb",
+    "tegra210-odin.dtb",
+    "tegra210b01-odin.dtb",
+    "tegra210b01-vali.dtb",
+    "tegra210b01-fric.dtb",
 ]

 kernel_build(
    name = "kernel_aarch64_tegra",
    srcs = ["//vendor/nvidia/kernel:kernel_aarch64_sources",],
-    outs = [],
-    arch = "arm64",
-
-    # Enable mixed build.
-    base_kernel = "//vendor/nvidia/kernel:kernel_aarch64",
-    collect_unstripped_modules = True,
-    defconfig = "//vendor/nvidia/kernel:arch/arm64/configs/gki_defconfig",
-    keep_module_symvers = True,
-    make_goals = [
-        "modules",
-    ],
-    makefile = "//vendor/nvidia/kernel:Makefile",
-    module_outs = _TEGRA_MODULES_LIST + _TEGRA_MAINLINE_MODULES_LIST,
-    pre_defconfig_fragments = ["tegra.fragment"],
-    pahole = "//common:pahole",
-    strip_modules = True,
-)
-
-kernel_build(
-    name = "kernel_aarch64_tegra_618",
-    srcs = ["//vendor/nvidia/kernel:kernel_aarch64_sources",],
-    outs = [],
+    dtstree = "//vendor/nvidia/tegra/dts:tegra_dts",
+    outs = _TEGRA_DTB_LIST,
    arch = "arm64",

    # Enable mixed build.
@@ -229,20 +234,22 @@ kernel_build(
    collect_unstripped_modules = True,
    defconfig = "//vendor/nvidia/kernel:arch/arm64/configs/gki_defconfig",
    keep_module_symvers = True,
+    kmi_symbol_list = "//vendor/nvidia/kernel:gki/aarch64/symbols/tegra",
    make_goals = [
        "modules",
+        "dtbs",
    ],
    makefile = "//vendor/nvidia/kernel:Makefile",
    module_outs = _TEGRA_MODULES_LIST + _TEGRA_K618_MODULES_LIST,
    pre_defconfig_fragments = ["tegra.fragment"],
-    pahole = "//common:pahole",
    strip_modules = True,
 )

 kernel_build(
    name = "kernel_aarch64_tegra_612",
    srcs = ["//vendor/nvidia/kernel:kernel_aarch64_sources",],
-    outs = [],
+    dtstree = "//vendor/nvidia/tegra/dts:tegra_dts",
+    outs = _TEGRA_DTB_LIST,
    arch = "arm64",

    # Enable mixed build.
@@ -250,13 +257,14 @@ kernel_build(
    collect_unstripped_modules = True,
    defconfig = "//vendor/nvidia/kernel:arch/arm64/configs/gki_defconfig",
    keep_module_symvers = True,
+    kmi_symbol_list = "//vendor/nvidia/kernel:gki/aarch64/symbols/tegra",
    make_goals = [
        "modules",
+        "dtbs",
    ],
    makefile = "//vendor/nvidia/kernel:Makefile",
    module_outs = _TEGRA_MODULES_LIST + _TEGRA_K612_MODULES_LIST,
    pre_defconfig_fragments = ["tegra.fragment"],
-    pahole = "//common:pahole",
    strip_modules = True,
 )

@@ -264,7 +272,6 @@ alias(
    name = "kernel_tegra",
    actual = select({
        "kernel_612": ":kernel_aarch64_tegra_612",
-        "kernel_618": ":kernel_aarch64_tegra_618",
        "//conditions:default": ":kernel_aarch64_tegra",
    }),
    visibility = ["//visibility:public"],
@@ -274,7 +281,6 @@ alias(
    name = "kernel_tegra_headers",
    actual = select({
        "kernel_612": ":kernel_aarch64_tegra_612_headers",
-        "kernel_618": ":kernel_aarch64_tegra_618_headers",
        "//conditions:default": ":kernel_aarch64_tegra_headers",
    }),
    visibility = ["//visibility:public"],
@@ -284,7 +290,6 @@ alias(
    name = "kernel_tegra_uapi_headers",
    actual = select({
        "kernel_612": ":kernel_aarch64_tegra_612_uapi_headers",
-        "kernel_618": ":kernel_aarch64_tegra_618_uapi_headers",
        "//conditions:default": ":kernel_aarch64_tegra_uapi_headers",
    }),
 )
@@ -293,10 +298,6 @@ kernel_module_group(
    name = "tegra_external_modules",
    srcs = [
        "//vendor/nvidia/lineage-oot:hid-nvidia-shield-oot",
-        "//vendor/nvidia/lineage-oot:panel-jdi-58-1440-810",
-        "//vendor/nvidia/lineage-oot:rm31080a_ctrl",
-        "//vendor/nvidia/lineage-oot:rm31080a_ts",
-        "//vendor/nvidia/lineage-oot:max77620-restart",
    ],
 )

@@ -328,16 +329,6 @@ pkg_files(
        ":kernel_tegra",
        ":tegra_modules_install",
        ":uapi_headers_dist_files",
-#        "//vendor/nvidia/t18x-devicetrees:dtbs",
-#        "//vendor/nvidia/t18x-devicetrees:dtbos",
-#        "//vendor/nvidia/t18x-devicetrees:dtbo_image",
-#        "//vendor/nvidia/t18x-devicetrees:dtbo_verifications",
-#        "//vendor/nvidia/t19x-devicetrees:dtbs",
-#        "//vendor/nvidia/t19x-devicetrees:dtbos",
-#        "//vendor/nvidia/t19x-devicetrees:dtbo_image",
-#        "//vendor/nvidia/t19x-devicetrees:dtbo_verifications",
-#        "//vendor/nvidia/t21x-devicetrees:dtbs",
-        "//vendor/nvidia/nx-devicetrees:dtbs",
        # Mixed build: Additional GKI artifacts.
        "//vendor/nvidia/kernel:kernel_aarch64",
        "//vendor/nvidia/kernel:kernel_aarch64_modules",
@@ -1,22 +1,27 @@
 [
+ {
+   "repository": "android_kernel_nvidia_kernel",
+   "target_path": "kernel/platform/kernel-6.12/vendor/nvidia/kernel",
+   "branch": "lineage-23.2_6.12"
+ },
 {
   "repository": "android_kernel_nvidia_lineage-oot",
-   "target_path": "kernel/platform/kernel-mainline/vendor/nvidia/lineage-oot"
+   "target_path": "kernel/platform/kernel-6.12/vendor/nvidia/lineage-oot"
 },
 {
   "repository": "android_hardware_nvidia_t18x_lineage",
-   "target_path": "kernel/platform/kernel-mainline/vendor/nvidia/t18x-devicetrees"
+   "target_path": "kernel/platform/kernel-6.12/vendor/nvidia/tegra/dts/t18x/lineage"
 },
 {
   "repository": "android_hardware_nvidia_t19x_lineage",
-   "target_path": "kernel/platform/kernel-mainline/vendor/nvidia/t19x-devicetrees"
+   "target_path": "kernel/platform/kernel-6.12/vendor/nvidia/tegra/dts/t19x/lineage"
 },
 {
   "repository": "android_hardware_nvidia_t21x_lineage",
-   "target_path": "kernel/platform/kernel-mainline/vendor/nvidia/t21x-devicetrees"
+   "target_path": "kernel/platform/kernel-6.12/vendor/nvidia/tegra/dts/t21x/lineage"
 },
 {
   "repository": "android_hardware_nvidia_t21x_nx",
-   "target_path": "kernel/platform/kernel-mainline/vendor/nvidia/nx-devicetrees"
+   "target_path": "kernel/platform/kernel-6.12/vendor/nvidia/tegra/dts/t21x/nx"
 }
 ]
@@ -70,13 +70,14 @@ CONFIG_I2C_TEGRA=m
 CONFIG_I2C_TEGRA_BPMP=m

 # Input
-CONFIG_TOUCHSCREEN_STMFTS=m
+CONFIG_TOUCHSCREEN_FTM4=m

 # MMC
 CONFIG_MMC_SDHCI_TEGRA=m

 # MMU
 CONFIG_ARM_SMMU=m
+#CONFIG_ARM_SMMU_NVIDIA=m

 # PCI
 CONFIG_PCI_TEGRA=m
@@ -86,7 +87,6 @@ CONFIG_PCIE_TEGRA194_HOST=m
 CONFIG_MFD_MAX77620=m
 CONFIG_GPIO_MAX77620=m
 CONFIG_PINCTRL_MAX77620=m
-CONFIG_INPUT_MAX77620_ONOFF=m
 CONFIG_REGULATOR_MAX77620=m
 CONFIG_RTC_DRV_MAX77686=m

@@ -102,10 +102,6 @@ CONFIG_REGULATOR_PWM=m
 CONFIG_CHARGER_BQ24190=m
 CONFIG_BATTERY_BQ27XXX=m
 CONFIG_BATTERY_BQ27XXX_I2C=m
-CONFIG_BATTERY_MAX17042=m
-
-# Reboot2Payload
-CONFIG_SOC_TEGRA_R2P=m

 # Regulators
 CONFIG_REGULATOR_MAX77812=m
@@ -170,6 +166,10 @@ CONFIG_USB_TEGRA_XUDC=m
 CONFIG_USB_XHCI_TEGRA=m
 CONFIG_UCSI_CCG=m

+# Wifi, common
+CONFIG_CFG80211=m
+CONFIG_MAC80211=m
+
 # Wifi, broadcom
 CONFIG_WLAN_VENDOR_BROADCOM=y
 CONFIG_BRCMUTIL=m