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

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

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm: (25 commits)
  ARM: 5728/1: Proper prefetch abort handling on ARMv6 and ARMv7
  ARM: 5727/1: Pass IFSR register to do_PrefetchAbort()
  ARM: 5740/1: fix valid_phys_addr_range() range check
  ARM: 5739/1: ARM: allow empty ATAG_CORE
  ARM: 5735/1: sa1111: CodingStyle cleanups
  ARM: 5738/1: Correct TCM documentation
  ARM: 5734/1: arm: fix compilation of entry-common.S for older CPUs
  ARM: 5733/1: fix bcmring compile error
  ARM: 5732/1: remove redundant include file
  ARM: 5731/2: Fix U300 generic GPIO, remove ifdefs from MMCI v3
  ARM: Ensure do_cache_op takes mmap_sem
  ARM: Fix __cpuexit section mismatch warnings
  ARM: Don't allow highmem on SMP platforms without h/w TLB ops broadcast
  ARM: includecheck fix: mach-davinci, board-dm365-evm.c
  ARM: Remove unused CONFIG SA1100_H3XXX
  ARM: Fix warning: unused variable 'highmem'
  ARM: Fix warning: #warning syscall migrate_pages not implemented
  ARM: Fix SA11x0 clocksource warning
  ARM: Fix SA1100 Neponset serial section mismatch
  ARM: Fix SA1100 Assabet/Neponset PCMCIA section mismatch warnings
  ...
parents 90d5ffc7 d25ef8b8

Documentation/arm/tcm.txt

+6 −4
Original line number Diff line number Diff line
@@ -29,11 +29,13 @@ TCM location and size. Notice that this is not a MMU table: you 
actually move the physical location of the TCM around. At the

place you put it, it will mask any underlying RAM from the

CPU so it is usually wise not to overlap any physical RAM with

the TCM. The TCM memory exists totally outside the MMU and will

override any MMU mappings.

the TCM.



Code executing inside the ITCM does not "see" any MMU mappings

and e.g. register accesses must be made to physical addresses.

The TCM memory can then be remapped to another address again using

the MMU, but notice that the TCM if often used in situations where

the MMU is turned off. To avoid confusion the current Linux

implementation will map the TCM 1 to 1 from physical to virtual

memory in the location specified by the machine.



TCM is used for a few things:

MAINTAINERS

+6 −6
Original line number Diff line number Diff line
@@ -646,24 +646,24 @@ ARM/INTEL IOP32X ARM ARCHITECTURE 
M:	Lennert Buytenhek <kernel@wantstofly.org>

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

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

S:	Supported

S:	Maintained



ARM/INTEL IOP33X ARM ARCHITECTURE

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

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

S:	Supported

S:	Maintained



ARM/INTEL IOP13XX ARM ARCHITECTURE

M:	Lennert Buytenhek <kernel@wantstofly.org>

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

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

S:	Supported

S:	Maintained



ARM/INTEL IQ81342EX MACHINE SUPPORT

M:	Lennert Buytenhek <kernel@wantstofly.org>

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

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

S:	Supported

S:	Maintained



ARM/INTEL IXP2000 ARM ARCHITECTURE

M:	Lennert Buytenhek <kernel@wantstofly.org>
@@ -691,7 +691,7 @@ ARM/INTEL XSC3 (MANZANO) ARM CORE 
M:	Lennert Buytenhek <kernel@wantstofly.org>

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

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

S:	Supported

S:	Maintained



ARM/IP FABRICS DOUBLE ESPRESSO MACHINE SUPPORT

M:	Lennert Buytenhek <kernel@wantstofly.org>
@@ -2695,7 +2695,7 @@ F: include/linux/intel-iommu.h 


INTEL IOP-ADMA DMA DRIVER

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

S:	Supported

S:	Maintained

F:	drivers/dma/iop-adma.c



INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT

arch/arm/common/sa1111.c

+12 −13
Original line number Diff line number Diff line
@@ -1032,6 +1032,7 @@ unsigned int sa1111_pll_clock(struct sa1111_dev *sadev) 


	return __sa1111_pll_clock(sachip);

}

EXPORT_SYMBOL(sa1111_pll_clock);



