Commit 7f544a51 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-defconfig-4.6' of... 

Merge tag 'samsung-defconfig-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/defconfig

Defconfig (exynos and multi_v7) changes for Exynos based boards for v4.6:
1. exynos defconfig:
   a. Enable NEON and accelerated crypto,
   b. Enable s5p-secss driver (Security SubSystem block for accelerating
      some cryptographic operations),
2. exynos and multi_v7: Remove MAX77802 RTC Kconfig because the driver
   was combined into existing rtc-max77686 driver. This depends on changes
   from RTC tree.

* tag 'samsung-defconfig-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  ARM: multi_v7_defconfig: Remove MAX77802 RTC Kconfig symbol
  ARM: exynos_defconfig: Remove MAX77802 RTC Kconfig symbol
  rtc: max77686: Cleanup and reduce dmesg output
  rtc: Remove Maxim 77802 driver
  rtc: max77686: Properly handle regmap_irq_get_virq() error code
  rtc: max77686: Fix unsupported year message
  rtc: max77686: Add max77802 support
  rtc: max77686: Add an indirection level to access RTC registers
  rtc: max77686: Use a driver data struct instead hard-coded values
  rtc: max77686: Use usleep_range() instead of msleep()
  rtc: max77686: Use ARRAY_SIZE() instead of current array length
  rtc: max77686: Fix max77686_rtc_read_alarm() return value
  ARM: exynos_defconfig: Enable s5p-secss driver
  ARM: exynos_defconfig: Enable NEON, accelerated crypto and cpufreq stats

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 39b898a0 5d51f1dd

arch/arm/configs/exynos_defconfig

+8 −2
Original line number Diff line number Diff line
@@ -26,12 +26,14 @@ CONFIG_ARM_APPENDED_DTB=y 
CONFIG_ARM_ATAG_DTB_COMPAT=y

CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M"

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_STAT_DETAILS=y

CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y

CONFIG_CPUFREQ_DT=y

CONFIG_CPU_IDLE=y

CONFIG_ARM_EXYNOS_CPUIDLE=y

CONFIG_VFP=y

CONFIG_NEON=y

CONFIG_KERNEL_MODE_NEON=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y
@@ -193,7 +195,6 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y 
CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_MAX8997=y

CONFIG_RTC_DRV_MAX77686=y

CONFIG_RTC_DRV_MAX77802=y

CONFIG_RTC_DRV_S5M=y

CONFIG_RTC_DRV_S3C=y

CONFIG_DMADEVICES=y
@@ -238,7 +239,12 @@ CONFIG_DEBUG_RT_MUTEXES=y 
CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_DEBUG_USER=y

CONFIG_CRYPTO_SHA256=y

CONFIG_CRYPTO_DEV_S5P=y

CONFIG_ARM_CRYPTO=y

CONFIG_CRYPTO_SHA1_ARM_NEON=m

CONFIG_CRYPTO_SHA256_ARM=m

CONFIG_CRYPTO_SHA512_ARM=m

CONFIG_CRYPTO_AES_ARM_BS=m

CONFIG_CRC_CCITT=y

CONFIG_FONTS=y

CONFIG_FONT_7x14=y

arch/arm/configs/multi_v7_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -669,7 +669,6 @@ CONFIG_RTC_DRV_MAX8907=y 
CONFIG_RTC_DRV_MAX8997=m

CONFIG_RTC_DRV_MAX77686=y

CONFIG_RTC_DRV_RK808=m

CONFIG_RTC_DRV_MAX77802=m

CONFIG_RTC_DRV_RS5C372=m

CONFIG_RTC_DRV_PALMAS=y

CONFIG_RTC_DRV_ST_LPC=y

drivers/rtc/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -335,16 +335,6 @@ config RTC_DRV_RK808 
	  This driver can also be built as a module. If so, the module

	  will be called rk808-rtc.



