Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752183Ab3FZBZJ (ORCPT ); Tue, 25 Jun 2013 21:25:09 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:48978 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751271Ab3FZBZG (ORCPT ); Tue, 25 Jun 2013 21:25:06 -0400 From: Joel A Fernandes To: Tony Lindgren , Sekhar Nori , Matt Porter , Grant Likely , Rob Herring , Vinod Koul , Mark Brown , Benoit Cousson , Russell King , Rob Landley , Andrew Morton , Jason Kridner , Koen Kooi , Balaji TK , Chris Ball CC: Devicetree Discuss , Linux OMAP List , Linux ARM Kernel List , Linux DaVinci Kernel List , Linux Kernel Mailing List , Linux Documentation List , Linux MMC List , Linux SPI Devel List , Arnd Bergmann Subject: [PATCH 1/5] MMC: omap_hsmmc: Add reg_offset to DT bindings Date: Tue, 25 Jun 2013 20:24:09 -0500 Message-ID: <1372209849-6580-1-git-send-email-joelagnel@ti.com> X-Mailer: git-send-email 1.7.0.4 MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1834 Lines: 52 From: Joel A Fernandes Some omap_hsmmc's need to start from a particular offset but otherwise are same and can be reused. Let the DT tell us about the HW difference, check for the reg-offset property and use the same in the driver. Signed-off-by: Joel A Fernandes --- drivers/mmc/host/omap_hsmmc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 5af62c6..aae0994 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -1717,6 +1717,7 @@ static struct omap_mmc_platform_data *of_get_hsmmc_pdata(struct device *dev) struct omap_mmc_platform_data *pdata; struct device_node *np = dev->of_node; u32 bus_width, max_freq; + u32 reg_offset; int cd_gpio, wp_gpio; cd_gpio = of_get_named_gpio(np, "cd-gpios", 0); @@ -1755,6 +1756,9 @@ static struct omap_mmc_platform_data *of_get_hsmmc_pdata(struct device *dev) if (of_find_property(np, "ti,needs-special-hs-handling", NULL)) pdata->slots[0].features |= HSMMC_HAS_HSPE_SUPPORT; + if (!of_property_read_u32(np, "reg-offset", ®_offset)) + pdata->reg_offset = reg_offset; + return pdata; } #else @@ -1785,7 +1789,8 @@ static int omap_hsmmc_probe(struct platform_device *pdev) if (IS_ERR(pdata)) return PTR_ERR(pdata); - if (match->data) { + /* Provide reg_offset from match->data unless specified in DT */ + if (match->data && !pdata->reg_offset) { const u16 *offsetp = match->data; pdata->reg_offset = *offsetp; } -- 1.7.9.5 -- 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/