[ARM] omap: mcspi: new short connection id names

... rather than the clock names themselves.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c
index aca4ca42bf48cbcbe6b709c8110ed3f87a7ce8b8..ac038035c1c9fa7315341056d27417a86fdc10a3 100644 (file)
--- a/arch/arm/mach-omap2/clock24xx.c
+++ b/arch/arm/mach-omap2/clock24xx.c
@@ -149,12 +149,12 @@ static struct omap_clk omap24xx_clks[] = {
        CLK("omap-mcbsp.4", "mcbsp_fck", &mcbsp4_fck,   CK_243X),
        CLK("omap-mcbsp.5", "mcbsp_ick", &mcbsp5_ick,   CK_243X),
        CLK("omap-mcbsp.5", "mcbsp_fck", &mcbsp5_fck,   CK_243X),
-       CLK("omap2_mcspi.1", "mcspi_ick", &mcspi1_ick,  CK_243X | CK_242X),
-       CLK("omap2_mcspi.1", "mcspi_fck", &mcspi1_fck,  CK_243X | CK_242X),
-       CLK("omap2_mcspi.2", "mcspi_ick", &mcspi2_ick,  CK_243X | CK_242X),
-       CLK("omap2_mcspi.2", "mcspi_fck", &mcspi2_fck,  CK_243X | CK_242X),
-       CLK("omap2_mcspi.3", "mcspi_ick", &mcspi3_ick,  CK_243X),
-       CLK("omap2_mcspi.3", "mcspi_fck", &mcspi3_fck,  CK_243X),
+       CLK("omap2_mcspi.1", "ick",     &mcspi1_ick,    CK_243X | CK_242X),
+       CLK("omap2_mcspi.1", "fck",     &mcspi1_fck,    CK_243X | CK_242X),
+       CLK("omap2_mcspi.2", "ick",     &mcspi2_ick,    CK_243X | CK_242X),
+       CLK("omap2_mcspi.2", "fck",     &mcspi2_fck,    CK_243X | CK_242X),
+       CLK("omap2_mcspi.3", "ick",     &mcspi3_ick,    CK_243X),
+       CLK("omap2_mcspi.3", "fck",     &mcspi3_fck,    CK_243X),
        CLK(NULL,       "uart1_ick",    &uart1_ick,     CK_243X | CK_242X),
        CLK(NULL,       "uart1_fck",    &uart1_fck,     CK_243X | CK_242X),
        CLK(NULL,       "uart2_ick",    &uart2_ick,     CK_243X | CK_242X),

diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
index b3334b355cb19277173938efc3a280d2eece88f5..d0bfae5a2f4132b77747c9a60eb8d7d8fdf6f6e5 100644 (file)
--- a/arch/arm/mach-omap2/clock34xx.c
+++ b/arch/arm/mach-omap2/clock34xx.c
@@ -147,10 +147,10 @@ static struct omap_clk omap34xx_clks[] = {
        CLK("omap-mcbsp.5", "mcbsp_fck", &mcbsp5_fck,   CK_343X),
        CLK("omap-mcbsp.1", "mcbsp_fck", &mcbsp1_fck,   CK_343X),
        CLK(NULL,       "core_48m_fck", &core_48m_fck,  CK_343X),
-       CLK("omap2_mcspi.4", "mcspi_fck", &mcspi4_fck,  CK_343X),
-       CLK("omap2_mcspi.3", "mcspi_fck", &mcspi3_fck,  CK_343X),
-       CLK("omap2_mcspi.2", "mcspi_fck", &mcspi2_fck,  CK_343X),
-       CLK("omap2_mcspi.1", "mcspi_fck", &mcspi1_fck,  CK_343X),
+       CLK("omap2_mcspi.4", "fck",     &mcspi4_fck,    CK_343X),
+       CLK("omap2_mcspi.3", "fck",     &mcspi3_fck,    CK_343X),
+       CLK("omap2_mcspi.2", "fck",     &mcspi2_fck,    CK_343X),
+       CLK("omap2_mcspi.1", "fck",     &mcspi1_fck,    CK_343X),
        CLK(NULL,       "uart2_fck",    &uart2_fck,     CK_343X),
        CLK(NULL,       "uart1_fck",    &uart1_fck,     CK_343X),
        CLK(NULL,       "fshostusb_fck", &fshostusb_fck, CK_3430ES1),
@@ -175,10 +175,10 @@ static struct omap_clk omap34xx_clks[] = {
        CLK("mmci-omap-hs.0",   "mmchs_ick",    &mmchs1_ick,    CK_343X),
        CLK(NULL,       "mspro_ick",    &mspro_ick,     CK_343X),
        CLK(NULL,       "hdq_ick",      &hdq_ick,       CK_343X),
-       CLK("omap2_mcspi.4", "mcspi_ick", &mcspi4_ick,  CK_343X),
-       CLK("omap2_mcspi.3", "mcspi_ick", &mcspi3_ick,  CK_343X),
-       CLK("omap2_mcspi.2", "mcspi_ick", &mcspi2_ick,  CK_343X),
-       CLK("omap2_mcspi.1", "mcspi_ick", &mcspi1_ick,  CK_343X),
+       CLK("omap2_mcspi.4", "ick",     &mcspi4_ick,    CK_343X),
+       CLK("omap2_mcspi.3", "ick",     &mcspi3_ick,    CK_343X),
+       CLK("omap2_mcspi.2", "ick",     &mcspi2_ick,    CK_343X),
+       CLK("omap2_mcspi.1", "ick",     &mcspi1_ick,    CK_343X),
        CLK("i2c_omap.3", "i2c_ick",    &i2c3_ick,      CK_343X),
        CLK("i2c_omap.2", "i2c_ick",    &i2c2_ick,      CK_343X),
        CLK("i2c_omap.1", "i2c_ick",    &i2c1_ick,      CK_343X),

diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c
index 454a2712e6290ee0f0f085667a0baec9ec6bb027..b91ee1ae975da1950e15526fc71a782e2561cd51 100644 (file)
--- a/drivers/spi/omap2_mcspi.c
+++ b/drivers/spi/omap2_mcspi.c
@@ -1021,13 +1021,13 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev)
        spin_lock_init(&mcspi->lock);
        INIT_LIST_HEAD(&mcspi->msg_queue);
 
-       mcspi->ick = clk_get(&pdev->dev, "mcspi_ick");
+       mcspi->ick = clk_get(&pdev->dev, "ick");
        if (IS_ERR(mcspi->ick)) {
                dev_dbg(&pdev->dev, "can't get mcspi_ick\n");
                status = PTR_ERR(mcspi->ick);
                goto err1a;
        }
-       mcspi->fck = clk_get(&pdev->dev, "mcspi_fck");
+       mcspi->fck = clk_get(&pdev->dev, "fck");
        if (IS_ERR(mcspi->fck)) {
                dev_dbg(&pdev->dev, "can't get mcspi_fck\n");
                status = PTR_ERR(mcspi->fck);