config RTC_DRV_MAX77802

	tristate "Maxim 77802 RTC"

	depends on MFD_MAX77686

	help

	  If you say yes here you will get support for the

	  RTC of Maxim MAX77802 PMIC.



	  This driver can also be built as a module. If so, the module

	  will be called rtc-max77802.



config RTC_DRV_RS5C372

	tristate "Ricoh R2025S/D, RS5C372A/B, RV5C386, RV5C387A"

	help

drivers/rtc/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ obj-$(CONFIG_RTC_DRV_M48T86) += rtc-m48t86.o 
obj-$(CONFIG_RTC_DRV_MAX6900)	+= rtc-max6900.o

obj-$(CONFIG_RTC_DRV_MAX6902)	+= rtc-max6902.o

obj-$(CONFIG_RTC_DRV_MAX77686)	+= rtc-max77686.o

obj-$(CONFIG_RTC_DRV_MAX77802)	+= rtc-max77802.o

obj-$(CONFIG_RTC_DRV_MAX8907)	+= rtc-max8907.o

obj-$(CONFIG_RTC_DRV_MAX8925)	+= rtc-max8925.o

obj-$(CONFIG_RTC_DRV_MAX8997)	+= rtc-max8997.o

drivers/rtc/rtc-max77686.c

+277 −85
Original line number Diff line number Diff line 
/*

 * RTC driver for Maxim MAX77686

 * RTC driver for Maxim MAX77686 and MAX77802

 *

 * Copyright (C) 2012 Samsung Electronics Co.Ltd

 *
@@ -12,8 +12,6 @@ 
 *

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/slab.h>

#include <linux/rtc.h>

#include <linux/delay.h>
@@ -41,7 +39,14 @@ 
#define ALARM_ENABLE_SHIFT		7

#define ALARM_ENABLE_MASK		(1 << ALARM_ENABLE_SHIFT)



#define MAX77686_RTC_UPDATE_DELAY	16

#define REG_RTC_NONE			0xdeadbeef



/*

 * MAX77802 has separate register (RTCAE1) for alarm enable instead

 * using 1 bit from registers RTC{SEC,MIN,HOUR,DAY,MONTH,YEAR,DATE}

 * as in done in MAX77686.

 */

#define MAX77802_ALARM_ENABLE_VALUE	0x77



enum {

	RTC_SEC = 0,
@@ -54,6 +59,19 @@ enum { 
	RTC_NR_TIME

};



struct max77686_rtc_driver_data {

	/* Minimum usecs needed for a RTC update */

	unsigned long		delay;

	/* Mask used to read RTC registers value */

	u8			mask;

	/* Registers offset to I2C addresses map */

	const unsigned int	*map;

	/* Has a separate alarm enable register? */

	bool			alarm_enable_reg;

	/* Has a separate I2C regmap for the RTC? */

	bool			separate_i2c_addr;

};



struct max77686_rtc_info {

	struct device		*dev;

	struct max77686_dev	*max77686;
@@ -63,6 +81,8 @@ struct max77686_rtc_info { 


	struct regmap		*regmap;



	const struct max77686_rtc_driver_data *drv_data;



	int virq;

	int rtc_24hr_mode;

};
@@ -72,12 +92,120 @@ enum MAX77686_RTC_OP { 
	MAX77686_RTC_READ,

};



/* These are not registers but just offsets that are mapped to addresses */

enum max77686_rtc_reg_offset {

	REG_RTC_CONTROLM = 0,

	REG_RTC_CONTROL,

	REG_RTC_UPDATE0,

	REG_WTSR_SMPL_CNTL,

	REG_RTC_SEC,

	REG_RTC_MIN,

	REG_RTC_HOUR,

	REG_RTC_WEEKDAY,

	REG_RTC_MONTH,

	REG_RTC_YEAR,

	REG_RTC_DATE,

	REG_ALARM1_SEC,

	REG_ALARM1_MIN,

	REG_ALARM1_HOUR,

	REG_ALARM1_WEEKDAY,

	REG_ALARM1_MONTH,

	REG_ALARM1_YEAR,

