+ }
+
+ /* 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,
+ "qcom,system-voltage", 1, temp);
+ if (rc)
+ }
+ }
+
-+ if (of_find_property(vreg->of_node,
-+ "qcom,allow-aging-voltage-adjustment", NULL)) {
++ if (of_property_present(vreg->of_node,
++ "qcom,allow-aging-voltage-adjustment")) {
+ rc = cpr3_parse_array_property(vreg,
+ "qcom,allow-aging-voltage-adjustment",
+ 1, &aging_allowed);
+ vreg->aging_allowed = aging_allowed;
+ }
+
-+ if (of_find_property(vreg->of_node,
-+ "qcom,allow-aging-open-loop-voltage-adjustment", NULL)) {
++ if (of_property_present(vreg->of_node,
++ "qcom,allow-aging-open-loop-voltage-adjustment")) {
+ rc = cpr3_parse_array_property(vreg,
+ "qcom,allow-aging-open-loop-voltage-adjustment",
+ 1, &aging_allowed);
+ }
+ vreg->aging_corner -= CPR3_CORNER_OFFSET;
+
-+ if (of_find_property(vreg->of_node, "qcom,cpr-aging-derate",
-+ NULL)) {
++ if (of_property_present(vreg->of_node, "qcom,cpr-aging-derate",
++ )) {
+ rc = cpr3_parse_corner_array_property(vreg,
+ "qcom,cpr-aging-derate", 1, temp);
+ if (rc)
+ int i, cpu;
+ 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)) {
+ /* No IRQ affinity required */
+ return 0;
+ 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");
+ return -EINVAL;
+ }
+ 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");
+ if (IS_ERR(ctrl->core_clk)) {
+ rc = PTR_ERR(ctrl->core_clk);
+ if (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");
+ if (IS_ERR(ctrl->vdd_regulator)) {
+ rc = PTR_ERR(ctrl->vdd_regulator);
+ 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");
+ if (IS_ERR(ctrl->vdd_regulator)) {
+ rc = PTR_ERR(ctrl->vdd_regulator);
+ u32 *floor_range;
+ int rc = 0;
+
-+ if (!of_find_property(vreg->of_node, prop, NULL))
++ if (!of_property_present(vreg->of_node, prop))
+ goto enforce_monotonicity;
+
+ floor_range = kcalloc(vreg->corner_count, sizeof(*floor_range),
+ 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. */
+ cpr3_info(vreg, "No cold temperature adjustment required.\n");
+ return 0;
+ strscpy(prop_str, "qcom,cpr-cold-temp-threshold",
+ 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. */
+ return false;
+ } else
+ strscpy(prop_str, "qcom,cpr-cold-temp-threshold",
+ 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. */
+ cpr3_info(vreg, "Cold temperature adjustment not required.\n");
+ return 0;
+ }
+
-+ if (!of_find_property(vreg->of_node, prop_str, NULL)) {
++ if (!of_property_present(vreg->of_node, prop_str)) {
+ /* No adjustment required. */
+ cpr3_err(vreg, "Missing %s required for %s\n",
+ prop_str, req_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. */
+ return 0;
+ }
+ int i, rc, prev_volt, min_volt;
+ int *volt_adjust, *volt_diff;
+
-+ if (!of_find_property(vreg->of_node,
-+ "qcom,cpr-open-loop-voltage-adjustment", NULL)) {
++ if (!of_property_present(vreg->of_node,
++ "qcom,cpr-open-loop-voltage-adjustment")) {
+ /* No adjustment required. */
+ return 0;
+ }
+ }
+ }
+
-+ if (of_find_property(vreg->of_node,
-+ "qcom,cpr-open-loop-voltage-min-diff", NULL)) {
++ if (of_property_present(vreg->of_node,
++ "qcom,cpr-open-loop-voltage-min-diff")) {
+ rc = cpr3_parse_corner_array_property(vreg,
+ "qcom,cpr-open-loop-voltage-min-diff", 1, volt_diff);
+ if (rc) {
+ char volt_fuse_adj[] = "qcom,cpr-closed-loop-voltage-fuse-adjustment";
+ char ro_scaling[] = "qcom,cpr-ro-scaling-factor";
+
-+ if (!of_find_property(vreg->of_node, volt_adj, NULL)
-+ && !of_find_property(vreg->of_node, volt_fuse_adj, NULL)
++ if (!of_property_present(vreg->of_node, volt_adj)
++ && !of_property_present(vreg->of_node, volt_fuse_adj)
+ && !vreg->aging_allowed) {
+ /* No adjustment required. */
+ 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",
+ ro_scaling);
+ return -EINVAL;
+ &ro_all_scale[vreg->corner[i].cpr_fuse_corner * 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,
+ vreg->fuse_corner_count, volt_adjust_fuse);
+ if (rc) {
+ }
+ }
+
-+ 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,
+ 1, volt_adjust);
+ if (rc) {
+ struct device_node *node = ctrl->dev->of_node;
+ int rc;
+
-+ if (!of_find_property(node, "qcom,apm-ctrl", NULL)) {
++ if (!of_property_present(node, "qcom,apm-ctrl")) {
+ /* No APM used */
+ return 0;
+ }
+ int *allow_core_count_adj = NULL, *allow_temp_adj = NULL;
+ 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-allow-temp-adjustment", NULL)) {
++ : "qcom,corner-allow-temp-adjustment")) {
+ if (!ctrl->allow_temp_adj) {
+ cpr3_err(ctrl, "Temperature adjustment configurations missing\n");
+ return -EINVAL;
+ 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-allow-core-count-adjustment",
-+ NULL)) {
++ )) {
+ rc = of_property_read_u32(node, "qcom,max-core-count",
+ &vreg->max_core_count);
+ if (rc) {
+ u32 *corner_map;
+ int rc = 0, i;
+
-+ if (!of_find_property(vreg->of_node,
-+ "qcom,cpr-fused-closed-loop-voltage-adjustment-map", NULL)) {
++ if (!of_property_present(vreg->of_node,
++ "qcom,cpr-fused-closed-loop-voltage-adjustment-map")) {
+ /* No closed-loop offset required. */
+ return 0;
+ }
+ int *volt_adjust, *ro_scale;
+ bool explicit_adjustment, fused_adjustment, is_increasing;
+
-+ explicit_adjustment = of_find_property(vreg->of_node,
-+ "qcom,cpr-closed-loop-voltage-adjustment", NULL);
-+ fused_adjustment = of_find_property(vreg->of_node,
-+ "qcom,cpr-fused-closed-loop-voltage-adjustment-map", NULL);
++ explicit_adjustment = of_property_present(vreg->of_node,
++ "qcom,cpr-closed-loop-voltage-adjustment");
++ fused_adjustment = of_property_present(vreg->of_node,
++ "qcom,cpr-fused-closed-loop-voltage-adjustment-map");
+
+ if (!explicit_adjustment && !fused_adjustment && !vreg->aging_allowed) {
+ /* No adjustment required. */
+ return 0;
-+ } else if (!of_find_property(vreg->of_node,
-+ "qcom,cpr-ro-scaling-factor", NULL)) {
++ } else if (!of_property_present(vreg->of_node,
++ "qcom,cpr-ro-scaling-factor")) {
+ cpr3_err(vreg, "qcom,cpr-ro-scaling-factor is required for closed-loop voltage adjustment, but is missing\n");
+ return -EINVAL;
+ }
+ * entry with RO select values other than zero, then dtsi values will
+ * 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),
+ GFP_KERNEL);
+ if (!temp)
+ cpr3_err(vreg, "open-loop voltage adjustment failed, rc=%d\n",
+ rc);
+
-+ if (of_find_property(node,
-+ "qcom,cpr-misc-fuse-voltage-adjustment",
-+ NULL)) {
++ if (of_property_present(node,
++ "qcom,cpr-misc-fuse-voltage-adjustment"
++ )) {
+ misc_adj_volt = kcalloc(vreg->corner_count,
+ sizeof(*misc_adj_volt), GFP_KERNEL);
+ if (!misc_adj_volt) {
+ goto done;
+ }
+
-+ if (of_find_property(vreg->of_node,
-+ "qcom,cpr-misc-fuse-voltage-adjustment", NULL)) {
++ if (of_property_present(vreg->of_node,
++ "qcom,cpr-misc-fuse-voltage-adjustment")) {
+ voltage_adj_misc = kcalloc(vreg->corner_count,
+ sizeof(*voltage_adj_misc), GFP_KERNEL);
+ if (!voltage_adj_misc) {
+ /* Voltage boost is disabled in fuse */
+ 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,
+ &boost_allowed);
+ if (rc)
+ /* Log boost voltage value for debugging purposes. */
+ cpr3_info(vreg, "Boost open-loop=%7d uV\n", boost_voltage);
+
-+ if (of_find_property(vreg->of_node,
-+ "qcom,cpr-boost-voltage-fuse-adjustment", NULL)) {
++ if (of_property_present(vreg->of_node,
++ "qcom,cpr-boost-voltage-fuse-adjustment")) {
+ rc = cpr3_parse_array_property(vreg,
+ "qcom,cpr-boost-voltage-fuse-adjustment",
+ 1, &boost_voltage_adjust);
+ if (!boost_table)
+ return -ENOMEM;
+
-+ if (of_find_property(vreg->of_node,
-+ "qcom,cpr-boost-temp-adjustment", NULL)) {
++ if (of_property_present(vreg->of_node,
++ "qcom,cpr-boost-temp-adjustment")) {
+ boost_temp_adj = kcalloc(corner->sdelta->temp_band_count,
+ sizeof(*boost_temp_adj), GFP_KERNEL);
+ if (!boost_temp_adj)
+ "qcom,cpr-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 =
+ devm_regulator_get(ctrl->dev, "vdd-limit");
+ if (IS_ERR(ctrl->vdd_limit_regulator)) {
projects / openwrt / openwrt.git / commitdiff