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

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



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.

Note that we need to use "ti,no-idle" here.

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

arch/arm/boot/dts/am4372.dtsi

+23 −13
Original line number Diff line number Diff line
@@ -503,10 +503,19 @@ 
			};

		};



		ocmcram: sram@40300000 {

		target-module@40300000 {

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

			clocks = <&l3_clkctrl AM4_L3_OCMCRAM_CLKCTRL 0>;

			clock-names = "fck";

			ti,no-idle;

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0 0x40300000 0x40000>;



			ocmcram: sram@0 {

				compatible = "mmio-sram";

			reg = <0x40300000 0x40000>; /* 256k */

			ranges = <0x0 0x40300000 0x40000>;

				reg = <0 0x40000>; /* 256k */

				ranges = <0 0 0x40000>;

				#address-cells = <1>;

				#size-cells = <1>;
@@ -522,6 +531,7 @@ 
					pool;

				};

			};

		};



		target-module@56000000 {

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

arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c

+0 −7
Original line number Diff line number Diff line
@@ -73,10 +73,3 @@ struct omap_hwmod_ocp_if am33xx_l3_s__l3_main = { 
	.clk		= "l3s_gclk",

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};
 


/* l3 main -> ocmc */

struct omap_hwmod_ocp_if am33xx_l3_main__ocmc = {

	.master		= &am33xx_l3_main_hwmod,

	.slave		= &am33xx_ocmcram_hwmod,

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};

arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c

+0 −19
Original line number Diff line number Diff line
@@ -139,24 +139,6 @@ struct omap_hwmod am33xx_prcm_hwmod = { 
	.clkdm_name	= "l4_wkup_clkdm",

};



/* ocmcram */

static struct omap_hwmod_class am33xx_ocmcram_hwmod_class = {

	.name = "ocmcram",

};



struct omap_hwmod am33xx_ocmcram_hwmod = {

	.name		= "ocmcram",

	.class		= &am33xx_ocmcram_hwmod_class,

	.clkdm_name	= "l3_clkdm",

	.flags		= HWMOD_INIT_NO_IDLE,

	.main_clk	= "l3_gclk",

	.prcm		= {

		.omap4	= {

			.modulemode	= MODULEMODE_SWCTRL,

		},

	},

};



/* 'smartreflex' class */

static struct omap_hwmod_class am33xx_smartreflex_hwmod_class = {

	.name		= "smartreflex",
@@ -215,7 +197,6 @@ static void omap_hwmod_am43xx_clkctrl(void) 
	CLKCTRL(am33xx_l4_wkup_hwmod, AM43XX_CM_WKUP_L4WKUP_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_l3_main_hwmod, AM43XX_CM_PER_L3_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_mpu_hwmod , AM43XX_CM_MPU_MPU_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_ocmcram_hwmod , AM43XX_CM_PER_OCMCRAM_CLKCTRL_OFFSET);

}



void omap_hwmod_am43xx_reg(void)

arch/arm/mach-omap2/omap_hwmod_43xx_data.c

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = { 
	&am33xx_l3_s__l3_main,

	&am43xx_l4_wkup__smartreflex0,

	&am43xx_l4_wkup__smartreflex1,

	&am33xx_l3_main__ocmc,

	NULL,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE