On 19 August 2014 19:28, Doug Anderson <dianders@xxxxxxxxxxxx> wrote: > Hi, > > On Mon, Aug 18, 2014 at 9:36 PM, Addy Ke <addy.ke@xxxxxxxxxxxxxx> wrote: >> To support HS200 and UHS-1, we need add a big hunk of code, >> as shown in the following patches. So a separate file for >> rockchip SOCs is suitable. >> >> Signed-off-by: Addy Ke <addy.ke@xxxxxxxxxxxxxx> >> --- >> Changes in v2: >> - Kconfig: depend on ARCH_ROCKCHIP, suggested by Bartlomiej Zolnierkiewicz >> - Kconfig: depend on OF, suggested by Doug Anderson >> - Not change suspend/resume code, suggested by Doug Anderson >> - If pdev->dev.of_node is NULL, then return -ENODEV, suggested by Heiko Stübner >> >> drivers/mmc/host/Kconfig | 9 +++ >> drivers/mmc/host/Makefile | 1 + >> drivers/mmc/host/dw_mmc-pltfm.c | 57 ---------------- >> drivers/mmc/host/dw_mmc-rockchip.c | 136 +++++++++++++++++++++++++++++++++++++ >> 4 files changed, 146 insertions(+), 57 deletions(-) >> create mode 100644 drivers/mmc/host/dw_mmc-rockchip.c >> >> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig >> index a565254..f6095f6 100644 >> --- a/drivers/mmc/host/Kconfig >> +++ b/drivers/mmc/host/Kconfig >> @@ -621,6 +621,15 @@ config MMC_DW_PCI >> >> If unsure, say N. >> >> +config MMC_DW_ROCKCHIP >> + tristate "Rockchip specific extensions for Synopsys DW Memory Card Interface" >> + depends on MMC_DW && ARCH_ROCKCHIP && OF > > Actually, Heiko's change to check if pdev->dev.of_node is NULL means > that you don't need to depend on OF anymore. > > Ulf: do you want Addy to spin again, or do you want to just remove > this "&& OF" when applying the patch? > > ...I've tested this both with and without the "&& OF", and the "&& OF" > won't really hurt anything, so: > > Tested-by: Doug Anderson <dianders@xxxxxxxxxxxx> > Reviewed-by: Doug Anderson <dianders@xxxxxxxxxxxx> Thanks! Applied for next and by removing the dependency to "OF". Kind regards Uffe -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
