tegra: support android-mainline

Change-Id: Ie9d0a1a44deb576c82045a8e0821089d2d8f68b8

BUILD.bazel

@@ -13,8 +13,8 @@ load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
 
 string_flag(
     name = "kernel_version",
-    build_setting_default = "6.18",
-    values = ["6.12", "6.18"],
+    build_setting_default = "mainline",
+    values = ["6.12", "6.18", "mainline"],
 )
 config_setting(
     name = "kernel_612",
@@ -24,6 +24,10 @@ 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
@@ -54,6 +58,7 @@ _TEGRA_MODULES_LIST = [
     "drivers/gpu/drm/display/drm_display_helper.ko",
     "drivers/gpu/drm/display/drm_dp_aux_bus.ko",
     "drivers/gpu/drm/nouveau/nouveau.ko",
+    "drivers/gpu/drm/panel/panel-nx-dsi.ko",
     "drivers/gpu/drm/panel/panel-simple.ko",
     "drivers/gpu/drm/scheduler/gpu-sched.ko",
     "drivers/gpu/drm/tegra/tegra-drm.ko",
@@ -76,6 +81,8 @@ _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/iommu/arm/arm-smmu/arm_smmu.ko",
     "drivers/media/cec/platform/tegra/tegra_cec.ko",
     "drivers/mfd/max77620.ko",
@@ -119,6 +126,7 @@ _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",
@@ -126,6 +134,7 @@ _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",
@@ -133,11 +142,13 @@ _TEGRA_MODULES_LIST = [
     "drivers/tty/serial/serial-tegra.ko",
     "drivers/usb/common/usb-conn-gpio.ko",
     "drivers/usb/gadget/udc/tegra-xudc.ko",
+    "drivers/usb/typec/bm92txx.ko",
     "drivers/usb/typec/ucsi/ucsi_ccg.ko",
     "drivers/usb/host/xhci-tegra.ko",
     "drivers/video/backlight/pwm_bl.ko",
     "sound/soc/codecs/snd-soc-rl6231.ko",
     "sound/soc/codecs/snd-soc-rt5659.ko",
+    "sound/soc/codecs/snd-soc-rt5640.ko",
     "sound/soc/generic/snd-soc-audio-graph-card.ko",
     "sound/soc/generic/snd-soc-simple-card-utils.ko",
     "sound/soc/tegra/snd-soc-tegra-audio-graph-card.ko",
@@ -176,12 +187,43 @@ _TEGRA_K618_MODULES_LIST = [
     "sound/hda/core/snd-hda-core.ko",
 ]
 
+_TEGRA_MAINLINE_MODULES_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",
+]
+
 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 = [],
+    arch = "arm64",
+
     # Enable mixed build.
     base_kernel = "//vendor/nvidia/kernel:kernel_aarch64",
     collect_unstripped_modules = True,
@@ -193,6 +235,7 @@ kernel_build(
     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,
 )
 
@@ -213,6 +256,7 @@ kernel_build(
     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,
 )
 
@@ -220,6 +264,7 @@ 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"],
@@ -229,6 +274,7 @@ 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"],
@@ -238,6 +284,7 @@ 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",
     }),
 )
@@ -281,15 +328,15 @@ 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/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",

lineage.dependencies

@@ -1,27 +1,22 @@
 [
- {
-   "repository": "android_kernel_nvidia_kernel",
-   "target_path": "kernel/platform/kernel-6.18/vendor/nvidia/kernel",
-   "branch": "lineage-24.0_6.18"
- },
  {
    "repository": "android_kernel_nvidia_lineage-oot",
-   "target_path": "kernel/platform/kernel-6.18/vendor/nvidia/lineage-oot"
+   "target_path": "kernel/platform/kernel-mainline/vendor/nvidia/lineage-oot"
  },
  {
    "repository": "android_hardware_nvidia_t18x_lineage",
-   "target_path": "kernel/platform/kernel-6.18/vendor/nvidia/t18x-devicetrees"
+   "target_path": "kernel/platform/kernel-mainline/vendor/nvidia/t18x-devicetrees"
  },
  {
    "repository": "android_hardware_nvidia_t19x_lineage",
-   "target_path": "kernel/platform/kernel-6.18/vendor/nvidia/t19x-devicetrees"
+   "target_path": "kernel/platform/kernel-mainline/vendor/nvidia/t19x-devicetrees"
  },
  {
    "repository": "android_hardware_nvidia_t21x_lineage",
-   "target_path": "kernel/platform/kernel-6.18/vendor/nvidia/t21x-devicetrees"
+   "target_path": "kernel/platform/kernel-mainline/vendor/nvidia/t21x-devicetrees"
  },
  {
    "repository": "android_hardware_nvidia_t21x_nx",
-   "target_path": "kernel/platform/kernel-6.18/vendor/nvidia/nx-devicetrees"
+   "target_path": "kernel/platform/kernel-mainline/vendor/nvidia/nx-devicetrees"
  }
 ]

tegra.fragment

@@ -44,6 +44,7 @@ CONFIG_DRM_TEGRA=m
 CONFIG_DRM_TEGRA_STAGING=y
 CONFIG_IOMMU_IOVA=y
 CONFIG_DRM_PANEL_SIMPLE=m
+CONFIG_DRM_PANEL_NX_DSI=m
 CONFIG_BACKLIGHT_PWM=m
 # CONFIG_DRM_I2C_CH7006 is not set
 # CONFIG_DRM_I2C_SIL164 is not set
@@ -68,6 +69,9 @@ CONFIG_I2C_MUX=m
 CONFIG_I2C_TEGRA=m
 CONFIG_I2C_TEGRA_BPMP=m
 
+# Input
+CONFIG_TOUCHSCREEN_STMFTS=m
+
 # MMC
 CONFIG_MMC_SDHCI_TEGRA=m
 
@@ -82,6 +86,7 @@ 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
 
@@ -97,6 +102,10 @@ 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
@@ -139,6 +148,7 @@ CONFIG_SND_SOC_TEGRA210_OPE=m
 CONFIG_SND_SOC_TEGRA210_SFC=m
 CONFIG_SND_SOC_TEGRA186_ASRC=m
 CONFIG_SND_SOC_TEGRA186_DSPK=m
+CONFIG_SND_SOC_RT5640=m
 CONFIG_SND_SOC_RT5659=m
 # CONFIG_SND_HDA_CODEC_HDMI_ATI is not set
 # CONFIG_SND_HDA_CODEC_HDMI_INTEL is not set
@@ -155,6 +165,7 @@ CONFIG_MTD_BLOCK=m
 
 # USB
 CONFIG_PHY_TEGRA_XUSB=m
+CONFIG_TYPEC_BM92TXX=m
 CONFIG_USB_TEGRA_XUDC=m
 CONFIG_USB_XHCI_TEGRA=m
 CONFIG_UCSI_CCG=m