Commit d1964dab authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branches 'arm', 'at91', 'ep93xx', 'iop', 'ks8695', 'misc', 'mxc',... 

Merge branches 'arm', 'at91', 'ep93xx', 'iop', 'ks8695', 'misc', 'mxc', 'ns9x', 'orion', 'pxa', 'sa1100', 's3c' and 'sparsemem' into devel
parents ba927951 ad48ce74 b685004f c34002c1 fdb72fd8 c48b2e90 3a8daaa4 04c366f0 87549251 58762e77 3e238be2 140749e2 05944d74

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -480,6 +480,12 @@ M: kernel@wantstofly.org 
L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

S:	Maintained



ARM/GUMSTIX MACHINE SUPPORT

P:	Steve Sakoman

M:	sakoman@gmail.com

L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

S:	Maintained



ARM/HP JORNADA 7XX MACHINE SUPPORT

P:      Kristoffer Ericson

M:      kristoffer.ericson@gmail.com

arch/arm/Kconfig

+20 −3
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ config ARCH_EP93XX 
	select ARM_AMBA

	select ARM_VIC

	select GENERIC_GPIO

	select HAVE_GPIO_LIB

	help

	  This enables support for the Cirrus EP93xx series of CPUs.
@@ -377,15 +378,17 @@ config ARCH_MXC 
	help

	  Support for Freescale MXC/iMX-based family of processors



config ARCH_ORION

config ARCH_ORION5X

	bool "Marvell Orion"

	depends on MMU

	select PCI

	select GENERIC_GPIO

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select PLAT_ORION

	help

	  Support for Marvell Orion System on Chip family.

	  Support for the following Marvell Orion 5x series SoCs:

	  Orion-1 (5181), Orion-NAS (5182), Orion-2 (5281.)



config ARCH_PNX4008

	bool "Philips Nexperia PNX4008 Mobile"
@@ -422,10 +425,15 @@ config ARCH_SA1100 
	bool "SA1100-based"

	select ISA

	select ARCH_DISCONTIGMEM_ENABLE

	select ARCH_SPARSEMEM_ENABLE

	select ARCH_SELECT_MEMORY_MODEL

	select ARCH_MTD_XIP

	select GENERIC_GPIO

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select TICK_ONESHOT

	select HAVE_IDE

	select HAVE_GPIO_LIB

	help

	  Support for StrongARM 11x0 based boards.
@@ -516,7 +524,7 @@ source "arch/arm/mach-omap1/Kconfig" 


source "arch/arm/mach-omap2/Kconfig"



source "arch/arm/mach-orion/Kconfig"

source "arch/arm/mach-orion5x/Kconfig"



source "arch/arm/plat-s3c24xx/Kconfig"

source "arch/arm/plat-s3c/Kconfig"
@@ -563,6 +571,9 @@ config ARCH_ACORN 
config PLAT_IOP

	bool



config PLAT_ORION

	bool



source arch/arm/mm/Kconfig



config IWMMXT
@@ -774,6 +785,12 @@ config ARCH_DISCONTIGMEM_ENABLE 
	  or have huge holes in the physical address space for other reasons.

	  See <file:Documentation/vm/numa> for more.



config ARCH_SPARSEMEM_ENABLE

	bool



config ARCH_SELECT_MEMORY_MODEL

	bool



config NODES_SHIFT

	int

	default "4" if ARCH_LH7A40X

arch/arm/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -134,12 +134,11 @@ endif 
 machine-$(CONFIG_ARCH_PNX4008)	   := pnx4008

 machine-$(CONFIG_ARCH_NETX)	   := netx

 machine-$(CONFIG_ARCH_NS9XXX)	   := ns9xxx

 textofs-$(CONFIG_ARCH_NS9XXX)	   := 0x00108000

 machine-$(CONFIG_ARCH_DAVINCI)	   := davinci

 machine-$(CONFIG_ARCH_KS8695)     := ks8695

  incdir-$(CONFIG_ARCH_MXC)	   := mxc

 machine-$(CONFIG_ARCH_MX3)	   := mx3

 machine-$(CONFIG_ARCH_ORION)	   := orion

 machine-$(CONFIG_ARCH_ORION5X)	   := orion5x

 machine-$(CONFIG_ARCH_MSM7X00A)   := msm



ifeq ($(CONFIG_ARCH_EBSA110),y)
@@ -185,6 +184,7 @@ core-$(CONFIG_VFP) += arch/arm/vfp/ 


# If we have a common platform directory, then include it in the build.

core-$(CONFIG_PLAT_IOP)		+= arch/arm/plat-iop/

