2 more fixes added

diff --git a/patches.fixes/asoc-shmobile-armadillo800eva-enable-clock-inversion-on-fsi-a.patch b/patches.fixes/asoc-shmobile-armadillo800eva-enable-clock-inversion-on-fsi-a.patch
new file mode 100644 (file)
index 0000000..cb2538e
--- /dev/null
+++ b/patches.fixes/asoc-shmobile-armadillo800eva-enable-clock-inversion-on-fsi-a.patch
@@ -0,0 +1,31 @@
+From ltsi-dev-bounces@lists.linuxfoundation.org Thu Feb 14 20:37:39 2013
+From: Do Quang Thang <dq-thang@jinso.co.jp>
+Date: Fri, 15 Feb 2013 13:37:03 +0900
+Subject: [PATCH 2/2] ASoC: shmobile: armadillo800eva: enable clock inversion on FSI-A
+To: ltsi-dev@lists.linuxfoundation.org
+Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+Message-ID: <1360903023-19758-3-git-send-email-dq-thang@jinso.co.jp>
+
+
+Since board flags were updated with simple-card driver in upstream kernel on
+a4a2992c531f6ca0aa00ce0deb31e51c1b7ae69b
+(ASoC: simple-card: add asoc_simple_dai for initializing)
+fixup patch for an "old style" does not exist.
+This patch is for LTSI kernel
+
+Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+Tested-by: Nguyen Viet Dung <nv-dung@jinso.co.jp>
+---
+ arch/arm/mach-shmobile/board-armadillo800eva.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
++++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
+@@ -795,6 +795,7 @@ static int fsi_hdmi_set_rate(struct devi
+ static struct sh_fsi_platform_info fsi_info = {
+       /* FSI-WM8978 */
+       .port_a = {
++              .flags = SH_FSI_BRS_INV,
+               .tx_id = SHDMA_SLAVE_FSIA_TX,
+       },
+       /* FSI-HDMI */

diff --git a/patches.fixes/sh-clkfwk-bugfix-sh_clk_div_enable-care-sh_clk_div_set_rate-if-div6.patch b/patches.fixes/sh-clkfwk-bugfix-sh_clk_div_enable-care-sh_clk_div_set_rate-if-div6.patch
new file mode 100644 (file)
index 0000000..cc8c1cf
--- /dev/null
+++ b/patches.fixes/sh-clkfwk-bugfix-sh_clk_div_enable-care-sh_clk_div_set_rate-if-div6.patch
@@ -0,0 +1,40 @@
+From ltsi-dev-bounces@lists.linuxfoundation.org Thu Feb 14 20:37:35 2013
+From: Do Quang Thang <dq-thang@jinso.co.jp>
+Date: Fri, 15 Feb 2013 13:37:02 +0900
+Subject: [PATCH 1/2] sh: clkfwk: bugfix: sh_clk_div_enable() care sh_clk_div_set_rate() if div6
+To: ltsi-dev@lists.linuxfoundation.org
+Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+Message-ID: <1360903023-19758-2-git-send-email-dq-thang@jinso.co.jp>
+
+
+764f4e4e33d18cde4dcaf8a0d860b749c6d6d08b
+(sh: clkfwk: Use shared sh_clk_div_enable/disable())
+shared enable/disable funcions for div4/div6.
+But new sh_clk_div_enable() didn't care sh_clk_div_set_rate()
+which is required on div6 clock.
+This patch fixes it.
+
+Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+Signed-off-by: Paul Mundt <lethal@linux-sh.org>
+(cherry picked from commit 5a799b824b6046befa7e10107a3d65f40816f645)
+
+Signed-off-by: Do Quang Thang <dq-thang@jinso.co.jp>
+---
+ drivers/sh/clk/cpg.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/drivers/sh/clk/cpg.c
++++ b/drivers/sh/clk/cpg.c
+@@ -126,6 +126,12 @@ static int sh_clk_div_set_rate(struct cl
+ 
+ static int sh_clk_div_enable(struct clk *clk)
+ {
++      if (clk->div_mask == SH_CLK_DIV6_MSK) {
++              int ret = sh_clk_div_set_rate(clk, clk->rate);
++              if (ret < 0)
++                      return ret;
++      }
++
+       sh_clk_write(sh_clk_read(clk) & ~CPG_CKSTP_BIT, clk);
+       return 0;
+ }

diff --git a/series b/series
index 998032a714e60c8ba20339cdc5ceea1d00a404d6..81c45caf755036c7994b2924eae040e4afafee1c 100644 (file)
--- a/series
+++ b/series
@@ -783,3 +783,5 @@ patches.fixes/0002-usb-renesas_usbhs-gadget-remove-usbhsg_uep_init.patch
 patches.fixes/0003-usb-renesas_usbhs-gadget-usbhsg_ep_disable-care-pipe.patch
 patches.fixes/revert-usb-renesas_usbhs-gadget-usbhsg_ep_disable-care-pipe-settings.patch
 patches.fixes/revert-usb-renesas_usbhs-gadget-remove-usbhsg_uep_init.patch
+patches.fixes/sh-clkfwk-bugfix-sh_clk_div_enable-care-sh_clk_div_set_rate-if-div6.patch
+patches.fixes/asoc-shmobile-armadillo800eva-enable-clock-inversion-on-fsi-a.patch