	REG_ALARM1_DATE,

	REG_ALARM2_SEC,

	REG_ALARM2_MIN,

	REG_ALARM2_HOUR,

	REG_ALARM2_WEEKDAY,

	REG_ALARM2_MONTH,

	REG_ALARM2_YEAR,

	REG_ALARM2_DATE,

	REG_RTC_AE1,

	REG_RTC_END,

};



/* Maps RTC registers offset to the MAX77686 register addresses */

static const unsigned int max77686_map[REG_RTC_END] = {

	[REG_RTC_CONTROLM]   = MAX77686_RTC_CONTROLM,

	[REG_RTC_CONTROL]    = MAX77686_RTC_CONTROL,

	[REG_RTC_UPDATE0]    = MAX77686_RTC_UPDATE0,

	[REG_WTSR_SMPL_CNTL] = MAX77686_WTSR_SMPL_CNTL,

	[REG_RTC_SEC]        = MAX77686_RTC_SEC,

	[REG_RTC_MIN]        = MAX77686_RTC_MIN,

	[REG_RTC_HOUR]       = MAX77686_RTC_HOUR,

	[REG_RTC_WEEKDAY]    = MAX77686_RTC_WEEKDAY,

	[REG_RTC_MONTH]      = MAX77686_RTC_MONTH,

	[REG_RTC_YEAR]       = MAX77686_RTC_YEAR,

	[REG_RTC_DATE]       = MAX77686_RTC_DATE,

	[REG_ALARM1_SEC]     = MAX77686_ALARM1_SEC,

	[REG_ALARM1_MIN]     = MAX77686_ALARM1_MIN,

	[REG_ALARM1_HOUR]    = MAX77686_ALARM1_HOUR,

	[REG_ALARM1_WEEKDAY] = MAX77686_ALARM1_WEEKDAY,

	[REG_ALARM1_MONTH]   = MAX77686_ALARM1_MONTH,

	[REG_ALARM1_YEAR]    = MAX77686_ALARM1_YEAR,

	[REG_ALARM1_DATE]    = MAX77686_ALARM1_DATE,

	[REG_ALARM2_SEC]     = MAX77686_ALARM2_SEC,

	[REG_ALARM2_MIN]     = MAX77686_ALARM2_MIN,

	[REG_ALARM2_HOUR]    = MAX77686_ALARM2_HOUR,

	[REG_ALARM2_WEEKDAY] = MAX77686_ALARM2_WEEKDAY,

	[REG_ALARM2_MONTH]   = MAX77686_ALARM2_MONTH,

	[REG_ALARM2_YEAR]    = MAX77686_ALARM2_YEAR,

	[REG_ALARM2_DATE]    = MAX77686_ALARM2_DATE,

	[REG_RTC_AE1]	     = REG_RTC_NONE,

};



static const struct max77686_rtc_driver_data max77686_drv_data = {

	.delay = 16000,

	.mask  = 0x7f,

	.map   = max77686_map,

	.alarm_enable_reg  = false,

	.separate_i2c_addr = true,

};



static const unsigned int max77802_map[REG_RTC_END] = {

	[REG_RTC_CONTROLM]   = MAX77802_RTC_CONTROLM,

	[REG_RTC_CONTROL]    = MAX77802_RTC_CONTROL,

	[REG_RTC_UPDATE0]    = MAX77802_RTC_UPDATE0,

	[REG_WTSR_SMPL_CNTL] = MAX77802_WTSR_SMPL_CNTL,

	[REG_RTC_SEC]        = MAX77802_RTC_SEC,

	[REG_RTC_MIN]        = MAX77802_RTC_MIN,

	[REG_RTC_HOUR]       = MAX77802_RTC_HOUR,

	[REG_RTC_WEEKDAY]    = MAX77802_RTC_WEEKDAY,

	[REG_RTC_MONTH]      = MAX77802_RTC_MONTH,

	[REG_RTC_YEAR]       = MAX77802_RTC_YEAR,

	[REG_RTC_DATE]       = MAX77802_RTC_DATE,

	[REG_ALARM1_SEC]     = MAX77802_ALARM1_SEC,

	[REG_ALARM1_MIN]     = MAX77802_ALARM1_MIN,

	[REG_ALARM1_HOUR]    = MAX77802_ALARM1_HOUR,

	[REG_ALARM1_WEEKDAY] = MAX77802_ALARM1_WEEKDAY,

	[REG_ALARM1_MONTH]   = MAX77802_ALARM1_MONTH,

	[REG_ALARM1_YEAR]    = MAX77802_ALARM1_YEAR,

	[REG_ALARM1_DATE]    = MAX77802_ALARM1_DATE,

	[REG_ALARM2_SEC]     = MAX77802_ALARM2_SEC,

	[REG_ALARM2_MIN]     = MAX77802_ALARM2_MIN,

	[REG_ALARM2_HOUR]    = MAX77802_ALARM2_HOUR,

	[REG_ALARM2_WEEKDAY] = MAX77802_ALARM2_WEEKDAY,

	[REG_ALARM2_MONTH]   = MAX77802_ALARM2_MONTH,

	[REG_ALARM2_YEAR]    = MAX77802_ALARM2_YEAR,

	[REG_ALARM2_DATE]    = MAX77802_ALARM2_DATE,

	[REG_RTC_AE1]	     = MAX77802_RTC_AE1,

};



static const struct max77686_rtc_driver_data max77802_drv_data = {

	.delay = 200,

	.mask  = 0xff,

	.map   = max77802_map,

	.alarm_enable_reg  = true,

	.separate_i2c_addr = false,

};



static void max77686_rtc_data_to_tm(u8 *data, struct rtc_time *tm,

				   int rtc_24hr_mode)

