svn commit: r356798 - head/sys/arm/allwinner

[Emmanuel Vadot]

Author: manu
Date: Thu Jan 16 19:57:38 2020
New Revision: 356798
URL: https://svnweb.freebsd.org/changeset/base/356798

Log:
  axp8xx: Add missing voltage regulators offset
  
  This lead to writing the desired voltage value to the wrong register.
  
  MFC after:	2 weeks

Modified:
  head/sys/arm/allwinner/axp81x.c

Modified: head/sys/arm/allwinner/axp81x.c
==============================================================================
--- head/sys/arm/allwinner/axp81x.c	Thu Jan 16 17:27:08 2020	(r356797)
+++ head/sys/arm/allwinner/axp81x.c	Thu Jan 16 19:57:38 2020	(r356798)
@@ -437,6 +437,7 @@ static struct axp8xx_regdef axp8xx_common_regdefs[] = 
 		.enable_reg = AXP_POWERCTL3,
 		.enable_mask = (uint8_t) AXP_POWERCTL3_ALDO1,
 		.enable_value = AXP_POWERCTL3_ALDO1,
+		.voltage_reg = AXP_VOLTCTL_ALDO1,
 		.voltage_min = 700,
 		.voltage_max = 3300,
 		.voltage_step1 = 100,
@@ -448,6 +449,7 @@ static struct axp8xx_regdef axp8xx_common_regdefs[] = 
 		.enable_reg = AXP_POWERCTL3,
 		.enable_mask = (uint8_t) AXP_POWERCTL3_ALDO2,
 		.enable_value = AXP_POWERCTL3_ALDO2,
+		.voltage_reg = AXP_VOLTCTL_ALDO2,
 		.voltage_min = 700,
 		.voltage_max = 3300,
 		.voltage_step1 = 100,
@@ -459,6 +461,7 @@ static struct axp8xx_regdef axp8xx_common_regdefs[] = 
 		.enable_reg = AXP_POWERCTL3,
 		.enable_mask = (uint8_t) AXP_POWERCTL3_ALDO3,
 		.enable_value = AXP_POWERCTL3_ALDO3,
+		.voltage_reg = AXP_VOLTCTL_ALDO3,
 		.voltage_min = 700,
 		.voltage_max = 3300,
 		.voltage_step1 = 100,
@@ -470,6 +473,7 @@ static struct axp8xx_regdef axp8xx_common_regdefs[] = 
 		.enable_reg = AXP_POWERCTL2,
 		.enable_mask = (uint8_t) AXP_POWERCTL2_ELDO1,
 		.enable_value = AXP_POWERCTL2_ELDO1,
+		.voltage_reg = AXP_VOLTCTL_ELDO1,
 		.voltage_min = 700,
 		.voltage_max = 1900,
 		.voltage_step1 = 50,
@@ -481,6 +485,7 @@ static struct axp8xx_regdef axp8xx_common_regdefs[] = 
 		.enable_reg = AXP_POWERCTL2,
 		.enable_mask = (uint8_t) AXP_POWERCTL2_ELDO2,
 		.enable_value = AXP_POWERCTL2_ELDO2,
+		.voltage_reg = AXP_VOLTCTL_ELDO2,
 		.voltage_min = 700,
 		.voltage_max = 1900,
 		.voltage_step1 = 50,
@@ -492,6 +497,7 @@ static struct axp8xx_regdef axp8xx_common_regdefs[] = 
 		.enable_reg = AXP_POWERCTL2,
 		.enable_mask = (uint8_t) AXP_POWERCTL2_ELDO3,
 		.enable_value = AXP_POWERCTL2_ELDO3,
+		.voltage_reg = AXP_VOLTCTL_ELDO3,
 		.voltage_min = 700,
 		.voltage_max = 1900,
 		.voltage_step1 = 50,
@@ -503,6 +509,7 @@ static struct axp8xx_regdef axp8xx_common_regdefs[] = 
 		.enable_reg = AXP_POWERCTL3,
 		.enable_mask = (uint8_t) AXP_POWERCTL3_FLDO1,
 		.enable_value = AXP_POWERCTL3_FLDO1,
+		.voltage_reg = AXP_VOLTCTL_FLDO1,
 		.voltage_min = 700,
 		.voltage_max = 1450,
 		.voltage_step1 = 50,
@@ -514,6 +521,7 @@ static struct axp8xx_regdef axp8xx_common_regdefs[] = 
 		.enable_reg = AXP_POWERCTL3,
 		.enable_mask = (uint8_t) AXP_POWERCTL3_FLDO2,
 		.enable_value = AXP_POWERCTL3_FLDO2,
+		.voltage_reg = AXP_VOLTCTL_FLDO2,
 		.voltage_min = 700,
 		.voltage_max = 1450,
 		.voltage_step1 = 50,