core-$(CONFIG_PLAT_ORION)		+= arch/arm/plat-orion/

core-$(CONFIG_ARCH_OMAP)	+= arch/arm/plat-omap/

core-$(CONFIG_PLAT_S3C24XX)		+= arch/arm/plat-s3c24xx/

core-$(CONFIG_ARCH_MXC)		+= arch/arm/plat-mxc/

arch/arm/boot/Makefile

+7 −1
Original line number Diff line number Diff line
@@ -61,9 +61,15 @@ endif 


quiet_cmd_uimage = UIMAGE  $@

      cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A arm -O linux -T kernel \

		   -C none -a $(ZRELADDR) -e $(ZRELADDR) \

		   -C none -a $(LOADADDR) -e $(LOADADDR) \

		   -n 'Linux-$(KERNELRELEASE)' -d $< $@



ifeq ($(CONFIG_ZBOOT_ROM),y)

$(obj)/uImage: LOADADDR=$(CONFIG_ZBOOT_ROM_TEXT)

else

$(obj)/uImage: LOADADDR=$(ZRELADDR)

endif



$(obj)/uImage:	$(obj)/zImage FORCE

	$(call if_changed,uimage)

	@echo '  Image $@ is ready'

arch/arm/common/scoop.c

+147 −36
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/slab.h>

#include <linux/platform_device.h>

#include <asm/io.h>

#include <asm/gpio.h>

#include <asm/hardware/scoop.h>



/* PCMCIA to Scoop linkage
@@ -30,10 +31,9 @@ 
struct scoop_pcmcia_config *platform_scoop_config;

EXPORT_SYMBOL(platform_scoop_config);



#define SCOOP_REG(d,adr) (*(volatile unsigned short*)(d +(adr)))



struct  scoop_dev {

	void  *base;

	void __iomem *base;

	struct gpio_chip gpio;

	spinlock_t scoop_lock;

	unsigned short suspend_clr;

	unsigned short suspend_set;
@@ -44,13 +44,84 @@ void reset_scoop(struct device *dev) 
{

	struct scoop_dev *sdev = dev_get_drvdata(dev);



	SCOOP_REG(sdev->base,SCOOP_MCR) = 0x0100;  // 00

	SCOOP_REG(sdev->base,SCOOP_CDR) = 0x0000;  // 04

	SCOOP_REG(sdev->base,SCOOP_CCR) = 0x0000;  // 10

	SCOOP_REG(sdev->base,SCOOP_IMR) = 0x0000;  // 18

	SCOOP_REG(sdev->base,SCOOP_IRM) = 0x00FF;  // 14

	SCOOP_REG(sdev->base,SCOOP_ISR) = 0x0000;  // 1C

	SCOOP_REG(sdev->base,SCOOP_IRM) = 0x0000;

	iowrite16(0x0100, sdev->base + SCOOP_MCR);  // 00

	iowrite16(0x0000, sdev->base + SCOOP_CDR);  // 04

	iowrite16(0x0000, sdev->base + SCOOP_CCR);  // 10

	iowrite16(0x0000, sdev->base + SCOOP_IMR);  // 18

	iowrite16(0x00FF, sdev->base + SCOOP_IRM);  // 14

	iowrite16(0x0000, sdev->base + SCOOP_ISR);  // 1C

	iowrite16(0x0000, sdev->base + SCOOP_IRM);

}



static void __scoop_gpio_set(struct scoop_dev *sdev,

			unsigned offset, int value)

{

	unsigned short gpwr;



	gpwr = ioread16(sdev->base + SCOOP_GPWR);

	if (value)

		gpwr |= 1 << (offset + 1);

	else

		gpwr &= ~(1 << (offset + 1));

	iowrite16(gpwr, sdev->base + SCOOP_GPWR);

}



static void scoop_gpio_set(struct gpio_chip *chip, unsigned offset, int value)

{

	struct scoop_dev *sdev = container_of(chip, struct scoop_dev, gpio);

	unsigned long flags;



	spin_lock_irqsave(&sdev->scoop_lock, flags);



	__scoop_gpio_set(sdev, offset, value);



	spin_unlock_irqrestore(&sdev->scoop_lock, flags);

}



static int scoop_gpio_get(struct gpio_chip *chip, unsigned offset)

{

	struct scoop_dev *sdev = container_of(chip, struct scoop_dev, gpio);



	/* XXX: I'm usure,  but it seems so */

	return ioread16(sdev->base + SCOOP_GPRR) & (1 << (offset + 1));

}



static int scoop_gpio_direction_input(struct gpio_chip *chip,

			unsigned offset)

