Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755939AbbGQXrV (ORCPT ); Fri, 17 Jul 2015 19:47:21 -0400 Received: from down.free-electrons.com ([37.187.137.238]:45464 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754708AbbGQXp2 (ORCPT ); Fri, 17 Jul 2015 19:45:28 -0400 Date: Sat, 18 Jul 2015 01:45:25 +0200 From: Alexandre Belloni To: S Twiss Cc: Alessandro Zummo , DEVICETREE , LINUXINPUT , LINUXKERNEL , RTCLINUX , David Dajun Chen , Ian Campbell , Kumar Gala , Lee Jones , Mark Rutland , Pawel Moll , Rob Herring , Samuel Ortiz , Support Opensource Subject: Re: [PATCH RFC V1 2/3] rtc: da9063: Add DA9062 RTC capability to DA9063 RTC driver Message-ID: <20150717234525.GI3487@piout.net> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5127 Lines: 131 Hi, On 09/07/2015 at 08:45:53 +0100, S Twiss wrote : > From: S Twiss > > Add DA9062 RTC support into the existing DA9063 RTC driver component by > using generic access tables for common register and bit mask definitions. > > The following change will add generic register and bit mask support to the > DA9063 RTC. The changes are slightly complicated by requiring support for > three register sets: DA9063-AD, DA9063-BB and DA9062-AA. > > The following alterations have been made to the DA9063 RTC: > > - Addition of a da9063_compatible_rtc_regmap structure to hold all generic > registers and bitmasks for this type of RTC component. > - A re-write of struct da9063 to use pointers for regmap and compatible > registers/masks definitions > - Addition of a of_device_id table for DA9063 and DA9062 defaults > - Refactoring functions to use struct da9063_compatible_rtc accesses to > generic registers/masks instead of using defines from registers.h > - Addition of a re-try when reading the RTC inside da9063_rtc_read_time() Can you separate that change in another patch as it is a change in the behaviour of the driver? And maybe give a word or two on why this is needed. > - Re-work of da9063_rtc_probe() to use of_match_node() and dev_get_regmap() > to provide initialisation of generic registers and masks and access to > regmap > > Signed-off-by: Steve Twiss > > --- > Checks performed with linux-next/next-20150708/scripts/checkpatch.pl > Kconfig total: 0 errors, 15 warnings, 1600 lines checked > rtc-da9063.c total: 0 errors, 0 warnings, 531 lines checked This is not true, there is a warning: WARNING: DT compatible string "dlg,da9062-rtc" appears un-documented -- check /home/alex/M/linux/Documentation/devicetree/bindings/ #275: FILE: drivers/rtc/rtc-da9063.c:171: + { .compatible = "dlg,da9062-rtc", .data = &da9062_aa_regs }, patch 3/3 should come before 2/3 if you want to avoid that. > diff --git a/drivers/rtc/rtc-da9063.c b/drivers/rtc/rtc-da9063.c > index 7ffc570..e94fb6d 100644 > --- a/drivers/rtc/rtc-da9063.c > +++ b/drivers/rtc/rtc-da9063.c > @@ -1,127 +1,274 @@ > -/* rtc-da9063.c - Real time clock device driver for DA9063 > - * Copyright (C) 2013-14 Dialog Semiconductor Ltd. > +/* > + * Real time clock device driver for DA9063/DA9062 > + * Copyright (C) 2013-15 Dialog Semiconductor Ltd. > * > - * This library is free software; you can redistribute it and/or > - * modify it under the terms of the GNU Library General Public > - * License as published by the Free Software Foundation; either > - * version 2 of the License, or (at your option) any later version. > + * 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. > * > - * This library is distributed in the hope that it will be useful, > + * 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 > - * Library General Public License for more details. > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > */ > Please also list that license change in the commit log. It should also probably be separated in another patch. [...] > static int da9063_rtc_probe(struct platform_device *pdev) > { > - struct da9063 *da9063 = dev_get_drvdata(pdev->dev.parent); > - struct da9063_rtc *rtc; > + struct da9063_compatible_rtc *rtc; > + const struct da9063_compatible_rtc_regmap *config; > + const struct of_device_id *match; > int irq_alarm; > u8 data[RTC_DATA_LEN]; > int ret; > > - ret = regmap_update_bits(da9063->regmap, DA9063_REG_CONTROL_E, > - DA9063_RTC_EN, DA9063_RTC_EN); > + match = of_match_node(da9063_compatible_reg_id_table, > + pdev->dev.of_node); > + if (!match) This will never happen if you are only probed from DT and this is waht you expect now. > + return -ENXIO; > + > + rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL); > + if (!rtc) > + return -ENOMEM; > + > + if (strncmp(match->name, "dlg,da9063-rtc", 14) == 0) { You must not do that. You should add a new compatible and change the of_compatible string of the mfd_cell in drivers/mfd/da9063-core.c onc you know the variant. > + struct da9063 *chip = dev_get_drvdata(pdev->dev.parent); > + > + if (chip->variant_code == PMIC_DA9063_AD) > + rtc->config = &da9063_ad_regs; > + } else > + rtc->config = match->data; -- Alexandre Belloni, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/