ARM: kirkwood: migration to DM_USB
Subsystems (4)
cover ARM: kirkwood: migration to DM_USB
This is my initial series to convert the kirkwood platforms to DM_USB.
I've been testing on an old kirkwood eval board which patch 2 adds. I've got some problems related to DMA which I think are probably due to caching or have something to do with the Z0 rev of the CPU.
I'd really appreciate some testing on other kirkwood platforms.
Chris Packham (7):
net: mvgbe: fallback phy-mode to GMII
ARM: kirkwood: add db-88f6281-bp board
ARM: kirkwood: rename KW_CPU_WIN_BASE to MVEBU_CPU_WIN_BASE
ARM: kirkwood: remove KW_DEFADR_PCI_IO_REMAP
ARM: kirkwood: switch to using mvebu mbus
ARM: kirkwood: remove kw_config_adr_windows
ARM: kirkwood: enable CONFIG_DM_USB on db-88f6281-bp
arch/arm/dts/kirkwood-db-88f6281-spi.dts | 48 +++++++++ arch/arm/dts/kirkwood-db-88f6281.dts | 26 +++++ arch/arm/dts/kirkwood-db.dtsi | 94 +++++++++++++++++ arch/arm/mach-kirkwood/Kconfig | 4 + arch/arm/mach-kirkwood/cpu.c | 73 ++++--------- arch/arm/mach-kirkwood/include/mach/cpu.h | 13 ++- arch/arm/mach-kirkwood/include/mach/soc.h | 2 +- arch/arm/mach-mvebu/Makefile | 1 + arch/arm/mach-mvebu/mbus.c | 6 ++ board/Marvell/db-88f6281-bp/Kconfig | 12 +++ board/Marvell/db-88f6281-bp/MAINTAINERS | 10 ++ board/Marvell/db-88f6281-bp/Makefile | 3 + board/Marvell/db-88f6281-bp/db-88f6281-bp.c | 103 +++++++++++++++++++ board/Marvell/db-88f6281-bp/kwbimage.cfg | 36 +++++++ configs/db-88f6281-bp-spi_defconfig | 55 ++++++++++ configs/db-88f6281-bp_defconfig | 54 ++++++++++ drivers/net/mvgbe.c | 6 +- include/configs/db-88f6281-bp.h | 107 ++++++++++++++++++++ 18 files changed, 591 insertions(+), 62 deletions(-) create mode 100644 arch/arm/dts/kirkwood-db-88f6281-spi.dts create mode 100644 arch/arm/dts/kirkwood-db-88f6281.dts create mode 100644 arch/arm/dts/kirkwood-db.dtsi create mode 100644 board/Marvell/db-88f6281-bp/Kconfig create mode 100644 board/Marvell/db-88f6281-bp/MAINTAINERS create mode 100644 board/Marvell/db-88f6281-bp/Makefile create mode 100644 board/Marvell/db-88f6281-bp/db-88f6281-bp.c create mode 100644 board/Marvell/db-88f6281-bp/kwbimage.cfg create mode 100644 configs/db-88f6281-bp-spi_defconfig create mode 100644 configs/db-88f6281-bp_defconfig create mode 100644 include/configs/db-88f6281-bp.h
Signature · 1 line
2.19.2
RFC PATCH 1/7 net: mvgbe: fallback phy-mode to GMII
Some existing device trees don't specify a phy-mode so fallback to GMII when a phy-mode is not provided.
---
This is similar to what the Linux mv643xx_eth.c network driver does to handle the same case.
drivers/net/mvgbe.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/net/mvgbe.c +2 -4
@@ -1005,10 +1005,8 @@ static int mvgbe_ofdata_to_platdata(struct udevice *dev) phy_mode =fdt_getprop (gd->fdt_blob, pnode,"phy-mode" ,NULL );if (phy_mode) pdata->phy_interface =phy_get_interface_by_name (phy_mode); -if (pdata->phy_interface ==-1 ) { -debug ("%s: Invalid PHY interface '%s'\n" , __func__, phy_mode); -return -EINVAL ; - } +else + pdata->phy_interface =PHY_INTERFACE_MODE_GMII ; dmvgbe->phy_interface = pdata->phy_interface;
Signature · 1 line
2.19.2
RFC PATCH 2/7 ARM: kirkwood: add db-88f6281-bp board
In reply to Chris PackhamThis is Marvell's Kirkwood development board. It has the following features
- 512M DDR2
- 2 PCI connectors
- 1 x1 PCI-e interface
- 1 Gigabit Ethernet Port
- 2 SATA Ports
- USB 2.0 Interface
- SDIO
- 128M NAND Flash
- 16M SPI Flash
It can be strapped to boot from SPI or NAND.
---
arch/arm/dts/kirkwood-db-88f6281-spi.dts | 48 +++++++++ arch/arm/dts/kirkwood-db-88f6281.dts | 26 +++++ arch/arm/dts/kirkwood-db.dtsi | 94 +++++++++++++++++ arch/arm/mach-kirkwood/Kconfig | 4 + board/Marvell/db-88f6281-bp/Kconfig | 12 +++ board/Marvell/db-88f6281-bp/MAINTAINERS | 10 ++ board/Marvell/db-88f6281-bp/Makefile | 3 + board/Marvell/db-88f6281-bp/db-88f6281-bp.c | 103 +++++++++++++++++++ board/Marvell/db-88f6281-bp/kwbimage.cfg | 36 +++++++ configs/db-88f6281-bp-spi_defconfig | 54 ++++++++++ configs/db-88f6281-bp_defconfig | 53 ++++++++++ include/configs/db-88f6281-bp.h | 107 ++++++++++++++++++++ 12 files changed, 550 insertions(+) create mode 100644 arch/arm/dts/kirkwood-db-88f6281-spi.dts create mode 100644 arch/arm/dts/kirkwood-db-88f6281.dts create mode 100644 arch/arm/dts/kirkwood-db.dtsi create mode 100644 board/Marvell/db-88f6281-bp/Kconfig create mode 100644 board/Marvell/db-88f6281-bp/MAINTAINERS create mode 100644 board/Marvell/db-88f6281-bp/Makefile create mode 100644 board/Marvell/db-88f6281-bp/db-88f6281-bp.c create mode 100644 board/Marvell/db-88f6281-bp/kwbimage.cfg create mode 100644 configs/db-88f6281-bp-spi_defconfig create mode 100644 configs/db-88f6281-bp_defconfig create mode 100644 include/configs/db-88f6281-bp.h
arch/arm/dts/kirkwood-db-88f6281-spi.dts new file +48 -0
@@ -0,0 +1,48 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Marvell DB-88F6281-BP Development Board Setup + * + * Saeed Bishara <[email protected]> + * Thomas Petazzoni <[email protected]> + * + */ + +/dts-v1/; + +#include "kirkwood-db-88f6281.dts" + +/ { + aliases { + spi0 = &spi0; + }; +}; + +&spi0 { + status = "okay"; + + flash at 0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "st,m25p128", "jedec,spi-nor", "spi-flash"; + reg = <0>; + spi-max-frequency = <50000000>; + mode = <0>; + + partition at u-boot { + reg = <0x00000000 0x00c00000>; + label = "u-boot"; + }; + partition at u-boot-env { + reg = <0x00c00000 0x00040000>; + label = "u-boot-env"; + }; + partition at unused { + reg = <0x00100000 0x00f00000>; + label = "unused"; + }; + }; +}; + +&nand { + status = "disabled"; +};
arch/arm/dts/kirkwood-db-88f6281.dts new file +26 -0
@@ -0,0 +1,26 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Marvell DB-88F6281-BP Development Board Setup + * + * Saeed Bishara <[email protected]> + * Thomas Petazzoni <[email protected]> + * + */ + +/dts-v1/; + +#include "kirkwood-db.dtsi" +#include "kirkwood-6281.dtsi" + +/ { + model = "Marvell DB-88F6281-BP Development Board"; + compatible = "marvell,db-88f6281-bp", "marvell,kirkwood-88f6281", "marvell,kirkwood"; +}; + +&pciec { + status = "okay"; +}; + +&pcie0 { + status = "okay"; +};
arch/arm/dts/kirkwood-db.dtsi new file +94 -0
94 lines not on this page · raw message
arch/arm/mach-kirkwood/Kconfig +4 -0
@@ -65,6 +65,9 @@ config TARGET_SBx81LIFKW config TARGET_SBx81LIFXCAT bool "Allied Telesis SBx81GP24/SBx81GT24" +config TARGET_DB_88F6281_BP + bool "Marvell DB-88F6281-BP" + endchoice config SYS_SOC
@@ -89,5 +92,6 @@ source "board/Seagate/nas220/Kconfig" source "board/zyxel/nsa310s/Kconfig" source "board/alliedtelesis/SBx81LIFKW/Kconfig" source "board/alliedtelesis/SBx81LIFXCAT/Kconfig" +source "board/Marvell/db-88f6281-bp/Kconfig" endif
board/Marvell/db-88f6281-bp/Kconfig new file +12 -0
@@ -0,0 +1,12 @@ +if TARGET_DB_88F6281_BP + +config SYS_BOARD + default "db-88f6281-bp" + +config SYS_VENDOR + default "Marvell" + +config SYS_CONFIG_NAME + default "db-88f6281-bp" + +endif
board/Marvell/db-88f6281-bp/MAINTAINERS new file +10 -0
@@ -0,0 +1,10 @@ +DB_88F6820_AMC BOARD +M: Chris Packham <[email protected]> +S: Maintained +F: arch/arm/dts/kirkwood-db-88f6281.dts +F: arch/arm/dts/kirkwood-db-88f6281-spi.dts +F: arch/arm/dts/kirkwood-db.dtsi +F: board/Marvell/db-88f6281-bp/ +F: include/configs/db-88f6281-bp.h +F: configs/db-88f6281-bp_defconfig +F: configs/db-88f6281-bp-spi_defconfig
board/Marvell/db-88f6281-bp/Makefile new file +3 -0
@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0+ + +obj-y := db-88f6281-bp.o
board/Marvell/db-88f6281-bp/db-88f6281-bp.c new file +103 -0
103 lines not on this page · raw message
board/Marvell/db-88f6281-bp/kwbimage.cfg new file +36 -0
@@ -0,0 +1,36 @@ +# SPDX-License-Identifier: GPL-2.0+ + +# Boot Media configurations +BOOT_FROM spi # Boot from SPI flash + +DATA 0xd00100e0 0x1b1b1b9b +DATA 0xd0020134 0xbbbbbbbb +DATA 0xd0020138 0x00bbbbbb +DATA 0xd0020154 0x00000200 +DATA 0xd002014c 0x00001c00 +DATA 0xd0020148 0x00000001 + +DATA 0xd0001400 0x43000c30 +DATA 0xd0001404 0x39543000 +DATA 0xd0001408 0x22125451 +DATA 0xd000140c 0x00000833 +DATA 0xd0001410 0x000000cc +DATA 0xd0001414 0x00000000 +DATA 0xd0001418 0x00000000 +DATA 0xd000141c 0x00000c52 +DATA 0xd0001420 0x00000044 +DATA 0xd0001424 0x0000f1ff +DATA 0xd0001428 0x00085520 +DATA 0xd000147c 0x00008552 +DATA 0xd0001504 0x0ffffff1 +DATA 0xd0001508 0x10000000 +DATA 0xd000150c 0x0ffffff5 +DATA 0xd0001514 0x00000000 +DATA 0xd000151c 0x00000000 +DATA 0xd0001494 0x84210000 +DATA 0xd0001498 0x00000000 +DATA 0xd000149c 0x0000f40f +DATA 0xd0001480 0x00000001 + +# End of Header extension +DATA 0x0 0x0
configs/db-88f6281-bp-spi_defconfig new file +54 -0
54 lines not on this page · raw message
configs/db-88f6281-bp_defconfig new file +53 -0
53 lines not on this page · raw message
include/configs/db-88f6281-bp.h new file +107 -0
107 lines not on this page · raw message
Signature · 1 line
2.19.2
RFC PATCH 3/7 ARM: kirkwood: rename KW_CPU_WIN_BASE to MVEBU_CPU_WIN_BASE
In reply to Chris PackhamThis will allow the kirkwood platforms to use more common code with the other mvebu SoCs.
---
arch/arm/mach-kirkwood/cpu.c | 2 +- arch/arm/mach-kirkwood/include/mach/soc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-kirkwood/cpu.c +1 -1
@@ -62,7 +62,7 @@ unsigned int kw_winctrl_calcsize(unsigned int sizeval)int kw_config_adr_windows (void ) {struct kwwin_registers *winregs = - (struct kwwin_registers *)KW_CPU_WIN_BASE ; + (struct kwwin_registers *)MVEBU_CPU_WIN_BASE ;/* Window 0: PCIE MEM address space */ writel(KWCPU_WIN_CTRL_DATA(1024 * 1024 * 256, KWCPU_TARGET_PCIE,
arch/arm/mach-kirkwood/include/mach/soc.h +1 -1
@@ -31,7 +31,7 @@#define KW_RTC_BASE (KW_REGISTER(0x10300))#define KW_NANDF_BASE (KW_REGISTER(0x10418))#define MVEBU_SPI_BASE (KW_REGISTER(0x10600)) -#define KW_CPU_WIN_BASE (KW_REGISTER(0x20000)) +#define MVEBU_CPU_WIN_BASE (KW_REGISTER(0x20000))#define KW_CPU_REG_BASE (KW_REGISTER(0x20100))#define MVEBU_TIMER_BASE (KW_REGISTER(0x20300))#define KW_REG_PCIE_BASE (KW_REGISTER(0x40000))
Signature · 1 line
2.19.2
RFC PATCH 4/7 ARM: kirkwood: remove KW_DEFADR_PCI_IO_REMAP
In reply to Chris PackhamKW_DEFADR_PCI_IO_REMAP has the same value as KW_DEFADR_PCI_IO and is only used to set up a 1:1 mapping. Remove it and update the mapping to use KW_DEFADR_PCI_IO.
---
arch/arm/mach-kirkwood/cpu.c | 2 +- arch/arm/mach-kirkwood/include/mach/cpu.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
arch/arm/mach-kirkwood/cpu.c +1 -1
@@ -76,7 +76,7 @@ int kw_config_adr_windows(void)writel (KWCPU_WIN_CTRL_DATA (1024 *64 ,KWCPU_TARGET_PCIE ,KWCPU_ATTR_PCIE_IO ,KWCPU_WIN_ENABLE ), &winregs[1 ].ctrl);writel (KW_DEFADR_PCI_IO , &winregs[1 ].base); -writel (KW_DEFADR_PCI_IO_REMAP , &winregs[1 ].remap_lo); +writel (KW_DEFADR_PCI_IO , &winregs[1 ].remap_lo);writel (0x0 , &winregs[1 ].remap_hi);/* Window 2: NAND Flash address space */
arch/arm/mach-kirkwood/include/mach/cpu.h +0 -1
@@ -63,7 +63,6 @@ enum kwcpu_attrib {*/ #define KW_DEFADR_PCI_MEM 0x90000000#define KW_DEFADR_PCI_IO 0xC0000000 -#define KW_DEFADR_PCI_IO_REMAP 0xC0000000#define KW_DEFADR_SASRAM 0xC8010000#define KW_DEFADR_NANDF 0xD8000000#define KW_DEFADR_SPIF 0xE8000000
Signature · 1 line
2.19.2
RFC PATCH 5/7 ARM: kirkwood: switch to using mvebu mbus
In reply to Chris PackhamThe mvebu mbus code already had most of the support required for kirkwood. The only difference is that unlike the other mvebu targets kirkwood doesn't have a bridge control block so the code related to managing that needs to be compiled out.
---
arch/arm/mach-kirkwood/cpu.c | 33 ++++++++++++++++++++--- arch/arm/mach-kirkwood/include/mach/cpu.h | 11 ++++++++ arch/arm/mach-mvebu/Makefile | 1 + arch/arm/mach-mvebu/mbus.c | 6 +++++ 4 files changed, 48 insertions(+), 3 deletions(-)
arch/arm/mach-kirkwood/cpu.c +30 -3
@@ -110,6 +110,32 @@ int kw_config_adr_windows(void)return 0 ; } +static struct mbus_win windows[] = { +/* Window 0: PCIE MEM address space */ + {KW_DEFADR_PCI_MEM ,1024 *1024 *256 , +KWCPU_TARGET_PCIE ,KWCPU_ATTR_PCIE_MEM }, + +/* Window 1: PCIE IO address space */ + {KW_DEFADR_PCI_IO ,1024 *64 , +KWCPU_TARGET_PCIE ,KWCPU_ATTR_PCIE_IO }, + +/* Window 2: NAND Flash address space */ + {KW_DEFADR_NANDF ,1024 *1024 *128 , +KWCPU_TARGET_MEMORY ,KWCPU_ATTR_NANDFLASH }, + +/* Window 3: SPI Flash address space */ + {KW_DEFADR_SPIF ,1024 *1024 *128 , +KWCPU_TARGET_MEMORY ,KWCPU_ATTR_SPIFLASH }, + +/* Window 4: BOOT Memory address space */ + {KW_DEFADR_BOOTROM ,1024 *1024 *128 , +KWCPU_TARGET_MEMORY ,KWCPU_ATTR_BOOTROM }, + +/* Window 5: Security SRAM address space */ + {KW_DEFADR_SASRAM ,1024 *64 , +KWCPU_TARGET_SASRAM ,KWCPU_ATTR_SASRAM }, +}; +/* * SYSRSTn Duration Counter Support *
@@ -221,15 +247,13 @@ int arch_cpu_init(void)struct kwcpu_registers *cpureg = (struct kwcpu_registers *)KW_CPU_REG_BASE ; -/* Linux expects` the internal registers to be at 0xf1000000 */ +/* Linux expects the internal registers to be at 0xf1000000 */ writel (KW_REGS_PHY_BASE ,KW_OFFSET_REG );/* Enable and invalidate L2 cache in write through mode */ writel (readl (&cpureg->l2_cfg) |0x18 , &cpureg->l2_cfg);invalidate_l2_cache (); -kw_config_adr_windows (); -#ifdef CONFIG_KIRKWOOD_RGMII_PAD_1V8 /* * Configures the I/O voltage of the pads connected to Egigabit
@@ -296,6 +320,9 @@ int arch_misc_init(void) temp =get_cr ();set_cr (temp & ~CR_V ); +/* Configure mbus windows */ +mvebu_mbus_probe (windows,ARRAY_SIZE (windows)); +/* checks and execute resset to factory event */ kw_sysrst_check ();
arch/arm/mach-kirkwood/include/mach/cpu.h +11 -0
@@ -68,6 +68,13 @@ enum kwcpu_attrib {#define KW_DEFADR_SPIF 0xE8000000#define KW_DEFADR_BOOTROM 0xF8000000 +struct mbus_win { +u32 base; +u32 size; +u8 target; +u8 attr; +}; +/* * read feroceon/sheeva core extra feature register * using co-proc instruction
@@ -134,6 +141,9 @@ struct kwgpio_registers {u32 irq_level; }; +/* Needed for dynamic (board-specific) mbus configuration */ +extern struct mvebu_mbus_state mbus_state; +/* * functions */
@@ -141,6 +151,7 @@ unsigned int mvebu_sdram_bar(enum memory_bank bank);unsigned int mvebu_sdram_bs (enum memory_bank bank);void mvebu_sdram_size_adjust (enum memory_bank bank);int kw_config_adr_windows (void ); +int mvebu_mbus_probe (struct mbus_win windows[],int count);void mvebu_config_gpio (unsigned int gpp0_oe_val,unsigned int gpp1_oe_val,unsigned int gpp0_oe,unsigned int gpp1_oe); int kw_config_mpp(unsigned int mpp0_7, unsigned int mpp8_15,
arch/arm/mach-mvebu/Makefile +1 -0
@@ -14,6 +14,7 @@ ifdef CONFIG_KIRKWOOD obj-y = dram.o obj-y += gpio.o +obj-y += mbus.o obj-y += timer.o else # CONFIG_KIRKWOOD
arch/arm/mach-mvebu/mbus.c +6 -0
@@ -405,6 +405,7 @@ int mvebu_mbus_del_window(phys_addr_t base, size_t size)return 0 ; } +#ifndef CONFIG_KIRKWOOD static void mvebu_mbus_get_lowest_base (struct mvebu_mbus_state *mbus,phys_addr_t *base) {
@@ -428,7 +429,9 @@ static void mvebu_mbus_get_lowest_base(struct mvebu_mbus_state *mbus, *base = wbase; } } +#endif +#ifndef CONFIG_KIRKWOOD static void mvebu_config_mbus_bridge (struct mvebu_mbus_state *mbus) {phys_addr_t base;
@@ -451,6 +454,7 @@ static void mvebu_config_mbus_bridge(struct mvebu_mbus_state *mbus) val = (size / (64 <<10 )) -1 ; writel((val << 16) | 0x1, MBUS_BRIDGE_WIN_CTRL_REG); } +#endif int mbus_dt_setup_win (struct mvebu_mbus_state *mbus,u32 base,u32 size,u8 target,u8 attr)
@@ -471,12 +475,14 @@ int mbus_dt_setup_win(struct mvebu_mbus_state *mbus,return -ENOMEM ; } +#ifndef CONFIG_KIRKWOOD /* * Re-configure the mbus bridge registers each time this function * is called. Since it may get called from the board code in * later boot stages as well. */ mvebu_config_mbus_bridge (mbus); +#endif return 0 ; }
Signature · 1 line
2.19.2
RFC PATCH 6/7 ARM: kirkwood: remove kw_config_adr_windows
In reply to Chris PackhamNow that kirkwood is using the mvebu mbus this function is no longer needed.
---
arch/arm/mach-kirkwood/cpu.c | 64 ----------------------- arch/arm/mach-kirkwood/include/mach/cpu.h | 1 - 2 files changed, 65 deletions(-)
arch/arm/mach-kirkwood/cpu.c +0 -64
@@ -46,70 +46,6 @@ unsigned int kw_winctrl_calcsize(unsigned int sizeval)return (0x0000ffff & j); } -/* -* kw_config_adr_windows - Configure address Windows -* -* There are 8 address windows supported by Kirkwood Soc to addess different -* devices. Each window can be configured for size, BAR and remap addr -* Below configuration is standard for most of the cases -* -* If remap function not used, remap_lo must be set as base -* -* Reference Documentation: -* Mbus-L to Mbus Bridge Registers Configuration. -* (Sec 25.1 and 25.3 of Datasheet) -*/ -int kw_config_adr_windows (void ) -{ -struct kwwin_registers *winregs = - (struct kwwin_registers *)MVEBU_CPU_WIN_BASE ; - -/* Window 0: PCIE MEM address space */ -writel (KWCPU_WIN_CTRL_DATA (1024 *1024 *256 ,KWCPU_TARGET_PCIE , -KWCPU_ATTR_PCIE_MEM ,KWCPU_WIN_ENABLE ), &winregs[0 ].ctrl); - -writel (KW_DEFADR_PCI_MEM , &winregs[0 ].base); -writel (KW_DEFADR_PCI_MEM , &winregs[0 ].remap_lo); -writel (0x0 , &winregs[0 ].remap_hi); - -/* Window 1: PCIE IO address space */ -writel (KWCPU_WIN_CTRL_DATA (1024 *64 ,KWCPU_TARGET_PCIE , -KWCPU_ATTR_PCIE_IO ,KWCPU_WIN_ENABLE ), &winregs[1 ].ctrl); -writel (KW_DEFADR_PCI_IO , &winregs[1 ].base); -writel (KW_DEFADR_PCI_IO , &winregs[1 ].remap_lo); -writel (0x0 , &winregs[1 ].remap_hi); - -/* Window 2: NAND Flash address space */ -writel (KWCPU_WIN_CTRL_DATA (1024 *1024 *128 ,KWCPU_TARGET_MEMORY , -KWCPU_ATTR_NANDFLASH ,KWCPU_WIN_ENABLE ), &winregs[2 ].ctrl); -writel (KW_DEFADR_NANDF , &winregs[2 ].base); -writel (KW_DEFADR_NANDF , &winregs[2 ].remap_lo); -writel (0x0 , &winregs[2 ].remap_hi); - -/* Window 3: SPI Flash address space */ -writel (KWCPU_WIN_CTRL_DATA (1024 *1024 *128 ,KWCPU_TARGET_MEMORY , -KWCPU_ATTR_SPIFLASH ,KWCPU_WIN_ENABLE ), &winregs[3 ].ctrl); -writel (KW_DEFADR_SPIF , &winregs[3 ].base); -writel (KW_DEFADR_SPIF , &winregs[3 ].remap_lo); -writel (0x0 , &winregs[3 ].remap_hi); - -/* Window 4: BOOT Memory address space */ -writel (KWCPU_WIN_CTRL_DATA (1024 *1024 *128 ,KWCPU_TARGET_MEMORY , -KWCPU_ATTR_BOOTROM ,KWCPU_WIN_ENABLE ), &winregs[4 ].ctrl); -writel (KW_DEFADR_BOOTROM , &winregs[4 ].base); - -/* Window 5: Security SRAM address space */ -writel (KWCPU_WIN_CTRL_DATA (1024 *64 ,KWCPU_TARGET_SASRAM , -KWCPU_ATTR_SASRAM ,KWCPU_WIN_ENABLE ), &winregs[5 ].ctrl); -writel (KW_DEFADR_SASRAM , &winregs[5 ].base); - -/* Window 6-7: Disabled */ -writel (KWCPU_WIN_DISABLE , &winregs[6 ].ctrl); -writel (KWCPU_WIN_DISABLE , &winregs[7 ].ctrl); - -return 0 ; -} -static struct mbus_win windows[] = {/* Window 0: PCIE MEM address space */ {KW_DEFADR_PCI_MEM ,1024 *1024 *256 ,
arch/arm/mach-kirkwood/include/mach/cpu.h +0 -1
@@ -150,7 +150,6 @@ extern struct mvebu_mbus_state mbus_state;unsigned int mvebu_sdram_bar (enum memory_bank bank);unsigned int mvebu_sdram_bs (enum memory_bank bank);void mvebu_sdram_size_adjust (enum memory_bank bank); -int kw_config_adr_windows (void );int mvebu_mbus_probe (struct mbus_win windows[],int count);void mvebu_config_gpio (unsigned int gpp0_oe_val,unsigned int gpp1_oe_val,unsigned int gpp0_oe,unsigned int gpp1_oe);
Signature · 1 line
2.19.2
RFC PATCH 7/7 ARM: kirkwood: enable CONFIG_DM_USB on db-88f6281-bp
In reply to Chris PackhamSwitch to the driver model for USB on the db-88f6281-bp board. CONFIG_BLK can't be enabled yet because mvebu_mmc.c needs converting.
---
configs/db-88f6281-bp-spi_defconfig | 1 + configs/db-88f6281-bp_defconfig | 1 + 2 files changed, 2 insertions(+)
configs/db-88f6281-bp-spi_defconfig +1 -0
@@ -48,6 +48,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_LZMA=y
configs/db-88f6281-bp_defconfig +1 -0
@@ -47,6 +47,7 @@ CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_LZMA=y
Signature · 1 line
2.19.2