{

	struct scoop_dev *sdev = container_of(chip, struct scoop_dev, gpio);

	unsigned long flags;

	unsigned short gpcr;



	spin_lock_irqsave(&sdev->scoop_lock, flags);



	gpcr = ioread16(sdev->base + SCOOP_GPCR);

	gpcr &= ~(1 << (offset + 1));

	iowrite16(gpcr, sdev->base + SCOOP_GPCR);



	spin_unlock_irqrestore(&sdev->scoop_lock, flags);



	return 0;

}



static int scoop_gpio_direction_output(struct gpio_chip *chip,

			unsigned offset, int value)

{

	struct scoop_dev *sdev = container_of(chip, struct scoop_dev, gpio);

	unsigned long flags;

	unsigned short gpcr;



	spin_lock_irqsave(&sdev->scoop_lock, flags);



	__scoop_gpio_set(sdev, offset, value);



	gpcr = ioread16(sdev->base + SCOOP_GPCR);

	gpcr |= 1 << (offset + 1);

	iowrite16(gpcr, sdev->base + SCOOP_GPCR);



	spin_unlock_irqrestore(&sdev->scoop_lock, flags);



	return 0;

}



unsigned short set_scoop_gpio(struct device *dev, unsigned short bit)
@@ -60,8 +131,8 @@ unsigned short set_scoop_gpio(struct device *dev, unsigned short bit) 
	struct scoop_dev *sdev = dev_get_drvdata(dev);



	spin_lock_irqsave(&sdev->scoop_lock, flag);

	gpio_bit = SCOOP_REG(sdev->base, SCOOP_GPWR) | bit;

	SCOOP_REG(sdev->base, SCOOP_GPWR) = gpio_bit;

	gpio_bit = ioread16(sdev->base + SCOOP_GPWR) | bit;

	iowrite16(gpio_bit, sdev->base + SCOOP_GPWR);

	spin_unlock_irqrestore(&sdev->scoop_lock, flag);



	return gpio_bit;
@@ -74,8 +145,8 @@ unsigned short reset_scoop_gpio(struct device *dev, unsigned short bit) 
	struct scoop_dev *sdev = dev_get_drvdata(dev);



	spin_lock_irqsave(&sdev->scoop_lock, flag);

	gpio_bit = SCOOP_REG(sdev->base, SCOOP_GPWR) & ~bit;

	SCOOP_REG(sdev->base,SCOOP_GPWR) = gpio_bit;

	gpio_bit = ioread16(sdev->base + SCOOP_GPWR) & ~bit;

	iowrite16(gpio_bit, sdev->base + SCOOP_GPWR);

	spin_unlock_irqrestore(&sdev->scoop_lock, flag);



	return gpio_bit;
@@ -87,13 +158,13 @@ EXPORT_SYMBOL(reset_scoop_gpio); 
unsigned short read_scoop_reg(struct device *dev, unsigned short reg)

{

	struct scoop_dev *sdev = dev_get_drvdata(dev);

	return SCOOP_REG(sdev->base,reg);

	return ioread16(sdev->base + reg);

}



void write_scoop_reg(struct device *dev, unsigned short reg, unsigned short data)

{

	struct scoop_dev *sdev = dev_get_drvdata(dev);

	SCOOP_REG(sdev->base,reg)=data;

	iowrite16(data, sdev->base + reg);

}



EXPORT_SYMBOL(reset_scoop);
@@ -104,9 +175,9 @@ static void check_scoop_reg(struct scoop_dev *sdev) 
{

	unsigned short mcr;



	mcr = SCOOP_REG(sdev->base, SCOOP_MCR);

	mcr = ioread16(sdev->base + SCOOP_MCR);

	if ((mcr & 0x100) == 0)

		SCOOP_REG(sdev->base, SCOOP_MCR) = 0x0101;

		iowrite16(0x0101, sdev->base + SCOOP_MCR);

}



#ifdef CONFIG_PM
@@ -115,8 +186,8 @@ static int scoop_suspend(struct platform_device *dev, pm_message_t state) 
	struct scoop_dev *sdev = platform_get_drvdata(dev);



	check_scoop_reg(sdev);

	sdev->scoop_gpwr = SCOOP_REG(sdev->base, SCOOP_GPWR);

	SCOOP_REG(sdev->base, SCOOP_GPWR) = (sdev->scoop_gpwr & ~sdev->suspend_clr) | sdev->suspend_set;

	sdev->scoop_gpwr = ioread16(sdev->base + SCOOP_GPWR);

	iowrite16((sdev->scoop_gpwr & ~sdev->suspend_clr) | sdev->suspend_set, sdev->base + SCOOP_GPWR);



	return 0;

}
@@ -126,7 +197,7 @@ static int scoop_resume(struct platform_device *dev) 
	struct scoop_dev *sdev = platform_get_drvdata(dev);



	check_scoop_reg(sdev);

	SCOOP_REG(sdev->base,SCOOP_GPWR) = sdev->scoop_gpwr;

	iowrite16(sdev->scoop_gpwr, sdev->base + SCOOP_GPWR);



	return 0;

}
@@ -135,11 +206,13 @@ static int scoop_resume(struct platform_device *dev) 
#define scoop_resume	NULL

