From 530cb2a9f0490661c52e641ca26773d7b9a79cbd Mon Sep 17 00:00:00 2001
From: Ramji Jiyani <ramjiyani@google.com>
Date: Thu, 27 Jul 2023 20:41:58 +0000
Subject: [PATCH] ANDROID: GKI: Convert PPS & PTP Clocks as protected modules

Convert PPS and PTP Clocks configs to protected GKI modules
from in-built.

Configs being set to modules:

- CONFIG_PPS: Pulse Per Second core (GPS Antennae related)

These are required to be modules for PPS core to be module:

- CONFIG_PTP_1588_CLOCK: PTP clock support

- CONFIG_PTP_1588_CLOCK_OPTIONAL: Drivers that can optionally
use the PTP_1588_CLOCK framework

- CONFIG_PTP_1588_CLOCK_KVM: KVM virtual PTP clock

Bug: 284024494
Test: TH
Change-Id: Ie42f95b3462980a725390a470490b558329e6963
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
---
 arch/arm64/configs/gki_defconfig | 1 +
 arch/riscv/configs/gki_defconfig | 1 +
 arch/x86/configs/gki_defconfig   | 1 +
 modules.bzl                      | 4 ++++
 4 files changed, 7 insertions(+)

diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 25f6faabf017..2267a5bc4cca 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -396,6 +396,7 @@ CONFIG_I3C=y
 CONFIG_SPI=y
 CONFIG_SPI_MEM=y
 # CONFIG_SPMI_MSM_PMIC_ARB is not set
+CONFIG_PTP_1588_CLOCK=m
 # CONFIG_PINCTRL_SUN8I_H3_R is not set
 # CONFIG_PINCTRL_SUN50I_A64 is not set
 # CONFIG_PINCTRL_SUN50I_A64_R is not set
diff --git a/arch/riscv/configs/gki_defconfig b/arch/riscv/configs/gki_defconfig
index ad67c343f797..7d9db5dec740 100644
--- a/arch/riscv/configs/gki_defconfig
+++ b/arch/riscv/configs/gki_defconfig
@@ -361,6 +361,7 @@ CONFIG_HW_RANDOM=y
 CONFIG_I3C=y
 CONFIG_SPI=y
 CONFIG_SPI_MEM=y
+CONFIG_PTP_1588_CLOCK=m
 CONFIG_PINCTRL=y
 CONFIG_GPIO_GENERIC_PLATFORM=y
 CONFIG_POWER_RESET=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 3abeca0f7025..62c9ba4152b4 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -377,6 +377,7 @@ CONFIG_HPET=y
 CONFIG_I3C=y
 CONFIG_SPI=y
 CONFIG_SPI_MEM=y
+CONFIG_PTP_1588_CLOCK=m
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_GENERIC_PLATFORM=y
 # CONFIG_HWMON is not set
diff --git a/modules.bzl b/modules.bzl
index b705a895ecf9..ef6c2a8bfd92 100644
--- a/modules.bzl
+++ b/modules.bzl
@@ -36,6 +36,8 @@ _COMMON_GKI_MODULES_LIST = [
     "drivers/net/usb/rtl8150.ko",
     "drivers/net/usb/usbnet.ko",
     "drivers/net/wwan/wwan.ko",
+    "drivers/pps/pps_core.ko",
+    "drivers/ptp/ptp.ko",
     "drivers/usb/class/cdc-acm.ko",
     "drivers/usb/serial/ftdi_sio.ko",
     "drivers/usb/serial/usbserial.ko",
@@ -77,6 +79,7 @@ COMMON_GKI_MODULES_LIST = _COMMON_GKI_MODULES_LIST
 
 _ARM64_GKI_MODULES_LIST = [
     # keep sorted
+    "drivers/ptp/ptp_kvm.ko",
 ]
 
 _RISCV64_GKI_MODULES_LIST = [
@@ -85,6 +88,7 @@ _RISCV64_GKI_MODULES_LIST = [
 
 _X86_64_GKI_MODULES_LIST = [
     # keep sorted
+    "drivers/ptp/ptp_kvm.ko",
 ]
 
 # buildifier: disable=unnamed-macro