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

Commit 7af13637 authored by Tero Kristo's avatar Tero Kristo Committed by Paul Walmsley
Browse files

ARM: OMAP2/3: CM: remove some external dependencies 



Done in preparation to move the CM driver to its own driver folder.
These drivers will not have access to functionality under mach-omap2 anymore.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 250e27ee

arch/arm/mach-omap2/cm2xxx.c

+2 −13
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@ 
#include <linux/err.h>

#include <linux/io.h>



#include "soc.h"

#include "iomap.h"

#include "common.h"

#include "prm2xxx.h"

#include "cm.h"

#include "cm2xxx.h"
@@ -390,7 +387,7 @@ void omap2xxx_cm_set_mod_dividers(u32 mpu, u32 dsp, u32 gfx, u32 core, u32 mdm) 
	tmp = omap2_cm_read_mod_reg(CORE_MOD, CM_CLKSEL1) &

		OMAP24XX_CLKSEL_DSS2_MASK;

	omap2_cm_write_mod_reg(core | tmp, CORE_MOD, CM_CLKSEL1);

	if (cpu_is_omap2430())

	if (mdm)

		omap2_cm_write_mod_reg(mdm, OMAP2430_MDM_MOD, CM_CLKSEL);

}
@@ -405,19 +402,11 @@ static struct cm_ll_data omap2xxx_cm_ll_data = { 


int __init omap2xxx_cm_init(void)

{

	if (!cpu_is_omap24xx())

		return 0;



	return cm_register(&omap2xxx_cm_ll_data);

}



static void __exit omap2xxx_cm_exit(void)

{

	if (!cpu_is_omap24xx())

		return;



	/* Should never happen */

	WARN(cm_unregister(&omap2xxx_cm_ll_data),

	     "%s: cm_ll_data function pointer mismatch\n", __func__);

	cm_unregister(&omap2xxx_cm_ll_data);

}

__exitcall(omap2xxx_cm_exit);

arch/arm/mach-omap2/cm3xxx.c

+1 −12
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@ 
#include <linux/err.h>

#include <linux/io.h>



#include "soc.h"

#include "iomap.h"

#include "common.h"

#include "prm2xxx_3xxx.h"

#include "cm.h"

#include "cm3xxx.h"
@@ -673,19 +670,11 @@ static struct cm_ll_data omap3xxx_cm_ll_data = { 


int __init omap3xxx_cm_init(void)

{

	if (!cpu_is_omap34xx())

		return 0;



	return cm_register(&omap3xxx_cm_ll_data);

}



static void __exit omap3xxx_cm_exit(void)

{

	if (!cpu_is_omap34xx())

		return;



	/* Should never happen */

	WARN(cm_unregister(&omap3xxx_cm_ll_data),

	     "%s: cm_ll_data function pointer mismatch\n", __func__);

	cm_unregister(&omap3xxx_cm_ll_data);

}

__exitcall(omap3xxx_cm_exit);