#endif



int __init scoop_probe(struct platform_device *pdev)

static int __devinit scoop_probe(struct platform_device *pdev)

{

	struct scoop_dev *devptr;

	struct scoop_config *inf;

	struct resource *mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	int ret;

	int temp;



	if (!mem)

		return -EINVAL;
@@ -154,40 +227,78 @@ int __init scoop_probe(struct platform_device *pdev) 
	devptr->base = ioremap(mem->start, mem->end - mem->start + 1);



	if (!devptr->base) {

		kfree(devptr);

		return -ENOMEM;

		ret = -ENOMEM;

		goto err_ioremap;

	}



	platform_set_drvdata(pdev, devptr);



	printk("Sharp Scoop Device found at 0x%08x -> 0x%08x\n",(unsigned int)mem->start,(unsigned int)devptr->base);

	printk("Sharp Scoop Device found at 0x%08x -> 0x%8p\n",(unsigned int)mem->start, devptr->base);



	SCOOP_REG(devptr->base, SCOOP_MCR) = 0x0140;

	iowrite16(0x0140, devptr->base + SCOOP_MCR);

	reset_scoop(&pdev->dev);

	SCOOP_REG(devptr->base, SCOOP_CPR) = 0x0000;

	SCOOP_REG(devptr->base, SCOOP_GPCR) = inf->io_dir & 0xffff;

	SCOOP_REG(devptr->base, SCOOP_GPWR) = inf->io_out & 0xffff;

	iowrite16(0x0000, devptr->base + SCOOP_CPR);

	iowrite16(inf->io_dir & 0xffff, devptr->base + SCOOP_GPCR);

	iowrite16(inf->io_out & 0xffff, devptr->base + SCOOP_GPWR);



	devptr->suspend_clr = inf->suspend_clr;

	devptr->suspend_set = inf->suspend_set;



	devptr->gpio.base = -1;



	if (inf->gpio_base != 0) {

		devptr->gpio.label = pdev->dev.bus_id;

		devptr->gpio.base = inf->gpio_base;

		devptr->gpio.ngpio = 12; /* PA11 = 0, PA12 = 1, etc. up to PA22 = 11 */

		devptr->gpio.set = scoop_gpio_set;

		devptr->gpio.get = scoop_gpio_get;

		devptr->gpio.direction_input = scoop_gpio_direction_input;

		devptr->gpio.direction_output = scoop_gpio_direction_output;



		ret = gpiochip_add(&devptr->gpio);

		if (ret)

			goto err_gpio;

	}



	return 0;



	if (devptr->gpio.base != -1)

		temp = gpiochip_remove(&devptr->gpio);

err_gpio:

	platform_set_drvdata(pdev, NULL);

err_ioremap:

	iounmap(devptr->base);

	kfree(devptr);



	return ret;

}



static int scoop_remove(struct platform_device *pdev)

static int __devexit scoop_remove(struct platform_device *pdev)

{

	struct scoop_dev *sdev = platform_get_drvdata(pdev);

	if (sdev) {

	int ret;



	if (!sdev)

		return -EINVAL;



	if (sdev->gpio.base != -1) {

		ret = gpiochip_remove(&sdev->gpio);

		if (ret) {

			dev_err(&pdev->dev, "Can't remove gpio chip: %d\n", ret);

			return ret;

		}

	}



	platform_set_drvdata(pdev, NULL);

	iounmap(sdev->base);

	kfree(sdev);

		platform_set_drvdata(pdev, NULL);

	}



	return 0;

}



static struct platform_driver scoop_driver = {

	.probe		= scoop_probe,

	.remove 	= scoop_remove,

	.remove		= __devexit_p(scoop_remove),

	.suspend	= scoop_suspend,

	.resume		= scoop_resume,

	.driver		= {
@@ -195,7 +306,7 @@ static struct platform_driver scoop_driver = { 
	},

};



int __init scoop_init(void)

static int __init scoop_init(void)

{

	return platform_driver_register(&scoop_driver);

}