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

Commit 7c3ada4f authored by Eric Miao's avatar Eric Miao Committed by Russell King
Browse files

[ARM] pxa: move pxa310 specific MMC3 clk out of generic pxa3xx.c 



Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 7a2c5cb0

arch/arm/mach-pxa/pxa300.c

+13 −1
Original line number Diff line number Diff line
@@ -15,10 +15,16 @@ 


#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/platform_device.h>



#include <asm/hardware.h>

#include <asm/arch/pxa3xx-regs.h>

#include <asm/arch/mfp-pxa300.h>



#include "generic.h"

#include "devices.h"

#include "clock.h"



static struct pxa3xx_mfp_addr_map pxa300_mfp_addr_map[] __initdata = {



	MFP_ADDR_X(GPIO0,   GPIO2,   0x00b4),
@@ -79,6 +85,10 @@ static struct pxa3xx_mfp_addr_map pxa310_mfp_addr_map[] __initdata = { 
	MFP_ADDR_END,

};



static struct clk pxa310_clks[] = {

	PXA3xx_CKEN("MMCCLK", MMC3, 19500000, 0, &pxa3xx_device_mci3.dev),

};



static int __init pxa300_init(void)

{

	if (cpu_is_pxa300() || cpu_is_pxa310()) {
@@ -86,8 +96,10 @@ static int __init pxa300_init(void) 
		pxa3xx_mfp_init_addr(pxa300_mfp_addr_map);

	}



	if (cpu_is_pxa310())

	if (cpu_is_pxa310()) {

		pxa3xx_mfp_init_addr(pxa310_mfp_addr_map);

		clks_register(ARRAY_AND_SIZE(pxa310_clks));

	}



	return 0;

}

arch/arm/mach-pxa/pxa3xx.c

+0 −1
Original line number Diff line number Diff line
@@ -226,7 +226,6 @@ static struct clk pxa3xx_clks[] = { 


	PXA3xx_CKEN("MMCCLK", MMC1, 19500000, 0, &pxa_device_mci.dev),

	PXA3xx_CKEN("MMCCLK", MMC2, 19500000, 0, &pxa3xx_device_mci2.dev),

	PXA3xx_CKEN("MMCCLK", MMC3, 19500000, 0, &pxa3xx_device_mci3.dev),

};



#ifdef CONFIG_PM