him411/openwrt-6.x
1
0
Fork 0
mirror of https://github.com/LiBwrt-op/openwrt-6.x.git synced 2025-12-16 16:57:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: use of_property_present

Browse Source 
Easier to read and reason about.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/19951
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Rosen Penev 2025-09-03 19:01:49 -07:00 committed by Hauke Mehrtens
parent 8d2d49195f
commit c9e7f32c4c
8 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/kernel/mac80211/patches/rt2x00/602-04-wifi-rt2x00-Support-EEPROM-swap-binding.patch
View File

@ -23,7 +23,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
+ size_t len = rt2x00dev->ops->eeprom_size; + size_t len = rt2x00dev->ops->eeprom_size;
+ int i; + int i;
+ +
+ if (!of_find_property(np, "ralink,eeprom-swap", NULL)) + if (!of_property_present(np, "ralink,eeprom-swap"))
+ return; + return;
+ +
+ for (i = 0; i < len / sizeof(u16); i++) + for (i = 0; i < len / sizeof(u16); i++)

4
target/linux/generic/pending-6.12/400-mtd-mtdsplit-support.patch
View File

@ -198,7 +198,7 @@ Subject: [PATCH] mtd: mtdsplit support
+ if (rootfs_found) + if (rootfs_found)
+ return; + return;
+ +
+ if (of_find_property(mtd_get_of_node(part), "linux,rootfs", NULL) || + if (of_property_present(mtd_get_of_node(part), "linux,rootfs") ||
+ !strcmp(part->name, "rootfs")) { + !strcmp(part->name, "rootfs")) {
+ run_parsers_by_type(part, MTD_PARSER_TYPE_ROOTFS); + run_parsers_by_type(part, MTD_PARSER_TYPE_ROOTFS);
+ +
@ -207,7 +207,7 @@ Subject: [PATCH] mtd: mtdsplit support
+ +
+ if (IS_ENABLED(CONFIG_MTD_SPLIT_FIRMWARE) && + if (IS_ENABLED(CONFIG_MTD_SPLIT_FIRMWARE) &&
+ !strcmp(part->name, SPLIT_FIRMWARE_NAME) && + !strcmp(part->name, SPLIT_FIRMWARE_NAME) &&
+ !of_find_property(mtd_get_of_node(part), "compatible", NULL)) + !of_property_present(mtd_get_of_node(part), "compatible"))
+ split_firmware(master, part); + split_firmware(master, part);
+} +}
+ +

2
target/linux/lantiq/patches-6.12/020-MTD-lantiq-handle-NO_XIP-on-cfi0001-flash.patch
View File

@ -15,7 +15,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
return -ENOMEM; return -ENOMEM;
- ltq_mtd->map->phys = ltq_mtd->res->start; - ltq_mtd->map->phys = ltq_mtd->res->start;
+ if (of_find_property(pdev->dev.of_node, "lantiq,noxip", NULL)) + if (of_property_present(pdev->dev.of_node, "lantiq,noxip"))
+ ltq_mtd->map->phys = NO_XIP; + ltq_mtd->map->phys = NO_XIP;
+ else + else
+ ltq_mtd->map->phys = ltq_mtd->res->start; + ltq_mtd->map->phys = ltq_mtd->res->start;

2
target/linux/lantiq/patches-6.12/035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch
View File

@ -118,7 +118,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ return -ENODEV; + return -ENODEV;
+ } + }
+ +
+ if (of_find_property(np, "ath,eep-swap", NULL)) + if (of_property_present(np, "ath,eep-swap"))
+ for (i = 0; i < ATH5K_PLAT_EEP_MAX_WORDS; i++) + for (i = 0; i < ATH5K_PLAT_EEP_MAX_WORDS; i++)
+ ath5k_pdata.eeprom_data[i] = swab16(ath5k_pdata.eeprom_data[i]); + ath5k_pdata.eeprom_data[i] = swab16(ath5k_pdata.eeprom_data[i]);
+ +

4
target/linux/lantiq/patches-6.12/160-owrt-lantiq-multiple-flash.patch
View File

