Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

qualcommax: 6.12: cpr: update for 6.12

Browse source 
Remove op is now of a void type and strlcpy was removed.

Link: https://github.com/openwrt/openwrt/pull/18795
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Robert Marko 2025-05-09 14:07:20 +02:00
parent b152f7ba22
commit 427522d1de
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
target/linux/qualcommax/patches-6.12/0901-regulator-add-Qualcomm-CPR-regulators.patch
View file

@ -741,11 +741,11 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ return cpr3_open_loop_regulator_register(pdev, ctrl); + return cpr3_open_loop_regulator_register(pdev, ctrl);
+} +}
+ +
+static int cpr3_npu_regulator_remove(struct platform_device *pdev) +static void cpr3_npu_regulator_remove(struct platform_device *pdev)
+{ +{
+ struct cpr3_controller *ctrl = platform_get_drvdata(pdev); + struct cpr3_controller *ctrl = platform_get_drvdata(pdev);
+ +
+ return cpr3_open_loop_regulator_unregister(ctrl); + cpr3_open_loop_regulator_unregister(ctrl);
+} +}
+ +
+static struct platform_driver cpr3_npu_regulator_driver = { +static struct platform_driver cpr3_npu_regulator_driver = {
@ -8667,9 +8667,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ return 0; + return 0;
+ +
+ if (soc_version_major > 1) + if (soc_version_major > 1)
+ strlcpy(prop_name, prop_name_v2, sizeof(prop_name_v2)); + strscpy(prop_name, prop_name_v2, sizeof(prop_name_v2));
+ else + else
+ strlcpy(prop_name, prop_name_def, sizeof(prop_name_def)); + strscpy(prop_name, prop_name_def, sizeof(prop_name_def));
+ +
+ if (!of_find_property(vreg->of_node, prop_name, &len)) { + if (!of_find_property(vreg->of_node, prop_name, &len)) {
+ cpr3_err(vreg, "property %s is missing\n", prop_name); + cpr3_err(vreg, "property %s is missing\n", prop_name);
@ -8718,7 +8718,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ "qcom,cpr-cold-temp-voltage-adjustment-%d", + "qcom,cpr-cold-temp-voltage-adjustment-%d",
+ vreg->part_type); + vreg->part_type);
+ } else { + } else {
+ strlcpy(prop_str, "qcom,cpr-cold-temp-voltage-adjustment", + strscpy(prop_str, "qcom,cpr-cold-temp-voltage-adjustment",
+ sizeof(prop_str)); + sizeof(prop_str));
+ } + }
+ +
@ -8773,10 +8773,10 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ BUG_ON(soc_version_major <= 0); + BUG_ON(soc_version_major <= 0);
+ +
+ if (soc_version_major > 1) + if (soc_version_major > 1)
+ strlcpy(prop_str, "qcom,cpr-cold-temp-threshold-v2", + strscpy(prop_str, "qcom,cpr-cold-temp-threshold-v2",
+ sizeof(prop_str)); + sizeof(prop_str));
+ else + else
+ strlcpy(prop_str, "qcom,cpr-cold-temp-threshold", + strscpy(prop_str, "qcom,cpr-cold-temp-threshold",
+ sizeof(prop_str)); + sizeof(prop_str));
+ +
+ if (!of_find_property(vreg->of_node, prop_str, NULL)) { + if (!of_find_property(vreg->of_node, prop_str, NULL)) {
@ -8816,15 +8816,15 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ "qcom,cpr-cold-temp-voltage-adjustment-%d", + "qcom,cpr-cold-temp-voltage-adjustment-%d",
+ vreg->part_type); + vreg->part_type);
+ } else { + } else {
+ strlcpy(req_prop_str, "qcom,cpr-cold-temp-voltage-adjustment", + strscpy(req_prop_str, "qcom,cpr-cold-temp-voltage-adjustment",
+ sizeof(req_prop_str)); + sizeof(req_prop_str));
+ } + }
+ +
+ if (soc_version_major > 1) + if (soc_version_major > 1)
+ strlcpy(prop_str, "qcom,cpr-cold-temp-threshold-v2", + strscpy(prop_str, "qcom,cpr-cold-temp-threshold-v2",
+ sizeof(prop_str)); + sizeof(prop_str));
+ else + else
+ strlcpy(prop_str, "qcom,cpr-cold-temp-threshold", + strscpy(prop_str, "qcom,cpr-cold-temp-threshold",
+ sizeof(prop_str)); + sizeof(prop_str));
+ +
+ if (!of_find_property(vreg->of_node, req_prop_str, NULL)) { + if (!of_find_property(vreg->of_node, req_prop_str, NULL)) {
@ -8882,7 +8882,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ "qcom,cpr-open-loop-voltage-fuse-adjustment-%d", + "qcom,cpr-open-loop-voltage-fuse-adjustment-%d",
+ vreg->part_type); + vreg->part_type);
+ } else { + } else {
+ strlcpy(prop_str, "qcom,cpr-open-loop-voltage-fuse-adjustment", + strscpy(prop_str, "qcom,cpr-open-loop-voltage-fuse-adjustment",
+ sizeof(prop_str)); + sizeof(prop_str));
+ } + }
+ +
@ -11651,11 +11651,11 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ return cpr3_regulator_register(pdev, ctrl); + return cpr3_regulator_register(pdev, ctrl);
+} +}
+ +
+static int cpr4_apss_regulator_remove(struct platform_device *pdev) +static void cpr4_apss_regulator_remove(struct platform_device *pdev)
+{ +{
+ struct cpr3_controller *ctrl = platform_get_drvdata(pdev); + struct cpr3_controller *ctrl = platform_get_drvdata(pdev);
+ +
+ return cpr3_regulator_unregister(ctrl); + cpr3_regulator_unregister(ctrl);
+} +}
+ +
+static struct platform_driver cpr4_apss_regulator_driver = { +static struct platform_driver cpr4_apss_regulator_driver = {