				    struct max77686_rtc_info *info)

{

	tm->tm_sec = data[RTC_SEC] & 0x7f;

	tm->tm_min = data[RTC_MIN] & 0x7f;

	if (rtc_24hr_mode)

	u8 mask = info->drv_data->mask;



	tm->tm_sec = data[RTC_SEC] & mask;

	tm->tm_min = data[RTC_MIN] & mask;

	if (info->rtc_24hr_mode)

		tm->tm_hour = data[RTC_HOUR] & 0x1f;

	else {

		tm->tm_hour = data[RTC_HOUR] & 0x0f;
@@ -86,15 +214,23 @@ static void max77686_rtc_data_to_tm(u8 *data, struct rtc_time *tm, 
	}



	/* Only a single bit is set in data[], so fls() would be equivalent */

	tm->tm_wday = ffs(data[RTC_WEEKDAY] & 0x7f) - 1;

	tm->tm_wday = ffs(data[RTC_WEEKDAY] & mask) - 1;

	tm->tm_mday = data[RTC_DATE] & 0x1f;

	tm->tm_mon = (data[RTC_MONTH] & 0x0f) - 1;

	tm->tm_year = (data[RTC_YEAR] & 0x7f) + 100;

	tm->tm_year = data[RTC_YEAR] & mask;

	tm->tm_yday = 0;

	tm->tm_isdst = 0;



	/*

	 * MAX77686 uses 1 bit from sec/min/hour/etc RTC registers and the

	 * year values are just 0..99 so add 100 to support up to 2099.

	 */

	if (!info->drv_data->alarm_enable_reg)

		tm->tm_year += 100;

}



static int max77686_rtc_tm_to_data(struct rtc_time *tm, u8 *data)

static int max77686_rtc_tm_to_data(struct rtc_time *tm, u8 *data,

				   struct max77686_rtc_info *info)

{

	data[RTC_SEC] = tm->tm_sec;

	data[RTC_MIN] = tm->tm_min;
@@ -102,13 +238,20 @@ static int max77686_rtc_tm_to_data(struct rtc_time *tm, u8 *data) 
	data[RTC_WEEKDAY] = 1 << tm->tm_wday;

