Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7f73d61 authored by Franklin S Cooper Jr's avatar Franklin S Cooper Jr Committed by Paul Walmsley
Browse files

ARM: DRA7/AM335x/AM437x: hwmod: Remove gpmc address space from hwmod data 



GPMC address information is provided by device tree. No longer need
to include this information within hwmod.

Signed-off-by: default avatarFranklin S Cooper Jr <fcooper@ti.com>
Acked-by: default avatarRoger Quadros <rogerq@ti.com>
[paul@pwsan.com: fixed chip names in subject line]
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 0fd5eba5

arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c

+0 −10
Original line number Original line Diff line number Diff line
@@ -275,20 +275,10 @@ struct omap_hwmod_ocp_if am33xx_epwmss2__ehrpwm2 = { 
};

};





/* l3s cfg -> gpmc */

/* l3s cfg -> gpmc */

static struct omap_hwmod_addr_space am33xx_gpmc_addr_space[] = {

	{

		.pa_start	= 0x50000000,

		.pa_end		= 0x50000000 + SZ_8K - 1,

		.flags		= ADDR_TYPE_RT,

	},

	{ }

};



struct omap_hwmod_ocp_if am33xx_l3_s__gpmc = {

struct omap_hwmod_ocp_if am33xx_l3_s__gpmc = {

	.master		= &am33xx_l3_s_hwmod,

	.master		= &am33xx_l3_s_hwmod,

	.slave		= &am33xx_gpmc_hwmod,

	.slave		= &am33xx_gpmc_hwmod,

	.clk		= "l3s_gclk",

	.clk		= "l3s_gclk",

	.addr		= am33xx_gpmc_addr_space,

	.user		= OCP_USER_MPU,

	.user		= OCP_USER_MPU,

};

};

arch/arm/mach-omap2/omap_hwmod_7xx_data.c

+0 −10
Original line number Original line Diff line number Diff line
@@ -2638,21 +2638,11 @@ static struct omap_hwmod_ocp_if dra7xx_l4_per1__gpio8 = { 
	.user		= OCP_USER_MPU | OCP_USER_SDMA,

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};

};





static struct omap_hwmod_addr_space dra7xx_gpmc_addrs[] = {

	{

		.pa_start	= 0x50000000,

		.pa_end		= 0x500003ff,

		.flags		= ADDR_TYPE_RT

	},

	{ }

};



/* l3_main_1 -> gpmc */

/* l3_main_1 -> gpmc */

static struct omap_hwmod_ocp_if dra7xx_l3_main_1__gpmc = {

static struct omap_hwmod_ocp_if dra7xx_l3_main_1__gpmc = {

	.master		= &dra7xx_l3_main_1_hwmod,

	.master		= &dra7xx_l3_main_1_hwmod,

	.slave		= &dra7xx_gpmc_hwmod,

	.slave		= &dra7xx_gpmc_hwmod,

	.clk		= "l3_iclk_div",

	.clk		= "l3_iclk_div",

	.addr		= dra7xx_gpmc_addrs,

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};

};