@ -96,7 +96,7 @@ Signed-off-by: Maikel Bloemendal <openwrt@maikelenyvonne.nl>
- if (!ltq_mtd->map) - if (!ltq_mtd->map)
- return -ENOMEM; - return -ENOMEM;
- -
- if (of_find_property(pdev->dev.of_node, "lantiq,noxip", NULL)) - if (of_property_present(pdev->dev.of_node, "lantiq,noxip"))
- ltq_mtd->map->phys = NO_XIP; - ltq_mtd->map->phys = NO_XIP;
- else - else
- ltq_mtd->map->phys = ltq_mtd->res->start; - ltq_mtd->map->phys = ltq_mtd->res->start;
@ -137,7 +137,7 @@ Signed-off-by: Maikel Bloemendal <openwrt@maikelenyvonne.nl>
+ ltq_mtd->map[i].copy_from = ltq_copy_from; + ltq_mtd->map[i].copy_from = ltq_copy_from;
+ ltq_mtd->map[i].copy_to = ltq_copy_to; + ltq_mtd->map[i].copy_to = ltq_copy_to;
+ +
+ if (of_find_property(pdev->dev.of_node, "lantiq,noxip", NULL)) + if (of_property_present(pdev->dev.of_node, "lantiq,noxip"))
+ ltq_mtd->map[i].phys = NO_XIP; + ltq_mtd->map[i].phys = NO_XIP;
+ else + else
+ ltq_mtd->map[i].phys = pdev->resource[i].start; + ltq_mtd->map[i].phys = pdev->resource[i].start;

2
target/linux/mediatek/patches-6.12/200-phy-phy-mtk-tphy-Add-hifsys-support.patch
View File