	data[RTC_DATE] = tm->tm_mday;

	data[RTC_MONTH] = tm->tm_mon + 1;



	if (info->drv_data->alarm_enable_reg) {

		data[RTC_YEAR] = tm->tm_year;

		return 0;

	}



	data[RTC_YEAR] = tm->tm_year > 100 ? (tm->tm_year - 100) : 0;



	if (tm->tm_year < 100) {

		pr_warn("RTC cannot handle the year %d.  Assume it's 2000.\n",

		dev_err(info->dev, "RTC cannot handle the year %d.\n",

			1900 + tm->tm_year);

		return -EINVAL;

	}



	return 0;

}
@@ -117,6 +260,7 @@ static int max77686_rtc_update(struct max77686_rtc_info *info, 
{

	int ret;

	unsigned int data;

	unsigned long delay = info->drv_data->delay;



	if (op == MAX77686_RTC_WRITE)

		data = 1 << RTC_UDR_SHIFT;
@@ -124,13 +268,14 @@ static int max77686_rtc_update(struct max77686_rtc_info *info, 
		data = 1 << RTC_RBUDR_SHIFT;



	ret = regmap_update_bits(info->max77686->rtc_regmap,

				 MAX77686_RTC_UPDATE0, data, data);

				 info->drv_data->map[REG_RTC_UPDATE0],

				 data, data);

	if (ret < 0)

		dev_err(info->dev, "%s: fail to write update reg(ret=%d, data=0x%x)\n",

				__func__, ret, data);

		dev_err(info->dev, "Fail to write update reg(ret=%d, data=0x%x)\n",

			ret, data);

	else {

		/* Minimum 16ms delay required before RTC update. */

		msleep(MAX77686_RTC_UPDATE_DELAY);

		/* Minimum delay required before RTC update. */

		usleep_range(delay, delay * 2);

	}



	return ret;
@@ -149,13 +294,14 @@ static int max77686_rtc_read_time(struct device *dev, struct rtc_time *tm) 
		goto out;



	ret = regmap_bulk_read(info->max77686->rtc_regmap,

				MAX77686_RTC_SEC, data, RTC_NR_TIME);

			       info->drv_data->map[REG_RTC_SEC],

			       data, ARRAY_SIZE(data));

	if (ret < 0) {

		dev_err(info->dev, "%s: fail to read time reg(%d)\n", __func__,	ret);

		dev_err(info->dev, "Fail to read time reg(%d)\n", ret);

		goto out;

	}



	max77686_rtc_data_to_tm(data, tm, info->rtc_24hr_mode);

	max77686_rtc_data_to_tm(data, tm, info);



	ret = rtc_valid_tm(tm);
@@ -170,17 +316,17 @@ static int max77686_rtc_set_time(struct device *dev, struct rtc_time *tm) 
	u8 data[RTC_NR_TIME];

	int ret;



	ret = max77686_rtc_tm_to_data(tm, data);

	ret = max77686_rtc_tm_to_data(tm, data, info);

	if (ret < 0)

		return ret;



	mutex_lock(&info->lock);



	ret = regmap_bulk_write(info->max77686->rtc_regmap,

				 MAX77686_RTC_SEC, data, RTC_NR_TIME);

				info->drv_data->map[REG_RTC_SEC],

				data, ARRAY_SIZE(data));

	if (ret < 0) {

		dev_err(info->dev, "%s: fail to write time reg(%d)\n", __func__,

				ret);

		dev_err(info->dev, "Fail to write time reg(%d)\n", ret);

		goto out;

	}
@@ -196,6 +342,7 @@ static int max77686_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) 
	struct max77686_rtc_info *info = dev_get_drvdata(dev);

	u8 data[RTC_NR_TIME];

	unsigned int val;

	const unsigned int *map = info->drv_data->map;

	int i, ret;



	mutex_lock(&info->lock);
@@ -205,28 +352,47 @@ static int max77686_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) 
		goto out;



