From patchwork Sat Jan 2 22:57:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7941111 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5CF9CBEEE5 for ; Sat, 2 Jan 2016 22:57:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2ABB8203AC for ; Sat, 2 Jan 2016 22:57:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 40CFA2039C for ; Sat, 2 Jan 2016 22:57:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752399AbcABW5z (ORCPT ); Sat, 2 Jan 2016 17:57:55 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:56803 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752019AbcABW5x convert rfc822-to-8bit (ORCPT ); Sat, 2 Jan 2016 17:57:53 -0500 Received: from wuerfel.localnet ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue004) with ESMTPSA (Nemesis) id 0M9LFi-1aNn6Z1GrW-00Ckux; Sat, 02 Jan 2016 23:57:49 +0100 From: Arnd Bergmann To: Pali =?ISO-8859-1?Q?Roh=E1r?= Cc: Tony Lindgren , =?ISO-8859-1?Q?Beno=EEt?= Cousson , Ulf Hansson , linux-omap@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org Subject: Re: [PATCH 1/2] mmc: omap_hsmmc: Add support for slot-name property in DT Date: Sat, 02 Jan 2016 23:57:47 +0100 Message-ID: <9361696.ohU1ACX8N1@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <201601021622.03763@pali> References: <1431724489-32359-1-git-send-email-pali.rohar@gmail.com> <4500962.b9ypZOL9bV@wuerfel> <201601021622.03763@pali> MIME-Version: 1.0 X-Provags-ID: V03:K0:UxMo/6kzg//ChfHF7CaMkbtgyckMAOu9zNQj2lcpXu/friwyWTe WBAlK/deiSXmaO8eSxS2Aoi/wtnN6Ustz6wmPy08y5cD/UprHf9QKJvkv6wmEFoC35PY8Wd Qk6b0+Pbg2J5pBbbJYVWq0vZ1rDW1166NsvRmnA+lgUB3fLDfjZf0noqRsTlFldSI4WH2vW s3WU71ZE63wINEtynmOyw== X-UI-Out-Filterresults: notjunk:1; V01:K0:nh1kqEooNc8=:r0qmPlxIKiz+T6T3cuxnmm 34pgpQuwFdygH2Hz8xxROrT5fjpVkDtfIq/NsMv3MBTIL0ov7cai3WLm74HZjsAYnaSzkgxpg mJjJiXosjCQKqY3fOdmO1UxQeo6cX4S6/IsDW/huiV28+LLC1G/b+HH1MWqjuUB6/9j1NBLMC qNLa7TgylRsXR1zfdTj+H5nIeklhljUOIdUYakLbWCkDXUvVM52uWAx2ZH2VX6cm8wtLuh5lm l3f4uKJVJPdBjRB/bd8g9LwEsjGs8fCpPpmMEaylLQ1MbQdgnC/GJwwtH0UFXs/HtPe5qRxjO IS76M3FyZsoUUyRd72OEIUBgs6dax3mCyWgQQEO5p3e8Ev7hTEsq7dgicBQ+kLUW9ALhTltTB rUV1Vj3f5pMZccQJJtUWHQIsNFm/miarqbvuP8yB/0NyTMixjsFvt0OhF7m49swhXclFf9RBf nJaWq+R0fFP3DJf00L4bNHEy6fmRqeglp0vz6Fvqtrbdtt6luH3Ew8AMlJZ8+zCLAzgolaQfh cWEcAd2Ryo8rf1T46iaIVaGPX3jZtQTxuXKlsGWD/azPIixGr0siNw9MaLvIHremA9VEBaljq hhMLFqzX2NAVzJ+zk8Ve2lKU4LRWSq+o7dnSJVupOER5UNpyDV92HEnQ4Uy9JfHMoHtchzRRC yKm8sVQWVFXgX+SUQlO1iuBuNC94CxppSvBNssuvTkw/z8cZOdRoUxQfFlwhjQck7WiUjRwMh Dqp8IJKwqKkhg8xI Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Saturday 02 January 2016 16:22:03 Pali Rohár wrote: > On Monday 28 December 2015 15:55:28 Arnd Bergmann wrote: > > On Monday 28 December 2015 15:54:35 Pali Rohár wrote: > > > > > > > > I mean you can add the platform data to the omap_auxdata_lookup[] > > > > table for this board. > > > > > > But can I mix data from omap3-n900.dts and omap_auxdata_lookup[]? > > > Hm... looks like it is not possible. omap_hsmmc driver ignores any > supplied platform data if there are device tree data. So array > omap_auxdata_lookup[] does not help. Obviously you need to the driver to work with that setting. Maybe something as simple as Arnd --- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index e06b1881b6a1..4fa35fc84b8b 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -2006,7 +2006,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev) void __iomem *base; match = of_match_device(of_match_ptr(omap_mmc_of_match), &pdev->dev); - if (match) { + if (!pdata && match) { pdata = of_get_hsmmc_pdata(&pdev->dev); if (IS_ERR(pdata))