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

Commit dc691966 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Lee Jones
Browse files

mfd: sec: Add support for S2MPS14 



Add support for S2MPS14 PMIC device to the MFD sec-core driver.
The S2MPS14 is similar to S2MPS11 but it has fewer regulators, two
clocks instead of three and a little different registers layout.

Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 67762095

drivers/mfd/sec-core.c

+43 −5
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/mfd/samsung/irq.h>

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

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

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

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

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

#include <linux/regmap.h>
@@ -69,6 +70,16 @@ static const struct mfd_cell s2mps11_devs[] = { 
	}

};



static const struct mfd_cell s2mps14_devs[] = {

	{

		.name = "s2mps14-pmic",

	}, {

		.name = "s2mps14-rtc",

	}, {

		.name = "s2mps14-clk",

	}

};



#ifdef CONFIG_OF

static struct of_device_id sec_dt_match[] = {

	{	.compatible = "samsung,s5m8767-pmic",
@@ -77,6 +88,9 @@ static struct of_device_id sec_dt_match[] = { 
	{	.compatible = "samsung,s2mps11-pmic",

		.data = (void *)S2MPS11X,

	},

	{	.compatible = "samsung,s2mps14-pmic",

		.data = (void *)S2MPS14X,

	},

	{},

};

#endif
@@ -120,6 +134,15 @@ static const struct regmap_config s2mps11_regmap_config = { 
	.cache_type = REGCACHE_FLAT,

};



static const struct regmap_config s2mps14_regmap_config = {

	.reg_bits = 8,

	.val_bits = 8,



	.max_register = S2MPS14_REG_LDODSCH3,

	.volatile_reg = s2mps11_volatile,

	.cache_type = REGCACHE_FLAT,

};



static const struct regmap_config s5m8763_regmap_config = {

	.reg_bits = 8,

	.val_bits = 8,
@@ -138,13 +161,20 @@ static const struct regmap_config s5m8767_regmap_config = { 
	.cache_type = REGCACHE_FLAT,

};



static const struct regmap_config sec_rtc_regmap_config = {

static const struct regmap_config s5m_rtc_regmap_config = {

	.reg_bits = 8,

	.val_bits = 8,



	.max_register = SEC_RTC_REG_MAX,

};



static const struct regmap_config s2mps14_rtc_regmap_config = {

	.reg_bits = 8,

	.val_bits = 8,



	.max_register = S2MPS_RTC_REG_MAX,

};



#ifdef CONFIG_OF

/*

 * Only the common platform data elements for s5m8767 are parsed here from the
@@ -239,19 +269,23 @@ static int sec_pmic_probe(struct i2c_client *i2c, 
		 * However we must pass something to devm_regmap_init_i2c()

		 * so use S5M-like regmap config even though it wouldn't work.

		 */

		regmap_rtc = &sec_rtc_regmap_config;

		regmap_rtc = &s5m_rtc_regmap_config;

		break;

	case S2MPS14X:

		regmap = &s2mps14_regmap_config;

		regmap_rtc = &s2mps14_rtc_regmap_config;

		break;

	case S5M8763X:

		regmap = &s5m8763_regmap_config;

		regmap_rtc = &sec_rtc_regmap_config;

		regmap_rtc = &s5m_rtc_regmap_config;

		break;

	case S5M8767X:

		regmap = &s5m8767_regmap_config;

		regmap_rtc = &sec_rtc_regmap_config;

		regmap_rtc = &s5m_rtc_regmap_config;

		break;

	default:

		regmap = &sec_regmap_config;

		regmap_rtc = &sec_rtc_regmap_config;

		regmap_rtc = &s5m_rtc_regmap_config;

		break;

	}
@@ -298,6 +332,10 @@ static int sec_pmic_probe(struct i2c_client *i2c, 
		ret = mfd_add_devices(sec_pmic->dev, -1, s2mps11_devs,

				      ARRAY_SIZE(s2mps11_devs), NULL, 0, NULL);

		break;

	case S2MPS14X:

		ret = mfd_add_devices(sec_pmic->dev, -1, s2mps14_devs,

				      ARRAY_SIZE(s2mps14_devs), NULL, 0, NULL);

		break;

	default:

		/* If this happens the probe function is problem */

		BUG();

drivers/mfd/sec-irq.c

+88 −1
Original line number Diff line number Diff line 
/*

 * sec-irq.c

 *

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

 * Copyright (c) 2011-2014 Samsung Electronics Co., Ltd

 *              http://www.samsung.com

 *

 *  This program is free software; you can redistribute  it and/or modify it
@@ -19,6 +19,7 @@ 
#include <linux/mfd/samsung/core.h>

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

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

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

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

#include <linux/mfd/samsung/s5m8767.h>
@@ -89,6 +90,76 @@ static const struct regmap_irq s2mps11_irqs[] = { 
	},

};



static const struct regmap_irq s2mps14_irqs[] = {

	[S2MPS14_IRQ_PWRONF] = {

		.reg_offset = 0,

		.mask = S2MPS11_IRQ_PWRONF_MASK,

	},

	[S2MPS14_IRQ_PWRONR] = {

		.reg_offset = 0,

		.mask = S2MPS11_IRQ_PWRONR_MASK,

	},

	[S2MPS14_IRQ_JIGONBF] = {

		.reg_offset = 0,

		.mask = S2MPS11_IRQ_JIGONBF_MASK,

	},

	[S2MPS14_IRQ_JIGONBR] = {

		.reg_offset = 0,

		.mask = S2MPS11_IRQ_JIGONBR_MASK,

	},

	[S2MPS14_IRQ_ACOKBF] = {

		.reg_offset = 0,

		.mask = S2MPS11_IRQ_ACOKBF_MASK,

	},

	[S2MPS14_IRQ_ACOKBR] = {

		.reg_offset = 0,

		.mask = S2MPS11_IRQ_ACOKBR_MASK,

	},

	[S2MPS14_IRQ_PWRON1S] = {

		.reg_offset = 0,

		.mask = S2MPS11_IRQ_PWRON1S_MASK,

	},

	[S2MPS14_IRQ_MRB] = {

		.reg_offset = 0,

		.mask = S2MPS11_IRQ_MRB_MASK,

	},

	[S2MPS14_IRQ_RTC60S] = {

		.reg_offset = 1,

		.mask = S2MPS11_IRQ_RTC60S_MASK,

	},

	[S2MPS14_IRQ_RTCA1] = {

		.reg_offset = 1,

		.mask = S2MPS11_IRQ_RTCA1_MASK,

	},

	[S2MPS14_IRQ_RTCA0] = {

		.reg_offset = 1,

		.mask = S2MPS11_IRQ_RTCA0_MASK,

	},

	[S2MPS14_IRQ_SMPL] = {

		.reg_offset = 1,

		.mask = S2MPS11_IRQ_SMPL_MASK,

	},

	[S2MPS14_IRQ_RTC1S] = {

		.reg_offset = 1,

		.mask = S2MPS11_IRQ_RTC1S_MASK,

	},

	[S2MPS14_IRQ_WTSR] = {

		.reg_offset = 1,

		.mask = S2MPS11_IRQ_WTSR_MASK,

	},

	[S2MPS14_IRQ_INT120C] = {

		.reg_offset = 2,

		.mask = S2MPS11_IRQ_INT120C_MASK,

	},

	[S2MPS14_IRQ_INT140C] = {

		.reg_offset = 2,

		.mask = S2MPS11_IRQ_INT140C_MASK,

	},

	[S2MPS14_IRQ_TSD] = {

		.reg_offset = 2,

		.mask = S2MPS14_IRQ_TSD_MASK,

	},

};



static const struct regmap_irq s5m8767_irqs[] = {

	[S5M8767_IRQ_PWRR] = {
@@ -246,6 +317,16 @@ static const struct regmap_irq_chip s2mps11_irq_chip = { 
	.ack_base = S2MPS11_REG_INT1,

};



static const struct regmap_irq_chip s2mps14_irq_chip = {

	.name = "s2mps14",

	.irqs = s2mps14_irqs,

	.num_irqs = ARRAY_SIZE(s2mps14_irqs),

	.num_regs = 3,

	.status_base = S2MPS14_REG_INT1,

	.mask_base = S2MPS14_REG_INT1M,

	.ack_base = S2MPS14_REG_INT1,

};



static const struct regmap_irq_chip s5m8767_irq_chip = {

	.name = "s5m8767",

	.irqs = s5m8767_irqs,
@@ -297,6 +378,12 @@ int sec_irq_init(struct sec_pmic_dev *sec_pmic) 
				  sec_pmic->irq_base, &s2mps11_irq_chip,

				  &sec_pmic->irq_data);

		break;

	case S2MPS14X:

		ret = regmap_add_irq_chip(sec_pmic->regmap_pmic, sec_pmic->irq,

				  IRQF_TRIGGER_FALLING | IRQF_ONESHOT,

				  sec_pmic->irq_base, &s2mps14_irq_chip,

				  &sec_pmic->irq_data);

		break;

	default:

		dev_err(sec_pmic->dev, "Unknown device type %d\n",

			sec_pmic->device_type);

include/linux/mfd/samsung/core.h

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ enum sec_device_type { 
	S5M8763X,

	S5M8767X,

	S2MPS11X,

	S2MPS14X,

};



/**

include/linux/mfd/samsung/irq.h

+27 −0
Original line number Diff line number Diff line
@@ -55,6 +55,33 @@ enum s2mps11_irq { 
#define S2MPS11_IRQ_INT120C_MASK	(1 << 0)

#define S2MPS11_IRQ_INT140C_MASK	(1 << 1)



enum s2mps14_irq {

	S2MPS14_IRQ_PWRONF,

	S2MPS14_IRQ_PWRONR,

	S2MPS14_IRQ_JIGONBF,

	S2MPS14_IRQ_JIGONBR,

	S2MPS14_IRQ_ACOKBF,

	S2MPS14_IRQ_ACOKBR,

	S2MPS14_IRQ_PWRON1S,

	S2MPS14_IRQ_MRB,



	S2MPS14_IRQ_RTC60S,

	S2MPS14_IRQ_RTCA1,

	S2MPS14_IRQ_RTCA0,

	S2MPS14_IRQ_SMPL,

	S2MPS14_IRQ_RTC1S,

	S2MPS14_IRQ_WTSR,



	S2MPS14_IRQ_INT120C,

	S2MPS14_IRQ_INT140C,

	S2MPS14_IRQ_TSD,



	S2MPS14_IRQ_NR,

};



/* Masks for interrupts are the same as in s2mps11 */

#define S2MPS14_IRQ_TSD_MASK		(1 << 2)



enum s5m8767_irq {

	S5M8767_IRQ_PWRR,

	S5M8767_IRQ_PWRF,

include/linux/mfd/samsung/rtc.h

+49 −6
Original line number Diff line number Diff line 
/* rtc.h

 *

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

 * Copyright (c) 2011-2014 Samsung Electronics Co., Ltd

 *              http://www.samsung.com

 *

 * This program is free software; you can redistribute  it and/or modify it
@@ -8,6 +8,11 @@ 
 * Free Software Foundation;  either version 2 of the  License, or (at your

 * option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 */



#ifndef __LINUX_MFD_SEC_RTC_H
@@ -47,6 +52,37 @@ enum sec_rtc_reg { 
	SEC_RTC_REG_MAX,

};



enum s2mps_rtc_reg {

	S2MPS_RTC_CTRL,

	S2MPS_WTSR_SMPL_CNTL,

	S2MPS_RTC_UDR_CON,

	S2MPS_RSVD,

	S2MPS_RTC_SEC,

	S2MPS_RTC_MIN,

	S2MPS_RTC_HOUR,

	S2MPS_RTC_WEEKDAY,

	S2MPS_RTC_DATE,

	S2MPS_RTC_MONTH,

	S2MPS_RTC_YEAR,

	S2MPS_ALARM0_SEC,

	S2MPS_ALARM0_MIN,

	S2MPS_ALARM0_HOUR,

	S2MPS_ALARM0_WEEKDAY,

	S2MPS_ALARM0_DATE,

	S2MPS_ALARM0_MONTH,

	S2MPS_ALARM0_YEAR,

	S2MPS_ALARM1_SEC,

	S2MPS_ALARM1_MIN,

	S2MPS_ALARM1_HOUR,

	S2MPS_ALARM1_WEEKDAY,

	S2MPS_ALARM1_DATE,

	S2MPS_ALARM1_MONTH,

	S2MPS_ALARM1_YEAR,

	S2MPS_OFFSRC,



	S2MPS_RTC_REG_MAX,

};



#define RTC_I2C_ADDR		(0x0C >> 1)



#define HOUR_12			(1 << 7)
@@ -56,6 +92,9 @@ enum sec_rtc_reg { 
#define ALARM1_STATUS		(1 << 2)

#define UPDATE_AD		(1 << 0)



#define S2MPS_ALARM0_STATUS	(1 << 2)

#define S2MPS_ALARM1_STATUS	(1 << 1)



/* RTC Control Register */

#define BCD_EN_SHIFT		0

#define BCD_EN_MASK		(1 << BCD_EN_SHIFT)
@@ -64,6 +103,10 @@ enum sec_rtc_reg { 
/* RTC Update Register1 */

#define RTC_UDR_SHIFT		0

#define RTC_UDR_MASK		(1 << RTC_UDR_SHIFT)

#define S2MPS_RTC_WUDR_SHIFT	4

#define S2MPS_RTC_WUDR_MASK	(1 << S2MPS_RTC_WUDR_SHIFT)

#define S2MPS_RTC_RUDR_SHIFT	0

#define S2MPS_RTC_RUDR_MASK	(1 << S2MPS_RTC_RUDR_SHIFT)

#define RTC_TCON_SHIFT		1

#define RTC_TCON_MASK		(1 << RTC_TCON_SHIFT)

#define RTC_TIME_EN_SHIFT	3