Merge branch 'rmobile/fsi-despair' into rmobile-fixes-for-linus

5 files changed, 125 insertions, 67 deletions

diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index 9be261beae7d..2652af124acd 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -359,8 +359,8 @@ static struct clk_lookup dm355_clks[] = {
         CLK(NULL, "uart1", &uart1_clk),
         CLK(NULL, "uart2", &uart2_clk),
         CLK("i2c_davinci.1", NULL, &i2c_clk),
-        CLK("davinci-asp.0", NULL, &asp0_clk),
-        CLK("davinci-asp.1", NULL, &asp1_clk),
+        CLK("davinci-mcbsp.0", NULL, &asp0_clk),
+        CLK("davinci-mcbsp.1", NULL, &asp1_clk),
         CLK("davinci_mmc.0", NULL, &mmcsd0_clk),
         CLK("davinci_mmc.1", NULL, &mmcsd1_clk),
         CLK("spi_davinci.0", NULL, &spi0_clk),
@@ -664,7 +664,7 @@ static struct resource dm355_asp1_resources[] = {
 };
 
 static struct platform_device dm355_asp1_device = {
-        .name           = "davinci-asp",
+        .name           = "davinci-mcbsp",
         .id             = 1,
         .num_resources  = ARRAY_SIZE(dm355_asp1_resources),
         .resource       = dm355_asp1_resources,
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index a12065e87266..c466d710d3c1 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -459,7 +459,7 @@ static struct clk_lookup dm365_clks[] = {
         CLK(NULL, "usb", &usb_clk),
         CLK("davinci_emac.1", NULL, &emac_clk),
         CLK("davinci_voicecodec", NULL, &voicecodec_clk),
-        CLK("davinci-asp.0", NULL, &asp0_clk),
+        CLK("davinci-mcbsp", NULL, &asp0_clk),
         CLK(NULL, "rto", &rto_clk),
         CLK(NULL, "mjcp", &mjcp_clk),
         CLK(NULL, NULL, NULL),
@@ -922,8 +922,8 @@ static struct resource dm365_asp_resources[] = {
 };
 
 static struct platform_device dm365_asp_device = {
-        .name           = "davinci-asp",
-        .id             = 0,
+        .name           = "davinci-mcbsp",
+        .id             = -1,
         .num_resources  = ARRAY_SIZE(dm365_asp_resources),
         .resource       = dm365_asp_resources,
 };
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 0608dd776a16..9a2376b3137c 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -302,7 +302,7 @@ static struct clk_lookup dm644x_clks[] = {
         CLK("davinci_emac.1", NULL, &emac_clk),
         CLK("i2c_davinci.1", NULL, &i2c_clk),
         CLK("palm_bk3710", NULL, &ide_clk),
-        CLK("davinci-asp", NULL, &asp_clk),
+        CLK("davinci-mcbsp", NULL, &asp_clk),
         CLK("davinci_mmc.0", NULL, &mmcsd_clk),
         CLK(NULL, "spi", &spi_clk),
         CLK(NULL, "gpio", &gpio_clk),
@@ -580,7 +580,7 @@ static struct resource dm644x_asp_resources[] = {
 };
 
 static struct platform_device dm644x_asp_device = {
-        .name           = "davinci-asp",
+        .name           = "davinci-mcbsp",
         .id             = -1,
         .num_resources  = ARRAY_SIZE(dm644x_asp_resources),
         .resource       = dm644x_asp_resources,
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index d3260542b943..d440e5f456ad 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -567,38 +567,127 @@ static struct platform_device *qhd_devices[] __initdata = {
 
 /* FSI */
 #define IRQ_FSI         evt2irq(0x1840)
+static int __fsi_set_rate(struct clk *clk, long rate, int enable)
+{
+        int ret = 0;
+
+        if (rate <= 0)
+                return ret;
+
+        if (enable) {
+                ret = clk_set_rate(clk, rate);
+                if (0 == ret)
+                        ret = clk_enable(clk);
+        } else {
+                clk_disable(clk);
+        }
+
+        return ret;
+}
+
+static int __fsi_set_round_rate(struct clk *clk, long rate, int enable)
+{
+        return __fsi_set_rate(clk, clk_round_rate(clk, rate), enable);
+}
 
-static int fsi_set_rate(int is_porta, int rate)
+static int fsi_ak4642_set_rate(struct device *dev, int rate, int enable)
+{
+        struct clk *fsia_ick;
+        struct clk *fsiack;
+        int ret = -EIO;
+
+        fsia_ick = clk_get(dev, "icka");
+        if (IS_ERR(fsia_ick))
+                return PTR_ERR(fsia_ick);
+
+        /*
+         * FSIACK is connected to AK4642,
+         * and use external clock pin from it.
+         * it is parent of fsia_ick now.
+         */
+        fsiack = clk_get_parent(fsia_ick);
+        if (!fsiack)
+                goto fsia_ick_out;
+
+        /*
+         * we get 1/1 divided clock by setting same rate to fsiack and fsia_ick
+         *
+         ** FIXME **
+         * Because the freq_table of external clk (fsiack) are all 0,
+         * the return value of clk_round_rate became 0.
+         * So, it use __fsi_set_rate here.
+         */
+        ret = __fsi_set_rate(fsiack, rate, enable);
+        if (ret < 0)
+                goto fsiack_out;
+
+        ret = __fsi_set_round_rate(fsia_ick, rate, enable);
+        if ((ret < 0) && enable)
+                __fsi_set_round_rate(fsiack, rate, 0); /* disable FSI ACK */
+
+fsiack_out:
+        clk_put(fsiack);
+
+fsia_ick_out:
+        clk_put(fsia_ick);
+
+        return 0;
+}
+
+static int fsi_hdmi_set_rate(struct device *dev, int rate, int enable)
 {
         struct clk *fsib_clk;
         struct clk *fdiv_clk = &sh7372_fsidivb_clk;
+        long fsib_rate = 0;
+        long fdiv_rate = 0;
+        int ackmd_bpfmd;
         int ret;
 
-        /* set_rate is not needed if port A */
-        if (is_porta)
-                return 0;
-
-        fsib_clk = clk_get(NULL, "fsib_clk");
-        if (IS_ERR(fsib_clk))
-                return -EINVAL;
-
         switch (rate) {
         case 44100:
-                clk_set_rate(fsib_clk, clk_round_rate(fsib_clk, 11283000));
-                ret = SH_FSI_ACKMD_256 | SH_FSI_BPFMD_64;
+                fsib_rate       = rate * 256;
+                ackmd_bpfmd     = SH_FSI_ACKMD_256 | SH_FSI_BPFMD_64;
                 break;
         case 48000:
-                clk_set_rate(fsib_clk, clk_round_rate(fsib_clk, 85428000));
-                clk_set_rate(fdiv_clk, clk_round_rate(fdiv_clk, 12204000));
-                ret = SH_FSI_ACKMD_256 | SH_FSI_BPFMD_64;
+                fsib_rate       = 85428000; /* around 48kHz x 256 x 7 */
+                fdiv_rate       = rate * 256;
+                ackmd_bpfmd     = SH_FSI_ACKMD_256 | SH_FSI_BPFMD_64;
                 break;
         default:
                 pr_err("unsupported rate in FSI2 port B\n");
-                ret = -EINVAL;
-                break;
+                return -EINVAL;
         }
 
+        /* FSI B setting */
+        fsib_clk = clk_get(dev, "ickb");
+        if (IS_ERR(fsib_clk))
+                return -EIO;
+
+        ret = __fsi_set_round_rate(fsib_clk, fsib_rate, enable);
         clk_put(fsib_clk);
+        if (ret < 0)
+                return ret;
+
+        /* FSI DIV setting */
+        ret = __fsi_set_round_rate(fdiv_clk, fdiv_rate, enable);
+        if (ret < 0) {
+                /* disable FSI B */
+                if (enable)
+                        __fsi_set_round_rate(fsib_clk, fsib_rate, 0);
+                return ret;
+        }
+
+        return ackmd_bpfmd;
+}
+
+static int fsi_set_rate(struct device *dev, int is_porta, int rate, int enable)
+{
+        int ret;
+
+        if (is_porta)
+                ret = fsi_ak4642_set_rate(dev, rate, enable);
+        else
+                ret = fsi_hdmi_set_rate(dev, rate, enable);
 
         return ret;
 }
@@ -880,6 +969,11 @@ static int __init hdmi_init_pm_clock(void)
                 goto out;
         }
 
+        ret = clk_enable(&sh7372_pllc2_clk);
+        if (ret < 0) {
+                pr_err("Cannot enable pllc2 clock\n");
+                goto out;
+        }
         pr_debug("PLLC2 set frequency %lu\n", rate);
 
         ret = clk_set_parent(hdmi_ick, &sh7372_pllc2_clk);
@@ -896,23 +990,11 @@ out:
 
 device_initcall(hdmi_init_pm_clock);
 
-#define FSIACK_DUMMY_RATE 48000
 static int __init fsi_init_pm_clock(void)
 {
         struct clk *fsia_ick;
         int ret;
 
-        /*
-         * FSIACK is connected to AK4642,
-         * and the rate is depend on playing sound rate.
-         * So, set dummy rate (= 48k) here
-         */
-        ret = clk_set_rate(&sh7372_fsiack_clk, FSIACK_DUMMY_RATE);
-        if (ret < 0) {
-                pr_err("Cannot set FSIACK dummy rate: %d\n", ret);
-                return ret;
-        }
-
         fsia_ick = clk_get(&fsi_device.dev, "icka");
         if (IS_ERR(fsia_ick)) {
                 ret = PTR_ERR(fsia_ick);
@@ -921,16 +1003,9 @@ static int __init fsi_init_pm_clock(void)
         }
 
         ret = clk_set_parent(fsia_ick, &sh7372_fsiack_clk);
-        if (ret < 0) {
-                pr_err("Cannot set FSI-A parent: %d\n", ret);
-                goto out;
-        }
-
-        ret = clk_set_rate(fsia_ick, FSIACK_DUMMY_RATE);
         if (ret < 0)
-                pr_err("Cannot set FSI-A rate: %d\n", ret);
+                pr_err("Cannot set FSI-A parent: %d\n", ret);
 
-out:
         clk_put(fsia_ick);
 
         return ret;
diff --git a/arch/arm/mach-shmobile/clock-sh7372.c b/arch/arm/mach-shmobile/clock-sh7372.c
index d3313a95dbfc..d0011a5b165d 100644
--- a/arch/arm/mach-shmobile/clock-sh7372.c
+++ b/arch/arm/mach-shmobile/clock-sh7372.c
@@ -230,21 +230,13 @@ static int pllc2_set_rate(struct clk *clk,
         if (idx < 0)
                 return idx;
 
-        if (rate == clk->parent->rate) {
-                pllc2_disable(clk);
-                return 0;
-        }
+        if (rate == clk->parent->rate)
+                return -EINVAL;
 
         value = __raw_readl(PLLC2CR) & ~(0x3f << 24);
 
-        if (value & 0x80000000)
-                pllc2_disable(clk);
-
         __raw_writel((value & ~0x80000000) | ((idx + 19) << 24), PLLC2CR);
 
-        if (value & 0x80000000)
-                return pllc2_enable(clk);
-
         return 0;
 }
 
@@ -453,10 +445,8 @@ static int fsidiv_enable(struct clk *clk)
         unsigned long value;
 
         value  = __raw_readl(clk->mapping->base) >> 16;
-        if (value < 2) {
-                fsidiv_disable(clk);
-                return -ENOENT;
-        }
+        if (value < 2)
+                return -EIO;
 
         __raw_writel((value << 16) | 0x3, clk->mapping->base);
 
@@ -468,17 +458,12 @@ static int fsidiv_set_rate(struct clk *clk,
 {
         int idx;
 
-        if (clk->parent->rate == rate) {
-                fsidiv_disable(clk);
-                return 0;
-        }
-
         idx = (clk->parent->rate / rate) & 0xffff;
         if (idx < 2)
-                return -ENOENT;
+                return -EINVAL;
 
         __raw_writel(idx << 16, clk->mapping->base);
-        return fsidiv_enable(clk);
+        return 0;
 }
 
 static struct clk_ops fsidiv_clk_ops = {
@@ -609,8 +594,6 @@ static struct clk_lookup lookups[] = {
         CLKDEV_CON_ID("vck3_clk", &div6_clks[DIV6_VCK3]),
         CLKDEV_CON_ID("fmsi_clk", &div6_clks[DIV6_FMSI]),
         CLKDEV_CON_ID("fmso_clk", &div6_clks[DIV6_FMSO]),
-        CLKDEV_CON_ID("fsia_clk", &div6_reparent_clks[DIV6_FSIA]),
-        CLKDEV_CON_ID("fsib_clk", &div6_reparent_clks[DIV6_FSIB]),
         CLKDEV_CON_ID("sub_clk", &div6_clks[DIV6_SUB]),
         CLKDEV_CON_ID("spu_clk", &div6_clks[DIV6_SPU]),
         CLKDEV_CON_ID("vou_clk", &div6_clks[DIV6_VOU]),