commit 8e2af21eb6bd74e2e0e617a948b5ae4860057be8
author Linux Build Service Account <lnxbuild@localhost> Tue Mar 19 01:16:51 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Mar 19 01:16:50 2013 -0700
tree 91f81cff36b70765d90484be770e3862b801f0c7
parent be426580bd4fc3c17ec87ca210d251c71d0e0bc5
parent 60275dac6044d1e0b3051eb817ac37cd58356b00

Merge "jtagmm: Modify save-restore driver to use reg-names property"

arch/arm/mach-msm/jtag-mm.c

diff --git a/arch/arm/mach-msm/jtag-mm.c b/arch/arm/mach-msm/jtag-mm.c
index 7689b66..8a67614 100644
--- a/arch/arm/mach-msm/jtag-mm.c
+++ b/arch/arm/mach-msm/jtag-mm.c
@@ -685,7 +685,7 @@
 
 	etm.cpu_ctx[cpu] = etmdata;
 
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "etm-base");
 
 	etmdata->base = devm_ioremap(dev, res->start, resource_size(res));
 	if (!etmdata->base)
@@ -753,7 +753,7 @@
 
 	dbg.cpu_ctx[cpu] = dbgdata;
 
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "debug-base");
 
 	dbgdata->base = devm_ioremap(dev, res->start, resource_size(res));
 	if (!dbgdata->base)