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

Commit b06b5a53 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 4081/1: Add definition for TI Sync Serial Protocol
  [ARM] 4080/1: Fix for the SSCR0_SlotsPerFrm macro
  [ARM] Fix VFP initialisation issue for SMP systems
  [ARM] 4078/1: Fix ARM copypage cache coherency problems
  [ARM] 4077/1: iop13xx: fix __io() macro
  [ARM] 4074/1: Flat loader stack alignment
  [ARM] 4073/1: Prevent s3c24xx drivers from including asm/arch/hardware.h and asm/arch/irqs.h
  [ARM] 4071/1: S3C24XX: Documentation update
  [ARM] 4066/1: correct a comment about PXA's sched_clock range
  [ARM] 4065/1: S3C24XX: dma printk fixes
  [ARM] 4064/1: make pxa_get_cycles() static
  [ARM] 4063/1: ep93xx: fix IRQ_EP93XX_GPIO?MUX numbering
parents c6b33cc4 d02b161e

Documentation/arm/Samsung-S3C24XX/Overview.txt

+29 −1
Original line number Diff line number Diff line
@@ -76,6 +76,15 @@ Machines 
    A S3C2410 based PDA from Acer.  There is a Wiki page at

    http://handhelds.org/moin/moin.cgi/AcerN30Documentation .



  AML M5900



    American Microsystems' M5900



  Nex Vision Nexcoder

  Nex Vision Otom



    Two machines by Nex Vision





Adding New Machines

-------------------
@@ -115,6 +124,10 @@ RTC 


  Support for the onboard RTC unit, including alarm function.



  This has recently been upgraded to use the new RTC core,

  and the module has been renamed to rtc-s3c to fit in with

  the new rtc naming scheme.





Watchdog

--------
@@ -128,7 +141,7 @@ NAND 


  The current kernels now have support for the s3c2410 NAND

  controller. If there are any problems the latest linux-mtd

  CVS can be found from http://www.linux-mtd.infradead.org/

  code can be found from http://www.linux-mtd.infradead.org/





Serial
@@ -168,6 +181,21 @@ Suspend to RAM 
  See Suspend.txt for more information.





SPI

---



  SPI drivers are available for both the in-built hardware

  (although there is no DMA support yet) and a generic

  GPIO based solution.





LEDs

----



  There is support for GPIO based LEDs via a platform driver

  in the LED subsystem.





Platform Data

-------------

arch/arm/mach-iop13xx/io.c

+19 −0
Original line number Diff line number Diff line
@@ -21,6 +21,25 @@ 
#include <asm/hardware.h>

#include <asm/io.h>



void * __iomem __iop13xx_io(unsigned long io_addr)

{

	void __iomem * io_virt;



	switch (io_addr) {

	case IOP13XX_PCIE_LOWER_IO_PA ... IOP13XX_PCIE_UPPER_IO_PA:

		io_virt = (void *) IOP13XX_PCIE_IO_PHYS_TO_VIRT(io_addr);

		break;

	case IOP13XX_PCIX_LOWER_IO_PA ... IOP13XX_PCIX_UPPER_IO_PA:

		io_virt = (void *) IOP13XX_PCIX_IO_PHYS_TO_VIRT(io_addr);

		break;

	default:

		BUG();

	}



	return io_virt;

}

EXPORT_SYMBOL(__iop13xx_io);



void * __iomem __iop13xx_ioremap(unsigned long cookie, size_t size,

	unsigned long flags)

{

arch/arm/mach-pxa/generic.c

+3 −1
Original line number Diff line number Diff line
@@ -76,7 +76,9 @@ unsigned long long sched_clock(void) 
	/*

	 * 96-bit math to perform tick * NSEC_PER_SEC / CLOCK_TICK_RATE for

	 * any value of CLOCK_TICK_RATE. Max value is in the 80 thousand

	 * years range which is nice, but with higher computation cost.

	 * years range and truncation to unsigned long long limits it to

	 * sched_clock's max range of ~584 years.  This is nice but with

	 * higher computation cost.

	 */

	{

		union {

arch/arm/mach-pxa/time.c

+4 −4
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static struct irqaction pxa_timer_irq = { 
	.handler	= pxa_timer_interrupt,

};



cycle_t pxa_get_cycles(void)

static cycle_t pxa_get_cycles(void)

{

	return OSCR;

}
@@ -134,13 +134,13 @@ static void __init pxa_timer_init(void) 
	OSMR0 = OSCR + LATCH;	/* set initial match */

	local_irq_restore(flags);



	/* on PXA OSCR runs continiously and is not written to, so we can use it

	 * as clock source directly.

	/*

	 * OSCR runs continuously on PXA and is not written to,

	 * so we can use it as clock source directly.

	 */

	clocksource_pxa.mult =

		clocksource_hz2mult(CLOCK_TICK_RATE, clocksource_pxa.shift);

	clocksource_register(&clocksource_pxa);



}



#ifdef CONFIG_NO_IDLE_HZ

arch/arm/mach-s3c2410/dma.c

+2 −2
Original line number Diff line number Diff line
@@ -1053,11 +1053,11 @@ int s3c2410_dma_config(dmach_t channel, 
	if (chan == NULL)

		return -EINVAL;



	printk("Initial dcon is %08x\n", dcon);

	pr_debug("%s: Initial dcon is %08x\n", __FUNCTION__, dcon);



	dcon |= chan->dcon & dma_sel.dcon_mask;



	printk("New dcon is %08x\n", dcon);

	pr_debug("%s: New dcon is %08x\n", __FUNCTION__, dcon);



	switch (xferunit) {

	case 1: