Re: [RFC] AM35x: Workaround to use generic OMAP3 hwmods

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Benoît,

one question about this.

On Fri, 25 Feb 2011, Cousson, Benoit wrote:

> From 09506eedef901af0fa19ddb48f486ce4ef353645 Mon Sep 17 00:00:00 2001
> From: Benoit Cousson <b-cousson@xxxxxx>
> Date: Fri, 25 Feb 2011 17:46:33 +0100
> Subject: [PATCH] OMAP3: hwmod data: Remove masters port links for
> interconnects.
> 
> Master ports from interconnect are generating some annoying circular
> references that become tricky to handle if we have to dynamically
> remove some IP on some variant platforms.
> Since they are not used for the moment, and since we can still build
> that relation using the reverse relation (slave port from the IP
> toward master port of the interconnect), let remove them for the
> moment like it is done on OMAP4.
> 
> Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
> Cc: Paul Walmsley <paul@xxxxxxxxx>
> ---
>  arch/arm/mach-omap2/omap_hwmod_3xxx_data.c |   28
> ----------------------------
>  1 files changed, 0 insertions(+), 28 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> index 7fa2dfb..0e7d43f 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> @@ -463,26 +463,12 @@ static struct omap_hwmod_ocp_if
> *am35xx_usbhsotg_slaves[] = {
>  /* Slave interfaces on the L4_CORE interconnect */
>  static struct omap_hwmod_ocp_if *omap3xxx_l4_core_slaves[] = {
>  	&omap3xxx_l3_main__l4_core,
> -	&omap3_l4_core__sr1,
> -	&omap3_l4_core__sr2,

Is there some reason why these SR OCP slaves are removed?

> -};
> -
> -/* Master interfaces on the L4_CORE interconnect */
> -static struct omap_hwmod_ocp_if *omap3xxx_l4_core_masters[] = {
> -	&omap3xxx_l4_core__l4_wkup,
> -	&omap3_l4_core__uart1,
> -	&omap3_l4_core__uart2,
> -	&omap3_l4_core__i2c1,
> -	&omap3_l4_core__i2c2,
> -	&omap3_l4_core__i2c3,
>  };
> 
>  /* L4 CORE */
>  static struct omap_hwmod omap3xxx_l4_core_hwmod = {
>  	.name		= "l4_core",
>  	.class		= &l4_hwmod_class,
> -	.masters	= omap3xxx_l4_core_masters,
> -	.masters_cnt	= ARRAY_SIZE(omap3xxx_l4_core_masters),
>  	.slaves		= omap3xxx_l4_core_slaves,
>  	.slaves_cnt	= ARRAY_SIZE(omap3xxx_l4_core_slaves),
>  	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
> @@ -494,18 +480,10 @@ static struct omap_hwmod_ocp_if
> *omap3xxx_l4_per_slaves[] = {
>  	&omap3xxx_l3_main__l4_per,
>  };
> 
> -/* Master interfaces on the L4_PER interconnect */
> -static struct omap_hwmod_ocp_if *omap3xxx_l4_per_masters[] = {
> -	&omap3_l4_per__uart3,
> -	&omap3_l4_per__uart4,
> -};
> -
>  /* L4 PER */
>  static struct omap_hwmod omap3xxx_l4_per_hwmod = {
>  	.name		= "l4_per",
>  	.class		= &l4_hwmod_class,
> -	.masters	= omap3xxx_l4_per_masters,
> -	.masters_cnt	= ARRAY_SIZE(omap3xxx_l4_per_masters),
>  	.slaves		= omap3xxx_l4_per_slaves,
>  	.slaves_cnt	= ARRAY_SIZE(omap3xxx_l4_per_slaves),
>  	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
> @@ -517,16 +495,10 @@ static struct omap_hwmod_ocp_if
> *omap3xxx_l4_wkup_slaves[] = {
>  	&omap3xxx_l4_core__l4_wkup,
>  };
> 
> -/* Master interfaces on the L4_WKUP interconnect */
> -static struct omap_hwmod_ocp_if *omap3xxx_l4_wkup_masters[] = {
> -};
> -
>  /* L4 WKUP */
>  static struct omap_hwmod omap3xxx_l4_wkup_hwmod = {
>  	.name		= "l4_wkup",
>  	.class		= &l4_hwmod_class,
> -	.masters	= omap3xxx_l4_wkup_masters,
> -	.masters_cnt	= ARRAY_SIZE(omap3xxx_l4_wkup_masters),
>  	.slaves		= omap3xxx_l4_wkup_slaves,
>  	.slaves_cnt	= ARRAY_SIZE(omap3xxx_l4_wkup_slaves),
>  	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
> -- 
> 1.7.0.4
> 


- Paul

[Index of Archives]     [Linux Arm (vger)]     [ARM Kernel]     [ARM MSM]     [Linux Tegra]     [Linux WPAN Networking]     [Linux Wireless Networking]     [Maemo Users]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux