From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752285AbcABXRv (ORCPT ); Sat, 2 Jan 2016 18:17:51 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:53231 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750952AbcABXRt convert rfc822-to-8bit (ORCPT ); Sat, 2 Jan 2016 18:17:49 -0500 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: Sun, 03 Jan 2016 00:17:40 +0100 Message-ID: <5286117.vKOl7qiBNG@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <201601030003.54168@pali> References: <1431724489-32359-1-git-send-email-pali.rohar@gmail.com> <9361696.ohU1ACX8N1@wuerfel> <201601030003.54168@pali> MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT Content-Type: text/plain; charset="iso-8859-1" X-Provags-ID: V03:K0:j9LErBcBdYq7lQ/wHQKyoa7NBvl9K1LviFAbxho9OK9Zcx+eucC Je2Ff7ZRfu7oxL+xfoom9wsbB/qCea9rXJEmIE07vs8taQnmbzL7kYgrPPvJz6mlvby5Noz y6xrs/K6I6TUN2l/lYN5F7ZfNc9FIJa++vUrw1Xj8LkFDGp1o6sznrVamoKH4p/6QOBvzaF bv75quawVdUzA9R4/GhKQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:7vAiz/QoVuI=:xd+1bBqEoOa2EMVbL/pRFt XPG2QDDX3YCcbwef6jDEIpFF+4E2zN45kDcL1FaNEZWWaWO97+3MhVYi7PNOoRUDL9OtzAPBv Ml1c8xRSArwelwlzXffg1azwZU5+T3bccY3T/GvxuZR3aAYPve5DZYfrGcCdX2gWt7ILoC8R2 Sdls39FkDjWQ+C4Y2752jP1gfOYKa/Qbhts6TP2tPxDTHRPFlb9PyiTfoWPCPs+i5kj71b36W d8LvmRzMOzePDXOhEf+BXVqpc23hvHE1vBbDd0/gIwIlmeN5C8+xEOgIEQtOik+1noO7f+ML0 Gk9+2fJWKfbqQ8Frc4CgwD3mR5LbK8x1ewgwArQWa+5LqGdyLpvMWuwS1mCQCING5LlUhdlgN ThE05eBU9kogZtG1+PGIGv9VnzKPCwV7UWYCgiE/9R9txbwf+lyhB9SQbXPU/OJmHhnMmxqIa olbqxz5llKlSUuUs9CQ15T17dtzFxayOTzKd17t+HcvibnBrauNScsm+fXmfVBdQElSxRq875 Bkiyi8Bl1kSG62B/PbCRena7uY4VjyMA9DkmCLQ0SSgm687P3v8mASni2U+f4JT8qYxrB3ePW t7lLX0OaCKoGRIzvNAE6IcsPs+AdHG4m8rucKomkjRfQBnTPu0o7hhQwssKcRV+B0W/z6uEwU zihGv+7dFROOaUIgl6YHMsE0sO920dYrw8X3g0KDi+uw0rFjcg+CIx/Ti21k2kfr7a+PMk4Q9 8RS6pIkLsZIcr7we Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sunday 03 January 2016 00:03:54 Pali Rohár wrote: > On Saturday 02 January 2016 23:57:47 Arnd Bergmann wrote: > > 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 > > > > 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)) > > > > But in this case I must copy mmc definition from omap3-n900.dts file > back to board code to omap_auxdata_lookup[]. And mmc definitions in > omap3-n900.dts will be ignored. This is step back. > > Mixing mmc definitions from DTS file together with omap_auxdata_lookup[] > just will not work. As I said earlier, if you prefer to avoid the auxdata hack, you are also welcome to work on support for named slots in the MMC core code, it will just be more work and will take time to get consensus on. Arnd