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

Commit c514e58c authored by Kenneth Tan's avatar Kenneth Tan Committed by Russell King
Browse files

[ARM] 3022/1: Missing peripheral devices memory mapping definition for IXP46X processor 



Patch from Kenneth Tan

Defining IXP46X peripheral devices memory mapping definitions that have
been missed out:
o Peripheral virtual base address is being adjusted to allow more headroom to add extra peripheral device addresses
o Peripheral size is being increased to address the above needs
o Virtual address of expansion bus and PCI configuration register needs to be adjusted as new peripheral device memory space is overlapping with their virtual address space

Signed-off-by: default avatarKenneth Tan <chong.yin.tan@intel.com>
Signed-off-by: default avatarDeepak Saxena <dsaxena@plexity.net>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 1a47ebc0

include/asm-arm/arch-ixp4xx/ixp4xx-regs.h

+49 −26
Original line number Diff line number Diff line
@@ -36,11 +36,11 @@ 
 *

 * 0x6000000	0x00004000	ioremap'd	QMgr

 *

 * 0xC0000000	0x00001000	0xffbfe000	PCI CFG 

 * 0xC0000000	0x00001000	0xffbff000	PCI CFG

 *

 * 0xC4000000	0x00001000	0xffbfd000	EXP CFG 

 * 0xC4000000	0x00001000	0xffbfe000	EXP CFG

 *

 * 0xC8000000	0x0000C000	0xffbf2000	On-Chip Peripherals

 * 0xC8000000	0x00013000	0xffbeb000	On-Chip Peripherals

 */



/*
@@ -52,22 +52,22 @@ 
 * Expansion BUS Configuration registers

 */

#define IXP4XX_EXP_CFG_BASE_PHYS	(0xC4000000)

#define IXP4XX_EXP_CFG_BASE_VIRT	(0xFFBFD000)

#define IXP4XX_EXP_CFG_BASE_VIRT	(0xFFBFE000)

#define IXP4XX_EXP_CFG_REGION_SIZE	(0x00001000)



/*

 * PCI Config registers

 */

#define IXP4XX_PCI_CFG_BASE_PHYS	(0xC0000000)

#define	IXP4XX_PCI_CFG_BASE_VIRT	(0xFFBFE000)

#define	IXP4XX_PCI_CFG_BASE_VIRT	(0xFFBFF000)

#define IXP4XX_PCI_CFG_REGION_SIZE	(0x00001000)



/*

 * Peripheral space

 */

#define IXP4XX_PERIPHERAL_BASE_PHYS	(0xC8000000)

#define IXP4XX_PERIPHERAL_BASE_VIRT	(0xFFBF2000)

#define IXP4XX_PERIPHERAL_REGION_SIZE	(0x0000C000)

#define IXP4XX_PERIPHERAL_BASE_VIRT	(0xFFBEB000)

#define IXP4XX_PERIPHERAL_REGION_SIZE	(0x00013000)



/*

 * Debug UART
@@ -121,9 +121,21 @@ 
#define IXP4XX_INTC_BASE_PHYS		(IXP4XX_PERIPHERAL_BASE_PHYS + 0x3000)

#define IXP4XX_GPIO_BASE_PHYS		(IXP4XX_PERIPHERAL_BASE_PHYS + 0x4000)

#define IXP4XX_TIMER_BASE_PHYS		(IXP4XX_PERIPHERAL_BASE_PHYS + 0x5000)

#define IXP4XX_EthA_BASE_PHYS	(IXP4XX_PERIPHERAL_BASE_PHYS + 0x9000)

#define IXP4XX_EthB_BASE_PHYS	(IXP4XX_PERIPHERAL_BASE_PHYS + 0xA000)

#define IXP4XX_NPEA_BASE_PHYS   	(IXP4XX_PERIPHERAL_BASE_PHYS + 0x6000)

#define IXP4XX_NPEB_BASE_PHYS   	(IXP4XX_PERIPHERAL_BASE_PHYS + 0x7000)

#define IXP4XX_NPEC_BASE_PHYS   	(IXP4XX_PERIPHERAL_BASE_PHYS + 0x8000)

#define IXP4XX_EthB_BASE_PHYS		(IXP4XX_PERIPHERAL_BASE_PHYS + 0x9000)

#define IXP4XX_EthC_BASE_PHYS		(IXP4XX_PERIPHERAL_BASE_PHYS + 0xA000)

#define IXP4XX_USB_BASE_PHYS		(IXP4XX_PERIPHERAL_BASE_PHYS + 0xB000)

/* ixp46X only */

