diff options
| author | Florian Fainelli <florian@openwrt.org> | 2010-04-26 09:22:27 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2010-04-26 09:22:27 +0000 |
| commit | 698761efeb139905d969548182ddae7d0fca69fa (patch) | |
| tree | 923542d197349db99de98871dd36c945b3b759c1 /target/linux/brcm63xx/patches-2.6.33 | |
| parent | 6ad5cee86b167c48557989f782faff8e8a35cae6 (diff) | |
| download | upstream-698761efeb139905d969548182ddae7d0fca69fa.tar.gz upstream-698761efeb139905d969548182ddae7d0fca69fa.tar.bz2 upstream-698761efeb139905d969548182ddae7d0fca69fa.zip | |
[brcm63xx] fix bcm6358 spi base register address (#7234)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21163 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-2.6.33')
| -rw-r--r-- | target/linux/brcm63xx/patches-2.6.33/040-bcm963xx_flashmap.patch | 6 | ||||
| -rw-r--r-- | target/linux/brcm63xx/patches-2.6.33/240-spi.patch | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/patches-2.6.33/040-bcm963xx_flashmap.patch b/target/linux/brcm63xx/patches-2.6.33/040-bcm963xx_flashmap.patch index 4784de7d6a..6edb8c7873 100644 --- a/target/linux/brcm63xx/patches-2.6.33/040-bcm963xx_flashmap.patch +++ b/target/linux/brcm63xx/patches-2.6.33/040-bcm963xx_flashmap.patch @@ -13,7 +13,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org> --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig -@@ -259,6 +259,13 @@ config MTD_ALCHEMY +@@ -257,6 +257,13 @@ config MTD_ALCHEMY help Flash memory access on AMD Alchemy Pb/Db/RDK Reference Boards @@ -342,7 +342,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org> +MODULE_AUTHOR("Mike Albon <malbon@openwrt.org>"); --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -722,20 +722,6 @@ static int board_get_mac_address(u8 *mac +@@ -721,20 +721,6 @@ static int board_get_mac_address(u8 *mac return 0; } @@ -363,7 +363,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org> static struct resource mtd_resources[] = { { .start = 0, /* filled at runtime */ -@@ -745,12 +731,9 @@ static struct resource mtd_resources[] = +@@ -744,12 +730,9 @@ static struct resource mtd_resources[] = }; static struct platform_device mtd_dev = { diff --git a/target/linux/brcm63xx/patches-2.6.33/240-spi.patch b/target/linux/brcm63xx/patches-2.6.33/240-spi.patch index 86fcc7d76d..8d7e7b2968 100644 --- a/target/linux/brcm63xx/patches-2.6.33/240-spi.patch +++ b/target/linux/brcm63xx/patches-2.6.33/240-spi.patch @@ -97,6 +97,15 @@ #define RSET_UART_SIZE 24 #define RSET_UDC_SIZE 256 #define RSET_OHCI_SIZE 256 +@@ -209,7 +210,7 @@ enum bcm63xx_regs_set { + #define BCM_6358_WDT_BASE (0xfffe005c) + #define BCM_6358_UART0_BASE (0xfffe0100) + #define BCM_6358_GPIO_BASE (0xfffe0080) +-#define BCM_6358_SPI_BASE (0xdeadbeef) ++#define BCM_6358_SPI_BASE (0xfffe0800) + #define BCM_6358_UDC0_BASE (0xfffe0400) + #define BCM_6358_OHCI0_BASE (0xfffe1400) + #define BCM_6358_OHCI_PRIV_BASE (0xdeadbeef) @@ -428,6 +429,7 @@ static inline unsigned long bcm63xx_regs */ enum bcm63xx_irq { |