	ret = regmap_bulk_read(info->max77686->rtc_regmap,

				 MAX77686_ALARM1_SEC, data, RTC_NR_TIME);

			       map[REG_ALARM1_SEC], data, ARRAY_SIZE(data));

	if (ret < 0) {

		dev_err(info->dev, "%s:%d fail to read alarm reg(%d)\n",

				__func__, __LINE__, ret);

		dev_err(info->dev, "Fail to read alarm reg(%d)\n", ret);

		goto out;

	}



	max77686_rtc_data_to_tm(data, &alrm->time, info->rtc_24hr_mode);

	max77686_rtc_data_to_tm(data, &alrm->time, info);



	alrm->enabled = 0;

	for (i = 0; i < RTC_NR_TIME; i++) {



	if (info->drv_data->alarm_enable_reg) {

		if (map[REG_RTC_AE1] == REG_RTC_NONE) {

			ret = -EINVAL;

			dev_err(info->dev,

				"alarm enable register not set(%d)\n", ret);

			goto out;

		}



		ret = regmap_read(info->max77686->regmap,

				  map[REG_RTC_AE1], &val);

		if (ret < 0) {

			dev_err(info->dev,

				"fail to read alarm enable(%d)\n", ret);

			goto out;

		}



		if (val)

			alrm->enabled = 1;

	} else {

		for (i = 0; i < ARRAY_SIZE(data); i++) {

			if (data[i] & ALARM_ENABLE_MASK) {

				alrm->enabled = 1;

				break;

			}

		}

	}



	alrm->pending = 0;

	ret = regmap_read(info->max77686->regmap, MAX77686_REG_STATUS2, &val);

	if (ret < 0) {

		dev_err(info->dev, "%s:%d fail to read status2 reg(%d)\n",

				__func__, __LINE__, ret);

		dev_err(info->dev, "Fail to read status2 reg(%d)\n", ret);

		goto out;

	}
@@ -235,7 +401,7 @@ static int max77686_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) 


out:

	mutex_unlock(&info->lock);

	return 0;

	return ret;

}



static int max77686_rtc_stop_alarm(struct max77686_rtc_info *info)
@@ -243,6 +409,7 @@ static int max77686_rtc_stop_alarm(struct max77686_rtc_info *info) 
	u8 data[RTC_NR_TIME];

	int ret, i;

	struct rtc_time tm;

	const unsigned int *map = info->drv_data->map;



	if (!mutex_is_locked(&info->lock))

		dev_warn(info->dev, "%s: should have mutex locked\n", __func__);
@@ -251,24 +418,36 @@ static int max77686_rtc_stop_alarm(struct max77686_rtc_info *info) 
	if (ret < 0)

		goto out;



	if (info->drv_data->alarm_enable_reg) {

		if (map[REG_RTC_AE1] == REG_RTC_NONE) {

			ret = -EINVAL;

			dev_err(info->dev,

				"alarm enable register not set(%d)\n", ret);

			goto out;

		}



		ret = regmap_write(info->max77686->regmap, map[REG_RTC_AE1], 0);

	} else {

		ret = regmap_bulk_read(info->max77686->rtc_regmap,

				 MAX77686_ALARM1_SEC, data, RTC_NR_TIME);

				       map[REG_ALARM1_SEC], data,

				       ARRAY_SIZE(data));

		if (ret < 0) {

		dev_err(info->dev, "%s: fail to read alarm reg(%d)\n",

				__func__, ret);

			dev_err(info->dev, "Fail to read alarm reg(%d)\n", ret);

			goto out;

		}



	max77686_rtc_data_to_tm(data, &tm, info->rtc_24hr_mode);

		max77686_rtc_data_to_tm(data, &tm, info);



	for (i = 0; i < RTC_NR_TIME; i++)

		for (i = 0; i < ARRAY_SIZE(data); i++)

			data[i] &= ~ALARM_ENABLE_MASK;



		ret = regmap_bulk_write(info->max77686->rtc_regmap,

				 MAX77686_ALARM1_SEC, data, RTC_NR_TIME);

					map[REG_ALARM1_SEC], data,

					ARRAY_SIZE(data));

	}



	if (ret < 0) {

		dev_err(info->dev, "%s: fail to write alarm reg(%d)\n",

				__func__, ret);

		dev_err(info->dev, "Fail to write alarm reg(%d)\n", ret);

		goto out;

	}
