Commit df6c2ec8 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Drop legacy remaining legacy platform data for am4 



We can now drop the remaining legacy platform data as we are
probing devices with device tree data.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 4cf6a214

arch/arm/mach-omap2/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ config SOC_AM43XX 
	select HAVE_ARM_TWD

	select ARM_ERRATA_754322

	select ARM_ERRATA_775420

	select OMAP_HWMOD

	select OMAP_INTERCONNECT

	select ARM_CPU_SUSPEND if PM

arch/arm/mach-omap2/Makefile

+1 −4
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common) 
obj-$(CONFIG_ARCH_OMAP4) += $(hwmod-common) $(secure-common)

obj-$(CONFIG_SOC_AM33XX) += $(secure-common)

obj-$(CONFIG_SOC_OMAP5)  += $(hwmod-common) $(secure-common)

obj-$(CONFIG_SOC_AM43XX) += $(hwmod-common) $(secure-common)

obj-$(CONFIG_SOC_AM43XX) += $(secure-common)

obj-$(CONFIG_SOC_DRA7XX) += $(hwmod-common) $(secure-common)



ifneq ($(CONFIG_SND_SOC_OMAP_MCBSP),)
@@ -206,9 +206,6 @@ obj-$(CONFIG_SOC_OMAP2430) += omap_hwmod_2xxx_interconnect_data.o 
obj-$(CONFIG_SOC_OMAP2430)		+= omap_hwmod_2430_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= omap_hwmod_2xxx_3xxx_ipblock_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= omap_hwmod_3xxx_data.o

obj-$(CONFIG_SOC_AM43XX)		+= omap_hwmod_43xx_data.o

obj-$(CONFIG_SOC_AM43XX)		+= omap_hwmod_33xx_43xx_interconnect_data.o

obj-$(CONFIG_SOC_AM43XX)		+= omap_hwmod_33xx_43xx_ipblock_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

arch/arm/mach-omap2/io.c

+0 −1
Original line number Diff line number Diff line
@@ -588,7 +588,6 @@ void __init am43xx_init_early(void) 
	omap2_prcm_base_init();

	am43xx_powerdomains_init();

	am43xx_clockdomains_init();

	am43xx_hwmod_init();

	omap_hwmod_init_postsetup();

	omap_l2_cache_init();

	omap_clk_soc_init = am43xx_dt_clk_init;

arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h

deleted100644 → 0
+0 −52
Original line number Diff line number Diff line 
/*

 *

 * Copyright (C) 2013 Texas Instruments Incorporated

 *

 * Data common for AM335x and AM43x

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as

 * published by the Free Software Foundation version 2.

 *

 * This program is distributed "as is" WITHOUT ANY WARRANTY of any

 * kind, whether express or implied; without even the implied warranty

 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

 * GNU General Public License for more details.

 */



#ifndef __ARCH_ARM_MACH_OMAP2_OMAP_HWMOD_33XX_43XX_COMMON_DATA_H

#define __ARCH_ARM_MACH_OMAP2_OMAP_HWMOD_33XX_43XX_COMMON_DATA_H



extern struct omap_hwmod_ocp_if am33xx_l3_main__l3_s;

extern struct omap_hwmod_ocp_if am33xx_l3_s__l4_ls;

extern struct omap_hwmod_ocp_if am33xx_l3_s__l4_wkup;

extern struct omap_hwmod_ocp_if am33xx_l3_main__l3_instr;

extern struct omap_hwmod_ocp_if am33xx_l3_s__l3_main;

extern struct omap_hwmod_ocp_if am33xx_gfx__l3_main;

extern struct omap_hwmod_ocp_if am33xx_l3_main__gfx;

extern struct omap_hwmod_ocp_if am33xx_l4_ls__timer2;

extern struct omap_hwmod_ocp_if am33xx_l3_main__ocmc;



extern struct omap_hwmod am33xx_l3_main_hwmod;

extern struct omap_hwmod am33xx_l3_s_hwmod;

extern struct omap_hwmod am33xx_l3_instr_hwmod;

extern struct omap_hwmod am33xx_l4_ls_hwmod;

extern struct omap_hwmod am33xx_l4_wkup_hwmod;

extern struct omap_hwmod am33xx_gfx_hwmod;

extern struct omap_hwmod am33xx_prcm_hwmod;

extern struct omap_hwmod am33xx_ocmcram_hwmod;

extern struct omap_hwmod am33xx_smartreflex0_hwmod;

extern struct omap_hwmod am33xx_smartreflex1_hwmod;



extern struct omap_hwmod_class am33xx_emif_hwmod_class;

extern struct omap_hwmod_class am33xx_l4_hwmod_class;

extern struct omap_hwmod_class am33xx_wkup_m3_hwmod_class;

extern struct omap_hwmod_class am33xx_control_hwmod_class;

extern struct omap_hwmod_class am33xx_timer_hwmod_class;

extern struct omap_hwmod_class am33xx_ehrpwm_hwmod_class;

extern struct omap_hwmod_class am33xx_spi_hwmod_class;



void omap_hwmod_am33xx_reg(void);

void omap_hwmod_am43xx_reg(void);



#endif

arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c

deleted100644 → 0
+0 −59
Original line number Diff line number Diff line 
/*

 *

 * Copyright (C) 2013 Texas Instruments Incorporated

 *

 * Interconnects common for AM335x and AM43x

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as

 * published by the Free Software Foundation version 2.

 *

 * This program is distributed "as is" WITHOUT ANY WARRANTY of any

 * kind, whether express or implied; without even the implied warranty

 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

 * GNU General Public License for more details.

 */



#include <linux/sizes.h>

#include "omap_hwmod.h"

#include "omap_hwmod_33xx_43xx_common_data.h"



/* l3 main -> l3 s */

struct omap_hwmod_ocp_if am33xx_l3_main__l3_s = {

	.master		= &am33xx_l3_main_hwmod,

	.slave		= &am33xx_l3_s_hwmod,

	.clk		= "l3s_gclk",

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



/* l3 s -> l4 per/ls */

struct omap_hwmod_ocp_if am33xx_l3_s__l4_ls = {

	.master		= &am33xx_l3_s_hwmod,

	.slave		= &am33xx_l4_ls_hwmod,

	.clk		= "l3s_gclk",

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



/* l3 s -> l4 wkup */

struct omap_hwmod_ocp_if am33xx_l3_s__l4_wkup = {

	.master		= &am33xx_l3_s_hwmod,

	.slave		= &am33xx_l4_wkup_hwmod,

	.clk		= "l3s_gclk",

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



/* l3 main -> l3 instr */

struct omap_hwmod_ocp_if am33xx_l3_main__l3_instr = {

	.master		= &am33xx_l3_main_hwmod,

	.slave		= &am33xx_l3_instr_hwmod,

	.clk		= "l3s_gclk",

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



/* l3 s -> l3 main*/

struct omap_hwmod_ocp_if am33xx_l3_s__l3_main = {

	.master		= &am33xx_l3_s_hwmod,

	.slave		= &am33xx_l3_main_hwmod,

	.clk		= "l3s_gclk",

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE