more kxm9g board patches

5 files changed, 227 insertions, 0 deletions

diff --git a/patches.kzm9g/arm-shmobile-add-new-__iomem-annotation-for-new-code.patch b/patches.kzm9g/arm-shmobile-add-new-__iomem-annotation-for-new-code.patch
new file mode 100644
index 00000000000000..03577144ad9c1d
--- /dev/null
+++ b/patches.kzm9g/arm-shmobile-add-new-__iomem-annotation-for-new-code.patch
@@ -0,0 +1,49 @@
+From koba@kmckk.co.jp Mon Nov 19 00:51:57 2012
+From: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
+Date: Mon, 19 Nov 2012 17:51:06 +0900
+Subject: [PATCH 4/5] ARM: shmobile: add new __iomem annotation for new code
+To: gregkh@linuxfoundation.org
+Cc: ltsi-dev@lists.linuxfoundation.org, Arnd Bergmann <arnd@arndb.de>, Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>, Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>, Tetsuyuki Kobayashi <koba@kmckk.co.jp>, Simon Horman <horms@verge.net.au>
+Message-ID: <1353315067-7771-5-git-send-email-koba@kmckk.co.jp>
+
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+This is back port to LTSI 3.4.
+
+While we fixed up all instances that were already present in v3.6,
+this one came in through new code.
+
+Without this patch, building kzm9g_defconfig results in:
+
+arch/arm/mach-shmobile/board-kzm9g.c: In function 'kzm9g_restart':
+arch/arm/mach-shmobile/board-kzm9g.c:781:2: warning: passing argument 2 of '__raw_writel' makes pointer from integer without a cast [enabled by default]
+
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
+Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+Cc: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
+Cc: Simon Horman <horms@verge.net.au>
+(cherry picked from commit 28901c1fed11dfeab65f640878e85a9b61d311ed)
+
+Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
+---
+ arch/arm/mach-shmobile/board-kzm9g.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
+index 4e62227..af4d760 100644
+--- a/arch/arm/mach-shmobile/board-kzm9g.c
++++ b/arch/arm/mach-shmobile/board-kzm9g.c
+@@ -733,7 +733,7 @@ static void __init kzm_init(void)
+ 
+ static void kzm9g_restart(char mode, const char *cmd)
+ {
+-#define RESCNT2 0xe6188020
++#define RESCNT2 IOMEM(0xe6188020)
+ 	/* Do soft power on reset */
+ 	writel((1 << 31), RESCNT2);
+ }
+-- 
+1.7.9.5
+
diff --git a/patches.kzm9g/arm-shmobile-kzm9g-bugfix-correct-mmcif-interrupt-settings.patch b/patches.kzm9g/arm-shmobile-kzm9g-bugfix-correct-mmcif-interrupt-settings.patch
new file mode 100644
index 00000000000000..e920cf35e63e57
--- /dev/null
+++ b/patches.kzm9g/arm-shmobile-kzm9g-bugfix-correct-mmcif-interrupt-settings.patch
@@ -0,0 +1,43 @@
+From koba@kmckk.co.jp Mon Nov 19 00:51:45 2012
+From: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
+Date: Mon, 19 Nov 2012 17:51:05 +0900
+Subject: [PATCH 3/5] ARM: shmobile: kzm9g: bugfix: correct mmcif interrupt settings
+To: gregkh@linuxfoundation.org
+Cc: ltsi-dev@lists.linuxfoundation.org, Tetsuyuki Kobayashi <koba@kmckk.co.jp>, Simon Horman <horms@verge.net.au>
+Message-ID: <1353315067-7771-4-git-send-email-koba@kmckk.co.jp>
+
+
+This is back port to LTSI 3.4.
+Correct interrupt settings of sh_mmc:int and sh_mmc:error in board-kzm9g.c.
+
+Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
+Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+Signed-off-by: Simon Horman <horms@verge.net.au>
+(cherry picked from commit a704835d6a7a8254067a1be60d614cd5c0c73e44)
+
+Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
+---
+ arch/arm/mach-shmobile/board-kzm9g.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
+index 9b69a95..4e62227 100644
+--- a/arch/arm/mach-shmobile/board-kzm9g.c
++++ b/arch/arm/mach-shmobile/board-kzm9g.c
+@@ -331,11 +331,11 @@ static struct resource sh_mmcif_resources[] = {
+ 		.flags	= IORESOURCE_MEM,
+ 	},
+ 	[1] = {
+-		.start	= gic_spi(141),
++		.start	= gic_spi(140),
+ 		.flags	= IORESOURCE_IRQ,
+ 	},
+ 	[2] = {
+-		.start	= gic_spi(140),
++		.start	= gic_spi(141),
+ 		.flags	= IORESOURCE_IRQ,
+ 	},
+ };
+-- 
+1.7.9.5
+
diff --git a/patches.kzm9g/arm-shmobile-kzm9g-enable-restarting.patch b/patches.kzm9g/arm-shmobile-kzm9g-enable-restarting.patch
new file mode 100644
index 00000000000000..1b730cfad80a2c
--- /dev/null
+++ b/patches.kzm9g/arm-shmobile-kzm9g-enable-restarting.patch
@@ -0,0 +1,55 @@
+From koba@kmckk.co.jp Mon Nov 19 00:51:36 2012
+From: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
+Date: Mon, 19 Nov 2012 17:51:03 +0900
+Subject: [PATCH 1/5] ARM: shmobile: kzm9g: enable restarting
+To: gregkh@linuxfoundation.org
+Cc: ltsi-dev@lists.linuxfoundation.org, Tetsuyuki Kobayashi <koba@kmckk.co.jp>, Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>, Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>, Simon Horman <horms@verge.net.au>
+Message-ID: <1353315067-7771-2-git-send-email-koba@kmckk.co.jp>
+
+
+This is back port to LTSI 3.4.
+Do soft-power-on-reset in sys_reboot system call.
+
+How to test this patch
+  Execute "sudo reboot" from command line. The system will start shutdown
+  sequence and finally reboot and U-Boot restarts.
+
+Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
+Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
+Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+Signed-off-by: Simon Horman <horms@verge.net.au>
+(cherry picked from commit 7952717adb69efc1d2443a1858f96d23c2fb93e0)
+
+Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
+---
+ arch/arm/mach-shmobile/board-kzm9g.c |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
+index 212c524..9b69a95 100644
+--- a/arch/arm/mach-shmobile/board-kzm9g.c
++++ b/arch/arm/mach-shmobile/board-kzm9g.c
+@@ -731,6 +731,13 @@ static void __init kzm_init(void)
+ 	platform_add_devices(kzm_devices, ARRAY_SIZE(kzm_devices));
+ }
+ 
++static void kzm9g_restart(char mode, const char *cmd)
++{
++#define RESCNT2 0xe6188020
++	/* Do soft power on reset */
++	writel((1 << 31), RESCNT2);
++}
++
+ static const char *kzm9g_boards_compat_dt[] __initdata = {
+ 	"renesas,kzm9g",
+ 	NULL,
+@@ -744,5 +751,6 @@ DT_MACHINE_START(KZM9G_DT, "kzm9g")
+ 	.handle_irq	= gic_handle_irq,
+ 	.init_machine	= kzm_init,
+ 	.timer		= &shmobile_timer,
++	.restart	= kzm9g_restart,
+ 	.dt_compat	= kzm9g_boards_compat_dt,
+ MACHINE_END
+-- 
+1.7.9.5
+
diff --git a/patches.kzm9g/arm-shmobile-sh73a0-enable-pmu-performance-monitoring-unit.patch b/patches.kzm9g/arm-shmobile-sh73a0-enable-pmu-performance-monitoring-unit.patch
new file mode 100644
index 00000000000000..535742f97958b7
--- /dev/null
+++ b/patches.kzm9g/arm-shmobile-sh73a0-enable-pmu-performance-monitoring-unit.patch
@@ -0,0 +1,76 @@
+From koba@kmckk.co.jp Mon Nov 19 00:51:41 2012
+From: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
+Date: Mon, 19 Nov 2012 17:51:04 +0900
+Subject: [PATCH 2/5] ARM: shmobile: sh73a0: enable PMU(Performance Monitoring Unit)
+To: gregkh@linuxfoundation.org
+Cc: ltsi-dev@lists.linuxfoundation.org, Tetsuyuki Kobayashi <koba@kmckk.co.jp>, Simon Horman <horms@verge.net.au>
+Message-ID: <1353315067-7771-3-git-send-email-koba@kmckk.co.jp>
+
+
+This is back port to LTSI 3.4.
+This patch enables PMU(Performance Monitoring Unit) for sh73a0.
+
+Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
+Signed-off-by: Simon Horman <horms@verge.net.au>
+(cherry picked from commit f23f5be0ed87f1c53420086c936385d0a80c7e4d)
+
+Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
+---
+ arch/arm/configs/kzm9g_defconfig      |    1 +
+ arch/arm/mach-shmobile/setup-sh73a0.c |   21 +++++++++++++++++++++
+ 2 files changed, 22 insertions(+)
+
+diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig
+index 2388c86..5d0c667 100644
+--- a/arch/arm/configs/kzm9g_defconfig
++++ b/arch/arm/configs/kzm9g_defconfig
+@@ -14,6 +14,7 @@ CONFIG_NAMESPACES=y
+ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+ CONFIG_SYSCTL_SYSCALL=y
+ CONFIG_EMBEDDED=y
++CONFIG_PERF_EVENTS=y
+ CONFIG_SLAB=y
+ CONFIG_MODULES=y
+ CONFIG_MODULE_FORCE_LOAD=y
+diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
+index d230af6..38ed2dd 100644
+--- a/arch/arm/mach-shmobile/setup-sh73a0.c
++++ b/arch/arm/mach-shmobile/setup-sh73a0.c
+@@ -734,6 +734,26 @@ static struct platform_device mpdma0_device = {
+ 	},
+ };
+ 
++static struct resource pmu_resources[] = {
++	[0] = {
++		.start	= gic_spi(55),
++		.end	= gic_spi(55),
++		.flags	= IORESOURCE_IRQ,
++	},
++	[1] = {
++		.start	= gic_spi(56),
++		.end	= gic_spi(56),
++		.flags	= IORESOURCE_IRQ,
++	},
++};
++
++static struct platform_device pmu_device = {
++	.name		= "arm-pmu",
++	.id		= -1,
++	.num_resources	= ARRAY_SIZE(pmu_resources),
++	.resource	= pmu_resources,
++};
++
+ static struct platform_device *sh73a0_early_devices[] __initdata = {
+ 	&scif0_device,
+ 	&scif1_device,
+@@ -757,6 +777,7 @@ static struct platform_device *sh73a0_late_devices[] __initdata = {
+ 	&i2c4_device,
+ 	&dma0_device,
+ 	&mpdma0_device,
++	&pmu_device,
+ };
+ 
+ #define SRCR2          0xe61580b0
+-- 
+1.7.9.5
+
diff --git a/series b/series
index f09e0e9d2a0daa..871f5f0557c0d4 100644
--- a/series
+++ b/series
@@ -635,6 +635,10 @@ patches.kzm9g/arm-shmobile-use-common-dmaengine-definitions-on-sh73a0.patch
 patches.kzm9g/arm-shmobile-kzm9g-enable-dmaengine-on-fsi.patch
 patches.kzm9g/arm-shmobile-kzm9g-defconfig-enable-inotify_user.patch
 patches.kzm9g/arm-shmobile-sh73a0-fixup-reloc_base-of-intca_irq_pins_desc.patch
+patches.kzm9g/arm-shmobile-kzm9g-enable-restarting.patch
+patches.kzm9g/arm-shmobile-sh73a0-enable-pmu-performance-monitoring-unit.patch
+patches.kzm9g/arm-shmobile-kzm9g-bugfix-correct-mmcif-interrupt-settings.patch
+patches.kzm9g/arm-shmobile-add-new-__iomem-annotation-for-new-code.patch
 
 
 #############################################################################