clk: davinci: remove PLL and PSC clocks for DaVinci DM644x and DM646x

Commit 7dd33764486d ("ARM: davinci: Delete DM644x board files") and commit
b4aed01de486 ("ARM: davinci: Delete DM646x board files") removes the
support for DaVinci DM644x and DM646x boards.

Hence, remove the PLL and PSC clock descriptions for those boards as well.

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Link: https://lore.kernel.org/r/20220720082934.17741-1-lukas.bulwahn@gmail.com
Reviewed-by: David Lechner <david@lechnology.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/davinci/Makefile b/drivers/clk/davinci/Makefile
index 11178b7..be6f55d 100644 (file)
--- a/drivers/clk/davinci/Makefile
+++ b/drivers/clk/davinci/Makefile
@@ -8,14 +8,10 @@ obj-$(CONFIG_ARCH_DAVINCI_DA830)      += pll-da830.o
 obj-$(CONFIG_ARCH_DAVINCI_DA850)       += pll-da850.o
 obj-$(CONFIG_ARCH_DAVINCI_DM355)       += pll-dm355.o
 obj-$(CONFIG_ARCH_DAVINCI_DM365)       += pll-dm365.o
-obj-$(CONFIG_ARCH_DAVINCI_DM644x)      += pll-dm644x.o
-obj-$(CONFIG_ARCH_DAVINCI_DM646x)      += pll-dm646x.o
 
 obj-y += psc.o
 obj-$(CONFIG_ARCH_DAVINCI_DA830)       += psc-da830.o
 obj-$(CONFIG_ARCH_DAVINCI_DA850)       += psc-da850.o
 obj-$(CONFIG_ARCH_DAVINCI_DM355)       += psc-dm355.o
 obj-$(CONFIG_ARCH_DAVINCI_DM365)       += psc-dm365.o
-obj-$(CONFIG_ARCH_DAVINCI_DM644x)      += psc-dm644x.o
-obj-$(CONFIG_ARCH_DAVINCI_DM646x)      += psc-dm646x.o
 endif

diff --git a/drivers/clk/davinci/pll-dm644x.c b/drivers/clk/davinci/pll-dm644x.c
deleted file mode 100644 (file)
index 7650fad..0000000
--- a/drivers/clk/davinci/pll-dm644x.c
+++ /dev/null
@@ -1,81 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * PLL clock descriptions for TI DM644X
- *
- * Copyright (C) 2018 David Lechner <david@lechnology.com>
- */
-
-#include <linux/bitops.h>
-#include <linux/clk/davinci.h>
-#include <linux/clkdev.h>
-#include <linux/init.h>
-#include <linux/types.h>
-
-#include "pll.h"
-
-static const struct davinci_pll_clk_info dm644x_pll1_info = {
-       .name = "pll1",
-       .pllm_mask = GENMASK(4, 0),
-       .pllm_min = 1,
-       .pllm_max = 32,
-       .pllout_min_rate = 400000000,
-       .pllout_max_rate = 600000000, /* 810MHz @ 1.3V, -810 only */
-       .flags = PLL_HAS_CLKMODE | PLL_HAS_POSTDIV,
-};
-
-SYSCLK(1, pll1_sysclk1, pll1_pllen, 4, SYSCLK_FIXED_DIV);
-SYSCLK(2, pll1_sysclk2, pll1_pllen, 4, SYSCLK_FIXED_DIV);
-SYSCLK(3, pll1_sysclk3, pll1_pllen, 4, SYSCLK_FIXED_DIV);
-SYSCLK(5, pll1_sysclk5, pll1_pllen, 4, SYSCLK_FIXED_DIV);
-
-int dm644x_pll1_init(struct device *dev, void __iomem *base, struct regmap *cfgchip)
-{
-       struct clk *clk;
-
-       davinci_pll_clk_register(dev, &dm644x_pll1_info, "ref_clk", base, cfgchip);
-
-       clk = davinci_pll_sysclk_register(dev, &pll1_sysclk1, base);
-       clk_register_clkdev(clk, "pll1_sysclk1", "dm644x-psc");
-
-       clk = davinci_pll_sysclk_register(dev, &pll1_sysclk2, base);
-       clk_register_clkdev(clk, "pll1_sysclk2", "dm644x-psc");
-
-       clk = davinci_pll_sysclk_register(dev, &pll1_sysclk3, base);
-       clk_register_clkdev(clk, "pll1_sysclk3", "dm644x-psc");
-
-       clk = davinci_pll_sysclk_register(dev, &pll1_sysclk5, base);
-       clk_register_clkdev(clk, "pll1_sysclk5", "dm644x-psc");
-
-       clk = davinci_pll_auxclk_register(dev, "pll1_auxclk", base);
-       clk_register_clkdev(clk, "pll1_auxclk", "dm644x-psc");
-
-       davinci_pll_sysclkbp_clk_register(dev, "pll1_sysclkbp", base);
-
-       return 0;
-}
-
-static const struct davinci_pll_clk_info dm644x_pll2_info = {
-       .name = "pll2",
-       .pllm_mask = GENMASK(4, 0),
-       .pllm_min = 1,
-       .pllm_max = 32,
-       .pllout_min_rate = 400000000,
-       .pllout_max_rate = 900000000,
-       .flags = PLL_HAS_POSTDIV | PLL_POSTDIV_FIXED_DIV,
-};
-
-SYSCLK(1, pll2_sysclk1, pll2_pllen, 4, 0);
-SYSCLK(2, pll2_sysclk2, pll2_pllen, 4, 0);
-
-int dm644x_pll2_init(struct device *dev, void __iomem *base, struct regmap *cfgchip)
-{
-       davinci_pll_clk_register(dev, &dm644x_pll2_info, "oscin", base, cfgchip);
-
-       davinci_pll_sysclk_register(dev, &pll2_sysclk1, base);
-
-       davinci_pll_sysclk_register(dev, &pll2_sysclk2, base);
-
-       davinci_pll_sysclkbp_clk_register(dev, "pll2_sysclkbp", base);
-
-       return 0;
-}

