Eric Lee / smarc-uboot | Embedian Git Server

Commit 93a6d92cfa990240314c2299fb7a3a3a39811c07

Authored by Tim Harvey 2014-04-23 12:53:56 +0800

Committed by Stefano Babic 2014-05-09 20:38:23 +0800

Exists in v2017.01-smarct4x and in 43 other branches

power: make pfuze100 be able to coexist with other pmics

Avoid uding pmic_init() as this forces the model of only allowing a
single PMIC driver to be built at a time.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>

Showing 2 changed files with 2 additions and 1 deletions Inline Diff

drivers/power/pmic/pmic_pfuze100.c
include/power/pfuze100_pmic.h

drivers/power/pmic/pmic_pfuze100.c

Diff comments View file @ 93a6d92

1	/*	1	/*
2	* Copyright (C) 2014 Gateworks Corporation	2	* Copyright (C) 2014 Gateworks Corporation
3	* Tim Harvey <tharvey@gateworks.com>	3	* Tim Harvey <tharvey@gateworks.com>
4	*	4	*
5	* SPDX-License-Identifier: GPL-2.0+	5	* SPDX-License-Identifier: GPL-2.0+
6	*/	6	*/
7		7
8	#include <common.h>	8	#include <common.h>
9	#include <errno.h>	9	#include <errno.h>
10	#include <i2c.h>	10	#include <i2c.h>
11	#include <power/pmic.h>	11	#include <power/pmic.h>
12	#include <power/pfuze100_pmic.h>	12	#include <power/pfuze100_pmic.h>
13		13
14	int pmic_init(unsigned char bus)	14	int power_pfuze100_init(unsigned char bus)
15	{	15	{
16	static const char name[] = "PFUZE100_PMIC";	16	static const char name[] = "PFUZE100_PMIC";
17	struct pmic *p = pmic_alloc();	17	struct pmic *p = pmic_alloc();
18		18
19	if (!p) {	19	if (!p) {
20	printf("%s: POWER allocation error!\n", __func__);	20	printf("%s: POWER allocation error!\n", __func__);
21	return -ENOMEM;	21	return -ENOMEM;
22	}	22	}
23		23
24	p->name = name;	24	p->name = name;
25	p->interface = PMIC_I2C;	25	p->interface = PMIC_I2C;
26	p->number_of_regs = PMIC_NUM_OF_REGS;	26	p->number_of_regs = PMIC_NUM_OF_REGS;
27	p->hw.i2c.addr = CONFIG_POWER_PFUZE100_I2C_ADDR;	27	p->hw.i2c.addr = CONFIG_POWER_PFUZE100_I2C_ADDR;
28	p->hw.i2c.tx_num = 1;	28	p->hw.i2c.tx_num = 1;
29	p->bus = bus;	29	p->bus = bus;
30		30
31	return 0;	31	return 0;
32	}	32	}
33		33

include/power/pfuze100_pmic.h

Diff comments View file @ 93a6d92

 /*
  *  Copyright (C) 2014 Gateworks Corporation
  *  Tim Harvey <tharvey@gateworks.com>
  *
  * SPDX-License-Identifier:     GPL-2.0+
  */
 #ifndef __PFUZE100_PMIC_H_
 #define __PFUZE100_PMIC_H_
 /* PFUZE100 registers */
 enum {
 	PFUZE100_DEVICEID	= 0x00,
 	PFUZE100_REVID		= 0x03,
 	PFUZE100_FABID		= 0x04,
 	PFUZE100_SW1ABVOL	= 0x20,
 	PFUZE100_SW1CVOL	= 0x2e,
 	PFUZE100_SW2VOL		= 0x35,
 	PFUZE100_SW3AVOL	= 0x3c,
 	PFUZE100_SW3BVOL	= 0x43,
 	PFUZE100_SW4VOL		= 0x4a,
 	PFUZE100_SWBSTCON1	= 0x66,
 	PFUZE100_VREFDDRCON	= 0x6a,
 	PFUZE100_VSNVSVOL	= 0x6b,
 	PFUZE100_VGEN1VOL	= 0x6c,
 	PFUZE100_VGEN2VOL	= 0x6d,
 	PFUZE100_VGEN3VOL	= 0x6e,
 	PFUZE100_VGEN4VOL	= 0x6f,
 	PFUZE100_VGEN5VOL	= 0x70,
 	PFUZE100_VGEN6VOL	= 0x71,
 	PMIC_NUM_OF_REGS	= 0x7f,
 };
 /*
  * LDO Configuration
  */
 /* VGEN1/2 Voltage Configuration */
 #define LDOA_0_80V	0
 #define LDOA_0_85V	1
 #define LDOA_0_90V	2
 #define LDOA_0_95V	3
 #define LDOA_1_00V	4
 #define LDOA_1_05V	5
 #define LDOA_1_10V	6
 #define LDOA_1_15V	7
 #define LDOA_1_20V	8
 #define LDOA_1_25V	9
 #define LDOA_1_30V	10
 #define LDOA_1_35V	11
 #define LDOA_1_40V	12
 #define LDOA_1_45V	13
 #define LDOA_1_50V	14
 #define LDOA_1_55V	15
 /* VGEN3/4/5/6 Voltage Configuration */
 #define LDOB_1_80V	0
 #define LDOB_1_90V	1
 #define LDOB_2_00V	2
 #define LDOB_2_10V	3
 #define LDOB_2_20V	4
 #define LDOB_2_30V	5
 #define LDOB_2_40V	6
 #define LDOB_2_50V	7
 #define LDOB_2_60V	8
 #define LDOB_2_70V	9
 #define LDOB_2_80V	10
 #define LDOB_2_90V	11
 #define LDOB_3_00V	12
 #define LDOB_3_10V	13
 #define LDOB_3_20V	14
 #define LDOB_3_30V	15
 #define LDO_VOL_MASK	0xf
 #define LDO_EN		4
 /*
  * Boost Regulator
  */
 /* SWBST Output Voltage */
 #define SWBST_5_00V	0
 #define SWBST_5_05V	1
 #define SWBST_5_10V	2
 #define SWBST_5_15V	3
 #define SWBST_VOL_MASK	0x3
 #define SWBST_MODE_MASK	0x6
 #define SWBST_MODE_OFF	(2 << 0)
 #define SWBST_MODE_PFM	(2 << 1)
 #define SWBST_MODE_AUTO	(2 << 2)
 #define SWBST_MODE_APS	(2 << 3)
+int power_pfuze100_init(unsigned char bus);
 #endif