@@ -282,6 +461,7 @@ static int max77686_rtc_start_alarm(struct max77686_rtc_info *info) 
	u8 data[RTC_NR_TIME];

	int ret;

	struct rtc_time tm;

	const unsigned int *map = info->drv_data->map;



	if (!mutex_is_locked(&info->lock))

		dev_warn(info->dev, "%s: should have mutex locked\n", __func__);
@@ -290,15 +470,19 @@ static int max77686_rtc_start_alarm(struct max77686_rtc_info *info) 
	if (ret < 0)

		goto out;



	if (info->drv_data->alarm_enable_reg) {

		ret = regmap_write(info->max77686->regmap, map[REG_RTC_AE1],

				   MAX77802_ALARM_ENABLE_VALUE);

	} else {

		ret = regmap_bulk_read(info->max77686->rtc_regmap,

				 MAX77686_ALARM1_SEC, data, RTC_NR_TIME);

				       map[REG_ALARM1_SEC], data,

				       ARRAY_SIZE(data));

		if (ret < 0) {

		dev_err(info->dev, "%s: fail to read alarm reg(%d)\n",

				__func__, ret);

			dev_err(info->dev, "Fail to read alarm reg(%d)\n", ret);

			goto out;

		}



	max77686_rtc_data_to_tm(data, &tm, info->rtc_24hr_mode);

		max77686_rtc_data_to_tm(data, &tm, info);



		data[RTC_SEC] |= (1 << ALARM_ENABLE_SHIFT);

		data[RTC_MIN] |= (1 << ALARM_ENABLE_SHIFT);
@@ -306,16 +490,18 @@ static int max77686_rtc_start_alarm(struct max77686_rtc_info *info) 
		data[RTC_WEEKDAY] &= ~ALARM_ENABLE_MASK;

		if (data[RTC_MONTH] & 0xf)

			data[RTC_MONTH] |= (1 << ALARM_ENABLE_SHIFT);

	if (data[RTC_YEAR] & 0x7f)

		if (data[RTC_YEAR] & info->drv_data->mask)

			data[RTC_YEAR] |= (1 << ALARM_ENABLE_SHIFT);

		if (data[RTC_DATE] & 0x1f)

			data[RTC_DATE] |= (1 << ALARM_ENABLE_SHIFT);



		ret = regmap_bulk_write(info->max77686->rtc_regmap,

				 MAX77686_ALARM1_SEC, data, RTC_NR_TIME);

					map[REG_ALARM1_SEC], data,

					ARRAY_SIZE(data));

	}



	if (ret < 0) {

		dev_err(info->dev, "%s: fail to write alarm reg(%d)\n",

				__func__, ret);

		dev_err(info->dev, "Fail to write alarm reg(%d)\n", ret);

		goto out;

	}
@@ -330,7 +516,7 @@ static int max77686_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) 
	u8 data[RTC_NR_TIME];

	int ret;



	ret = max77686_rtc_tm_to_data(&alrm->time, data);

	ret = max77686_rtc_tm_to_data(&alrm->time, data, info);

	if (ret < 0)

		return ret;
@@ -341,11 +527,11 @@ static int max77686_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) 
		goto out;



	ret = regmap_bulk_write(info->max77686->rtc_regmap,

				 MAX77686_ALARM1_SEC, data, RTC_NR_TIME);

				info->drv_data->map[REG_ALARM1_SEC],

				data, ARRAY_SIZE(data));



	if (ret < 0) {

		dev_err(info->dev, "%s: fail to write alarm reg(%d)\n",

				__func__, ret);

		dev_err(info->dev, "Fail to write alarm reg(%d)\n", ret);

		goto out;

	}