diff --git a/drivers/clk/davinci/pll-dm646x.c b/drivers/clk/davinci/pll-dm646x.c
deleted file mode 100644 (file)
index 2698297..0000000
--- a/drivers/clk/davinci/pll-dm646x.c
+++ /dev/null
@@ -1,85 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * PLL clock descriptions for TI DM646X
- *
- * Copyright (C) 2018 David Lechner <david@lechnology.com>
- */
-
-#include <linux/clk-provider.h>
-#include <linux/clk/davinci.h>
-#include <linux/clkdev.h>
-#include <linux/init.h>
-#include <linux/types.h>
-
-#include "pll.h"
-
-static const struct davinci_pll_clk_info dm646x_pll1_info = {
-       .name = "pll1",
-       .pllm_mask = GENMASK(4, 0),
-       .pllm_min = 14,
-       .pllm_max = 32,
-       .flags = PLL_HAS_CLKMODE,
-};
-
-SYSCLK(1, pll1_sysclk1, pll1_pllen, 4, SYSCLK_FIXED_DIV);
-SYSCLK(2, pll1_sysclk2, pll1_pllen, 4, SYSCLK_FIXED_DIV);
-SYSCLK(3, pll1_sysclk3, pll1_pllen, 4, SYSCLK_FIXED_DIV);
-SYSCLK(4, pll1_sysclk4, pll1_pllen, 4, 0);
-SYSCLK(5, pll1_sysclk5, pll1_pllen, 4, 0);
-SYSCLK(6, pll1_sysclk6, pll1_pllen, 4, 0);
-SYSCLK(8, pll1_sysclk8, pll1_pllen, 4, 0);
-SYSCLK(9, pll1_sysclk9, pll1_pllen, 4, 0);
-
-int dm646x_pll1_init(struct device *dev, void __iomem *base, struct regmap *cfgchip)
-{
-       struct clk *clk;
-
-       davinci_pll_clk_register(dev, &dm646x_pll1_info, "ref_clk", base, cfgchip);
-
-       clk = davinci_pll_sysclk_register(dev, &pll1_sysclk1, base);
-       clk_register_clkdev(clk, "pll1_sysclk1", "dm646x-psc");
-
-       clk = davinci_pll_sysclk_register(dev, &pll1_sysclk2, base);
-       clk_register_clkdev(clk, "pll1_sysclk2", "dm646x-psc");
-
-       clk = davinci_pll_sysclk_register(dev, &pll1_sysclk3, base);
-       clk_register_clkdev(clk, "pll1_sysclk3", "dm646x-psc");
-       clk_register_clkdev(clk, NULL, "davinci-wdt");
-
-       clk = davinci_pll_sysclk_register(dev, &pll1_sysclk4, base);
-       clk_register_clkdev(clk, "pll1_sysclk4", "dm646x-psc");
-
-       clk = davinci_pll_sysclk_register(dev, &pll1_sysclk5, base);
-       clk_register_clkdev(clk, "pll1_sysclk5", "dm646x-psc");
-
-       davinci_pll_sysclk_register(dev, &pll1_sysclk6, base);
-
-       davinci_pll_sysclk_register(dev, &pll1_sysclk8, base);
-
-       davinci_pll_sysclk_register(dev, &pll1_sysclk9, base);
-
-       davinci_pll_sysclkbp_clk_register(dev, "pll1_sysclkbp", base);
-
-       davinci_pll_auxclk_register(dev, "pll1_auxclk", base);
-
-       return 0;
-}
-
-static const struct davinci_pll_clk_info dm646x_pll2_info = {
-       .name = "pll2",
-       .pllm_mask = GENMASK(4, 0),
-       .pllm_min = 14,
-       .pllm_max = 32,
-       .flags = 0,
-};
-
-SYSCLK(1, pll2_sysclk1, pll2_pllen, 4, SYSCLK_ALWAYS_ENABLED);
-
-int dm646x_pll2_init(struct device *dev, void __iomem *base, struct regmap *cfgchip)
-{
-       davinci_pll_clk_register(dev, &dm646x_pll2_info, "oscin", base, cfgchip);
-
-       davinci_pll_sysclk_register(dev, &pll2_sysclk1, base);
-
-       return 0;
-}

