From patchwork Mon Jan 15 10:33:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 124509 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp625673lje; Mon, 15 Jan 2018 02:41:33 -0800 (PST) X-Google-Smtp-Source: ACJfBov1gZpSD1mDDCCrqXxSltFcwsVbRa7YBshhwV814dIyu9S9+g1AxvDB18/IvZeXm6ZZqffC X-Received: by 10.84.210.195 with SMTP id a61mr871311pli.335.1516012893503; Mon, 15 Jan 2018 02:41:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516012893; cv=none; d=google.com; s=arc-20160816; b=kwWKdRmdivIbH8JSsfCzWpzVQ+i+/UqzkrV/YZQnvkXnCnHM4lvedHCPxMtLl3k5z5 ISagghuKWbBLN79ICg4oTyqzUABBwqhBhAjN6BKeGsa+dDS4Kyra4m4WrE2foT13AJzc f94xSieM4TyG2qvrFNRUud1Dk3NtdlcSmx94DV56qZ5VA7/facHHz45GMOccPx0lJukU MkjW9k66JpQvZGrkDElaJb6cKlKEeosK/qTYLd/Ev96RS7XLOg3Om0Ulno+9FjveGLed XqfYlgMJlc0LerOW9v1fYk87BBuIm2LLEKikvxH7VIj+//rlmNu9BXJ5RKUwkU8hSDH4 kcfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=wvdyATUbCt80FpogSGtUoUetveNhBeFhJSDTF0gffsA=; b=m2qUyhyNirFHVWTKz3BygGkZi8v3ajApNazZ3V5FyPiNBG+8MgqxUCZqbPQ1mMniOj r1pyw2w47XCv54cuTNJAzaYeJSSGwNZqmK4vA5BfE9dIuobc5XV1v272ovehXzTI1i4K AmoyFL6JohoWNS9KtvqhfVRMgD4pc+Dcy6khahVnqjJscw2rzqfQC5fukDgNk3Pi6JxK tdedObbujhCmo091w252RVRL85QjcoVKy6JbXwm64oks1sbbOxmq+5zwLipg8HVw1xB8 1eenfleHRC7U9MpalepixlVVv+Jq+Kd8MrFCbdK0Nl6l0/f+UBH1spR5nmFNTewU+yYI CnYA== 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 9si21166936ple.790.2018.01.15.02.41.33; Mon, 15 Jan 2018 02:41:33 -0800 (PST) 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751329AbeAOKlb (ORCPT + 28 others); Mon, 15 Jan 2018 05:41:31 -0500 Received: from mail.free-electrons.com ([62.4.15.54]:43771 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754603AbeAOKfC (ORCPT ); Mon, 15 Jan 2018 05:35:02 -0500 Received: by mail.free-electrons.com (Postfix, from userid 110) id 7D657207A4; Mon, 15 Jan 2018 11:34:59 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0 Received: from localhost.localdomain (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id 01CC92086D; Mon, 15 Jan 2018 11:34:48 +0100 (CET) From: Quentin Schulz To: jic23@kernel.org, knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net, robh+dt@kernel.org, mark.rutland@arm.com, wens@csie.org, sre@kernel.org, linux@armlinux.org.uk, maxime.ripard@free-electrons.com, lee.jones@linaro.org Cc: linux-iio@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, thomas.petazzoni@free-electrons.com, linux-sunxi@googlegroups.com, julian.calaby@gmail.com, Quentin Schulz Subject: [PATCH v3 03/16] iio: adc: axp20x_adc: make it possible to probe from DT Date: Mon, 15 Jan 2018 11:33:37 +0100 Message-Id: <063c68ec080a999e10bf33e417c974142ddaaf9a.1516012352.git-series.quentin.schulz@free-electrons.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To prepare for a future patch that will add a DT node for the ADC, make axp20x_adc able to probe from DT and get the per-variant data from of_device_id.data since platform_device_id.driver_data won't be set when probing by DT. Leave the ability to probe via platform for driver compatibility with old DTs. Signed-off-by: Quentin Schulz --- drivers/iio/adc/axp20x_adc.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) -- git-series 0.9.1 diff --git a/drivers/iio/adc/axp20x_adc.c b/drivers/iio/adc/axp20x_adc.c index 3fc1b06..3968053 100644 --- a/drivers/iio/adc/axp20x_adc.c +++ b/drivers/iio/adc/axp20x_adc.c @@ -515,6 +515,13 @@ static const struct axp_data axp22x_data = { .maps = axp22x_maps, }; +static const struct of_device_id axp20x_adc_of_match[] = { + { .compatible = "x-powers,axp209-adc", .data = (void *)&axp20x_data, }, + { .compatible = "x-powers,axp221-adc", .data = (void *)&axp22x_data, }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, axp20x_adc_of_match); + static const struct platform_device_id axp20x_adc_id_match[] = { { .name = "axp20x-adc", .driver_data = (kernel_ulong_t)&axp20x_data, }, { .name = "axp22x-adc", .driver_data = (kernel_ulong_t)&axp22x_data, }, @@ -543,7 +550,16 @@ static int axp20x_probe(struct platform_device *pdev) indio_dev->dev.of_node = pdev->dev.of_node; indio_dev->modes = INDIO_DIRECT_MODE; - info->data = (struct axp_data *)platform_get_device_id(pdev)->driver_data; + if (!pdev->dev.of_node) { + const struct platform_device_id *id; + + id = platform_get_device_id(pdev); + info->data = (struct axp_data *)id->driver_data; + } else { + struct device *dev = &pdev->dev; + + info->data = (struct axp_data *)of_device_get_match_data(dev); + } indio_dev->name = platform_get_device_id(pdev)->name; indio_dev->info = info->data->iio_info; @@ -606,6 +622,7 @@ static int axp20x_remove(struct platform_device *pdev) static struct platform_driver axp20x_adc_driver = { .driver = { .name = "axp20x-adc", + .of_match_table = of_match_ptr(axp20x_adc_of_match), }, .id_table = axp20x_adc_id_match, .probe = axp20x_probe,