Merge "clk: qcom: Add snapshot of OSM CPU clock DT for SDM660"

drivers/clk/qcom/Kconfig

@@ -543,3 +543,15 @@ config QM_DEBUGCC_SCUBA
 	  Support for the debug clock controller on Qualcomm Technologies, Inc
 	  SCUBA devices.
 	  Say Y if you want to support the clock measurement functionality.
+
+config CLOCK_CPU_OSM_660
+	tristate "OSM CPU Clock Controller for SDM660"
+	depends on COMMON_CLK_QCOM
+	help
+	 Support for the OSM clock controller for SDM660.
+	 Operating State Manager (OSM) is a hardware engine used by some
+	 Qualcomm Technologies, Inc. (QTI) SoCs to manage frequency and
+	 voltage scaling in hardware. OSM is capable of controlling
+	 frequency and voltage requests for multiple clusters via the
+	 existence of multiple OSM domains.
+	 Say Y if you want to support OSM clocks.

drivers/clk/qcom/Makefile

@@ -19,6 +19,7 @@ clk-qcom-$(CONFIG_QCOM_GDSC) += gdsc.o
 # Keep alphabetically sorted by config
 obj-$(CONFIG_APQ_GCC_8084) += gcc-apq8084.o
 obj-$(CONFIG_APQ_MMCC_8084) += mmcc-apq8084.o
+obj-$(CONFIG_CLOCK_CPU_OSM_660) += clk-cpu-osm-660.o
 obj-$(CONFIG_IPQ_GCC_4019) += gcc-ipq4019.o
 obj-$(CONFIG_IPQ_GCC_806X) += gcc-ipq806x.o
 obj-$(CONFIG_IPQ_GCC_8074) += gcc-ipq8074.o

include/dt-bindings/clock/qcom,cpu-osm.h

@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ *  Copyright (c) 2016, 2020, The Linux Foundation. All rights reserved.
+ */
+
+#ifndef _DT_BINDINGS_CLK_MSM_CPU_OSM_H
+#define _DT_BINDINGS_CLK_MSM_CPU_OSM_H
+
+/* CPU clock IDs */
+#define SYS_APCSAUX_CLK_GCC	0
+#define PWRCL_CLK		1
+#define PERFCL_CLK		2
+#define OSM_CLK_SRC		3
+
+#endif