/**

 *	sa1111_select_audio_mode - select I2S or AC link mode
@@ -1059,6 +1060,7 @@ void sa1111_select_audio_mode(struct sa1111_dev *sadev, int mode) 


	spin_unlock_irqrestore(&sachip->lock, flags);

}

EXPORT_SYMBOL(sa1111_select_audio_mode);



/**

 *	sa1111_set_audio_rate - set the audio sample rate
@@ -1083,6 +1085,7 @@ int sa1111_set_audio_rate(struct sa1111_dev *sadev, int rate) 


	return 0;

}

EXPORT_SYMBOL(sa1111_set_audio_rate);



/**

 *	sa1111_get_audio_rate - get the audio sample rate
@@ -1100,6 +1103,7 @@ int sa1111_get_audio_rate(struct sa1111_dev *sadev) 


	return __sa1111_pll_clock(sachip) / (256 * div);

}

EXPORT_SYMBOL(sa1111_get_audio_rate);



void sa1111_set_io_dir(struct sa1111_dev *sadev,

		       unsigned int bits, unsigned int dir,
@@ -1128,6 +1132,7 @@ void sa1111_set_io_dir(struct sa1111_dev *sadev, 
	MODIFY_BITS(gpio + SA1111_GPIO_PCSDR, (bits >> 16) & 255, sleep_dir >> 16);

	spin_unlock_irqrestore(&sachip->lock, flags);

}

EXPORT_SYMBOL(sa1111_set_io_dir);



void sa1111_set_io(struct sa1111_dev *sadev, unsigned int bits, unsigned int v)

{
@@ -1142,6 +1147,7 @@ void sa1111_set_io(struct sa1111_dev *sadev, unsigned int bits, unsigned int v) 
	MODIFY_BITS(gpio + SA1111_GPIO_PCDWR, (bits >> 16) & 255, v >> 16);

	spin_unlock_irqrestore(&sachip->lock, flags);

}

EXPORT_SYMBOL(sa1111_set_io);



void sa1111_set_sleep_io(struct sa1111_dev *sadev, unsigned int bits, unsigned int v)

{
@@ -1156,6 +1162,7 @@ void sa1111_set_sleep_io(struct sa1111_dev *sadev, unsigned int bits, unsigned i 
	MODIFY_BITS(gpio + SA1111_GPIO_PCSSR, (bits >> 16) & 255, v >> 16);

	spin_unlock_irqrestore(&sachip->lock, flags);

}

EXPORT_SYMBOL(sa1111_set_sleep_io);



/*

 * Individual device operations.
@@ -1176,6 +1183,7 @@ void sa1111_enable_device(struct sa1111_dev *sadev) 
	sa1111_writel(val | sadev->skpcr_mask, sachip->base + SA1111_SKPCR);

	spin_unlock_irqrestore(&sachip->lock, flags);

}

EXPORT_SYMBOL(sa1111_enable_device);



/**

 *	sa1111_disable_device - disable an on-chip SA1111 function block
@@ -1192,6 +1200,7 @@ void sa1111_disable_device(struct sa1111_dev *sadev) 
	sa1111_writel(val & ~sadev->skpcr_mask, sachip->base + SA1111_SKPCR);

	spin_unlock_irqrestore(&sachip->lock, flags);

}

EXPORT_SYMBOL(sa1111_disable_device);



/*

 *	SA1111 "Register Access Bus."
@@ -1259,17 +1268,20 @@ struct bus_type sa1111_bus_type = { 
	.suspend	= sa1111_bus_suspend,

	.resume		= sa1111_bus_resume,

};

EXPORT_SYMBOL(sa1111_bus_type);



int sa1111_driver_register(struct sa1111_driver *driver)

{

	driver->drv.bus = &sa1111_bus_type;

	return driver_register(&driver->drv);

}

EXPORT_SYMBOL(sa1111_driver_register);



void sa1111_driver_unregister(struct sa1111_driver *driver)

{

	driver_unregister(&driver->drv);

}

EXPORT_SYMBOL(sa1111_driver_unregister);



static int __init sa1111_init(void)

{
@@ -1290,16 +1302,3 @@ module_exit(sa1111_exit); 


MODULE_DESCRIPTION("Intel Corporation SA1111 core driver");

MODULE_LICENSE("GPL");
 


EXPORT_SYMBOL(sa1111_select_audio_mode);

EXPORT_SYMBOL(sa1111_set_audio_rate);

EXPORT_SYMBOL(sa1111_get_audio_rate);

EXPORT_SYMBOL(sa1111_set_io_dir);

EXPORT_SYMBOL(sa1111_set_io);

EXPORT_SYMBOL(sa1111_set_sleep_io);

EXPORT_SYMBOL(sa1111_enable_device);

EXPORT_SYMBOL(sa1111_disable_device);

EXPORT_SYMBOL(sa1111_pll_clock);

EXPORT_SYMBOL(sa1111_bus_type);

EXPORT_SYMBOL(sa1111_driver_register);

EXPORT_SYMBOL(sa1111_driver_unregister);

arch/arm/configs/h3600_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ CONFIG_ARCH_SA1100=y 
# CONFIG_SA1100_COLLIE is not set

# CONFIG_SA1100_H3100 is not set

CONFIG_SA1100_H3600=y

CONFIG_SA1100_H3XXX=y

# CONFIG_SA1100_BADGE4 is not set

# CONFIG_SA1100_JORNADA720 is not set

# CONFIG_SA1100_HACKKIT is not set

arch/arm/configs/iop33x_defconfig

+429 −125

File changed.

Preview size limit exceeded, changes collapsed.