diff --git a/drivers/clk/davinci/pll.c b/drivers/clk/davinci/pll.c
index 0d75043..0822066 100644 (file)
--- a/drivers/clk/davinci/pll.c
+++ b/drivers/clk/davinci/pll.c
@@ -890,14 +890,6 @@ static const struct platform_device_id davinci_pll_id_table[] = {
        { .name = "dm365-pll1",  .driver_data = (kernel_ulong_t)dm365_pll1_init  },
        { .name = "dm365-pll2",  .driver_data = (kernel_ulong_t)dm365_pll2_init  },
 #endif
-#ifdef CONFIG_ARCH_DAVINCI_DM644x
-       { .name = "dm644x-pll1", .driver_data = (kernel_ulong_t)dm644x_pll1_init },
-       { .name = "dm644x-pll2", .driver_data = (kernel_ulong_t)dm644x_pll2_init },
-#endif
-#ifdef CONFIG_ARCH_DAVINCI_DM646x
-       { .name = "dm646x-pll1", .driver_data = (kernel_ulong_t)dm646x_pll1_init },
-       { .name = "dm646x-pll2", .driver_data = (kernel_ulong_t)dm646x_pll2_init },
-#endif
        { }
 };
 

diff --git a/drivers/clk/davinci/pll.h b/drivers/clk/davinci/pll.h
index c2a453c..1773277 100644 (file)
--- a/drivers/clk/davinci/pll.h
+++ b/drivers/clk/davinci/pll.h
@@ -130,11 +130,5 @@ int of_da850_pll1_init(struct device *dev, void __iomem *base, struct regmap *cf
 #ifdef CONFIG_ARCH_DAVINCI_DM355
 int dm355_pll2_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);
 #endif
-#ifdef CONFIG_ARCH_DAVINCI_DM644x
-int dm644x_pll2_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);
-#endif
-#ifdef CONFIG_ARCH_DAVINCI_DM646x
-int dm646x_pll2_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);
-#endif
 
 #endif /* __CLK_DAVINCI_PLL_H___ */

diff --git a/drivers/clk/davinci/psc-dm644x.c b/drivers/clk/davinci/psc-dm644x.c
deleted file mode 100644 (file)
index 0cea6e0..0000000
--- a/drivers/clk/davinci/psc-dm644x.c
+++ /dev/null
@@ -1,85 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * PSC clock descriptions for TI DaVinci DM644x
- *
- * Copyright (C) 2018 David Lechner <david@lechnology.com>
- */
-
-#include <linux/clk-provider.h>
-#include <linux/clk/davinci.h>
-#include <linux/clk.h>
-#include <linux/clkdev.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-
-#include "psc.h"
-
-LPSC_CLKDEV1(vpss_master_clkdev,       "master",       "vpss");
-LPSC_CLKDEV1(vpss_slave_clkdev,                "slave",        "vpss");
-LPSC_CLKDEV2(emac_clkdev,              NULL,           "davinci_emac.1",
-                                       "fck",          "davinci_mdio.0");
-LPSC_CLKDEV1(usb_clkdev,               "usb",          NULL);
-LPSC_CLKDEV1(ide_clkdev,               NULL,           "palm_bk3710");
-LPSC_CLKDEV2(aemif_clkdev,             "aemif",        NULL,
-                                       NULL,           "ti-aemif");
-LPSC_CLKDEV1(mmcsd_clkdev,             NULL,           "dm6441-mmc.0");
-LPSC_CLKDEV1(asp0_clkdev,              NULL,           "davinci-mcbsp");
-LPSC_CLKDEV1(i2c_clkdev,               NULL,           "i2c_davinci.1");
-LPSC_CLKDEV1(uart0_clkdev,             NULL,           "serial8250.0");
-LPSC_CLKDEV1(uart1_clkdev,             NULL,           "serial8250.1");
-LPSC_CLKDEV1(uart2_clkdev,             NULL,           "serial8250.2");
-/* REVISIT: gpio-davinci.c should be modified to drop con_id */
-LPSC_CLKDEV1(gpio_clkdev,              "gpio",         NULL);
-LPSC_CLKDEV1(timer0_clkdev,            "timer0",       NULL);
-LPSC_CLKDEV1(timer2_clkdev,            NULL,           "davinci-wdt");
-
-static const struct davinci_lpsc_clk_info dm644x_psc_info[] = {
-       LPSC(0,  0, vpss_master, pll1_sysclk3, vpss_master_clkdev, 0),
-       LPSC(1,  0, vpss_slave,  pll1_sysclk3, vpss_slave_clkdev,  0),
-       LPSC(6,  0, emac,        pll1_sysclk5, emac_clkdev,        0),
-       LPSC(9,  0, usb,         pll1_sysclk5, usb_clkdev,         0),
-       LPSC(10, 0, ide,         pll1_sysclk5, ide_clkdev,         0),
-       LPSC(11, 0, vlynq,       pll1_sysclk5, NULL,               0),
-       LPSC(14, 0, aemif,       pll1_sysclk5, aemif_clkdev,       0),
-       LPSC(15, 0, mmcsd,       pll1_sysclk5, mmcsd_clkdev,       0),
-       LPSC(17, 0, asp0,        pll1_sysclk5, asp0_clkdev,        0),
-       LPSC(18, 0, i2c,         pll1_auxclk,  i2c_clkdev,         0),
-       LPSC(19, 0, uart0,       pll1_auxclk,  uart0_clkdev,       0),
-       LPSC(20, 0, uart1,       pll1_auxclk,  uart1_clkdev,       0),
-       LPSC(21, 0, uart2,       pll1_auxclk,  uart2_clkdev,       0),
-       LPSC(22, 0, spi,         pll1_sysclk5, NULL,               0),
-       LPSC(23, 0, pwm0,        pll1_auxclk,  NULL,               0),
-       LPSC(24, 0, pwm1,        pll1_auxclk,  NULL,               0),
-       LPSC(25, 0, pwm2,        pll1_auxclk,  NULL,               0),
-       LPSC(26, 0, gpio,        pll1_sysclk5, gpio_clkdev,        0),
-       LPSC(27, 0, timer0,      pll1_auxclk,  timer0_clkdev,      LPSC_ALWAYS_ENABLED),
-       LPSC(28, 0, timer1,      pll1_auxclk,  NULL,               0),
-       /* REVISIT: why can't this be disabled? */
-       LPSC(29, 0, timer2,      pll1_auxclk,  timer2_clkdev,      LPSC_ALWAYS_ENABLED),
-       LPSC(31, 0, arm,         pll1_sysclk2, NULL,               LPSC_ALWAYS_ENABLED),
-       /* REVISIT how to disable? */
-       LPSC(39, 1, dsp,         pll1_sysclk1, NULL,               LPSC_ALWAYS_ENABLED),
-       /* REVISIT how to disable? */
-       LPSC(40, 1, vicp,        pll1_sysclk2, NULL,               LPSC_ALWAYS_ENABLED),
-       { }
-};
-
-int dm644x_psc_init(struct device *dev, void __iomem *base)
-{
-       return davinci_psc_register_clocks(dev, dm644x_psc_info, 41, base);
-}
-
-static struct clk_bulk_data dm644x_psc_parent_clks[] = {
-       { .id = "pll1_sysclk1" },
-       { .id = "pll1_sysclk2" },
-       { .id = "pll1_sysclk3" },
-       { .id = "pll1_sysclk5" },
-       { .id = "pll1_auxclk"  },
-};
-
-const struct davinci_psc_init_data dm644x_psc_init_data = {
-       .parent_clks            = dm644x_psc_parent_clks,
-       .num_parent_clks        = ARRAY_SIZE(dm644x_psc_parent_clks),
-       .psc_init               = &dm644x_psc_init,
-};

