Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54227bcf authored by Sangbeom Kim's avatar Sangbeom Kim Committed by Samuel Ortiz
Browse files

mfd: Modify samsung mfd header 



As Prefix of Samsung pmic changed from s5m to s2m,
To make common mfd driver for s2m and s5m series,
This patch rename header of Samsung mfd and modify mfd driver.

Signed-off-by: default avatarSangbeom Kim <sbkim73@samsung.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 63063bfb

drivers/mfd/sec-core.c

+3 −3
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ 
#include <linux/pm_runtime.h>

#include <linux/mutex.h>

#include <linux/mfd/core.h>

#include <linux/mfd/samsung/s5m-core.h>

#include <linux/mfd/samsung/s5m-pmic.h>

#include <linux/mfd/samsung/s5m-rtc.h>

#include <linux/mfd/samsung/core.h>

#include <linux/mfd/samsung/irq.h>

#include <linux/mfd/samsung/rtc.h>

#include <linux/regmap.h>



static struct mfd_cell s5m8751_devs[] = {

drivers/mfd/sec-irq.c

+4 −1
Original line number Diff line number Diff line
@@ -14,7 +14,10 @@ 
#include <linux/device.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

#include <linux/mfd/samsung/s5m-core.h>

#include <linux/mfd/samsung/core.h>

#include <linux/mfd/samsung/irq.h>

#include <linux/mfd/samsung/s5m8763.h>

#include <linux/mfd/samsung/s5m8767.h>



struct sec_irq_data {

	int reg;

drivers/regulator/s5m8767.c

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
#include <linux/platform_device.h>

#include <linux/regulator/driver.h>

#include <linux/regulator/machine.h>

#include <linux/mfd/samsung/s5m-core.h>

#include <linux/mfd/samsung/s5m-pmic.h>

#include <linux/mfd/samsung/core.h>

#include <linux/mfd/samsung/s5m8767.h>



struct s5m8767_info {

	struct device *dev;

include/linux/mfd/samsung/core.h

0 → 100644
+147 −0
Original line number Diff line number Diff line 
/*

 * core.h

 *

 * copyright (c) 2011 Samsung Electronics Co., Ltd

 *              http://www.samsung.com

 *

 *  This program is free software; you can redistribute  it and/or modify it

 *  under  the terms of  the GNU General  Public License as published by the

 *  Free Software Foundation;  either version 2 of the  License, or (at your

 *  option) any later version.

 *

 */



#ifndef __LINUX_MFD_SEC_CORE_H

#define __LINUX_MFD_SEC_CORE_H



#define NUM_IRQ_REGS	4



enum sec_device_type {

	S5M8751X,

	S5M8763X,

	S5M8767X,

};



/**

 * struct sec_pmic_dev - s5m87xx master device for sub-drivers

 * @dev: master device of the chip (can be used to access platform data)

 * @i2c: i2c client private data for regulator

 * @rtc: i2c client private data for rtc

 * @iolock: mutex for serializing io access

 * @irqlock: mutex for buslock

 * @irq_base: base IRQ number for sec-pmic, required for IRQs

 * @irq: generic IRQ number for s5m87xx

 * @ono: power onoff IRQ number for s5m87xx

 * @irq_masks_cur: currently active value

 * @irq_masks_cache: cached hardware value

 * @type: indicate which s5m87xx "variant" is used

 */

struct sec_pmic_dev {

	struct device *dev;

	struct regmap *regmap;

	struct i2c_client *i2c;

	struct i2c_client *rtc;

	struct mutex iolock;

	struct mutex irqlock;



	int device_type;

	int irq_base;

	int irq;

	int ono;

	u8 irq_masks_cur[NUM_IRQ_REGS];

	u8 irq_masks_cache[NUM_IRQ_REGS];

	int type;

