more bugfix patches

5 files changed, 196 insertions, 0 deletions

diff --git a/patches.armadillo800eva/ltsi-bugfix-armadillo800eva-sh_eth-needs-net_ethernet-on-defconfig.patch b/patches.armadillo800eva/ltsi-bugfix-armadillo800eva-sh_eth-needs-net_ethernet-on-defconfig.patch
new file mode 100644
index 00000000000000..6a1f951e05c927
--- /dev/null
+++ b/patches.armadillo800eva/ltsi-bugfix-armadillo800eva-sh_eth-needs-net_ethernet-on-defconfig.patch
@@ -0,0 +1,36 @@
+From kuninori.morimoto.gx@gmail.com Tue Jun 12 21:51:16 2012
+From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+Date: Tue, 12 Jun 2012 21:51:14 -0700 (PDT)
+Subject: [PATCH 1/2] LTSI: bugfix: armadillo800eva: SH_ETH needs NET_ETHERNET on defconfig
+To: Greg KH <gregkh@linuxfoundation.org>, ltsi-dev@lists.linuxfoundation.org
+Cc: Simon <horms@verge.net.au>, Kuninori Morimoto <kuninori.morimoto.gx@gmail.com>, (KMC)tuji <kunihiko@kmckk.co.jp>
+Message-ID: <87zk877r29.wl%kuninori.morimoto.gx@renesas.com>
+
+
+On LTSI, sh_eth driver was backported from latest kernel.
+But the ethernet driver dependency was modified between
+latest kernel and 3.0.x kernel.
+Then, LTSI kernel lost NET_ETHERNET which was required
+from SH_ETH on defconfig.
+This patch fix it up for LTSI.
+
+Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+---
+ arch/arm/configs/armadillo800eva_defconfig |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig
+index 0d20749..f29893a 100644
+--- a/arch/arm/configs/armadillo800eva_defconfig
++++ b/arch/arm/configs/armadillo800eva_defconfig
+@@ -68,6 +68,7 @@ CONFIG_NETDEVICES=y
+ # CONFIG_NET_VENDOR_MARVELL is not set
+ # CONFIG_NET_VENDOR_MICREL is not set
+ # CONFIG_NET_VENDOR_NATSEMI is not set
++CONFIG_NET_ETHERNET=y
+ CONFIG_SH_ETH=y
+ # CONFIG_NET_VENDOR_SEEQ is not set
+ # CONFIG_NET_VENDOR_STMICRO is not set
+-- 
+1.7.5.4
+
diff --git a/patches.kzm9g/ltsi-arm-shmobile-kzm9g-support-real-time-clock.patch b/patches.kzm9g/ltsi-arm-shmobile-kzm9g-support-real-time-clock.patch
new file mode 100644
index 00000000000000..fd8fbdfe6d2a50
--- /dev/null
+++ b/patches.kzm9g/ltsi-arm-shmobile-kzm9g-support-real-time-clock.patch
@@ -0,0 +1,53 @@
+From ltsi-dev-bounces@lists.linuxfoundation.org Mon Jun 18 04:06:00 2012
+From: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
+Date: Mon, 18 Jun 2012 20:06:02 +0900
+Subject: LTSI: ARM: shmobile: kzm9g: Support Real Time Clock
+To: ltsi-dev@lists.linuxfoundation.org
+Message-ID: <4FDF0B9A.6030404@kmckk.co.jp>
+
+
+KZM-A9-GT board has RTC device r2025d at I2C channel 0
+with slave address 0x64.
+
+This patch enables reading and writing hardware real time clock on
+KZM-A9-GT board. Interrupt is not yet supported.
+
+How to test this patch using user space command.
+
+Read RTC
+ # hwclock -r
+
+Copy system clock to RTC
+ # hwclock -w
+
+Shutdown and power off the board, and wait a while, then power on again.
+Check RTC still keeps correct date.
+
+Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
+---
+ arch/arm/configs/kzm9g_defconfig     |    1 +
+ arch/arm/mach-shmobile/board-kzm9g.c |    3 +++
+ 2 files changed, 4 insertions(+)
+
+--- a/arch/arm/configs/kzm9g_defconfig
++++ b/arch/arm/configs/kzm9g_defconfig
+@@ -108,6 +108,7 @@ CONFIG_MMC_SH_MMCIF=y
+ CONFIG_NEW_LEDS=y
+ CONFIG_LEDS_CLASS=y
+ CONFIG_RTC_CLASS=y
++CONFIG_RTC_DRV_RS5C372=y
+ CONFIG_DMADEVICES=y
+ CONFIG_SH_DMAE=y
+ CONFIG_ASYNC_TX_DMA=y
+--- a/arch/arm/mach-shmobile/board-kzm9g.c
++++ b/arch/arm/mach-shmobile/board-kzm9g.c
+@@ -278,6 +278,9 @@ static struct pcf857x_platform_data pcf8
+ static struct i2c_board_info i2c0_devices[] = {
+ 	{
+ 		I2C_BOARD_INFO("ak4648", 0x12),
++	},
++	{
++		I2C_BOARD_INFO("r2025sd", 0x32),
+ 	}
+ };
+ 
diff --git a/patches.kzm9g/ltsi-bugfix-add-config_i2c-to-kzm9g_defconfig.patch b/patches.kzm9g/ltsi-bugfix-add-config_i2c-to-kzm9g_defconfig.patch
new file mode 100644
index 00000000000000..35557987dff9ce
--- /dev/null
+++ b/patches.kzm9g/ltsi-bugfix-add-config_i2c-to-kzm9g_defconfig.patch
@@ -0,0 +1,51 @@
+From ltsi-dev-bounces@lists.linuxfoundation.org Mon Jun 18 02:55:43 2012
+From: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
+Date: Mon, 18 Jun 2012 18:55:45 +0900
+Subject: LTSI: bugfix: add CONFIG_I2C to kzm9g_defconfig
+To: ltsi-dev@lists.linuxfoundation.org
+Message-ID: <4FDEFB21.1090608@kmckk.co.jp>
+
+
+
+Build fails for kzm9g because CONFIG_I2C=y is missing in kzm9g_defconfig.
+
+$ make kzm9g_defconfig
+$ make
+
+  ...
+
+  CC      arch/arm/mach-shmobile/board-kzm9g.o
+arch/arm/mach-shmobile/board-kzm9g.c: In function 'as3711_enable_lcdc_backlight':
+arch/arm/mach-shmobile/board-kzm9g.c:314:9: error: implicit declaration of function 'i2c_get_adapter' [-Werror=implicit-function-declaration]
+arch/arm/mach-shmobile/board-kzm9g.c:314:26: warning: initialization makes pointer from integer without a cast [enabled by default]
+arch/arm/mach-shmobile/board-kzm9g.c:349:3: error: implicit declaration of function 'i2c_transfer' [-Werror=implicit-function-declaration]
+cc1: some warnings being treated as errors
+make[1]: *** [arch/arm/mach-shmobile/board-kzm9g.o] Error 1
+make: *** [arch/arm/mach-shmobile] Error 2
+
+This patch solves this problem.
+
+Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
+---
+ arch/arm/configs/kzm9g_defconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig
+index e3ebc20..ff7b698 100644
+--- a/arch/arm/configs/kzm9g_defconfig
++++ b/arch/arm/configs/kzm9g_defconfig
+@@ -78,6 +78,7 @@ CONFIG_SERIAL_SH_SCI=y
+ CONFIG_SERIAL_SH_SCI_NR_UARTS=9
+ CONFIG_SERIAL_SH_SCI_CONSOLE=y
+ # CONFIG_HW_RANDOM is not set
++CONFIG_I2C=y
+ CONFIG_I2C_CHARDEV=y
+ CONFIG_I2C_SH_MOBILE=y
+ CONFIG_GPIO_PCF857X=y
+-- 
+1.7.9.5
+_______________________________________________
+LTSI-dev mailing list
+LTSI-dev@lists.linuxfoundation.org
+https://lists.linuxfoundation.org/mailman/listinfo/ltsi-dev
+
diff --git a/patches.ltsi/ltsi-bugfix-sh73a0-add-lost-clk_enable_on_init-for-div6_zb1.patch b/patches.ltsi/ltsi-bugfix-sh73a0-add-lost-clk_enable_on_init-for-div6_zb1.patch
new file mode 100644
index 00000000000000..453ede70a0a2ce
--- /dev/null
+++ b/patches.ltsi/ltsi-bugfix-sh73a0-add-lost-clk_enable_on_init-for-div6_zb1.patch
@@ -0,0 +1,45 @@
+From kuninori.morimoto.gx@gmail.com Tue Jun 12 21:51:37 2012
+From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+Date: Tue, 12 Jun 2012 21:51:35 -0700 (PDT)
+Subject: [PATCH 2/2] LTSI: bugfix: sh73a0: add lost CLK_ENABLE_ON_INIT for DIV6_ZB1
+To: Greg KH <gregkh@linuxfoundation.org>, ltsi-dev@lists.linuxfoundation.org
+Cc: Simon <horms@verge.net.au>, Kuninori Morimoto <kuninori.morimoto.gx@gmail.com>, (KMC)tuji <kunihiko@kmckk.co.jp>
+Message-ID: <87y5nr7r1o.wl%kuninori.morimoto.gx@renesas.com>
+
+
+On upstream kernel, on one branch,
+CLK_ENABLE_ON_INIT was added to DIV6_ZB1 clock by
+9bcc0a5d0de137b3a154dc951c5ff70dce815879
+(ARM: mach-shmobile: SH73A0 external Ethernet fix)
+
+On the other branch, below commit modified dev6_clks[] controlling method.
+d4775356bb39eaa305844cc6cc4c267236535956
+(sh: clkfwk: clock-sh73a0: all div6_clks use SH_CLK_DIV6_EXT())
+
+These 2 commit had conflict, and were solved when merge window
+timing on upstream kernel.
+But unfortunately, this solution seems had be lost on backporting.
+This patch fixes it up for LTSI.
+
+Reported-by: Kunihiko Tsuji <kunihiko@kmckk.co.jp>
+Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+---
+ arch/arm/mach-shmobile/clock-sh73a0.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/arch/arm/mach-shmobile/clock-sh73a0.c b/arch/arm/mach-shmobile/clock-sh73a0.c
+index 012b284..fcecbdc 100644
+--- a/arch/arm/mach-shmobile/clock-sh73a0.c
++++ b/arch/arm/mach-shmobile/clock-sh73a0.c
+@@ -328,7 +328,7 @@ static struct clk div6_clks[DIV6_NR] = {
+ 			vck_parent, ARRAY_SIZE(vck_parent), 12, 3),
+ 	[DIV6_VCK3] = SH_CLK_DIV6_EXT(VCLKCR3, 0,
+ 			vck_parent, ARRAY_SIZE(vck_parent), 12, 3),
+-	[DIV6_ZB1] = SH_CLK_DIV6_EXT(ZBCKCR, 0,
++	[DIV6_ZB1] = SH_CLK_DIV6_EXT(ZBCKCR, CLK_ENABLE_ON_INIT,
+ 			pll_parent, ARRAY_SIZE(pll_parent), 7, 1),
+ 	[DIV6_FLCTL] = SH_CLK_DIV6_EXT(FLCKCR, 0,
+ 			pll_parent, ARRAY_SIZE(pll_parent), 7, 1),
+-- 
+1.7.5.4
+
diff --git a/series b/series
index 87f5aab6451082..86b3f9d5179570 100644
--- a/series
+++ b/series
@@ -314,6 +314,7 @@ patches.armadillo800eva/0251-ARM-mach-shmobile-armadillo800eva-add-support-ST123
 patches.armadillo800eva/0252-ARM-mach-shmobile-armadillo800eva-add-support-gpio_k.patch
 patches.armadillo800eva/0253-ARM-mach-shmobile-armadillo800eva-add-support-sh_eth.patch
 patches.armadillo800eva/arm-mach-shmobile-sh7372-ap4evb-and-mackerel-timer-rework.patch
+patches.armadillo800eva/ltsi-bugfix-armadillo800eva-sh_eth-needs-net_ethernet-on-defconfig.patch
 
 
 
@@ -856,6 +857,9 @@ patches.kzm9g/0061-mach-shmobile-Emma-Mobile-EV2-SMP-support-V3.patch
 patches.kzm9g/0062-mach-shmobile-Emma-Mobile-EV2-GPIO-support-V3.patch
 patches.kzm9g/0063-mach-shmobile-KZM9D-board-Ethernet-support-V3.patch
 
+patches.kzm9g/ltsi-arm-shmobile-kzm9g-support-real-time-clock.patch
+patches.kzm9g/ltsi-bugfix-add-config_i2c-to-kzm9g_defconfig.patch
+
 
 patches.sh7757lcr/001-spi-add-support-for-renesas-rspi.patch
 patches.sh7757lcr/002-spi-irq-remove-irqf_disabled.patch
@@ -892,3 +896,10 @@ patches.r8a66597-udc/009-usb-gadget-r8a66597-udc-add-function-for-external-contr
 patches.r8a66597-udc/010-usb-gadget-r8a66597-udc-use-dev_-instead-of-printk.patch
 patches.r8a66597-udc/011-usb-gadget-r8a66597-udc-add-support-for-sudmac.patch
 patches.r8a66597-udc/012-usb-gadget-r8a66597-udc-fix-flush-fifo-handling.patch
+
+# bugfixes due to LTSI-specific things that happened above.
+# This is usually due to merge issues, or specific things like config file
+# changes that are needed for the BSP being added.
+
+patches.ltsi/ltsi-bugfix-sh73a0-add-lost-clk_enable_on_init-for-div6_zb1.patch
+