| Message ID | 1360223825-23929-2-git-send-email-prakash.pm@ti.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
On 2/7/2013 1:27 PM, Manjunathappa, Prakash wrote: > Populate OF_DEV_AUXDATA with desired device name expected by > davinci_mmc driver. Without this clk_get of davinci_mmc DT driver > fails. But there is no mmc DT support for DaVinci at this time. This patch should come after the driver DT support and .dts addition patches. > diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c > index 37c27af..3362ca4 100644 > --- a/arch/arm/mach-davinci/da8xx-dt.c > +++ b/arch/arm/mach-davinci/da8xx-dt.c > @@ -39,9 +39,16 @@ static void __init da8xx_init_irq(void) > > #ifdef CONFIG_ARCH_DAVINCI_DA850 > > +static const struct of_dev_auxdata da8xx_auxdata[] __initconst = { > + OF_DEV_AUXDATA("ti,davinci-mmc-da830", 0x01c40000, "davinci_mmc.0", > + NULL), > + {}, > +}; > + > static void __init da850_init_machine(void) > { > - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); > + of_platform_populate(NULL, of_default_bus_match_table, da8xx_auxdata, > + NULL); This needs to be rebased on by v3.9/dt-2 branch. There are conflicts with the code already present. Thanks, Sekhar
On Tue, Feb 12, 2013 at 11:16:21, Nori, Sekhar wrote: > On 2/7/2013 1:27 PM, Manjunathappa, Prakash wrote: > > Populate OF_DEV_AUXDATA with desired device name expected by > > davinci_mmc driver. Without this clk_get of davinci_mmc DT driver > > fails. > > But there is no mmc DT support for DaVinci at this time. This patch > should come after the driver DT support and .dts addition patches. > Agreed, I will bring it up in the series. > > diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c > > index 37c27af..3362ca4 100644 > > --- a/arch/arm/mach-davinci/da8xx-dt.c > > +++ b/arch/arm/mach-davinci/da8xx-dt.c > > @@ -39,9 +39,16 @@ static void __init da8xx_init_irq(void) > > > > #ifdef CONFIG_ARCH_DAVINCI_DA850 > > > > +static const struct of_dev_auxdata da8xx_auxdata[] __initconst = { > > + OF_DEV_AUXDATA("ti,davinci-mmc-da830", 0x01c40000, "davinci_mmc.0", > > + NULL), > > + {}, > > +}; > > + > > static void __init da850_init_machine(void) > > { > > - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); > > + of_platform_populate(NULL, of_default_bus_match_table, da8xx_auxdata, > > + NULL); > > This needs to be rebased on by v3.9/dt-2 branch. There are conflicts > with the code already present. > Yes, I will send it after rebasing on new branch. Thanks, Prakash > Thanks, > Sekhar >
diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c index 37c27af..3362ca4 100644 --- a/arch/arm/mach-davinci/da8xx-dt.c +++ b/arch/arm/mach-davinci/da8xx-dt.c @@ -39,9 +39,16 @@ static void __init da8xx_init_irq(void) #ifdef CONFIG_ARCH_DAVINCI_DA850 +static const struct of_dev_auxdata da8xx_auxdata[] __initconst = { + OF_DEV_AUXDATA("ti,davinci-mmc-da830", 0x01c40000, "davinci_mmc.0", + NULL), + {}, +}; + static void __init da850_init_machine(void) { - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_populate(NULL, of_default_bus_match_table, da8xx_auxdata, + NULL); da8xx_uart_clk_enable(); }
Populate OF_DEV_AUXDATA with desired device name expected by davinci_mmc driver. Without this clk_get of davinci_mmc DT driver fails. Signed-off-by: Manjunathappa, Prakash <prakash.pm@ti.com> Cc: linux-mmc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: davinci-linux-open-source@linux.davincidsp.com Cc: devicetree-discuss@lists.ozlabs.org Cc: cjb@laptop.org Cc: Sekhar Nori <nsekhar@ti.com> --- Since v1: Compatible string modified to accomodate version information. arch/arm/mach-davinci/da8xx-dt.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)