@ -51,7 +51,7 @@ Subject: [PATCH] phy: phy-mtk-tphy: Add hifsys-support
&tphy->src_coef); &tphy->src_coef);
} }
+ if (of_find_property(np, "mediatek,phy-switch", NULL)) { + if (of_property_present(np, "mediatek,phy-switch")) {
+ tphy->hif = syscon_regmap_lookup_by_phandle(np, + tphy->hif = syscon_regmap_lookup_by_phandle(np,
+ "mediatek,phy-switch"); + "mediatek,phy-switch");
+ if (IS_ERR(tphy->hif)) { + if (IS_ERR(tphy->hif)) {

8
target/linux/qualcommax/patches-6.12/0900-power-Add-Qualcomm-APM.patch
View File

@ -321,7 +321,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ regval = readl_relaxed(ctrl->reg_base + MSM8953_APM_DLY_CNTR); + regval = readl_relaxed(ctrl->reg_base + MSM8953_APM_DLY_CNTR);
+ val = regval; + val = regval;
+ +
+ if (of_find_property(dev->of_node, "qcom,apm-post-halt-delay", NULL)) { + if (of_property_present(dev->of_node, "qcom,apm-post-halt-delay")) {
+ rc = of_property_read_u32(dev->of_node, + rc = of_property_read_u32(dev->of_node,
+ "qcom,apm-post-halt-delay", &delay_counter); + "qcom,apm-post-halt-delay", &delay_counter);
+ if (rc < 0) { + if (rc < 0) {
@ -335,7 +335,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ & APM_CTL_POST_HALT_DLY_MASK; + & APM_CTL_POST_HALT_DLY_MASK;
+ } + }
+ +
+ if (of_find_property(dev->of_node, "qcom,apm-halt-clk-delay", NULL)) { + if (of_property_present(dev->of_node, "qcom,apm-halt-clk-delay")) {
+ rc = of_property_read_u32(dev->of_node, + rc = of_property_read_u32(dev->of_node,
+ "qcom,apm-halt-clk-delay", &delay_counter); + "qcom,apm-halt-clk-delay", &delay_counter);
+ if (rc < 0) { + if (rc < 0) {
@ -349,7 +349,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ & APM_CTL_HALT_CLK_DLY_MASK; + & APM_CTL_HALT_CLK_DLY_MASK;
+ } + }
+ +
+ if (of_find_property(dev->of_node, "qcom,apm-resume-clk-delay", NULL)) { + if (of_property_present(dev->of_node, "qcom,apm-resume-clk-delay")) {
+ rc = of_property_read_u32(dev->of_node, + rc = of_property_read_u32(dev->of_node,
+ "qcom,apm-resume-clk-delay", &delay_counter); + "qcom,apm-resume-clk-delay", &delay_counter);
+ if (rc < 0) { + if (rc < 0) {
@ -363,7 +363,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ & APM_CTL_RESUME_CLK_DLY_MASK; + & APM_CTL_RESUME_CLK_DLY_MASK;
+ } + }
+ +
+ if (of_find_property(dev->of_node, "qcom,apm-sel-switch-delay", NULL)) { + if (of_property_present(dev->of_node, "qcom,apm-sel-switch-delay")) {
+ rc = of_property_read_u32(dev->of_node, + rc = of_property_read_u32(dev->of_node,
+ "qcom,apm-sel-switch-delay", &delay_counter); + "qcom,apm-sel-switch-delay", &delay_counter);
+ if (rc < 0) { + if (rc < 0) {

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

@ -7883,7 +7883,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ } + }
+ +
+ /* Load optional system-supply voltages */ + /* Load optional system-supply voltages */
+ if (of_find_property(vreg->of_node, "qcom,system-voltage", NULL)) { + if (of_property_present(vreg->of_node, "qcom,system-voltage")) {
+ rc = cpr3_parse_corner_array_property(vreg, + rc = cpr3_parse_corner_array_property(vreg,
+ "qcom,system-voltage", 1, temp); + "qcom,system-voltage", 1, temp);
+ if (rc) + if (rc)
@ -7959,8 +7959,8 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ } + }
+ } + }
+ +
+ if (of_find_property(vreg->of_node, + if (of_property_present(vreg->of_node,
+ "qcom,allow-aging-voltage-adjustment", NULL)) { + "qcom,allow-aging-voltage-adjustment")) {
+ rc = cpr3_parse_array_property(vreg, + rc = cpr3_parse_array_property(vreg,
+ "qcom,allow-aging-voltage-adjustment", + "qcom,allow-aging-voltage-adjustment",
+ 1, &aging_allowed); + 1, &aging_allowed);
@ -7970,8 +7970,8 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ vreg->aging_allowed = aging_allowed; + vreg->aging_allowed = aging_allowed;
+ } + }
+ +
+ if (of_find_property(vreg->of_node, + if (of_property_present(vreg->of_node,
+ "qcom,allow-aging-open-loop-voltage-adjustment", NULL)) { + "qcom,allow-aging-open-loop-voltage-adjustment")) {
+ rc = cpr3_parse_array_property(vreg, + rc = cpr3_parse_array_property(vreg,
+ "qcom,allow-aging-open-loop-voltage-adjustment", + "qcom,allow-aging-open-loop-voltage-adjustment",
+ 1, &aging_allowed); + 1, &aging_allowed);
@ -8009,8 +8009,8 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ } + }
+ vreg->aging_corner -= CPR3_CORNER_OFFSET; + vreg->aging_corner -= CPR3_CORNER_OFFSET;
+ +
+ if (of_find_property(vreg->of_node, "qcom,cpr-aging-derate", + if (of_property_present(vreg->of_node, "qcom,cpr-aging-derate",
+ NULL)) { + )) {
+ rc = cpr3_parse_corner_array_property(vreg, + rc = cpr3_parse_corner_array_property(vreg,
+ "qcom,cpr-aging-derate", 1, temp); + "qcom,cpr-aging-derate", 1, temp);
+ if (rc) + if (rc)
@ -8152,7 +8152,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ int i, cpu; + int i, cpu;
+ int len = 0; + int len = 0;
+ +
+ if (!of_find_property(ctrl->dev->of_node, "qcom,cpr-interrupt-affinity", + if (!of_property_present(ctrl->dev->of_node, "qcom,cpr-interrupt-affinity",
+ &len)) { + &len)) {
+ /* No IRQ affinity required */ + /* No IRQ affinity required */
+ return 0; + return 0;
@ -8199,7 +8199,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ return -EINVAL; + return -EINVAL;
+ } + }
+ +
+ if (!of_find_property(node, "qcom,cpr-panic-reg-name-list", NULL)) { + if (!of_property_present(node, "qcom,cpr-panic-reg-name-list")) {
+ cpr3_err(ctrl, "property qcom,cpr-panic-reg-name-list not specified\n"); + cpr3_err(ctrl, "property qcom,cpr-panic-reg-name-list not specified\n");
+ return -EINVAL; + return -EINVAL;
+ } + }
@ -8348,7 +8348,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ return rc; + return rc;
+ } + }
+ +
+ if (of_find_property(ctrl->dev->of_node, "clock-names", NULL)) { + if (of_property_present(ctrl->dev->of_node, "clock-names")) {
+ ctrl->core_clk = devm_clk_get(ctrl->dev, "core_clk"); + ctrl->core_clk = devm_clk_get(ctrl->dev, "core_clk");
+ if (IS_ERR(ctrl->core_clk)) { + if (IS_ERR(ctrl->core_clk)) {
+ rc = PTR_ERR(ctrl->core_clk); + rc = PTR_ERR(ctrl->core_clk);
@ -8363,7 +8363,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ if (rc) + if (rc)
+ return rc; + return rc;
+ +
+ if (of_find_property(ctrl->dev->of_node, "vdd-supply", NULL)) { + if (of_property_present(ctrl->dev->of_node, "vdd-supply")) {
+ ctrl->vdd_regulator = devm_regulator_get(ctrl->dev, "vdd"); + ctrl->vdd_regulator = devm_regulator_get(ctrl->dev, "vdd");
+ if (IS_ERR(ctrl->vdd_regulator)) { + if (IS_ERR(ctrl->vdd_regulator)) {
+ rc = PTR_ERR(ctrl->vdd_regulator); + rc = PTR_ERR(ctrl->vdd_regulator);
@ -8429,7 +8429,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ return -EINVAL; + return -EINVAL;
+ } + }
+ +
+ if (of_find_property(ctrl->dev->of_node, "vdd-supply", NULL)) { + if (of_property_present(ctrl->dev->of_node, "vdd-supply")) {
+ ctrl->vdd_regulator = devm_regulator_get(ctrl->dev, "vdd"); + ctrl->vdd_regulator = devm_regulator_get(ctrl->dev, "vdd");
+ if (IS_ERR(ctrl->vdd_regulator)) { + if (IS_ERR(ctrl->vdd_regulator)) {
+ rc = PTR_ERR(ctrl->vdd_regulator); + rc = PTR_ERR(ctrl->vdd_regulator);
@ -8547,7 +8547,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ u32 *floor_range; + u32 *floor_range;
+ int rc = 0; + int rc = 0;
+ +
+ if (!of_find_property(vreg->of_node, prop, NULL)) + if (!of_property_present(vreg->of_node, prop))
+ goto enforce_monotonicity; + goto enforce_monotonicity;
+ +
+ floor_range = kcalloc(vreg->corner_count, sizeof(*floor_range), + floor_range = kcalloc(vreg->corner_count, sizeof(*floor_range),
@ -8722,7 +8722,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ sizeof(prop_str)); + sizeof(prop_str));
+ } + }
+ +
+ if (!of_find_property(vreg->of_node, prop_str, NULL)) { + if (!of_property_present(vreg->of_node, prop_str)) {
+ /* No adjustment required. */ + /* No adjustment required. */
+ cpr3_info(vreg, "No cold temperature adjustment required.\n"); + cpr3_info(vreg, "No cold temperature adjustment required.\n");
+ return 0; + return 0;
@ -8779,7 +8779,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ strscpy(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_property_present(vreg->of_node, prop_str)) {
+ /* No adjustment required. */ + /* No adjustment required. */
+ return false; + return false;
+ } else + } else
@ -8827,13 +8827,13 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ strscpy(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_property_present(vreg->of_node, req_prop_str)) {
+ /* No adjustment required. */ + /* No adjustment required. */
+ cpr3_info(vreg, "Cold temperature adjustment not required.\n"); + cpr3_info(vreg, "Cold temperature adjustment not required.\n");
+ return 0; + return 0;
+ } + }
+ +
+ if (!of_find_property(vreg->of_node, prop_str, NULL)) { + if (!of_property_present(vreg->of_node, prop_str)) {
+ /* No adjustment required. */ + /* No adjustment required. */
+ cpr3_err(vreg, "Missing %s required for %s\n", + cpr3_err(vreg, "Missing %s required for %s\n",
+ prop_str, req_prop_str); + prop_str, req_prop_str);
@ -8886,7 +8886,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ sizeof(prop_str)); + sizeof(prop_str));
+ } + }
+ +
+ if (!of_find_property(vreg->of_node, prop_str, NULL)) { + if (!of_property_present(vreg->of_node, prop_str)) {
+ /* No adjustment required. */ + /* No adjustment required. */
+ return 0; + return 0;
+ } + }
@ -8930,8 +8930,8 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ int i, rc, prev_volt, min_volt; + int i, rc, prev_volt, min_volt;
+ int *volt_adjust, *volt_diff; + int *volt_adjust, *volt_diff;
+ +
+ if (!of_find_property(vreg->of_node, + if (!of_property_present(vreg->of_node,
+ "qcom,cpr-open-loop-voltage-adjustment", NULL)) { + "qcom,cpr-open-loop-voltage-adjustment")) {
+ /* No adjustment required. */ + /* No adjustment required. */
+ return 0; + return 0;
+ } + }
@ -8961,8 +8961,8 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ } + }
+ } + }
+ +
+ if (of_find_property(vreg->of_node, + if (of_property_present(vreg->of_node,
+ "qcom,cpr-open-loop-voltage-min-diff", NULL)) { + "qcom,cpr-open-loop-voltage-min-diff")) {
+ rc = cpr3_parse_corner_array_property(vreg, + rc = cpr3_parse_corner_array_property(vreg,
+ "qcom,cpr-open-loop-voltage-min-diff", 1, volt_diff); + "qcom,cpr-open-loop-voltage-min-diff", 1, volt_diff);
+ if (rc) { + if (rc) {
@ -9089,12 +9089,12 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ char volt_fuse_adj[] = "qcom,cpr-closed-loop-voltage-fuse-adjustment"; + char volt_fuse_adj[] = "qcom,cpr-closed-loop-voltage-fuse-adjustment";
+ char ro_scaling[] = "qcom,cpr-ro-scaling-factor"; + char ro_scaling[] = "qcom,cpr-ro-scaling-factor";
+ +
+ if (!of_find_property(vreg->of_node, volt_adj, NULL) + if (!of_property_present(vreg->of_node, volt_adj)
+ && !of_find_property(vreg->of_node, volt_fuse_adj, NULL) + && !of_property_present(vreg->of_node, volt_fuse_adj)
+ && !vreg->aging_allowed) { + && !vreg->aging_allowed) {
+ /* No adjustment required. */ + /* No adjustment required. */
+ return 0; + return 0;
+ } else if (!of_find_property(vreg->of_node, ro_scaling, NULL)) { + } else if (!of_property_present(vreg->of_node, ro_scaling)) {
+ cpr3_err(vreg, "Missing %s required for closed-loop voltage adjustment.\n", + cpr3_err(vreg, "Missing %s required for closed-loop voltage adjustment.\n",
+ ro_scaling); + ro_scaling);
+ return -EINVAL; + return -EINVAL;
@ -9121,7 +9121,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ &ro_all_scale[vreg->corner[i].cpr_fuse_corner * CPR3_RO_COUNT], + &ro_all_scale[vreg->corner[i].cpr_fuse_corner * CPR3_RO_COUNT],
+ sizeof(*ro_all_scale) * CPR3_RO_COUNT); + sizeof(*ro_all_scale) * CPR3_RO_COUNT);
+ +
+ if (of_find_property(vreg->of_node, volt_fuse_adj, NULL)) { + if (of_property_present(vreg->of_node, volt_fuse_adj)) {
+ rc = cpr3_parse_array_property(vreg, volt_fuse_adj, + rc = cpr3_parse_array_property(vreg, volt_fuse_adj,
+ vreg->fuse_corner_count, volt_adjust_fuse); + vreg->fuse_corner_count, volt_adjust_fuse);
+ if (rc) { + if (rc) {
@ -9131,7 +9131,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ } + }
+ } + }
+ +
+ if (of_find_property(vreg->of_node, volt_adj, NULL)) { + if (of_property_present(vreg->of_node, volt_adj)) {
+ rc = cpr3_parse_corner_array_property(vreg, volt_adj, + rc = cpr3_parse_corner_array_property(vreg, volt_adj,
+ 1, volt_adjust); + 1, volt_adjust);
+ if (rc) { + if (rc) {
@ -9161,7 +9161,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ struct device_node *node = ctrl->dev->of_node; + struct device_node *node = ctrl->dev->of_node;
+ int rc; + int rc;
+ +
+ if (!of_find_property(node, "qcom,apm-ctrl", NULL)) { + if (!of_property_present(node, "qcom,apm-ctrl")) {
+ /* No APM used */ + /* No APM used */
+ return 0; + return 0;
+ } + }
@ -9344,9 +9344,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ int *allow_core_count_adj = NULL, *allow_temp_adj = NULL; + int *allow_core_count_adj = NULL, *allow_temp_adj = NULL;
+ char prop_str[75]; + char prop_str[75];
+ +
+ if (of_find_property(node, use_corner_band ? + if (of_property_present(node, use_corner_band ?
+ "qcom,corner-band-allow-temp-adjustment" + "qcom,corner-band-allow-temp-adjustment"
+ : "qcom,corner-allow-temp-adjustment", NULL)) { + : "qcom,corner-allow-temp-adjustment")) {
+ if (!ctrl->allow_temp_adj) { + if (!ctrl->allow_temp_adj) {
+ cpr3_err(ctrl, "Temperature adjustment configurations missing\n"); + cpr3_err(ctrl, "Temperature adjustment configurations missing\n");
+ return -EINVAL; + return -EINVAL;
@ -9355,10 +9355,10 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ vreg->allow_temp_adj = true; + vreg->allow_temp_adj = true;
+ } + }
+ +
+ if (of_find_property(node, use_corner_band ? + if (of_property_present(node, use_corner_band ?
+ "qcom,corner-band-allow-core-count-adjustment" + "qcom,corner-band-allow-core-count-adjustment"
+ : "qcom,corner-allow-core-count-adjustment", + : "qcom,corner-allow-core-count-adjustment",
+ NULL)) { + )) {
+ rc = of_property_read_u32(node, "qcom,max-core-count", + rc = of_property_read_u32(node, "qcom,max-core-count",
+ &vreg->max_core_count); + &vreg->max_core_count);
+ if (rc) { + if (rc) {
@ -9627,8 +9627,8 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ u32 *corner_map; + u32 *corner_map;
+ int rc = 0, i; + int rc = 0, i;
+ +
+ if (!of_find_property(vreg->of_node, + if (!of_property_present(vreg->of_node,
+ "qcom,cpr-fused-closed-loop-voltage-adjustment-map", NULL)) { + "qcom,cpr-fused-closed-loop-voltage-adjustment-map")) {
+ /* No closed-loop offset required. */ + /* No closed-loop offset required. */
+ return 0; + return 0;
+ } + }
@ -9788,16 +9788,16 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ int *volt_adjust, *ro_scale; + int *volt_adjust, *ro_scale;
+ bool explicit_adjustment, fused_adjustment, is_increasing; + bool explicit_adjustment, fused_adjustment, is_increasing;
+ +
+ explicit_adjustment = of_find_property(vreg->of_node, + explicit_adjustment = of_property_present(vreg->of_node,
+ "qcom,cpr-closed-loop-voltage-adjustment", NULL); + "qcom,cpr-closed-loop-voltage-adjustment");
+ fused_adjustment = of_find_property(vreg->of_node, + fused_adjustment = of_property_present(vreg->of_node,
+ "qcom,cpr-fused-closed-loop-voltage-adjustment-map", NULL); + "qcom,cpr-fused-closed-loop-voltage-adjustment-map");
+ +
+ if (!explicit_adjustment && !fused_adjustment && !vreg->aging_allowed) { + if (!explicit_adjustment && !fused_adjustment && !vreg->aging_allowed) {
+ /* No adjustment required. */ + /* No adjustment required. */
+ return 0; + return 0;
+ } else if (!of_find_property(vreg->of_node, + } else if (!of_property_present(vreg->of_node,
+ "qcom,cpr-ro-scaling-factor", NULL)) { + "qcom,cpr-ro-scaling-factor")) {
+ cpr3_err(vreg, "qcom,cpr-ro-scaling-factor is required for closed-loop voltage adjustment, but is missing\n"); + cpr3_err(vreg, "qcom,cpr-ro-scaling-factor is required for closed-loop voltage adjustment, but is missing\n");
+ return -EINVAL; + return -EINVAL;
+ } + }
@ -10446,7 +10446,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ * entry with RO select values other than zero, then dtsi values will + * entry with RO select values other than zero, then dtsi values will
+ * be used. + * be used.
+ */ + */
+ if (of_find_property(node, "qcom,cpr-ro-sel", NULL)) { + if (of_property_present(node, "qcom,cpr-ro-sel")) {
+ temp = kcalloc(vreg->fuse_corner_count, sizeof(*temp), + temp = kcalloc(vreg->fuse_corner_count, sizeof(*temp),
+ GFP_KERNEL); + GFP_KERNEL);
+ if (!temp) + if (!temp)
@ -10674,9 +10674,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ cpr3_err(vreg, "open-loop voltage adjustment failed, rc=%d\n", + cpr3_err(vreg, "open-loop voltage adjustment failed, rc=%d\n",
+ rc); + rc);
+ +
+ if (of_find_property(node, + if (of_property_present(node,
+ "qcom,cpr-misc-fuse-voltage-adjustment", + "qcom,cpr-misc-fuse-voltage-adjustment"
+ NULL)) { + )) {
+ misc_adj_volt = kcalloc(vreg->corner_count, + misc_adj_volt = kcalloc(vreg->corner_count,
+ sizeof(*misc_adj_volt), GFP_KERNEL); + sizeof(*misc_adj_volt), GFP_KERNEL);
+ if (!misc_adj_volt) { + if (!misc_adj_volt) {
@ -10819,8 +10819,8 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ goto done; + goto done;
+ } + }
+ +
+ if (of_find_property(vreg->of_node, + if (of_property_present(vreg->of_node,
+ "qcom,cpr-misc-fuse-voltage-adjustment", NULL)) { + "qcom,cpr-misc-fuse-voltage-adjustment")) {
+ voltage_adj_misc = kcalloc(vreg->corner_count, + voltage_adj_misc = kcalloc(vreg->corner_count,
+ sizeof(*voltage_adj_misc), GFP_KERNEL); + sizeof(*voltage_adj_misc), GFP_KERNEL);
+ if (!voltage_adj_misc) { + if (!voltage_adj_misc) {
@ -11117,7 +11117,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ /* Voltage boost is disabled in fuse */ + /* Voltage boost is disabled in fuse */
+ return 0; + return 0;
+ +
+ if (of_find_property(vreg->of_node, "qcom,allow-boost", NULL)) { + if (of_property_present(vreg->of_node, "qcom,allow-boost")) {
+ rc = cpr3_parse_array_property(vreg, "qcom,allow-boost", 1, + rc = cpr3_parse_array_property(vreg, "qcom,allow-boost", 1,
+ &boost_allowed); + &boost_allowed);
+ if (rc) + if (rc)
@ -11138,8 +11138,8 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ /* Log boost voltage value for debugging purposes. */ + /* Log boost voltage value for debugging purposes. */
+ cpr3_info(vreg, "Boost open-loop=%7d uV\n", boost_voltage); + cpr3_info(vreg, "Boost open-loop=%7d uV\n", boost_voltage);
+ +
+ if (of_find_property(vreg->of_node, + if (of_property_present(vreg->of_node,
+ "qcom,cpr-boost-voltage-fuse-adjustment", NULL)) { + "qcom,cpr-boost-voltage-fuse-adjustment")) {
+ rc = cpr3_parse_array_property(vreg, + rc = cpr3_parse_array_property(vreg,
+ "qcom,cpr-boost-voltage-fuse-adjustment", + "qcom,cpr-boost-voltage-fuse-adjustment",
+ 1, &boost_voltage_adjust); + 1, &boost_voltage_adjust);
@ -11199,8 +11199,8 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ if (!boost_table) + if (!boost_table)
+ return -ENOMEM; + return -ENOMEM;
+ +
+ if (of_find_property(vreg->of_node, + if (of_property_present(vreg->of_node,
+ "qcom,cpr-boost-temp-adjustment", NULL)) { + "qcom,cpr-boost-temp-adjustment")) {
+ boost_temp_adj = kcalloc(corner->sdelta->temp_band_count, + boost_temp_adj = kcalloc(corner->sdelta->temp_band_count,
+ sizeof(*boost_temp_adj), GFP_KERNEL); + sizeof(*boost_temp_adj), GFP_KERNEL);
+ if (!boost_temp_adj) + if (!boost_temp_adj)
@ -11390,7 +11390,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+ "qcom,cpr-voltage-settling-time", + "qcom,cpr-voltage-settling-time",
+ &ctrl->voltage_settling_time); + &ctrl->voltage_settling_time);
+ +
+ if (of_find_property(ctrl->dev->of_node, "vdd-limit-supply", NULL)) { + if (of_property_present(ctrl->dev->of_node, "vdd-limit-supply")) {
+ ctrl->vdd_limit_regulator = + ctrl->vdd_limit_regulator =
+ devm_regulator_get(ctrl->dev, "vdd-limit"); + devm_regulator_get(ctrl->dev, "vdd-limit");
+ if (IS_ERR(ctrl->vdd_limit_regulator)) { + if (IS_ERR(ctrl->vdd_limit_regulator)) {