#define IXP4XX_EthA_BASE_PHYS		(IXP4XX_PERIPHERAL_BASE_PHYS + 0xC000)

#define IXP4XX_EthB1_BASE_PHYS		(IXP4XX_PERIPHERAL_BASE_PHYS + 0xD000)

#define IXP4XX_EthB2_BASE_PHYS		(IXP4XX_PERIPHERAL_BASE_PHYS + 0xE000)

#define IXP4XX_EthB3_BASE_PHYS		(IXP4XX_PERIPHERAL_BASE_PHYS + 0xF000)

#define IXP4XX_TIMESYNC_BASE_PHYS	(IXP4XX_PERIPHERAL_BASE_PHYS + 0x10000)

#define IXP4XX_I2C_BASE_PHYS		(IXP4XX_PERIPHERAL_BASE_PHYS + 0x11000)

#define IXP4XX_SSP_BASE_PHYS		(IXP4XX_PERIPHERAL_BASE_PHYS + 0x12000)





#define IXP4XX_UART1_BASE_VIRT		(IXP4XX_PERIPHERAL_BASE_VIRT + 0x0000)

#define IXP4XX_UART2_BASE_VIRT		(IXP4XX_PERIPHERAL_BASE_VIRT + 0x1000)
@@ -131,9 +143,20 @@ 
#define IXP4XX_INTC_BASE_VIRT		(IXP4XX_PERIPHERAL_BASE_VIRT + 0x3000)

#define IXP4XX_GPIO_BASE_VIRT		(IXP4XX_PERIPHERAL_BASE_VIRT + 0x4000)

#define IXP4XX_TIMER_BASE_VIRT		(IXP4XX_PERIPHERAL_BASE_VIRT + 0x5000)

#define IXP4XX_EthA_BASE_VIRT	(IXP4XX_PERIPHERAL_BASE_VIRT + 0x9000)

#define IXP4XX_EthB_BASE_VIRT	(IXP4XX_PERIPHERAL_BASE_VIRT + 0xA000)

#define IXP4XX_NPEA_BASE_VIRT   	(IXP4XX_PERIPHERAL_BASE_PHYS + 0x6000)

#define IXP4XX_NPEB_BASE_VIRT   	(IXP4XX_PERIPHERAL_BASE_PHYS + 0x7000)

#define IXP4XX_NPEC_BASE_VIRT   	(IXP4XX_PERIPHERAL_BASE_PHYS + 0x8000)

#define IXP4XX_EthB_BASE_VIRT		(IXP4XX_PERIPHERAL_BASE_VIRT + 0x9000)

#define IXP4XX_EthC_BASE_VIRT		(IXP4XX_PERIPHERAL_BASE_VIRT + 0xA000)

#define IXP4XX_USB_BASE_VIRT		(IXP4XX_PERIPHERAL_BASE_VIRT + 0xB000)

/* ixp46X only */

#define IXP4XX_EthA_BASE_VIRT		(IXP4XX_PERIPHERAL_BASE_VIRT + 0xC000)

#define IXP4XX_EthB1_BASE_VIRT		(IXP4XX_PERIPHERAL_BASE_VIRT + 0xD000)

#define IXP4XX_EthB2_BASE_VIRT		(IXP4XX_PERIPHERAL_BASE_VIRT + 0xE000)

#define IXP4XX_EthB3_BASE_VIRT		(IXP4XX_PERIPHERAL_BASE_VIRT + 0xF000)

#define IXP4XX_TIMESYNC_BASE_VIRT	(IXP4XX_PERIPHERAL_BASE_VIRT + 0x10000)

#define IXP4XX_I2C_BASE_VIRT		(IXP4XX_PERIPHERAL_BASE_VIRT + 0x11000)

#define IXP4XX_SSP_BASE_VIRT		(IXP4XX_PERIPHERAL_BASE_VIRT + 0x12000)



/*

 * Constants to make it easy to access  Interrupt Controller registers