diff mbox

[v2,1/3] ARM: davinci: da850: override mmc DT node device name

Message ID 1360223825-23929-2-git-send-email-prakash.pm@ti.com (mailing list archive)
State New, archived
Headers show

Commit Message

Manjunathappa, Prakash Feb. 7, 2013, 7:57 a.m. UTC
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(-)

Comments

Sekhar Nori Feb. 12, 2013, 5:46 a.m. UTC | #1
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
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Manjunathappa, Prakash Feb. 12, 2013, 6:20 a.m. UTC | #2
T24gVHVlLCBGZWIgMTIsIDIwMTMgYXQgMTE6MTY6MjEsIE5vcmksIFNla2hhciB3cm90ZToNCj4g
T24gMi83LzIwMTMgMToyNyBQTSwgTWFuanVuYXRoYXBwYSwgUHJha2FzaCB3cm90ZToNCj4gPiBQ
b3B1bGF0ZSBPRl9ERVZfQVVYREFUQSB3aXRoIGRlc2lyZWQgZGV2aWNlIG5hbWUgZXhwZWN0ZWQg
YnkNCj4gPiBkYXZpbmNpX21tYyBkcml2ZXIuIFdpdGhvdXQgdGhpcyBjbGtfZ2V0IG9mIGRhdmlu
Y2lfbW1jIERUIGRyaXZlcg0KPiA+IGZhaWxzLg0KPiANCj4gQnV0IHRoZXJlIGlzIG5vIG1tYyBE
VCBzdXBwb3J0IGZvciBEYVZpbmNpIGF0IHRoaXMgdGltZS4gVGhpcyBwYXRjaA0KPiBzaG91bGQg
Y29tZSBhZnRlciB0aGUgZHJpdmVyIERUIHN1cHBvcnQgYW5kIC5kdHMgYWRkaXRpb24gcGF0Y2hl
cy4NCj4gDQoNCkFncmVlZCwgSSB3aWxsIGJyaW5nIGl0IHVwIGluIHRoZSBzZXJpZXMuDQoNCj4g
PiBkaWZmIC0tZ2l0IGEvYXJjaC9hcm0vbWFjaC1kYXZpbmNpL2RhOHh4LWR0LmMgYi9hcmNoL2Fy
bS9tYWNoLWRhdmluY2kvZGE4eHgtZHQuYw0KPiA+IGluZGV4IDM3YzI3YWYuLjMzNjJjYTQgMTAw
NjQ0DQo+ID4gLS0tIGEvYXJjaC9hcm0vbWFjaC1kYXZpbmNpL2RhOHh4LWR0LmMNCj4gPiArKysg
Yi9hcmNoL2FybS9tYWNoLWRhdmluY2kvZGE4eHgtZHQuYw0KPiA+IEBAIC0zOSw5ICszOSwxNiBA
QCBzdGF0aWMgdm9pZCBfX2luaXQgZGE4eHhfaW5pdF9pcnEodm9pZCkNCj4gPiAgDQo+ID4gICNp
ZmRlZiBDT05GSUdfQVJDSF9EQVZJTkNJX0RBODUwDQo+ID4gIA0KPiA+ICtzdGF0aWMgY29uc3Qg
c3RydWN0IG9mX2Rldl9hdXhkYXRhIGRhOHh4X2F1eGRhdGFbXSBfX2luaXRjb25zdCA9IHsNCj4g
PiArCU9GX0RFVl9BVVhEQVRBKCJ0aSxkYXZpbmNpLW1tYy1kYTgzMCIsIDB4MDFjNDAwMDAsICJk
YXZpbmNpX21tYy4wIiwNCj4gPiArCQkJTlVMTCksDQo+ID4gKwl7fSwNCj4gPiArfTsNCj4gPiAr
DQo+ID4gIHN0YXRpYyB2b2lkIF9faW5pdCBkYTg1MF9pbml0X21hY2hpbmUodm9pZCkNCj4gPiAg
ew0KPiA+IC0Jb2ZfcGxhdGZvcm1fcG9wdWxhdGUoTlVMTCwgb2ZfZGVmYXVsdF9idXNfbWF0Y2hf
dGFibGUsIE5VTEwsIE5VTEwpOw0KPiA+ICsJb2ZfcGxhdGZvcm1fcG9wdWxhdGUoTlVMTCwgb2Zf
ZGVmYXVsdF9idXNfbWF0Y2hfdGFibGUsIGRhOHh4X2F1eGRhdGEsDQo+ID4gKwkJCU5VTEwpOw0K
PiANCj4gVGhpcyBuZWVkcyB0byBiZSByZWJhc2VkIG9uIGJ5IHYzLjkvZHQtMiBicmFuY2guIFRo
ZXJlIGFyZSBjb25mbGljdHMNCj4gd2l0aCB0aGUgY29kZSBhbHJlYWR5IHByZXNlbnQuDQo+IA0K
DQpZZXMsIEkgd2lsbCBzZW5kIGl0IGFmdGVyIHJlYmFzaW5nIG9uIG5ldyBicmFuY2guDQoNClRo
YW5rcywNClByYWthc2gNCg0KPiBUaGFua3MsDQo+IFNla2hhcg0KPiANCg0K
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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();
 }