From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752086AbaB1Kl7 (ORCPT ); Fri, 28 Feb 2014 05:41:59 -0500 Received: from mailout3.w1.samsung.com ([210.118.77.13]:14525 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751344AbaB1Kly (ORCPT ); Fri, 28 Feb 2014 05:41:54 -0500 X-AuditID: cbfec7f4-b7f796d000005a13-fe-531067efc625 From: Krzysztof Kozlowski To: Sangbeom Kim , Samuel Ortiz , Lee Jones , linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org Cc: Kyungmin Park , Marek Szyprowski , Bartlomiej Zolnierkiewicz , Tomasz Figa , Krzysztof Kozlowski Subject: [PATCH 2/4] mfd: sec: Select different RTC regmaps for devices Date: Fri, 28 Feb 2014 11:41:42 +0100 Message-id: <1393584104-18912-3-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1393584104-18912-1-git-send-email-k.kozlowski@samsung.com> References: <1393584104-18912-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDJMWRmVeSWpSXmKPExsVy+t/xK7rv0wWCDZZMNrPYOGM9q8XrF4YW Z5vesFvc/3qU0eLyrjlsFjPO72OyWHvkLrvF6W5Wi4srvjBZrJ/xmsWBy+POtT1sHvNOBnr0 bVnF6PF5k1wASxSXTUpqTmZZapG+XQJXxtT3E9kLZgpU/Hr5mrGBcRFvFyMnh4SAicSvNfvY IGwxiQv31gPZXBxCAksZJf58bWCEcPqYJCZ2/2UCqWITMJbYvHwJWJWIwGZGicXfr7KCJJgF njNKPP0e3sXIwSEs4C5x/UUASJhFQFWi7+FisA28QOHbx9oZQUokBBQk5kyyAQlzCnhIzJ7/ HGyKEFDJs7YLzBMYeRcwMqxiFE0tTS4oTkrPNdQrTswtLs1L10vOz93ECAmxLzsYFx+zOsQo wMGoxMM7wZM/WIg1say4MvcQowQHs5IIb567QLAQb0piZVVqUX58UWlOavEhRiYOTqkGxhBl kdfHezWj9Hcc8hHZwmuQojf5k/Ak65s2an+P+Qg1GcxWDV7dtvPSatk4iZf8FtPEFOVOvb7D 1qWWu+oPb5MPh3tj0/lCZavivrk1gY3hIZftrSo3vk5v+KT30N45fUuP7r3dq/UNHTfZni78 xco3Me5SCKP8gxpOJvmPU5Se5Rj6t7grsRRnJBpqMRcVJwIAMbiRoQ8CAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch prepares for adding support for S2MPS14 RTC driver by selecting different regmaps for S2MPS1X/S5M876X RTC devices. Signed-off-by: Krzysztof Kozlowski Acked-by: Lee Jones --- drivers/mfd/sec-core.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c index 074939c9bd42..e717c6dfb105 100644 --- a/drivers/mfd/sec-core.c +++ b/drivers/mfd/sec-core.c @@ -199,7 +199,7 @@ static int sec_pmic_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { struct sec_platform_data *pdata = dev_get_platdata(&i2c->dev); - const struct regmap_config *regmap; + const struct regmap_config *regmap, *regmap_rtc; struct sec_pmic_dev *sec_pmic; int ret; @@ -233,15 +233,25 @@ static int sec_pmic_probe(struct i2c_client *i2c, switch (sec_pmic->device_type) { case S2MPS11X: regmap = &s2mps11_regmap_config; + /* + * The rtc-s5m driver does not support S2MPS11 and there + * is no mfd_cell for S2MPS11 RTC device. + * 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; break; case S5M8763X: regmap = &s5m8763_regmap_config; + regmap_rtc = &sec_rtc_regmap_config; break; case S5M8767X: regmap = &s5m8767_regmap_config; + regmap_rtc = &sec_rtc_regmap_config; break; default: regmap = &sec_regmap_config; + regmap_rtc = &sec_rtc_regmap_config; break; } @@ -260,8 +270,7 @@ static int sec_pmic_probe(struct i2c_client *i2c, } i2c_set_clientdata(sec_pmic->rtc, sec_pmic); - sec_pmic->regmap_rtc = devm_regmap_init_i2c(sec_pmic->rtc, - &sec_rtc_regmap_config); + sec_pmic->regmap_rtc = devm_regmap_init_i2c(sec_pmic->rtc, regmap_rtc); if (IS_ERR(sec_pmic->regmap_rtc)) { ret = PTR_ERR(sec_pmic->regmap_rtc); dev_err(&i2c->dev, "Failed to allocate RTC register map: %d\n", -- 1.7.9.5