---

yaml --- r: 355355 b: refs/heads/master c: 38e9623 h: refs/heads/master i: 355353: 59aa4e1 355351: f79c0a3 v: v3
git-mirror · Jan 25, 2013 · da0d2d3 · da0d2d3
1 parent 587ff91
commit da0d2d3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49a8dd66c5bb224878cacc7eccb523e30ccaedc9
+refs/heads/master: 38e9623e2639fafb5d471c0f1ed8a3e707d383cf
diff --git a/trunk/arch/arm/mach-shmobile/pfc-r8a7740.c b/trunk/arch/arm/mach-shmobile/pfc-r8a7740.c
@@ -18,7 +18,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#include <linux/bug.h>
 #include <linux/init.h>
+#include <linux/ioport.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/sh_pfc.h>
@@ -2612,9 +2614,24 @@ static struct pinmux_info r8a7740_pinmux_info = {
 	.gpio_irq_size	= ARRAY_SIZE(pinmux_irqs),
 };
 
+static struct resource r8a7740_pfc_resources[] = {
+	[0] = {
+		.start	= 0xe6050000,
+		.end	= 0xe6057fff,
+		.flags	= IORESOURCE_MEM,
+	},
+	[1] = {
+		.start	= 0xe605800c,
+		.end	= 0xe605802b,
+		.flags	= IORESOURCE_MEM,
+	}
+};
+
 static struct platform_device r8a7740_pfc_device = {
 	.name		= "sh-pfc",
 	.id		= -1,
+	.resource	= r8a7740_pfc_resources,
+	.num_resources	= ARRAY_SIZE(r8a7740_pfc_resources),
 	.dev = {
 		.platform_data = &r8a7740_pinmux_info,
 	},