Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/xscaleiop (534d0c92) · Commits · 方亚芬 / raspberrypi_linux

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>
		@@ -2682,7 +2682,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/configs/iop33x_defconfig

+429 −125

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/include/asm/hardware/iop3xx.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -215,6 +215,7 @@ extern int iop3xx_get_init_atu(void);
		* IOP3XX I/O and Mem space regions for PCI autoconfiguration
		*/
		#define IOP3XX_PCI_LOWER_MEM_PA 0x80000000
		#define IOP3XX_PCI_MEM_WINDOW_SIZE 0x08000000

		#define IOP3XX_PCI_IO_WINDOW_SIZE 0x00010000
		#define IOP3XX_PCI_LOWER_IO_PA 0x90000000

arch/arm/mach-iop32x/include/mach/iop32x.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -31,7 +31,5 @@
		#define IOP32X_MAX_RAM_SIZE 0x40000000UL
		#define IOP3XX_MAX_RAM_SIZE IOP32X_MAX_RAM_SIZE
		#define IOP3XX_PCI_LOWER_MEM_BA 0x80000000
		#define IOP32X_PCI_MEM_WINDOW_SIZE 0x04000000
		#define IOP3XX_PCI_MEM_WINDOW_SIZE IOP32X_PCI_MEM_WINDOW_SIZE

		#endif

arch/arm/mach-iop33x/include/mach/iop33x.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -36,8 +36,6 @@
		#define IOP33X_MAX_RAM_SIZE 0x80000000UL
		#define IOP3XX_MAX_RAM_SIZE IOP33X_MAX_RAM_SIZE
		#define IOP3XX_PCI_LOWER_MEM_BA (PHYS_OFFSET + IOP33X_MAX_RAM_SIZE)
		#define IOP33X_PCI_MEM_WINDOW_SIZE 0x08000000
		#define IOP3XX_PCI_MEM_WINDOW_SIZE IOP33X_PCI_MEM_WINDOW_SIZE


		#endif