@@ -380,7 +566,7 @@ static irqreturn_t max77686_rtc_alarm_irq(int irq, void *data) 
{

	struct max77686_rtc_info *info = data;



	dev_info(info->dev, "%s:irq(%d)\n", __func__, irq);

	dev_dbg(info->dev, "RTC alarm IRQ: %d\n", irq);



	rtc_update_irq(info->rtc_dev, 1, RTC_IRQF | RTC_AF);
@@ -406,10 +592,11 @@ static int max77686_rtc_init_reg(struct max77686_rtc_info *info) 


	info->rtc_24hr_mode = 1;



	ret = regmap_bulk_write(info->max77686->rtc_regmap, MAX77686_RTC_CONTROLM, data, 2);

	ret = regmap_bulk_write(info->max77686->rtc_regmap,

				info->drv_data->map[REG_RTC_CONTROLM],

				data, ARRAY_SIZE(data));

	if (ret < 0) {

		dev_err(info->dev, "%s: fail to write controlm reg(%d)\n",

				__func__, ret);

		dev_err(info->dev, "Fail to write controlm reg(%d)\n", ret);

		return ret;

	}
@@ -421,10 +608,9 @@ static int max77686_rtc_probe(struct platform_device *pdev) 
{

	struct max77686_dev *max77686 = dev_get_drvdata(pdev->dev.parent);

	struct max77686_rtc_info *info;

	const struct platform_device_id *id = platform_get_device_id(pdev);

	int ret;



	dev_info(&pdev->dev, "%s\n", __func__);



	info = devm_kzalloc(&pdev->dev, sizeof(struct max77686_rtc_info),

				GFP_KERNEL);

	if (!info)
@@ -434,6 +620,11 @@ static int max77686_rtc_probe(struct platform_device *pdev) 
	info->dev = &pdev->dev;

	info->max77686 = max77686;

	info->rtc = max77686->rtc;

	info->drv_data = (const struct max77686_rtc_driver_data *)

		id->driver_data;



	if (!info->drv_data->separate_i2c_addr)

		info->max77686->rtc_regmap = info->max77686->regmap;



	platform_set_drvdata(pdev, info);
@@ -446,7 +637,7 @@ static int max77686_rtc_probe(struct platform_device *pdev) 


	device_init_wakeup(&pdev->dev, 1);



	info->rtc_dev = devm_rtc_device_register(&pdev->dev, "max77686-rtc",

	info->rtc_dev = devm_rtc_device_register(&pdev->dev, id->name,

					&max77686_rtc_ops, THIS_MODULE);



	if (IS_ERR(info->rtc_dev)) {
@@ -459,13 +650,13 @@ static int max77686_rtc_probe(struct platform_device *pdev) 


	if (!max77686->rtc_irq_data) {

		ret = -EINVAL;

		dev_err(&pdev->dev, "%s: no RTC regmap IRQ chip\n", __func__);

		dev_err(&pdev->dev, "No RTC regmap IRQ chip\n");

		goto err_rtc;

	}



	info->virq = regmap_irq_get_virq(max77686->rtc_irq_data,

					 MAX77686_RTCIRQ_RTCA1);

	if (!info->virq) {

	if (info->virq <= 0) {

		ret = -ENXIO;

		goto err_rtc;

	}
@@ -508,7 +699,8 @@ static SIMPLE_DEV_PM_OPS(max77686_rtc_pm_ops, 
			 max77686_rtc_suspend, max77686_rtc_resume);



static const struct platform_device_id rtc_id[] = {

	{ "max77686-rtc", 0 },

	{ "max77686-rtc", .driver_data = (kernel_ulong_t)&max77686_drv_data, },

	{ "max77802-rtc", .driver_data = (kernel_ulong_t)&max77802_drv_data, },

	{},

};

MODULE_DEVICE_TABLE(platform, rtc_id);

CRA Git | Maintained and supported by SUSTech CRA and CCSE