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

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



We can now probe devices with ti-sysc interconnect driver and dts
data. Let's drop the related platform data and custom ti,hwmods
dts property.

As we're just dropping data, and the early platform data init
is based on the custom ti,hwmods property, we want to drop both
the platform data and ti,hwmods property in a single patch.

Cc: Dave Gerlach <d-gerlach@ti.com>
Cc: Suman Anna <s-anna@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 302502ef

arch/arm/boot/dts/am437x-l4.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 


		target-module@0 {			/* 0x44d00000, ap 4 28.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "wkup_m3";

			reg = <0x0 0x4>;

			reg-names = "rev";

			clocks = <&l4_wkup_aon_clkctrl AM4_L4_WKUP_AON_WKUP_M3_CLKCTRL 0>;

arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c

+0 −8
Original line number Diff line number Diff line
@@ -124,14 +124,6 @@ struct omap_hwmod am33xx_mpu_hwmod = { 
	},

};



/*

 * 'wakeup m3' class

 * Wakeup controller sub-system under wakeup domain

 */

struct omap_hwmod_class am33xx_wkup_m3_hwmod_class = {

	.name		= "wkup_m3",

};



/*

 * 'prcm' class

 * power and reset manager (whole prcm infrastructure)

arch/arm/mach-omap2/omap_hwmod_43xx_data.c

+0 −39
Original line number Diff line number Diff line
@@ -48,29 +48,6 @@ static struct omap_hwmod am43xx_l4_hs_hwmod = { 
	},

};



static struct omap_hwmod_rst_info am33xx_wkup_m3_resets[] = {

	{ .name = "wkup_m3", .rst_shift = 3, .st_shift = 5 },

};



static struct omap_hwmod am43xx_wkup_m3_hwmod = {

	.name		= "wkup_m3",

	.class		= &am33xx_wkup_m3_hwmod_class,

	.clkdm_name	= "l4_wkup_aon_clkdm",

	/* Keep hardreset asserted */

	.flags		= HWMOD_INIT_NO_RESET | HWMOD_NO_IDLEST,

	.main_clk	= "sys_clkin_ck",

	.prcm		= {

		.omap4	= {

			.clkctrl_offs	= AM43XX_CM_WKUP_WKUP_M3_CLKCTRL_OFFSET,

			.rstctrl_offs	= AM43XX_RM_WKUP_RSTCTRL_OFFSET,

			.rstst_offs	= AM43XX_RM_WKUP_RSTST_OFFSET,

			.modulemode	= MODULEMODE_SWCTRL,

		},

	},

	.rst_lines	= am33xx_wkup_m3_resets,

	.rst_lines_cnt	= ARRAY_SIZE(am33xx_wkup_m3_resets),

};



/* Interfaces */

static struct omap_hwmod_ocp_if am43xx_l3_main__emif = {

	.master		= &am33xx_l3_main_hwmod,
@@ -86,20 +63,6 @@ static struct omap_hwmod_ocp_if am43xx_l3_main__l4_hs = { 
	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



static struct omap_hwmod_ocp_if am43xx_wkup_m3__l4_wkup = {

	.master		= &am43xx_wkup_m3_hwmod,

	.slave		= &am33xx_l4_wkup_hwmod,

	.clk		= "sys_clkin_ck",

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



static struct omap_hwmod_ocp_if am43xx_l4_wkup__wkup_m3 = {

	.master		= &am33xx_l4_wkup_hwmod,

	.slave		= &am43xx_wkup_m3_hwmod,

	.clk		= "sys_clkin_ck",

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



static struct omap_hwmod_ocp_if am43xx_l4_wkup__smartreflex0 = {

	.master		= &am33xx_l4_wkup_hwmod,

	.slave		= &am33xx_smartreflex0_hwmod,
@@ -124,8 +87,6 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = { 
	&am33xx_l3_main__l3_instr,

	&am33xx_l3_s__l3_main,

	&am43xx_l3_main__emif,

	&am43xx_wkup_m3__l4_wkup,

	&am43xx_l4_wkup__wkup_m3,

	&am43xx_l4_wkup__smartreflex0,

	&am43xx_l4_wkup__smartreflex1,

	&am33xx_l3_main__ocmc,

CRA Git | Maintained and supported by SUSTech CRA and CCSE