diff --git a/drivers/clk/davinci/psc-dm646x.c b/drivers/clk/davinci/psc-dm646x.c
deleted file mode 100644 (file)
index 20012dc..0000000
--- a/drivers/clk/davinci/psc-dm646x.c
+++ /dev/null
@@ -1,82 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * PSC clock descriptions for TI DaVinci DM646x
- *
- * Copyright (C) 2018 David Lechner <david@lechnology.com>
- */
-
-#include <linux/clk-provider.h>
-#include <linux/clk/davinci.h>
-#include <linux/clk.h>
-#include <linux/clkdev.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-
-#include "psc.h"
-
-LPSC_CLKDEV1(ide_clkdev,       NULL,           "palm_bk3710");
-LPSC_CLKDEV2(emac_clkdev,      NULL,           "davinci_emac.1",
-                               "fck",          "davinci_mdio.0");
-LPSC_CLKDEV2(aemif_clkdev,     "aemif",        NULL,
-                               NULL,           "ti-aemif");
-LPSC_CLKDEV1(mcasp0_clkdev,    NULL,           "davinci-mcasp.0");
-LPSC_CLKDEV1(mcasp1_clkdev,    NULL,           "davinci-mcasp.1");
-LPSC_CLKDEV1(uart0_clkdev,     NULL,           "serial8250.0");
-LPSC_CLKDEV1(uart1_clkdev,     NULL,           "serial8250.1");
-LPSC_CLKDEV1(uart2_clkdev,     NULL,           "serial8250.2");
-LPSC_CLKDEV1(i2c_clkdev,       NULL,           "i2c_davinci.1");
-/* REVISIT: gpio-davinci.c should be modified to drop con_id */
-LPSC_CLKDEV1(gpio_clkdev,      "gpio",         NULL);
-LPSC_CLKDEV1(timer0_clkdev,    "timer0",        NULL);
-
-static const struct davinci_lpsc_clk_info dm646x_psc_info[] = {
-       LPSC(0,  0, arm,      pll1_sysclk2, NULL,          LPSC_ALWAYS_ENABLED),
-       /* REVISIT how to disable? */
-       LPSC(1,  0, dsp,      pll1_sysclk1, NULL,          LPSC_ALWAYS_ENABLED),
-       LPSC(4,  0, edma_cc,  pll1_sysclk2, NULL,          LPSC_ALWAYS_ENABLED),
-       LPSC(5,  0, edma_tc0, pll1_sysclk2, NULL,          LPSC_ALWAYS_ENABLED),
-       LPSC(6,  0, edma_tc1, pll1_sysclk2, NULL,          LPSC_ALWAYS_ENABLED),
-       LPSC(7,  0, edma_tc2, pll1_sysclk2, NULL,          LPSC_ALWAYS_ENABLED),
-       LPSC(8,  0, edma_tc3, pll1_sysclk2, NULL,          LPSC_ALWAYS_ENABLED),
-       LPSC(10, 0, ide,      pll1_sysclk4, ide_clkdev,    0),
-       LPSC(14, 0, emac,     pll1_sysclk3, emac_clkdev,   0),
-       LPSC(16, 0, vpif0,    ref_clk,      NULL,          LPSC_ALWAYS_ENABLED),
-       LPSC(17, 0, vpif1,    ref_clk,      NULL,          LPSC_ALWAYS_ENABLED),
-       LPSC(21, 0, aemif,    pll1_sysclk3, aemif_clkdev,  LPSC_ALWAYS_ENABLED),
-       LPSC(22, 0, mcasp0,   pll1_sysclk3, mcasp0_clkdev, 0),
-       LPSC(23, 0, mcasp1,   pll1_sysclk3, mcasp1_clkdev, 0),
-       LPSC(26, 0, uart0,    aux_clkin,    uart0_clkdev,  0),
-       LPSC(27, 0, uart1,    aux_clkin,    uart1_clkdev,  0),
-       LPSC(28, 0, uart2,    aux_clkin,    uart2_clkdev,  0),
-       /* REVIST: disabling hangs system */
-       LPSC(29, 0, pwm0,     pll1_sysclk3, NULL,          LPSC_ALWAYS_ENABLED),
-       /* REVIST: disabling hangs system */
-       LPSC(30, 0, pwm1,     pll1_sysclk3, NULL,          LPSC_ALWAYS_ENABLED),
-       LPSC(31, 0, i2c,      pll1_sysclk3, i2c_clkdev,    0),
-       LPSC(33, 0, gpio,     pll1_sysclk3, gpio_clkdev,   0),
-       LPSC(34, 0, timer0,   pll1_sysclk3, timer0_clkdev, LPSC_ALWAYS_ENABLED),
-       LPSC(35, 0, timer1,   pll1_sysclk3, NULL,          0),
-       { }
-};
-
-int dm646x_psc_init(struct device *dev, void __iomem *base)
-{
-       return davinci_psc_register_clocks(dev, dm646x_psc_info, 46, base);
-}
-
-static struct clk_bulk_data dm646x_psc_parent_clks[] = {
-       { .id = "ref_clk"      },
-       { .id = "aux_clkin"    },
-       { .id = "pll1_sysclk1" },
-       { .id = "pll1_sysclk2" },
-       { .id = "pll1_sysclk3" },
-       { .id = "pll1_sysclk4" },
-       { .id = "pll1_sysclk5" },
-};
-
-const struct davinci_psc_init_data dm646x_psc_init_data = {
-       .parent_clks            = dm646x_psc_parent_clks,
-       .num_parent_clks        = ARRAY_SIZE(dm646x_psc_parent_clks),
-       .psc_init               = &dm646x_psc_init,
-};

