soc: rockchip: opp_select: Add support to select voltage accroding to bin

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I6244d0c6865efbfb82164b3512e6f66adec45302

Author: finley1226

drivers/soc/rockchip/rockchip_opp_select.c

@@ -677,6 +677,21 @@ void rockchip_of_get_bin_sel(struct device *dev, struct device_node *np,
 }
 EXPORT_SYMBOL(rockchip_of_get_bin_sel);
 
+void rockchip_of_get_bin_volt_sel(struct device *dev, struct device_node *np,
+				  int bin, int *bin_volt_sel)
+{
+	int ret = 0;
+
+	if (!bin_volt_sel || bin < 0)
+		return;
+
+	ret = rockchip_get_bin_sel(np, "rockchip,bin-voltage-sel",
+				   bin, bin_volt_sel);
+	if (!ret)
+		dev_info(dev, "bin-volt-sel=%d\n", *bin_volt_sel);
+}
+EXPORT_SYMBOL(rockchip_of_get_bin_volt_sel);
+
 void rockchip_get_soc_info(struct device *dev,
 			   const struct of_device_id *matches,
 			   int *bin, int *process)
@@ -718,6 +733,7 @@ void rockchip_get_scale_volt_sel(struct device *dev, char *lkg_name,
 	struct device_node *np;
 	int lkg_scale = 0, pvtm_scale = 0, bin_scale = 0;
 	int lkg_volt_sel = -EINVAL, pvtm_volt_sel = -EINVAL;
+	int bin_volt_sel = -EINVAL;
 
 	np = of_parse_phandle(dev->of_node, "operating-points-v2", 0);
 	if (!np) {
@@ -730,10 +746,15 @@ void rockchip_get_scale_volt_sel(struct device *dev, char *lkg_name,
 	rockchip_of_get_pvtm_sel(dev, np, reg_name, process,
 				 &pvtm_volt_sel, &pvtm_scale);
 	rockchip_of_get_bin_sel(dev, np, bin, &bin_scale);
+	rockchip_of_get_bin_volt_sel(dev, np, bin, &bin_volt_sel);
 	if (scale)
 		*scale = max3(lkg_scale, pvtm_scale, bin_scale);
-	if (volt_sel)
-		*volt_sel = max(lkg_volt_sel, pvtm_volt_sel);
+	if (volt_sel) {
+		if (bin_volt_sel >= 0)
+			*volt_sel = bin_volt_sel;
+		else
+			*volt_sel = max(lkg_volt_sel, pvtm_volt_sel);
+	}
 
 	of_node_put(np);
 }

include/soc/rockchip/rockchip_opp_select.h

@@ -16,6 +16,8 @@ void rockchip_of_get_pvtm_sel(struct device *dev, struct device_node *np,
 			      int *volt_sel, int *scale_sel);
 void rockchip_of_get_bin_sel(struct device *dev, struct device_node *np,
 			     int bin, int *scale_sel);
+void rockchip_of_get_bin_volt_sel(struct device *dev, struct device_node *np,
+				  int bin, int *bin_volt_sel);
 int rockchip_get_efuse_value(struct device_node *np, char *porp_name,
 			     int *value);
 void rockchip_get_soc_info(struct device *dev,
@@ -56,6 +58,12 @@ static inline void rockchip_of_get_bin_sel(struct device *dev,
 {
 }
 
+static inline void rockchip_of_get_bin_volt_sel(struct device *dev,
+						struct device_node *np,
+						int bin, int *bin_volt_sel)
+{
+}
+
 static inline int rockchip_get_efuse_value(struct device_node *np,
 					   char *porp_name, int *value)
 {