forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2023-12-09 b22da3d8526a935aa31e086e63f60ff3246cb61c 
 kernel/drivers/clk/qcom/mmcc-msm8996.c
....@@ -1,14 +1,6 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*x
23  * Copyright (c) 2015, The Linux Foundation. All rights reserved.
3
- *
4
- * This software is licensed under the terms of the GNU General Public
5
- * License version 2, as published by the Free Software Foundation, and
6
- * may be copied, distributed, and modified under those terms.
7
- *
8
- * This program is distributed in the hope that it will be useful,
9
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
10
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
- * GNU General Public License for more details.
124  */
135 
146 #include <linux/kernel.h>
....@@ -3072,7 +3064,9 @@
30723064 		.name = "gpu_gx",
30733065 	},
30743066 	.pwrsts = PWRSTS_OFF_ON,
3067
+	.parent = &gpu_gdsc.pd,
30753068 	.flags = CLAMP_IO,
3069
+	.supply = "vdd-gfx",
30763070 };
30773071 
30783072 static struct clk_regmap *mmcc_msm8996_clocks[] = {
....@@ -3347,6 +3341,8 @@
33473341 	.num_resets = ARRAY_SIZE(mmcc_msm8996_resets),
33483342 	.gdscs = mmcc_msm8996_gdscs,
33493343 	.num_gdscs = ARRAY_SIZE(mmcc_msm8996_gdscs),
3344
+	.clk_hws = mmcc_msm8996_hws,
3345
+	.num_clk_hws = ARRAY_SIZE(mmcc_msm8996_hws),
33503346 };
33513347 
33523348 static const struct of_device_id mmcc_msm8996_match_table[] = {
....@@ -3357,8 +3353,6 @@
33573353 
33583354 static int mmcc_msm8996_probe(struct platform_device *pdev)
33593355 {
3360
-	struct device *dev = &pdev->dev;
3361
-	int i, ret;
33623356 	struct regmap *regmap;
33633357 
33643358 	regmap = qcom_cc_map(pdev, &mmcc_msm8996_desc);
....@@ -3369,12 +3363,6 @@
33693363 	regmap_update_bits(regmap, 0x50d8, BIT(31), 0);
33703364 	/* Disable the NoC FSM for mmss_mmagic_cfg_ahb_clk */
33713365 	regmap_update_bits(regmap, 0x5054, BIT(15), 0);
3372
-
3373
-	for (i = 0; i < ARRAY_SIZE(mmcc_msm8996_hws); i++) {
3374
-		ret = devm_clk_hw_register(dev, mmcc_msm8996_hws[i]);
3375
-		if (ret)
3376
-			return ret;
3377
-	}
33783366 
33793367 	return qcom_cc_really_probe(pdev, &mmcc_msm8996_desc, regmap);
33803368 }