	bool wakeup;

};



int sec_irq_init(struct sec_pmic_dev *sec_pmic);

void sec_irq_exit(struct sec_pmic_dev *sec_pmic);

int sec_irq_resume(struct sec_pmic_dev *sec_pmic);



extern int sec_reg_read(struct sec_pmic_dev *sec_pmic, u8 reg, void *dest);

extern int sec_bulk_read(struct sec_pmic_dev *sec_pmic, u8 reg, int count, u8 *buf);

extern int sec_reg_write(struct sec_pmic_dev *sec_pmic, u8 reg, u8 value);

extern int sec_bulk_write(struct sec_pmic_dev *sec_pmic, u8 reg, int count, u8 *buf);

extern int sec_reg_update(struct sec_pmic_dev *sec_pmic, u8 reg, u8 val, u8 mask);



struct sec_platform_data {

	struct sec_regulator_data	*regulators;

	struct sec_opmode_data		*opmode;

	int				device_type;

	int				num_regulators;



	int				irq_base;

	int				(*cfg_pmic_irq)(void);



	int				ono;

	bool				wakeup;

	bool				buck_voltage_lock;



	int				buck_gpios[3];

	int				buck_ds[3];

	int				buck2_voltage[8];

	bool				buck2_gpiodvs;

	int				buck3_voltage[8];

	bool				buck3_gpiodvs;

	int				buck4_voltage[8];

	bool				buck4_gpiodvs;



	int				buck_set1;

	int				buck_set2;

	int				buck_set3;

	int				buck2_enable;

	int				buck3_enable;

	int				buck4_enable;

	int				buck_default_idx;

	int				buck2_default_idx;

	int				buck3_default_idx;

	int				buck4_default_idx;



	int                             buck_ramp_delay;

	bool                            buck2_ramp_enable;

	bool                            buck3_ramp_enable;

	bool                            buck4_ramp_enable;



	int				buck2_init;

	int				buck3_init;

	int				buck4_init;

};



/**

 * sec_regulator_data - regulator data

 * @id: regulator id

 * @initdata: regulator init data (contraints, supplies, ...)

 */

struct sec_regulator_data {

	int				id;

	struct regulator_init_data	*initdata;

};



/*

 * sec_opmode_data - regulator operation mode data

 * @id: regulator id

 * @mode: regulator operation mode

 */

struct sec_opmode_data {

	int id;

	int mode;

};



/*

 * samsung regulator operation mode

 * SEC_OPMODE_OFF	Regulator always OFF

 * SEC_OPMODE_ON	Regulator always ON

 * SEC_OPMODE_LOWPOWER  Regulator is on in low-power mode

 * SEC_OPMODE_SUSPEND   Regulator is changed by PWREN pin

 *			If PWREN is high, regulator is on

 *			If PWREN is low, regulator is off

 */



enum sec_opmode {

	SEC_OPMODE_OFF,

	SEC_OPMODE_ON,

	SEC_OPMODE_LOWPOWER,

	SEC_OPMODE_SUSPEND,

};



#endif /*  __LINUX_MFD_SEC_CORE_H */

include/linux/mfd/samsung/irq.h

0 → 100644
+110 −0
Original line number Diff line number Diff line 
/* irq.h

 *

 * Copyright (c) 2012 Samsung Electronics Co., Ltd

 *              http://www.samsung.com

 *

 *  This program is free software; you can redistribute  it and/or modify it

 *  under  the terms of  the GNU General  Public License as published by the

 *  Free Software Foundation;  either version 2 of the  License, or (at your

 *  option) any later version.

 *

 */



#ifndef __LINUX_MFD_SEC_IRQ_H

#define __LINUX_MFD_SEC_IRQ_H



enum s5m8767_irq {

	S5M8767_IRQ_PWRR,

	S5M8767_IRQ_PWRF,

	S5M8767_IRQ_PWR1S,

	S5M8767_IRQ_JIGR,

	S5M8767_IRQ_JIGF,

	S5M8767_IRQ_LOWBAT2,

	S5M8767_IRQ_LOWBAT1,



	S5M8767_IRQ_MRB,

	S5M8767_IRQ_DVSOK2,

	S5M8767_IRQ_DVSOK3,

	S5M8767_IRQ_DVSOK4,



	S5M8767_IRQ_RTC60S,

	S5M8767_IRQ_RTCA1,

