Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp1156638ybl; Wed, 21 Aug 2019 11:00:01 -0700 (PDT) X-Google-Smtp-Source: APXvYqwuAoC67Cwaf26fppLEJmspg7TVCCGdW0jBrI/XualZJL0QnbmkvVXAPd0fV0mcr/95F7p3 X-Received: by 2002:a17:902:8a87:: with SMTP id p7mr34995444plo.124.1566410401004; Wed, 21 Aug 2019 11:00:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566410400; cv=none; d=google.com; s=arc-20160816; b=iLjfDFEDCuahKmToif3liqY26VpCqH7b47NbNKgp7CZsJGU1YFG15rmAx09JLpQtjP NjjDjdzfhkRNMYF0Acym5pcJoIEQ4tjiuSHr3TXRSsSTXLWU9EVF8udSCThPjBxxdF1Z xmpEMneCaOQLfkWNWaKSBfd4J/Jn+VlSNld6Ls44ao/p0DnVgiEZ34Z4juA+I7L+dKfs JHx3tEtot/XaRZvOAl6g+RxBA/dLNIIVGKvZSFxt13D6/tXVTBECRMyyxm04wdgMotKr YZZ/YEQ9Pl7tRL042iqX5aA9qBLrd8xZ3qYFYcoLr0W0K6sWD7maKNsDRrVI2e94/S+1 cZoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject; bh=Oxh8KWmNO9eAxVYuLEF7Z0PWdV1LeM2s2O4barD3r1o=; b=iexO4UNycVColIBnIUql8pHiZqWmd2g8/7Ma2jto2JQ8yop3O0Sur/c02ALR8oV6nU uTzWmi/MqpYqvFlBbJuYGEdbYfZ2rWJ2DkITGHMAu+y/dHH27vGYqEwx9/B4DFTcVlFc mOZFkmP9x6IA7CJYTPt43yoSutvzYMVofhkZKD7vALuV7QCgT/MUHRF9mP3W0CBK91fM xuW9ANN5xui74ZmrNudhT5wR9hhP/XnT9LyCbtA0FO7hBiQs0pB2xRTUJ0zHr/qxEgC7 nFXuzGAbIVOTCnPobRlpYb23rW5T4gw5/M2dGGi65Ba9MMpIVzf/U5UzoVo9WY9imRET mlUw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u9si439267pjn.86.2019.08.21.10.59.46; Wed, 21 Aug 2019 11:00:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727558AbfHURkc (ORCPT + 99 others); Wed, 21 Aug 2019 13:40:32 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:51892 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727310AbfHURkc (ORCPT ); Wed, 21 Aug 2019 13:40:32 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: eballetbo) with ESMTPSA id 4DA1828BD6C Subject: Re: [PATCH v5 08/11] mfd: cros_ec: Add convenience struct to define dedicated CrOS EC MCUs To: Lee Jones Cc: linux-kernel@vger.kernel.org, Jonathan Corbet , Krzysztof Kozlowski , Will Deacon , MyungJoo Ham , Chanwoo Choi , Benson Leung , Guenter Roeck , Jonathan Cameron , Dmitry Torokhov , Mauro Carvalho Chehab , Sebastian Reichel , Thierry Reding , Alexandre Belloni , Liam Girdwood , Mark Brown , Neil Armstrong , Greg Kroah-Hartman , Collabora kernel ML , Andy Shevchenko , Gwendal Grignou References: <20190722133257.9336-1-enric.balletbo@collabora.com> <20190722133257.9336-9-enric.balletbo@collabora.com> <20190812071639.GC4594@dell> From: Enric Balletbo i Serra Message-ID: <0c6bd716-34d2-ec3f-4380-eb2457f97f9f@collabora.com> Date: Wed, 21 Aug 2019 19:40:16 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20190812071639.GC4594@dell> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Lee, On 12/8/19 9:16, Lee Jones wrote: > On Mon, 22 Jul 2019, Enric Balletbo i Serra wrote: > >> With the increasing use of dedicated CrOS EC MCUs, it takes a fair amount >> of boiler plate code to add those devices, add a struct that can be used >> to specify a dedicated CrOS EC MCU so we can just add a new item to it to >> define a new dedicated MCU. >> >> Signed-off-by: Enric Balletbo i Serra >> Acked-by: Andy Shevchenko >> Reviewed-by: Gwendal Grignou >> Tested-by: Gwendal Grignou >> --- >> >> Changes in v5: None >> Changes in v4: None >> Changes in v3: None >> Changes in v2: None >> >> drivers/mfd/cros_ec_dev.c | 87 +++++++++++++++++++++------------------ >> 1 file changed, 48 insertions(+), 39 deletions(-) >> >> diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c >> index c6bf52d795f2..e0e18c0eb9f5 100644 >> --- a/drivers/mfd/cros_ec_dev.c >> +++ b/drivers/mfd/cros_ec_dev.c >> @@ -22,6 +22,41 @@ static struct class cros_class = { >> .name = "chromeos", >> }; >> >> +/** >> + * cros_feature_to_name - CrOS feature id to name/short description. >> + * @id: The feature identifier. >> + * @name: Device name associated with the feature id. >> + * @desc: Short name that will be displayed. >> + */ >> +struct cros_feature_to_name { >> + unsigned int id; >> + const char *name; >> + const char *desc; >> +}; >> + >> +static const struct cros_feature_to_name cros_mcu_devices[] = { >> + { >> + .id = EC_FEATURE_FINGERPRINT, >> + .name = CROS_EC_DEV_FP_NAME, >> + .desc = "Fingerprint", >> + }, >> + { >> + .id = EC_FEATURE_ISH, >> + .name = CROS_EC_DEV_ISH_NAME, >> + .desc = "Integrated Sensor Hub", >> + }, >> + { >> + .id = EC_FEATURE_SCP, >> + .name = CROS_EC_DEV_SCP_NAME, >> + .desc = "System Control Processor", >> + }, >> + { >> + .id = EC_FEATURE_TOUCHPAD, >> + .name = CROS_EC_DEV_TP_NAME, >> + .desc = "Touchpad", >> + }, >> +}; >> + >> static int cros_ec_check_features(struct cros_ec_dev *ec, int feature) >> { >> struct cros_ec_command *msg; >> @@ -278,6 +313,7 @@ static int ec_device_probe(struct platform_device *pdev) >> struct device *dev = &pdev->dev; >> struct cros_ec_platform *ec_platform = dev_get_platdata(dev); >> struct cros_ec_dev *ec = kzalloc(sizeof(*ec), GFP_KERNEL); >> + int i; >> >> if (!ec) >> return retval; >> @@ -290,47 +326,20 @@ static int ec_device_probe(struct platform_device *pdev) >> ec->features[1] = -1U; /* Not cached yet */ >> device_initialize(&ec->class_dev); >> >> - /* Check whether this is actually a Fingerprint MCU rather than an EC */ >> - if (cros_ec_check_features(ec, EC_FEATURE_FINGERPRINT)) { >> - dev_info(dev, "CrOS Fingerprint MCU detected.\n"); >> - /* >> - * Help userspace differentiating ECs from FP MCU, >> - * regardless of the probing order. >> - */ >> - ec_platform->ec_name = CROS_EC_DEV_FP_NAME; >> - } >> - >> - /* >> - * Check whether this is actually an Integrated Sensor Hub (ISH) >> - * rather than an EC. >> - */ >> - if (cros_ec_check_features(ec, EC_FEATURE_ISH)) { >> - dev_info(dev, "CrOS ISH MCU detected.\n"); >> - /* >> - * Help userspace differentiating ECs from ISH MCU, >> - * regardless of the probing order. >> - */ >> - ec_platform->ec_name = CROS_EC_DEV_ISH_NAME; >> - } >> - >> - /* Check whether this is actually a Touchpad MCU rather than an EC */ >> - if (cros_ec_check_features(ec, EC_FEATURE_TOUCHPAD)) { >> - dev_info(dev, "CrOS Touchpad MCU detected.\n"); >> + for (i = 0; i < ARRAY_SIZE(cros_mcu_devices); i++) { >> /* >> - * Help userspace differentiating ECs from TP MCU, >> - * regardless of the probing order. >> + * Check whether this is actually a dedicated MCU rather >> + * than an standard EC. >> */ >> - ec_platform->ec_name = CROS_EC_DEV_TP_NAME; >> - } >> - >> - /* Check whether this is actually a SCP rather than an EC. */ >> - if (cros_ec_check_features(ec, EC_FEATURE_SCP)) { >> - dev_info(dev, "CrOS SCP MCU detected.\n"); >> - /* >> - * Help userspace differentiating ECs from SCP, >> - * regardless of the probing order. >> - */ >> - ec_platform->ec_name = CROS_EC_DEV_SCP_NAME; >> + if (cros_ec_check_features(ec, cros_mcu_devices[i].id)) { >> + dev_info(dev, "CrOS %s MCU detected\n", >> + cros_mcu_devices[i].desc); >> + /* >> + * Help userspace differentiating ECs from other MCU, >> + * regardless of the probing order. >> + */ >> + ec_platform->ec_name = cros_mcu_devices[i].name; > > I assume by "dedicated MCU", you mean it can only support one of these > at a time? If so, please make that clear by adding a break statement > once the MCU type has been determined. > Right, will done in next version Thanks, Enric >> + } >> } >> >> /* >