diff --git a/drivers/clk/davinci/psc.c b/drivers/clk/davinci/psc.c
index 7387e7f..42a59db 100644 (file)
--- a/drivers/clk/davinci/psc.c
+++ b/drivers/clk/davinci/psc.c
@@ -517,12 +517,6 @@ static const struct platform_device_id davinci_psc_id_table[] = {
 #ifdef CONFIG_ARCH_DAVINCI_DM365
        { .name = "dm365-psc",  .driver_data = (kernel_ulong_t)&dm365_psc_init_data  },
 #endif
-#ifdef CONFIG_ARCH_DAVINCI_DM644x
-       { .name = "dm644x-psc", .driver_data = (kernel_ulong_t)&dm644x_psc_init_data },
-#endif
-#ifdef CONFIG_ARCH_DAVINCI_DM646x
-       { .name = "dm646x-psc", .driver_data = (kernel_ulong_t)&dm646x_psc_init_data },
-#endif
        { }
 };
 

diff --git a/drivers/clk/davinci/psc.h b/drivers/clk/davinci/psc.h
index 69070f8..5e382b6 100644 (file)
--- a/drivers/clk/davinci/psc.h
+++ b/drivers/clk/davinci/psc.h
@@ -110,11 +110,5 @@ extern const struct davinci_psc_init_data dm355_psc_init_data;
 #ifdef CONFIG_ARCH_DAVINCI_DM365
 extern const struct davinci_psc_init_data dm365_psc_init_data;
 #endif
-#ifdef CONFIG_ARCH_DAVINCI_DM644x
-extern const struct davinci_psc_init_data dm644x_psc_init_data;
-#endif
-#ifdef CONFIG_ARCH_DAVINCI_DM646x
-extern const struct davinci_psc_init_data dm646x_psc_init_data;
-#endif
 
 #endif /* __CLK_DAVINCI_PSC_H__ */

diff --git a/include/linux/clk/davinci.h b/include/linux/clk/davinci.h
index 8a7b5cd..f6ebab6 100644 (file)
--- a/include/linux/clk/davinci.h
+++ b/include/linux/clk/davinci.h
@@ -28,13 +28,5 @@ int dm365_pll1_init(struct device *dev, void __iomem *base, struct regmap *cfgch
 int dm365_pll2_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);
 int dm365_psc_init(struct device *dev, void __iomem *base);
 #endif
-#ifdef CONFIG_ARCH_DAVINCI_DM644x
-int dm644x_pll1_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);
-int dm644x_psc_init(struct device *dev, void __iomem *base);
-#endif
-#ifdef CONFIG_ARCH_DAVINCI_DM646x
-int dm646x_pll1_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);
-int dm646x_psc_init(struct device *dev, void __iomem *base);
-#endif
 
 #endif /* __LINUX_CLK_DAVINCI_PLL_H___ */