	S5M8767_IRQ_RTCA2,

	S5M8767_IRQ_SMPL,

	S5M8767_IRQ_RTC1S,

	S5M8767_IRQ_WTSR,



	S5M8767_IRQ_NR,

};



#define S5M8767_IRQ_PWRR_MASK		(1 << 0)

#define S5M8767_IRQ_PWRF_MASK		(1 << 1)

#define S5M8767_IRQ_PWR1S_MASK		(1 << 3)

#define S5M8767_IRQ_JIGR_MASK		(1 << 4)

#define S5M8767_IRQ_JIGF_MASK		(1 << 5)

#define S5M8767_IRQ_LOWBAT2_MASK	(1 << 6)

#define S5M8767_IRQ_LOWBAT1_MASK	(1 << 7)



#define S5M8767_IRQ_MRB_MASK		(1 << 2)

#define S5M8767_IRQ_DVSOK2_MASK		(1 << 3)

#define S5M8767_IRQ_DVSOK3_MASK		(1 << 4)

#define S5M8767_IRQ_DVSOK4_MASK		(1 << 5)



#define S5M8767_IRQ_RTC60S_MASK		(1 << 0)

#define S5M8767_IRQ_RTCA1_MASK		(1 << 1)

#define S5M8767_IRQ_RTCA2_MASK		(1 << 2)

#define S5M8767_IRQ_SMPL_MASK		(1 << 3)

#define S5M8767_IRQ_RTC1S_MASK		(1 << 4)

#define S5M8767_IRQ_WTSR_MASK		(1 << 5)



enum s5m8763_irq {

	S5M8763_IRQ_DCINF,

	S5M8763_IRQ_DCINR,

	S5M8763_IRQ_JIGF,

	S5M8763_IRQ_JIGR,

	S5M8763_IRQ_PWRONF,

	S5M8763_IRQ_PWRONR,



	S5M8763_IRQ_WTSREVNT,

	S5M8763_IRQ_SMPLEVNT,

	S5M8763_IRQ_ALARM1,

	S5M8763_IRQ_ALARM0,



	S5M8763_IRQ_ONKEY1S,

	S5M8763_IRQ_TOPOFFR,

	S5M8763_IRQ_DCINOVPR,

	S5M8763_IRQ_CHGRSTF,

	S5M8763_IRQ_DONER,

	S5M8763_IRQ_CHGFAULT,



	S5M8763_IRQ_LOBAT1,

	S5M8763_IRQ_LOBAT2,



	S5M8763_IRQ_NR,

};



#define S5M8763_IRQ_DCINF_MASK		(1 << 2)

#define S5M8763_IRQ_DCINR_MASK		(1 << 3)

#define S5M8763_IRQ_JIGF_MASK		(1 << 4)

#define S5M8763_IRQ_JIGR_MASK		(1 << 5)

#define S5M8763_IRQ_PWRONF_MASK		(1 << 6)

#define S5M8763_IRQ_PWRONR_MASK		(1 << 7)



#define S5M8763_IRQ_WTSREVNT_MASK	(1 << 0)

#define S5M8763_IRQ_SMPLEVNT_MASK	(1 << 1)

#define S5M8763_IRQ_ALARM1_MASK		(1 << 2)

#define S5M8763_IRQ_ALARM0_MASK		(1 << 3)



#define S5M8763_IRQ_ONKEY1S_MASK	(1 << 0)

#define S5M8763_IRQ_TOPOFFR_MASK	(1 << 2)

#define S5M8763_IRQ_DCINOVPR_MASK	(1 << 3)

#define S5M8763_IRQ_CHGRSTF_MASK	(1 << 4)

#define S5M8763_IRQ_DONER_MASK		(1 << 5)

#define S5M8763_IRQ_CHGFAULT_MASK	(1 << 7)



#define S5M8763_IRQ_LOBAT1_MASK		(1 << 0)

#define S5M8763_IRQ_LOBAT2_MASK		(1 << 1)



#define S5M8763_ENRAMP                  (1 << 4)



#endif /*  __LINUX_MFD_SEC_IRQ_H */