From 17e5be797ad9ad33752b260f958d3d3876fef3b6 Mon Sep 17 00:00:00 2001 From: Navya Vemula Date: Tue, 23 Jul 2024 12:11:53 +0530 Subject: [PATCH 1/2] defconfig: Enable pinctrl config for Seraph SoC Add pinctrl config to support pin control in Seraph SoC. Add seraph pinctrl module to list of first stage module list. Add dependent QCOM_SCM config support and SCM module for seraph SoC. Change-Id: I9703ff9b04eb6646008f52226b600e8e90470cb7 Signed-off-by: Navya Vemula --- arch/arm64/configs/vendor/seraph_GKI.config | 3 +++ modules.list.msm.seraph | 3 +++ seraph.bzl | 3 +++ 3 files changed, 9 insertions(+) diff --git a/arch/arm64/configs/vendor/seraph_GKI.config b/arch/arm64/configs/vendor/seraph_GKI.config index 96ca36750dce..8aac24360086 100644 --- a/arch/arm64/configs/vendor/seraph_GKI.config +++ b/arch/arm64/configs/vendor/seraph_GKI.config @@ -2,3 +2,6 @@ CONFIG_ARCH_QCOM=y CONFIG_ARCH_SERAPH=y CONFIG_LOCALVERSION="-gki" # CONFIG_MODULE_SIG_ALL is not set +CONFIG_PINCTRL_MSM=m +CONFIG_PINCTRL_SERAPH=m +CONFIG_QCOM_SCM=m diff --git a/modules.list.msm.seraph b/modules.list.msm.seraph index 5f22fd052ba6..9da9b46358e7 100644 --- a/modules.list.msm.seraph +++ b/modules.list.msm.seraph @@ -1,2 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only # Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved. +qcom-scm.ko +pinctrl-msm.ko +pinctrl-seraph.ko diff --git a/seraph.bzl b/seraph.bzl index 5f1e2ec93d8f..f946b1cfafaa 100644 --- a/seraph.bzl +++ b/seraph.bzl @@ -8,6 +8,9 @@ def define_seraph(): _seraph_in_tree_modules = [ # keep sorted # TODO: Need to add GKI modules + "drivers/firmware/qcom-scm.ko", + "drivers/pinctrl/qcom/pinctrl-msm.ko", + "drivers/pinctrl/qcom/pinctrl-seraph.ko", ] _seraph_consolidate_in_tree_modules = _seraph_in_tree_modules + [ From e6ac656a861f26728f7b30bbe208413f9168579d Mon Sep 17 00:00:00 2001 From: Navya Vemula Date: Tue, 23 Jul 2024 15:44:40 +0530 Subject: [PATCH 2/2] arm64: defconfig: Enable socinfo and smem drivers for Seraph SoC Enable socinfo and dependent drivers for Seraph SoC. Add socinfo and dependency modules in first stage list. Change-Id: I80937e6ecf97e13c5e980434e52f4acd6b45c3d3 Signed-off-by: Navya Vemula --- arch/arm64/configs/vendor/seraph_GKI.config | 3 +++ modules.list.msm.seraph | 3 +++ seraph.bzl | 3 +++ 3 files changed, 9 insertions(+) diff --git a/arch/arm64/configs/vendor/seraph_GKI.config b/arch/arm64/configs/vendor/seraph_GKI.config index 8aac24360086..16f4a334c1b8 100644 --- a/arch/arm64/configs/vendor/seraph_GKI.config +++ b/arch/arm64/configs/vendor/seraph_GKI.config @@ -1,7 +1,10 @@ CONFIG_ARCH_QCOM=y CONFIG_ARCH_SERAPH=y +CONFIG_HWSPINLOCK_QCOM=m CONFIG_LOCALVERSION="-gki" # CONFIG_MODULE_SIG_ALL is not set CONFIG_PINCTRL_MSM=m CONFIG_PINCTRL_SERAPH=m CONFIG_QCOM_SCM=m +CONFIG_QCOM_SMEM=m +CONFIG_QCOM_SOCINFO=m diff --git a/modules.list.msm.seraph b/modules.list.msm.seraph index 9da9b46358e7..9acba4fd4cfc 100644 --- a/modules.list.msm.seraph +++ b/modules.list.msm.seraph @@ -3,3 +3,6 @@ qcom-scm.ko pinctrl-msm.ko pinctrl-seraph.ko +qcom_hwspinlock.ko +smem.ko +socinfo.ko diff --git a/seraph.bzl b/seraph.bzl index f946b1cfafaa..bf93f003608c 100644 --- a/seraph.bzl +++ b/seraph.bzl @@ -9,8 +9,11 @@ def define_seraph(): # keep sorted # TODO: Need to add GKI modules "drivers/firmware/qcom-scm.ko", + "drivers/hwspinlock/qcom_hwspinlock.ko", "drivers/pinctrl/qcom/pinctrl-msm.ko", "drivers/pinctrl/qcom/pinctrl-seraph.ko", + "drivers/soc/qcom/smem.ko", + "drivers/soc/qcom/socinfo.ko", ] _seraph_consolidate_in_tree_modules = _seraph_in_tree_modules + [