ARM: OMAP2+: Drop legacy platform data for dra7 hwmod

We can now probe interconnects with simple-pm-bus and genpd.

Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 4178c0ee46eba5a63ee33f8923ea431268a76ced..8cb7850462bad54f9fb38cc1d4938acab4f69472 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -90,7 +90,6 @@ config SOC_DRA7XX
        select HAVE_ARM_ARCH_TIMER
        select IRQ_CROSSBAR
        select ARM_ERRATA_798181 if SMP
-       select OMAP_HWMOD
        select OMAP_INTERCONNECT
        select OMAP_INTERCONNECT_BARRIER
        select PM_OPP

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 9bcfb34a22064752372ad241b09f734733152fde..1d7b9d77703d99d766df09d6bbbf2c3bb00c9c1e 100644 (file)
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -209,7 +209,6 @@ obj-$(CONFIG_ARCH_OMAP3)            += omap_hwmod_3xxx_data.o
 obj-$(CONFIG_SOC_TI81XX)               += omap_hwmod_81xx_data.o
 obj-$(CONFIG_ARCH_OMAP4)               += omap_hwmod_44xx_data.o
 obj-$(CONFIG_SOC_OMAP5)                        += omap_hwmod_54xx_data.o
-obj-$(CONFIG_SOC_DRA7XX)               += omap_hwmod_7xx_data.o
 
 # OMAP2420 MSDI controller integration support ("MMC")
 obj-$(CONFIG_SOC_OMAP2420)             += msdi.o

diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 060ba6957b7c838cea5c3030c3f220b2cab08a1e..1051fc76df004ea0627ddef51bb9e0d7ffe87c53 100644 (file)
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -667,8 +667,6 @@ void __init dra7xx_init_early(void)
        dra7xxx_check_revision();
        dra7xx_powerdomains_init();
        dra7xx_clockdomains_init();
-       dra7xx_hwmod_init();
-       omap_hwmod_init_postsetup();
        omap_clk_soc_init = dra7xx_dt_clk_init;
        omap_secure_init();
 }

diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
deleted file mode 100644 (file)
index a342a87..0000000
--- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
+++ /dev/null
@@ -1,64 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Hardware modules present on the DRA7xx chips
- *
- * Copyright (C) 2013 Texas Instruments Incorporated - https://www.ti.com
- *
- * Paul Walmsley
- * Benoit Cousson
- *
- * This file is automatically generated from the OMAP hardware databases.
- * We respectfully ask that any modifications to this file be coordinated
- * with the public linux-omap@vger.kernel.org mailing list and the
- * authors above to ensure that the autogeneration scripts are kept
- * up-to-date with the file contents.
- */
-
-#include <linux/io.h>
-
-#include "omap_hwmod.h"
-#include "omap_hwmod_common_data.h"
-#include "cm1_7xx.h"
-#include "cm2_7xx.h"
-#include "prm7xx.h"
-#include "soc.h"
-
-/* Base offset for all DRA7XX interrupts external to MPUSS */
-#define DRA7XX_IRQ_GIC_START   32
-
-/*
- * Interfaces
- */
-static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = {
-       NULL,
-};
-
-/* SoC variant specific hwmod links */
-static struct omap_hwmod_ocp_if *dra72x_hwmod_ocp_ifs[] __initdata = {
-       NULL,
-};
-
-static struct omap_hwmod_ocp_if *rtc_hwmod_ocp_ifs[] __initdata = {
-       NULL,
-};
-
-int __init dra7xx_hwmod_init(void)
-{
-       int ret;
-
-       omap_hwmod_init();
-       ret = omap_hwmod_register_links(dra7xx_hwmod_ocp_ifs);
-
-       if (!ret && soc_is_dra74x()) {
-               ret = omap_hwmod_register_links(rtc_hwmod_ocp_ifs);
-       } else if (!ret && soc_is_dra72x()) {
-               ret = omap_hwmod_register_links(dra72x_hwmod_ocp_ifs);
-               if (!ret && !of_machine_is_compatible("ti,dra718"))
-                       ret = omap_hwmod_register_links(rtc_hwmod_ocp_ifs);
-       } else if (!ret && soc_is_dra76x()) {
-               if (!ret && soc_is_dra76x_abz())
-                       ret = omap_hwmod_register_links(rtc_hwmod_ocp_ifs);
-       }
-
-       return ret;
-}