diff mbox

[v4,20/26] ARM: pxa: magician: Add support for MAX1587A Vcore regulator

Message ID 5609B377.3020404@tul.cz (mailing list archive)
State New, archived
Headers show

Commit Message

Petr Cvek Sept. 28, 2015, 9:39 p.m. UTC
HTC Magician contains a MAX1587A voltage regulator for a Vcore supply.
The Vcore regulation is required for a CPU speed switching. This patch adds
declaration for the max1586 driver.

Notice:

- MAX1587A version does not support the V6 (USIM) output.
- A boost resistor was directly measured for a board_id 0x3a.

Signed-off-by: Petr Cvek <petr.cvek@tul.cz>
---
 arch/arm/mach-pxa/magician.c | 52 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

Comments

Philipp Zabel Oct. 3, 2015, 12:57 p.m. UTC | #1
Am Montag, den 28.09.2015, 23:39 +0200 schrieb Petr Cvek:
> HTC Magician contains a MAX1587A voltage regulator for a Vcore
> supply.
> The Vcore regulation is required for a CPU speed switching. This
> patch adds
> declaration for the max1586 driver.
> 
> Notice:
> 
> - MAX1587A version does not support the V6 (USIM) output.
> - A boost resistor was directly measured for a board_id 0x3a.
> 
> Signed-off-by: Petr Cvek <petr.cvek@tul.cz>
> ---
>  arch/arm/mach-pxa/magician.c | 52
> ++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 52 insertions(+)
> 
> diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach
> -pxa/magician.c
> index d844b9c..490d79f 100644
> --- a/arch/arm/mach-pxa/magician.c
> +++ b/arch/arm/mach-pxa/magician.c
> @@ -52,6 +52,8 @@
>  #include <linux/platform_data/camera-pxa.h>
>  #include <media/soc_camera.h>
>  
> +#include <linux/regulator/max1586.h>
> +
>  #include "devices.h"
>  #include "generic.h"
>  
> @@ -787,6 +789,52 @@ static struct platform_device vads7846_device =
> {
>  };
>  
>  /*
> + * Vcore regulator MAX1587A
> + */
> +
> +static struct regulator_consumer_supply
> magician_max1587a_consumers[] = {
> +	REGULATOR_SUPPLY("vcc_core", NULL),
> +};
> +
> +static struct regulator_init_data magician_max1587a_v3_info = {
> +	.constraints = {
> +		.name		= "vcc_core range",
> +		.min_uV		= 700000,
> +		.max_uV		= 1500000,

Wouldn't that be 1475000 for MAX1587A without the R24 resistor?

regards
Philipp
Robert Jarzmik Oct. 13, 2015, 8:16 p.m. UTC | #2
Philipp Zabel <philipp.zabel@gmail.com> writes:

>> +static struct regulator_init_data magician_max1587a_v3_info = {
>> +	.constraints = {
>> +		.name		= "vcc_core range",
>> +		.min_uV		= 700000,
>> +		.max_uV		= 1500000,
>
> Wouldn't that be 1475000 for MAX1587A without the R24 resistor?
That is what I read in the Maxim 1587A datasheet, so squashed this into the
patch and queued into pxa/for-next.

Thanks.
diff mbox

Patch

diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index d844b9c..490d79f 100644
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -52,6 +52,8 @@ 
 #include <linux/platform_data/camera-pxa.h>
 #include <media/soc_camera.h>
 
+#include <linux/regulator/max1586.h>
+
 #include "devices.h"
 #include "generic.h"
 
@@ -787,6 +789,52 @@  static struct platform_device vads7846_device = {
 };
 
 /*
+ * Vcore regulator MAX1587A
+ */
+
+static struct regulator_consumer_supply magician_max1587a_consumers[] = {
+	REGULATOR_SUPPLY("vcc_core", NULL),
+};
+
+static struct regulator_init_data magician_max1587a_v3_info = {
+	.constraints = {
+		.name		= "vcc_core range",
+		.min_uV		= 700000,
+		.max_uV		= 1500000,
+		.always_on	= 1,
+		.valid_ops_mask	= REGULATOR_CHANGE_VOLTAGE,
+	},
+	.consumer_supplies	= magician_max1587a_consumers,
+	.num_consumer_supplies	= ARRAY_SIZE(magician_max1587a_consumers),
+};
+
+static struct max1586_subdev_data magician_max1587a_subdevs[] = {
+	{
+		.name		= "vcc_core",
+		.id		= MAX1586_V3,
+		.platform_data	= &magician_max1587a_v3_info,
+	}
+};
+
+static struct max1586_platform_data magician_max1587a_info = {
+	.subdevs     = magician_max1587a_subdevs,
+	.num_subdevs = ARRAY_SIZE(magician_max1587a_subdevs),
+	/*
+	 * NOTICE measured directly on the PCB (board_id == 0x3a), but
+	 * if R24 is present, it will boost the voltage
+	 * (write 1.475V, get 1.645V and smoke)
+	 */
+	.v3_gain     = MAX1586_GAIN_NO_R24,
+};
+
+static struct i2c_board_info magician_pwr_i2c_board_info[] __initdata = {
+	{
+		I2C_BOARD_INFO("max1586", 0x14),
+		.platform_data	= &magician_max1587a_info,
+	},
+};
+
+/*
  * MMC/SD
  */
 
@@ -1066,6 +1114,10 @@  static void __init magician_init(void)
 	pxa_set_ficp_info(&magician_ficp_info);
 	pxa27x_set_i2c_power_info(&magician_i2c_power_info);
 	pxa_set_i2c_info(&i2c_info);
+
+	i2c_register_board_info(1,
+		ARRAY_AND_SIZE(magician_pwr_i2c_board_info));
+
 	pxa_set_mci_info(&magician_mci_info);
 	pxa_set_ohci_info(&magician_ohci_info);