Merge tag 'ib-mfd-regulator-rtc-v4.5' into rtc-next (c60faa3a) · Commits · e / devices / android_kernel_teracube_emerald

drivers/mfd/sec-core.c

+31 −0

Original line number	Original line	Diff line number	Diff line
	@@ -29,6 +29,7 @@
	#include <linux/mfd/samsung/s2mps11.h>		#include <linux/mfd/samsung/s2mps11.h>
	#include <linux/mfd/samsung/s2mps13.h>		#include <linux/mfd/samsung/s2mps13.h>
	#include <linux/mfd/samsung/s2mps14.h>		#include <linux/mfd/samsung/s2mps14.h>
			#include <linux/mfd/samsung/s2mps15.h>
	#include <linux/mfd/samsung/s2mpu02.h>		#include <linux/mfd/samsung/s2mpu02.h>
	#include <linux/mfd/samsung/s5m8763.h>		#include <linux/mfd/samsung/s5m8763.h>
	#include <linux/mfd/samsung/s5m8767.h>		#include <linux/mfd/samsung/s5m8767.h>
	@@ -96,6 +97,17 @@ static const struct mfd_cell s2mps14_devs[] = {
	}		}
	};		};

			static const struct mfd_cell s2mps15_devs[] = {
			{
			.name = "s2mps15-regulator",
			}, {
			.name = "s2mps15-rtc",
			}, {
			.name = "s2mps13-clk",
			.of_compatible = "samsung,s2mps13-clk",
			},
			};

	static const struct mfd_cell s2mpa01_devs[] = {		static const struct mfd_cell s2mpa01_devs[] = {
	{		{
	.name = "s2mpa01-pmic",		.name = "s2mpa01-pmic",
	@@ -121,6 +133,9 @@ static const struct of_device_id sec_dt_match[] = {
	}, {		}, {
	.compatible = "samsung,s2mps14-pmic",		.compatible = "samsung,s2mps14-pmic",
	.data = (void *)S2MPS14X,		.data = (void *)S2MPS14X,
			}, {
			.compatible = "samsung,s2mps15-pmic",
			.data = (void *)S2MPS15X,
	}, {		}, {
	.compatible = "samsung,s2mpa01-pmic",		.compatible = "samsung,s2mpa01-pmic",
	.data = (void *)S2MPA01,		.data = (void *)S2MPA01,
	@@ -223,6 +238,15 @@ static const struct regmap_config s2mps14_regmap_config = {
	.cache_type = REGCACHE_FLAT,		.cache_type = REGCACHE_FLAT,
	};		};

			static const struct regmap_config s2mps15_regmap_config = {
			.reg_bits = 8,
			.val_bits = 8,

			.max_register = S2MPS15_REG_LDODSCH4,
			.volatile_reg = s2mps11_volatile,
			.cache_type = REGCACHE_FLAT,
			};

	static const struct regmap_config s2mpu02_regmap_config = {		static const struct regmap_config s2mpu02_regmap_config = {
	.reg_bits = 8,		.reg_bits = 8,
	.val_bits = 8,		.val_bits = 8,
	@@ -384,6 +408,9 @@ static int sec_pmic_probe(struct i2c_client *i2c,
	case S2MPS14X:		case S2MPS14X:
	regmap = &s2mps14_regmap_config;		regmap = &s2mps14_regmap_config;
	break;		break;
			case S2MPS15X:
			regmap = &s2mps15_regmap_config;
			break;
	case S5M8763X:		case S5M8763X:
	regmap = &s5m8763_regmap_config;		regmap = &s5m8763_regmap_config;
	break;		break;
	@@ -442,6 +469,10 @@ static int sec_pmic_probe(struct i2c_client *i2c,
	sec_devs = s2mps14_devs;		sec_devs = s2mps14_devs;
	num_sec_devs = ARRAY_SIZE(s2mps14_devs);		num_sec_devs = ARRAY_SIZE(s2mps14_devs);
	break;		break;
			case S2MPS15X:
			sec_devs = s2mps15_devs;
			num_sec_devs = ARRAY_SIZE(s2mps15_devs);
			break;
	case S2MPU02:		case S2MPU02:
	sec_devs = s2mpu02_devs;		sec_devs = s2mpu02_devs;
	num_sec_devs = ARRAY_SIZE(s2mpu02_devs);		num_sec_devs = ARRAY_SIZE(s2mpu02_devs);

drivers/mfd/sec-irq.c

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -407,6 +407,11 @@ static const struct regmap_irq_chip s2mps14_irq_chip = {
	S2MPS1X_IRQ_CHIP_COMMON_DATA,		S2MPS1X_IRQ_CHIP_COMMON_DATA,
	};		};

			static const struct regmap_irq_chip s2mps15_irq_chip = {
			.name = "s2mps15",
			S2MPS1X_IRQ_CHIP_COMMON_DATA,
			};

	static const struct regmap_irq_chip s2mpu02_irq_chip = {		static const struct regmap_irq_chip s2mpu02_irq_chip = {
	.name = "s2mpu02",		.name = "s2mpu02",
	.irqs = s2mpu02_irqs,		.irqs = s2mpu02_irqs,
	@@ -466,6 +471,9 @@ int sec_irq_init(struct sec_pmic_dev *sec_pmic)
	case S2MPS14X:		case S2MPS14X:
	sec_irq_chip = &s2mps14_irq_chip;		sec_irq_chip = &s2mps14_irq_chip;
	break;		break;
			case S2MPS15X:
			sec_irq_chip = &s2mps15_irq_chip;
			break;
	case S2MPU02:		case S2MPU02:
	sec_irq_chip = &s2mpu02_irq_chip;		sec_irq_chip = &s2mpu02_irq_chip;
	break;		break;

drivers/regulator/Kconfig

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -588,10 +588,10 @@ config REGULATOR_S2MPA01
	via I2C bus. S2MPA01 has 10 Bucks and 26 LDO outputs.		via I2C bus. S2MPA01 has 10 Bucks and 26 LDO outputs.

	config REGULATOR_S2MPS11		config REGULATOR_S2MPS11
	tristate "Samsung S2MPS11/S2MPS13/S2MPS14/S2MPU02 voltage regulator"		tristate "Samsung S2MPS11/13/14/15/S2MPU02 voltage regulator"
	depends on MFD_SEC_CORE		depends on MFD_SEC_CORE
	help		help
	This driver supports a Samsung S2MPS11/S2MPS13/S2MPS14/S2MPU02 voltage		This driver supports a Samsung S2MPS11/13/14/15/S2MPU02 voltage
	output regulator via I2C bus. The chip is comprised of high efficient		output regulator via I2C bus. The chip is comprised of high efficient
	Buck converters including Dual-Phase Buck converter, Buck-Boost		Buck converters including Dual-Phase Buck converter, Buck-Boost
	converter, various LDOs.		converter, various LDOs.

drivers/regulator/s2mps11.c

+134 −1

Original line number	Original line	Diff line number	Diff line
	@@ -32,6 +32,7 @@
	#include <linux/mfd/samsung/s2mps11.h>		#include <linux/mfd/samsung/s2mps11.h>
	#include <linux/mfd/samsung/s2mps13.h>		#include <linux/mfd/samsung/s2mps13.h>
	#include <linux/mfd/samsung/s2mps14.h>		#include <linux/mfd/samsung/s2mps14.h>
			#include <linux/mfd/samsung/s2mps15.h>
	#include <linux/mfd/samsung/s2mpu02.h>		#include <linux/mfd/samsung/s2mpu02.h>

	/* The highest number of possible regulators for supported devices. */		/* The highest number of possible regulators for supported devices. */
	@@ -661,6 +662,133 @@ static const struct regulator_desc s2mps14_regulators[] = {
	S2MPS14_BUCK1235_START_SEL),		S2MPS14_BUCK1235_START_SEL),
	};		};

			static struct regulator_ops s2mps15_reg_ldo_ops = {
			.list_voltage = regulator_list_voltage_linear_range,
			.map_voltage = regulator_map_voltage_linear_range,
			.is_enabled = regulator_is_enabled_regmap,
			.enable = regulator_enable_regmap,
			.disable = regulator_disable_regmap,
			.get_voltage_sel = regulator_get_voltage_sel_regmap,
			.set_voltage_sel = regulator_set_voltage_sel_regmap,
			};

			static struct regulator_ops s2mps15_reg_buck_ops = {
			.list_voltage = regulator_list_voltage_linear_range,
			.map_voltage = regulator_map_voltage_linear_range,
			.is_enabled = regulator_is_enabled_regmap,
			.enable = regulator_enable_regmap,
			.disable = regulator_disable_regmap,
			.get_voltage_sel = regulator_get_voltage_sel_regmap,
			.set_voltage_sel = regulator_set_voltage_sel_regmap,
			.set_voltage_time_sel = regulator_set_voltage_time_sel,
			};

			#define regulator_desc_s2mps15_ldo(num, range) { \
			.name = "LDO"#num, \
			.id = S2MPS15_LDO##num, \
			.ops = &s2mps15_reg_ldo_ops, \
			.type = REGULATOR_VOLTAGE, \
			.owner = THIS_MODULE, \
			.linear_ranges = range, \
			.n_linear_ranges = ARRAY_SIZE(range), \
			.n_voltages = S2MPS15_LDO_N_VOLTAGES, \
			.vsel_reg = S2MPS15_REG_L1CTRL + num - 1, \
			.vsel_mask = S2MPS15_LDO_VSEL_MASK, \
			.enable_reg = S2MPS15_REG_L1CTRL + num - 1, \
			.enable_mask = S2MPS15_ENABLE_MASK \
			}

			#define regulator_desc_s2mps15_buck(num, range) { \
			.name = "BUCK"#num, \
			.id = S2MPS15_BUCK##num, \
			.ops = &s2mps15_reg_buck_ops, \
			.type = REGULATOR_VOLTAGE, \
			.owner = THIS_MODULE, \
			.linear_ranges = range, \
			.n_linear_ranges = ARRAY_SIZE(range), \
			.ramp_delay = 12500, \
			.n_voltages = S2MPS15_BUCK_N_VOLTAGES, \
			.vsel_reg = S2MPS15_REG_B1CTRL2 + ((num - 1) * 2), \
			.vsel_mask = S2MPS15_BUCK_VSEL_MASK, \
			.enable_reg = S2MPS15_REG_B1CTRL1 + ((num - 1) * 2), \
			.enable_mask = S2MPS15_ENABLE_MASK \
			}

			/* voltage range for s2mps15 LDO 3, 5, 15, 16, 18, 20, 23 and 27 */
			static const struct regulator_linear_range s2mps15_ldo_voltage_ranges1[] = {
			REGULATOR_LINEAR_RANGE(1000000, 0xc, 0x38, 25000),
			};

			/* voltage range for s2mps15 LDO 2, 6, 14, 17, 19, 21, 24 and 25 */
			static const struct regulator_linear_range s2mps15_ldo_voltage_ranges2[] = {
			REGULATOR_LINEAR_RANGE(1800000, 0x0, 0x3f, 25000),
			};

			/* voltage range for s2mps15 LDO 4, 11, 12, 13, 22 and 26 */
			static const struct regulator_linear_range s2mps15_ldo_voltage_ranges3[] = {
			REGULATOR_LINEAR_RANGE(700000, 0x0, 0x34, 12500),
			};

			/* voltage range for s2mps15 LDO 7, 8, 9 and 10 */
			static const struct regulator_linear_range s2mps15_ldo_voltage_ranges4[] = {
			REGULATOR_LINEAR_RANGE(700000, 0xc, 0x18, 25000),
			};

			/* voltage range for s2mps15 LDO 1 */
			static const struct regulator_linear_range s2mps15_ldo_voltage_ranges5[] = {
			REGULATOR_LINEAR_RANGE(500000, 0x0, 0x20, 12500),
			};

			/* voltage range for s2mps15 BUCK 1, 2, 3, 4, 5, 6 and 7 */
			static const struct regulator_linear_range s2mps15_buck_voltage_ranges1[] = {
			REGULATOR_LINEAR_RANGE(500000, 0x20, 0xb0, 6250),
			};

			/* voltage range for s2mps15 BUCK 8, 9 and 10 */
			static const struct regulator_linear_range s2mps15_buck_voltage_ranges2[] = {
			REGULATOR_LINEAR_RANGE(1000000, 0x20, 0xc0, 12500),
			};

			static const struct regulator_desc s2mps15_regulators[] = {
			regulator_desc_s2mps15_ldo(1, s2mps15_ldo_voltage_ranges5),
			regulator_desc_s2mps15_ldo(2, s2mps15_ldo_voltage_ranges2),
			regulator_desc_s2mps15_ldo(3, s2mps15_ldo_voltage_ranges1),
			regulator_desc_s2mps15_ldo(4, s2mps15_ldo_voltage_ranges3),
			regulator_desc_s2mps15_ldo(5, s2mps15_ldo_voltage_ranges1),
			regulator_desc_s2mps15_ldo(6, s2mps15_ldo_voltage_ranges2),
			regulator_desc_s2mps15_ldo(7, s2mps15_ldo_voltage_ranges4),
			regulator_desc_s2mps15_ldo(8, s2mps15_ldo_voltage_ranges4),
			regulator_desc_s2mps15_ldo(9, s2mps15_ldo_voltage_ranges4),
			regulator_desc_s2mps15_ldo(10, s2mps15_ldo_voltage_ranges4),
			regulator_desc_s2mps15_ldo(11, s2mps15_ldo_voltage_ranges3),
			regulator_desc_s2mps15_ldo(12, s2mps15_ldo_voltage_ranges3),
			regulator_desc_s2mps15_ldo(13, s2mps15_ldo_voltage_ranges3),
			regulator_desc_s2mps15_ldo(14, s2mps15_ldo_voltage_ranges2),
			regulator_desc_s2mps15_ldo(15, s2mps15_ldo_voltage_ranges1),
			regulator_desc_s2mps15_ldo(16, s2mps15_ldo_voltage_ranges1),
			regulator_desc_s2mps15_ldo(17, s2mps15_ldo_voltage_ranges2),
			regulator_desc_s2mps15_ldo(18, s2mps15_ldo_voltage_ranges1),
			regulator_desc_s2mps15_ldo(19, s2mps15_ldo_voltage_ranges2),
			regulator_desc_s2mps15_ldo(20, s2mps15_ldo_voltage_ranges1),
			regulator_desc_s2mps15_ldo(21, s2mps15_ldo_voltage_ranges2),
			regulator_desc_s2mps15_ldo(22, s2mps15_ldo_voltage_ranges3),
			regulator_desc_s2mps15_ldo(23, s2mps15_ldo_voltage_ranges1),
			regulator_desc_s2mps15_ldo(24, s2mps15_ldo_voltage_ranges2),
			regulator_desc_s2mps15_ldo(25, s2mps15_ldo_voltage_ranges2),
			regulator_desc_s2mps15_ldo(26, s2mps15_ldo_voltage_ranges3),
			regulator_desc_s2mps15_ldo(27, s2mps15_ldo_voltage_ranges1),
			regulator_desc_s2mps15_buck(1, s2mps15_buck_voltage_ranges1),
			regulator_desc_s2mps15_buck(2, s2mps15_buck_voltage_ranges1),
			regulator_desc_s2mps15_buck(3, s2mps15_buck_voltage_ranges1),
			regulator_desc_s2mps15_buck(4, s2mps15_buck_voltage_ranges1),
			regulator_desc_s2mps15_buck(5, s2mps15_buck_voltage_ranges1),
			regulator_desc_s2mps15_buck(6, s2mps15_buck_voltage_ranges1),
			regulator_desc_s2mps15_buck(7, s2mps15_buck_voltage_ranges1),
			regulator_desc_s2mps15_buck(8, s2mps15_buck_voltage_ranges2),
			regulator_desc_s2mps15_buck(9, s2mps15_buck_voltage_ranges2),
			regulator_desc_s2mps15_buck(10, s2mps15_buck_voltage_ranges2),
			};

	static int s2mps14_pmic_enable_ext_control(struct s2mps11_info *s2mps11,		static int s2mps14_pmic_enable_ext_control(struct s2mps11_info *s2mps11,
	struct regulator_dev *rdev)		struct regulator_dev *rdev)
	{		{
	@@ -974,6 +1102,10 @@ static int s2mps11_pmic_probe(struct platform_device *pdev)
	regulators = s2mps14_regulators;		regulators = s2mps14_regulators;
	BUILD_BUG_ON(S2MPS_REGULATOR_MAX < s2mps11->rdev_num);		BUILD_BUG_ON(S2MPS_REGULATOR_MAX < s2mps11->rdev_num);
	break;		break;
			case S2MPS15X:
			s2mps11->rdev_num = ARRAY_SIZE(s2mps15_regulators);
			regulators = s2mps15_regulators;
			break;
	case S2MPU02:		case S2MPU02:
	s2mps11->rdev_num = ARRAY_SIZE(s2mpu02_regulators);		s2mps11->rdev_num = ARRAY_SIZE(s2mpu02_regulators);
	regulators = s2mpu02_regulators;		regulators = s2mpu02_regulators;
	@@ -1070,6 +1202,7 @@ static const struct platform_device_id s2mps11_pmic_id[] = {
	{ "s2mps11-pmic", S2MPS11X},		{ "s2mps11-pmic", S2MPS11X},
	{ "s2mps13-pmic", S2MPS13X},		{ "s2mps13-pmic", S2MPS13X},
	{ "s2mps14-pmic", S2MPS14X},		{ "s2mps14-pmic", S2MPS14X},
			{ "s2mps15-regulator", S2MPS15X},
	{ "s2mpu02-pmic", S2MPU02},		{ "s2mpu02-pmic", S2MPU02},
	{ },		{ },
	};		};
	@@ -1097,5 +1230,5 @@ module_exit(s2mps11_pmic_exit);

	/* Module information */		/* Module information */
	MODULE_AUTHOR("Sangbeom Kim <sbkim73@samsung.com>");		MODULE_AUTHOR("Sangbeom Kim <sbkim73@samsung.com>");
	MODULE_DESCRIPTION("SAMSUNG S2MPS11/S2MPS14/S2MPU02 Regulator Driver");		MODULE_DESCRIPTION("SAMSUNG S2MPS11/S2MPS14/S2MPS15/S2MPU02 Regulator Driver");
	MODULE_LICENSE("GPL");		MODULE_LICENSE("GPL");

drivers/rtc/rtc-s5m.c

+33 −4

Original line number	Original line	Diff line number	Diff line
	@@ -188,6 +188,7 @@ static inline int s5m_check_peding_alarm_interrupt(struct s5m_rtc_info *info,
	ret = regmap_read(info->regmap, S5M_RTC_STATUS, &val);		ret = regmap_read(info->regmap, S5M_RTC_STATUS, &val);
	val &= S5M_ALARM0_STATUS;		val &= S5M_ALARM0_STATUS;
	break;		break;
			case S2MPS15X:
	case S2MPS14X:		case S2MPS14X:
	case S2MPS13X:		case S2MPS13X:
	ret = regmap_read(info->s5m87xx->regmap_pmic, S2MPS14_REG_ST2,		ret = regmap_read(info->s5m87xx->regmap_pmic, S2MPS14_REG_ST2,
	@@ -219,9 +220,22 @@ static inline int s5m8767_rtc_set_time_reg(struct s5m_rtc_info *info)
	return ret;		return ret;
	}		}

			switch (info->device_type) {
			case S5M8763X:
			case S5M8767X:
			data \|= info->regs->rtc_udr_mask \| S5M_RTC_TIME_EN_MASK;
			case S2MPS15X:
			/* As per UM, for write time register, set WUDR bit to high */
			data \|= S2MPS15_RTC_WUDR_MASK;
			break;
			case S2MPS14X:
			case S2MPS13X:
	data \|= info->regs->rtc_udr_mask;		data \|= info->regs->rtc_udr_mask;
	if (info->device_type == S5M8763X \|\| info->device_type == S5M8767X)		break;
	data \|= S5M_RTC_TIME_EN_MASK;		default:
			return -EINVAL;
			}


	ret = regmap_write(info->regmap, info->regs->rtc_udr_update, data);		ret = regmap_write(info->regmap, info->regs->rtc_udr_update, data);
	if (ret < 0) {		if (ret < 0) {
	@@ -252,6 +266,11 @@ static inline int s5m8767_rtc_set_alarm_reg(struct s5m_rtc_info *info)
	case S5M8767X:		case S5M8767X:
	data &= ~S5M_RTC_TIME_EN_MASK;		data &= ~S5M_RTC_TIME_EN_MASK;
	break;		break;
			case S2MPS15X:
			/* As per UM, for write alarm, set A_UDR(bit[4]) to high
			* rtc_udr_mask above sets bit[4]
			*/
			break;
	case S2MPS14X:		case S2MPS14X:
	data \|= S2MPS_RTC_RUDR_MASK;		data \|= S2MPS_RTC_RUDR_MASK;
	break;		break;
	@@ -317,7 +336,8 @@ static int s5m_rtc_read_time(struct device dev, struct rtc_time tm)
	u8 data[info->regs->regs_count];		u8 data[info->regs->regs_count];
	int ret;		int ret;

	if (info->device_type == S2MPS14X \|\| info->device_type == S2MPS13X) {		if (info->device_type == S2MPS15X \|\| info->device_type == S2MPS14X \|\|
			info->device_type == S2MPS13X) {
	ret = regmap_update_bits(info->regmap,		ret = regmap_update_bits(info->regmap,
	info->regs->rtc_udr_update,		info->regs->rtc_udr_update,
	S2MPS_RTC_RUDR_MASK, S2MPS_RTC_RUDR_MASK);		S2MPS_RTC_RUDR_MASK, S2MPS_RTC_RUDR_MASK);
	@@ -339,6 +359,7 @@ static int s5m_rtc_read_time(struct device dev, struct rtc_time tm)
	break;		break;

	case S5M8767X:		case S5M8767X:
			case S2MPS15X:
	case S2MPS14X:		case S2MPS14X:
	case S2MPS13X:		case S2MPS13X:
	s5m8767_data_to_tm(data, tm, info->rtc_24hr_mode);		s5m8767_data_to_tm(data, tm, info->rtc_24hr_mode);
	@@ -366,6 +387,7 @@ static int s5m_rtc_set_time(struct device dev, struct rtc_time tm)
	s5m8763_tm_to_data(tm, data);		s5m8763_tm_to_data(tm, data);
	break;		break;
	case S5M8767X:		case S5M8767X:
			case S2MPS15X:
	case S2MPS14X:		case S2MPS14X:
	case S2MPS13X:		case S2MPS13X:
	ret = s5m8767_tm_to_data(tm, data);		ret = s5m8767_tm_to_data(tm, data);
	@@ -414,6 +436,7 @@ static int s5m_rtc_read_alarm(struct device dev, struct rtc_wkalrm alrm)
	break;		break;

	case S5M8767X:		case S5M8767X:
			case S2MPS15X:
	case S2MPS14X:		case S2MPS14X:
	case S2MPS13X:		case S2MPS13X:
	s5m8767_data_to_tm(data, &alrm->time, info->rtc_24hr_mode);		s5m8767_data_to_tm(data, &alrm->time, info->rtc_24hr_mode);
	@@ -463,6 +486,7 @@ static int s5m_rtc_stop_alarm(struct s5m_rtc_info *info)
	break;		break;

	case S5M8767X:		case S5M8767X:
			case S2MPS15X:
	case S2MPS14X:		case S2MPS14X:
	case S2MPS13X:		case S2MPS13X:
	for (i = 0; i < info->regs->regs_count; i++)		for (i = 0; i < info->regs->regs_count; i++)
	@@ -508,6 +532,7 @@ static int s5m_rtc_start_alarm(struct s5m_rtc_info *info)
	break;		break;

	case S5M8767X:		case S5M8767X:
			case S2MPS15X:
	case S2MPS14X:		case S2MPS14X:
	case S2MPS13X:		case S2MPS13X:
	data[RTC_SEC] \|= ALARM_ENABLE_MASK;		data[RTC_SEC] \|= ALARM_ENABLE_MASK;
	@@ -548,6 +573,7 @@ static int s5m_rtc_set_alarm(struct device dev, struct rtc_wkalrm alrm)
	break;		break;

	case S5M8767X:		case S5M8767X:
			case S2MPS15X:
	case S2MPS14X:		case S2MPS14X:
	case S2MPS13X:		case S2MPS13X:
	s5m8767_tm_to_data(&alrm->time, data);		s5m8767_tm_to_data(&alrm->time, data);
	@@ -631,6 +657,7 @@ static int s5m8767_rtc_init_reg(struct s5m_rtc_info *info)
	ret = regmap_raw_write(info->regmap, S5M_ALARM0_CONF, data, 2);		ret = regmap_raw_write(info->regmap, S5M_ALARM0_CONF, data, 2);
	break;		break;

			case S2MPS15X:
	case S2MPS14X:		case S2MPS14X:
	case S2MPS13X:		case S2MPS13X:
	data[0] = (0 << BCD_EN_SHIFT) \| (1 << MODEL24_SHIFT);		data[0] = (0 << BCD_EN_SHIFT) \| (1 << MODEL24_SHIFT);
	@@ -679,6 +706,7 @@ static int s5m_rtc_probe(struct platform_device *pdev)
	return -ENOMEM;		return -ENOMEM;

	switch (platform_get_device_id(pdev)->driver_data) {		switch (platform_get_device_id(pdev)->driver_data) {
			case S2MPS15X:
	case S2MPS14X:		case S2MPS14X:
	case S2MPS13X:		case S2MPS13X:
	regmap_cfg = &s2mps14_rtc_regmap_config;		regmap_cfg = &s2mps14_rtc_regmap_config;
	@@ -805,6 +833,7 @@ static const struct platform_device_id s5m_rtc_id[] = {
	{ "s5m-rtc", S5M8767X },		{ "s5m-rtc", S5M8767X },
	{ "s2mps13-rtc", S2MPS13X },		{ "s2mps13-rtc", S2MPS13X },
	{ "s2mps14-rtc", S2MPS14X },		{ "s2mps14-rtc", S2MPS14X },
			{ "s2mps15-rtc", S2MPS15X },
	{ },		{ },
	};		};
	MODULE_DEVICE_TABLE(platform, s5m_rtc_id);		MODULE_DEVICE_TABLE(platform, s5m_rtc_id);