Re: [PATCH 1/2] mmc: omap_hsmmc: Add support for slot-name property in DT

From	Arnd Bergmann <arnd@arndb.de>
Newsgroups	linux.kernel
Subject	Re: [PATCH 1/2] mmc: omap_hsmmc: Add support for slot-name property in DT
Date	2016-01-03 00:00 +0100
Message-ID	<qMDjr-5BB-5@gated-at.bofh.it> (permalink)
References	<pqvbr-3gz-3@gated-at.bofh.it> <qKHrb-3tz-5@gated-at.bofh.it> <qMwhX-1lf-1@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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))


	Arnd
--
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/

Thread

Re: [PATCH 1/2] mmc: omap_hsmmc: Add support for slot-name property in DT Pali Rohár <pali.rohar@gmail.com> - 2015-12-25 14:00 +0100
  Re: [PATCH 1/2] mmc: omap_hsmmc: Add support for slot-name property in DT Arnd Bergmann <arnd@arndb.de> - 2015-12-28 15:20 +0100
    Re: [PATCH 1/2] mmc: omap_hsmmc: Add support for slot-name property in DT Pali Rohár <pali.rohar@gmail.com> - 2015-12-28 15:30 +0100
      Re: [PATCH 1/2] mmc: omap_hsmmc: Add support for slot-name property in DT Arnd Bergmann <arnd@arndb.de> - 2015-12-28 15:50 +0100
        Re: [PATCH 1/2] mmc: omap_hsmmc: Add support for slot-name property in DT Pali Rohár <pali.rohar@gmail.com> - 2015-12-28 16:00 +0100
          Re: [PATCH 1/2] mmc: omap_hsmmc: Add support for slot-name property in DT Arnd Bergmann <arnd@arndb.de> - 2015-12-28 16:00 +0100
            Re: [PATCH 1/2] mmc: omap_hsmmc: Add support for slot-name property in DT Pali Rohár <pali.rohar@gmail.com> - 2016-01-02 16:30 +0100
              Re: [PATCH 1/2] mmc: omap_hsmmc: Add support for slot-name property in DT Arnd Bergmann <arnd@arndb.de> - 2016-01-03 00:00 +0100
                Re: [PATCH 1/2] mmc: omap_hsmmc: Add support for slot-name property in DT Pali Rohár <pali.rohar@gmail.com> - 2016-01-03 00:10 +0100
                Re: [PATCH 1/2] mmc: omap_hsmmc: Add support for slot-name property in DT Arnd Bergmann <arnd@arndb.de> - 2016-01-03 00:20 +0100

csiph-web