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

Commit 6279d0ea authored by Anton Vorontsov's avatar Anton Vorontsov
Browse files

ARM: cns3xxx: Add support for SDHCI controllers 



CNS3xxx chips have SDHCI-compatible SDIO/SD/MMC controller. This patch
adds the support using sdhci-cns3xxx driver.

Signed-off-by: default avatarAnton Vorontsov <avorontsov@mvista.com>
parent 5f32f7a0

arch/arm/mach-cns3xxx/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_ARCH_CNS3XXX)		+= core.o pm.o

obj-$(CONFIG_ARCH_CNS3XXX)		+= core.o pm.o devices.o

obj-$(CONFIG_PCI)			+= pcie.o

obj-$(CONFIG_MACH_CNS3420VB)		+= cns3420vb.o

arch/arm/mach-cns3xxx/cns3420vb.c

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <mach/cns3xxx.h>

#include <mach/irqs.h>

#include "core.h"

#include "devices.h"



/*

 * NOR Flash
@@ -117,6 +118,8 @@ static void __init cns3420_init(void) 
{

	platform_add_devices(cns3420_pdevs, ARRAY_SIZE(cns3420_pdevs));



	cns3xxx_sdhci_init();



	pm_power_off = cns3xxx_power_off;

}

arch/arm/mach-cns3xxx/devices.c

0 → 100644
+59 −0
Original line number Diff line number Diff line 
/*

 * CNS3xxx common devices

 *

 * Copyright 2008 Cavium Networks

 *		  Scott Shu

 * Copyright 2010 MontaVista Software, LLC.

 *		  Anton Vorontsov <avorontsov@mvista.com>

 *

 * This file is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License, Version 2, as

 * published by the Free Software Foundation.

 */



#include <linux/io.h>

#include <linux/init.h>

#include <linux/compiler.h>

#include <linux/platform_device.h>

#include <mach/cns3xxx.h>

#include <mach/irqs.h>

#include "core.h"

#include "devices.h"



/*

 * SDHCI

 */

static struct resource cns3xxx_sdhci_resources[] = {

	[0] = {

		.start = CNS3XXX_SDIO_BASE,

		.end   = CNS3XXX_SDIO_BASE + SZ_4K - 1,

		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.start = IRQ_CNS3XXX_SDIO,

		.end   = IRQ_CNS3XXX_SDIO,

		.flags = IORESOURCE_IRQ,

	},

};



static struct platform_device cns3xxx_sdhci_pdev = {

	.name		= "sdhci-cns3xxx",

	.id		= 0,

	.num_resources	= ARRAY_SIZE(cns3xxx_sdhci_resources),

	.resource	= cns3xxx_sdhci_resources,

};



void __init cns3xxx_sdhci_init(void)

{

	u32 __iomem *gpioa = __io(CNS3XXX_MISC_BASE_VIRT + 0x0014);

	u32 gpioa_pins = __raw_readl(gpioa);



	/* MMC/SD pins share with GPIOA */

	gpioa_pins |= 0x1fff0004;

	__raw_writel(gpioa_pins, gpioa);



	cns3xxx_pwr_clk_en(CNS3XXX_PWR_CLK_EN(SDIO));

	cns3xxx_pwr_soft_rst(CNS3XXX_PWR_SOFTWARE_RST(SDIO));



	platform_device_register(&cns3xxx_sdhci_pdev);

}

arch/arm/mach-cns3xxx/devices.h

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

 * CNS3xxx common devices

 *

 * Copyright 2008 Cavium Networks

 *		  Scott Shu

 * Copyright 2010 MontaVista Software, LLC.

 *		  Anton Vorontsov <avorontsov@mvista.com>

 *

 * This file is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License, Version 2, as

 * published by the Free Software Foundation.

 */



#ifndef __CNS3XXX_DEVICES_H_

#define __CNS3XXX_DEVICES_H_



void __init cns3xxx_sdhci_init(void);



#endif /* __CNS3XXX_DEVICES_H_ */