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

Commit 4567c4a8 authored by Russell King's avatar Russell King
Browse files

Merge branch 'devel' of... 

Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
parents 602fd7c3 19d6c13b

MAINTAINERS

+13 −0
Original line number Original line Diff line number Diff line
@@ -707,6 +707,19 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
S:	Maintained

S:	Maintained

F:	arch/arm/mach-ixp4xx/

F:	arch/arm/mach-ixp4xx/





ARM/INTEL RESEARCH IMOTE 2 MACHINE SUPPORT

M:	Jonathan Cameron <jic23@cam.ac.uk>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-pxa/imote2.c



ARM/INTEL RESEARCH STARGATE 2 MACHINE SUPPORT

M:	Jonathan Cameron <jic23@cam.ac.uk>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-pxa/stargate2.c

F:	drivers/pcmcia/pxa2xx_stargate2.c



ARM/INTEL XSC3 (MANZANO) ARM CORE

ARM/INTEL XSC3 (MANZANO) ARM CORE

M:	Lennert Buytenhek <kernel@wantstofly.org>

M:	Lennert Buytenhek <kernel@wantstofly.org>

M:	Dan Williams <dan.j.williams@intel.com>

M:	Dan Williams <dan.j.williams@intel.com>

arch/arm/configs/cm_x300_defconfig

+240 −111

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/configs/ezx_defconfig

+667 −280

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-mmp/aspenite.c

+39 −0
Original line number Original line Diff line number Diff line
@@ -13,6 +13,9 @@ 
#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/smc91x.h>

#include <linux/smc91x.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/nand.h>





#include <asm/mach-types.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/arch.h>
@@ -85,12 +88,48 @@ static struct platform_device smc91x_device = { 
	.resource	= smc91x_resources,

	.resource	= smc91x_resources,

};

};





static struct mtd_partition aspenite_nand_partitions[] = {

	{

		.name		= "bootloader",

		.offset		= 0,

		.size		= SZ_1M,

		.mask_flags	= MTD_WRITEABLE,

	}, {

		.name		= "reserved",

		.offset		= MTDPART_OFS_APPEND,

		.size		= SZ_128K,

		.mask_flags	= MTD_WRITEABLE,

	}, {

		.name		= "reserved",

		.offset		= MTDPART_OFS_APPEND,

		.size		= SZ_8M,

		.mask_flags	= MTD_WRITEABLE,

	}, {

		.name		= "kernel",

		.offset		= MTDPART_OFS_APPEND,

		.size		= (SZ_2M + SZ_1M),

		.mask_flags	= 0,

	}, {

		.name		= "filesystem",

		.offset		= MTDPART_OFS_APPEND,

		.size		= SZ_48M,

		.mask_flags	= 0,

	}

};



static struct pxa3xx_nand_platform_data aspenite_nand_info = {

	.enable_arbiter	= 1,

	.parts		= aspenite_nand_partitions,

	.nr_parts	= ARRAY_SIZE(aspenite_nand_partitions),

};



static void __init common_init(void)

static void __init common_init(void)

{

{

	mfp_config(ARRAY_AND_SIZE(common_pin_config));

	mfp_config(ARRAY_AND_SIZE(common_pin_config));





	/* on-chip devices */

	/* on-chip devices */

	pxa168_add_uart(1);

	pxa168_add_uart(1);

	pxa168_add_nand(&aspenite_nand_info);





	/* off-chip devices */

	/* off-chip devices */

	platform_device_register(&smc91x_device);

	platform_device_register(&smc91x_device);

arch/arm/mach-mmp/clock.c

+15 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,21 @@ struct clkops apbc_clk_ops = { 
	.disable	= apbc_clk_disable,

	.disable	= apbc_clk_disable,

};

};





static void apmu_clk_enable(struct clk *clk)

{

	__raw_writel(clk->enable_val, clk->clk_rst);

}



static void apmu_clk_disable(struct clk *clk)

{

	__raw_writel(0, clk->clk_rst);

}



struct clkops apmu_clk_ops = {

	.enable		= apmu_clk_enable,

	.disable	= apmu_clk_disable,

};



static DEFINE_SPINLOCK(clocks_lock);

static DEFINE_SPINLOCK(clocks_lock);





int clk_enable(struct clk *clk)

int clk_enable(struct clk *clk)