ARM: kirkwood: migrate to DM_USB
Subsystems (3)
v3 cover ARM: kirkwood: migrate 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 the first patch adds. I'd really appreciate some testing on other kirkwood platforms.
Changes in v3:
- incorporate review feedback (except for DM_SERIAL) from Stefan
- merge adjacent #ifndefs
Chris Packham (12):
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
ARM: kirkwood: enable CONFIG_DM_USB for {dream,guru,sheeva}plug
ARM: kirkwood: enable CONFIG_DM_USB for dns325
ARM: kirkwood: enable CONFIG_DM_USB for ds109
ARM: kirkwood: enable CONFIG_DM_USB for goflexhome
ARM: kirkwood: enable CONFIG_DM_USB for lschlv2 and lsxhl
ARM: kirkwood: enable CONFIG_DM_USB for nas220
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 | 4 + board/Marvell/db-88f6281-bp/Kconfig | 12 +++ board/Marvell/db-88f6281-bp/MAINTAINERS | 10 ++ board/Marvell/db-88f6281-bp/Makefile | 12 +++ board/Marvell/db-88f6281-bp/db-88f6281-bp.c | 103 ++++++++++++++++++++ board/Marvell/db-88f6281-bp/kwbimage.cfg.in | 36 +++++++ configs/db-88f6281-bp-nand_defconfig | 54 ++++++++++ configs/db-88f6281-bp-spi_defconfig | 56 +++++++++++ configs/dns325_defconfig | 2 + configs/dreamplug_defconfig | 2 + configs/ds109_defconfig | 2 + configs/goflexhome_defconfig | 2 + configs/guruplug_defconfig | 2 + configs/lschlv2_defconfig | 2 + configs/lsxhl_defconfig | 2 + configs/nas220_defconfig | 2 + configs/sheevaplug_defconfig | 1 + include/configs/db-88f6281-bp.h | 99 +++++++++++++++++++ 26 files changed, 606 insertions(+), 58 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.in create mode 100644 configs/db-88f6281-bp-nand_defconfig create mode 100644 configs/db-88f6281-bp-spi_defconfig create mode 100644 include/configs/db-88f6281-bp.h
Signature · 1 line
2.21.0
PATCH v3 1/12 ARM: kirkwood: add db-88f6281-bp board
This 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 so there are two defconfigs (one per boot media).
---
Changes in v3:
- incorporate review feedback (except for DM_SERIAL) from Stefan
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 | 12 +++ board/Marvell/db-88f6281-bp/db-88f6281-bp.c | 103 ++++++++++++++++++++ board/Marvell/db-88f6281-bp/kwbimage.cfg.in | 36 +++++++ configs/db-88f6281-bp-nand_defconfig | 53 ++++++++++ configs/db-88f6281-bp-spi_defconfig | 55 +++++++++++ include/configs/db-88f6281-bp.h | 99 +++++++++++++++++++ 12 files changed, 552 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.in create mode 100644 configs/db-88f6281-bp-nand_defconfig create mode 100644 configs/db-88f6281-bp-spi_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 +12 -0
@@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0+ + +quiet_cmd_sed = SED $@ +cmd_sed = sed $(SEDFLAGS_$(@F)) $< >$@ + +SEDFLAGS_kwbimage.cfg = -e "s/^\#@BOOT_FROM.*/BOOT_FROM $(if $(CONFIG_CMD_NAND),nand,spi)/" +$(src)/kwbimage.cfg: $(src)/kwbimage.cfg.in include/autoconf.mk \ + include/config/auto.conf + $(call if_changed,sed) + +obj-y += db-88f6281-bp.o +extra-y += kwbimage.cfg
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.in new file +36 -0
@@ -0,0 +1,36 @@ +# SPDX-License-Identifier: GPL-2.0+ + +# Boot Media configurations +#@BOOT_FROM + +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-nand_defconfig new file +53 -0
53 lines not on this page · raw message
configs/db-88f6281-bp-spi_defconfig new file +55 -0
55 lines not on this page · raw message
include/configs/db-88f6281-bp.h new file +99 -0
99 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH v3 1/12 ARM: kirkwood: add db-88f6281-bp board
Quoted 13 lines · Chris Packham
This 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
Quoted 4 lines
It can be strapped to boot from SPI or NAND so there are two defconfigs (one per boot media).
Signed-off-by Chris Packham <[email protected]>
Thanks,
Stefan
PATCH v3 1/12 ARM: kirkwood: add db-88f6281-bp board
In reply to Chris PackhamQuoted 35 lines · Chris Packham
This 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 FlashIt can be strapped to boot from SPI or NAND so there are two defconfigs (one per boot media).
Signed-off-by Chris Packham <[email protected]>---
Changes in v3:
- incorporate review feedback (except forDM_SERIAL) from Stefanarch/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 | 12 +++ board/Marvell/db-88f6281-bp/db-88f6281-bp.c | 103 ++++++++++++++++++++ board/Marvell/db-88f6281-bp/kwbimage.cfg.in | 36 +++++++ configs/db-88f6281-bp-nand_defconfig | 53 ++++++++++ configs/db-88f6281-bp-spi_defconfig | 55 +++++++++++ include/configs/db-88f6281-bp.h | 99 +++++++++++++++++++ 12 files changed, 552 insertions(+)
Quoted 11 lines
create mode 100644
arch/arm/dts/kirkwood-db-88f6281-spi.dtscreate mode 100644arch/arm/dts/kirkwood-db-88f6281.dtscreate mode 100644arch/arm/dts/kirkwood-db.dtsicreate 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 100644board/Marvell/db-88f6281-bp/db-88f6281-bp.ccreate mode 100644 board/Marvell/db-88f6281-bp/kwbimage.cfg.in create mode 100644 configs/db-88f6281-bp-nand_defconfig create mode 100644 configs/db-88f6281-bp-spi_defconfig create mode 100644include/configs/db-88f6281-bp.h
This patch is missing the dtb build target and results in this build error:
Device Tree Source is not correctly specified. Please define 'CONFIG_DEFAULT_DEVICE_TREE' or build with 'DEVICE_TREE=<device_tree>' argument
dts/Makefile:28: recipe for target 'arch/arm/dts/kirkwood-db-88f6281-spi.dtb' failed make[1]: *** [arch/arm/dts/kirkwood-db-88f6281-spi.dtb] Error 1 Makefile:1027: recipe for target 'dts/dt.dtb' failed
make: *** [dts/dt.dtb] Error 2
I've fixed this up locally and will push my changed patch version later today. So this is JFYI.
Thanks,
Stefan
Quoted 626 lines
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@@ -0,0 +1,94 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Marvell DB-{88F6281,88F6282}-BP Development Board Setup + * + * Saeed Bishara <[email protected]> + * Thomas Petazzoni <[email protected]> + * + * This file contains the definitions that are common between the 6281 + * and 6282 variants of the Marvell Kirkwood Development Board. + */ + +#include "kirkwood.dtsi" + +/ { + memory { + device_type = "memory"; + reg = <0x00000000 0x20000000>; /* 512 MB */ + }; + + chosen { + bootargs = "console=ttyS0,115200n8 earlyprintk"; + stdout-path = &uart0; + }; + + aliases { + ethernet0 = ð0; + spi0 = &spi0; + }; + + ocp at f1000000 { + pin-controller at 10000 { + pmx_sdio_gpios: pmx-sdio-gpios { + marvell,pins = "mpp37", "mpp38"; + marvell,function = "gpio"; + }; + }; + + serial at 12000 { + status = "okay"; + }; + + sata at 80000 { + nr-ports = <2>; + status = "okay"; + }; + + ehci at 50000 { + status = "okay"; + }; + + mvsdio at 90000 { + pinctrl-0 = <&pmx_sdio_gpios>; + pinctrl-names = "default"; + wp-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; + cd-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; + status = "okay"; + }; + }; +}; + +&nand { + chip-delay = <25>; + status = "okay"; + + partition at 0 { + label = "uboot"; + reg = <0x0 0x100000>; + }; + + partition at 100000 { + label = "uImage"; + reg = <0x100000 0x400000>; + }; + + partition at 500000 { + label = "root"; + reg = <0x500000 0x1fb00000>; + }; +}; + +&mdio { + status = "okay"; + + ethphy0: ethernet-phy at 8 { + reg = <8>; + }; +}; + +ð0 { + status = "okay"; + ethernet0-port at 0 { + phy-handle = <ðphy0>; + }; +};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" endifboard/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" + +endifboard/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_defconfigboard/Marvell/db-88f6281-bp/Makefile new file +12
-0@@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0+ + +quiet_cmd_sed = SED $@ +cmd_sed = sed $(SEDFLAGS_$(@F)) $< >$@ + +SEDFLAGS_kwbimage.cfg = -e "s/^\#@BOOT_FROM.*/BOOT_FROM $(if $(CONFIG_CMD_NAND),nand,spi)/" +$(src)/kwbimage.cfg: $(src)/kwbimage.cfg.in include/autoconf.mk \ + include/config/auto.conf + $(call if_changed,sed) + +obj-y += db-88f6281-bp.o +extra-y += kwbimage.cfgboard/Marvell/db-88f6281-bp/db-88f6281-bp.c new file +103
-0@@ -0,0 +1,103 @@ +// SPDX-License-Identifier: GPL-2.0+ + +#include <common.h> +#include <linux/io.h> +#include <miiphy.h> +#include <netdev.h> +#include <asm/arch/cpu.h> +#include <asm/arch/soc.h> +#include <asm/arch/mpp.h> +#include <asm/arch/gpio.h> + +#define DB_88F6281_OE_LOW ~(BIT(7)) +#define DB_88F6281_OE_HIGH ~(BIT(15) | BIT(14) | BIT(13) | BIT(4)) +#define DB_88F6281_OE_VAL_LOW BIT(7) +#define DB_88F6281_OE_VAL_HIGH 0 + +DECLARE_GLOBAL_DATA_PTR ; + +int board_early_init_f (void ) +{ +mvebu_config_gpio (DB_88F6281_OE_VAL_LOW , +DB_88F6281_OE_VAL_HIGH , +DB_88F6281_OE_LOW ,DB_88F6281_OE_HIGH ); + +/* Multi-Purpose Pins Functionality configuration */ +static const u32 kwmpp_config[] = { +#ifdef CONFIG_CMD_NAND +MPP0_NF_IO2 , +MPP1_NF_IO3 , +MPP2_NF_IO4 , +MPP3_NF_IO5 , +#else + MPP0_SPI_SCn, +MPP1_SPI_MOSI , +MPP2_SPI_SCK , +MPP3_SPI_MISO , +#endif +MPP4_NF_IO6 , +MPP5_NF_IO7 , + MPP6_SYSRST_OUTn, +MPP7_GPO , +MPP8_TW_SDA , +MPP9_TW_SCK , +MPP10_UART0_TXD , +MPP11_UART0_RXD , +MPP12_SD_CLK , +MPP13_SD_CMD , +MPP14_SD_D0 , +MPP15_SD_D1 , +MPP16_SD_D2 , +MPP17_SD_D3 , +MPP18_NF_IO0 , +MPP19_NF_IO1 , + MPP20_SATA1_ACTn, + MPP21_SATA0_ACTn, +MPP22_GPIO , +MPP23_GPIO , +MPP24_GPIO , +MPP25_GPIO , +MPP26_GPIO , +MPP27_GPIO , +MPP28_GPIO , +MPP29_GPIO , +MPP30_GPIO , +MPP31_GPIO , +MPP32_GPIO , +MPP33_GPIO , +MPP34_GPIO , +MPP35_GPIO , +MPP36_GPIO , +MPP37_GPIO , +MPP38_GPIO , +MPP39_GPIO , +MPP40_GPIO , +MPP41_GPIO , +MPP42_GPIO , +MPP43_GPIO , +MPP44_GPIO , +MPP45_GPIO , +MPP46_GPIO , +MPP47_GPIO , +MPP48_GPIO , +MPP49_GPIO , +0 + }; +kirkwood_mpp_conf (kwmpp_config,NULL ); + +return 0 ; +} + +int board_init (void ) +{ + gd->bd->bi_boot_params =mvebu_sdram_bar (0 ) +0x100 ; + +return 0 ; +} + +#ifdef CONFIG_RESET_PHY_R +/* automatically defined by kirkwood config.h */ +void reset_phy (void ) +{ +} +#endif board/Marvell/db-88f6281-bp/kwbimage.cfg.in new file +36
-0@@ -0,0 +1,36 @@ +# SPDX-License-Identifier: GPL-2.0+ + +# Boot Media configurations +#@BOOT_FROM + +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 0x0configs/db-88f6281-bp-nand_defconfig new file +53
-0@@ -0,0 +1,53 @@ +CONFIG_ARM=y +CONFIG_SYS_THUMB_BUILD=y +CONFIG_KIRKWOOD=y +CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TARGET_DB_88F6281_BP=y +CONFIG_IDENT_STRING="\nMarvell DB-88F6281-BP" +CONFIG_NR_DRAM_BANKS=2 +# CONFIG_SYS_MALLOC_F is not set +CONFIG_BOOTDELAY=3 +# CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_DM=y +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_IDE=y +CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y +CONFIG_CMD_SF=y +CONFIG_CMD_USB=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y +CONFIG_CMD_MTDPARTS=y +CONFIG_MTDIDS_DEFAULT="nand0=orion_nand" +CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:512K(uboot),512K(env),4M(kernel),-(rootfs)" +CONFIG_ISO_PARTITION=y +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="kirkwood-db-88f6281" +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_DM=y +CONFIG_MVSATA_IDE=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_STMICRO=y +CONFIG_PHY_MARVELL=y +CONFIG_DM_ETH=y +CONFIG_MVGBE=y +CONFIG_MII=y +CONFIG_DM_RTC=y +CONFIG_RTC_MV=y +CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_KIRKWOOD_SPI=y +CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_LZMA=y +CONFIG_LZO=yconfigs/db-88f6281-bp-spi_defconfig new file +55
-0@@ -0,0 +1,55 @@ +CONFIG_ARM=y +CONFIG_SYS_THUMB_BUILD=y +CONFIG_KIRKWOOD=y +CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TARGET_DB_88F6281_BP=y +CONFIG_IDENT_STRING="\nMarvell DB-88F6281-BP" +CONFIG_NR_DRAM_BANKS=2 +# CONFIG_SYS_MALLOC_F is not set +CONFIG_FIT=y +CONFIG_BOOTDELAY=3 +# CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_DM=y +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_IDE=y +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_USB=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y +CONFIG_CMD_MTDPARTS=y +CONFIG_MTDIDS_DEFAULT="nand0=orion_nand" +CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:512K(uboot),512K(env),4M(kernel),-(rootfs)" +CONFIG_ISO_PARTITION=y +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="kirkwood-db-88f6281-spi" +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_DM=y +CONFIG_MVSATA_IDE=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_STMICRO=y +CONFIG_PHY_MARVELL=y +CONFIG_DM_ETH=y +CONFIG_MVGBE=y +CONFIG_MII=y +CONFIG_DM_RTC=y +CONFIG_RTC_MV=y +CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_KIRKWOOD_SPI=y +CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_LZMA=y +CONFIG_LZO=yinclude/configs/db-88f6281-bp.h new file +89
-0@@ -0,0 +1,99 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ + +#ifndef _CONFIG_DB_88F6281_BP_H +#define _CONFIG_DB_88F6281_BP_H + +/* +* High Level Configuration Options (easy to change) +*/ +#define CONFIG_FEROCEON_88FR131 1/* CPU Core subversion */ +#define CONFIG_KW88F6281 1/* SOC Name */ +#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ +#define CONFIG_SYS_TCLK 166666667 +#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage.cfg +#define CONFIG_BUILD_TARGET "u-boot.kwb" + +/* additions for new ARM relocation support */ +#define CONFIG_SYS_SDRAM_BASE 0x00000000 + +#define CONFIG_KIRKWOOD_EGIGA_INIT /* Enable GbePort0/1 for kernel */ +#define CONFIG_KIRKWOOD_PCIE_INIT /* Enable PCIE Port0 */ +#define CONFIG_KIRKWOOD_RGMII_PAD_1V8 /* Set RGMII Pad voltage to 1.8V */ +#define CONFIG_KIRKWOOD_GPIO 1 + +/* +* NS16550 Configuration +*/ +#define CONFIG_SYS_NS16550_SERIAL +#define CONFIG_SYS_NS16550_REG_SIZE (-4) +#define CONFIG_SYS_NS16550_CLK CONFIG_SYS_TCLK +#define CONFIG_SYS_NS16550_COM1 KW_UART0_BASE + +#define CONFIG_SYS_MAX_NAND_DEVICE 1 +/* +* Serial Port configuration +* The following definitions let you select what serial you want to use +* for your console driver. +*/ + +#define CONFIG_CONS_INDEX 1/* Console on UART0 */ + +/* +* Environment variables configurations +*/ +#define CONFIG_ENV_SPI_BUS 0 +#define CONFIG_ENV_SPI_CS 0 +#define CONFIG_ENV_SPI_MAX_HZ 20000000/* 20Mhz */ +#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE +#define CONFIG_ENV_SECT_SIZE 0x40000/* 256K */ +#define CONFIG_ENV_SIZE 0x01000 +#define CONFIG_ENV_OFFSET 0xC0000 + +/* +* U-Boot bootcode configuration +*/ + +#define CONFIG_SYS_MONITOR_LEN (256 << 10)/* Reserve 256 kB for monitor */ +#define CONFIG_SYS_MALLOC_LEN (4 << 20)/* Reserve 4.0 MB for malloc */ + +/* +* For booting Linux, the board info and command line data +* have to be in the first 8 MB of memory, since this is +* the maximum mapped by the Linux kernel during initialization. +*/ +#define CONFIG_SYS_BOOTMAPSZ (8 << 20)/* Initial Mem map for Linux*/ + +/* size in bytes reserved for initial data */ + +#include <asm/arch/config.h> +/* There is no PHY directly connected so don't ask it for link status */ +#undef CONFIG_SYS_FAULT_ECHO_LINK_DOWN + +/* +* Other required minimal configurations +*/ +#define CONFIG_ARCH_CPU_INIT /* call arch_cpu_init() */ +#define CONFIG_SYS_MEMTEST_START 0x00400000/* 4M */ +#define CONFIG_SYS_MEMTEST_END 0x007fffff/* (_8M - 1) */ +#define CONFIG_SYS_RESET_ADDRESS 0xffff0000/* Rst Vector Adr */ + +/* +* SDIO/MMC Card Configuration +*/ +#ifdef CONFIG_CMD_MMC +#define CONFIG_MVEBU_MMC +#define CONFIG_SYS_MMC_BASE KW_SDIO_BASE +#endif /* CONFIG_CMD_MMC */ + +/* +* SATA Driver configuration
include/configs/db-88f6281-bp.h line 99
Quoted 10 lines
include/configs/db-88f6281-bp.h new file +10
-0+*/ +#ifdef CONFIG_MVSATA_IDE +#define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET +#endif /*CONFIG_MVSATA_IDE*/ + +#define CONFIG_SYS_LOAD_ADDR 0x1000000/* default location for tftp and bootm */ + +#define CONFIG_SYS_DCACHE_OFF + +#endif /* _CONFIG_DB_88F6281_BP_H */
Viele Grüße,
Stefan
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
PATCH v3 1/12 ARM: kirkwood: add db-88f6281-bp board
In reply to Chris PackhamQuoted 13 lines · Chris Packham
This 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
Quoted 4 lines
It can be strapped to boot from SPI or NAND so there are two defconfigs (one per boot media).
Signed-off-by Chris Packham <[email protected]>
Whole series:
Applied to u-boot-marvell/master.
Thanks,
Stefan
PATCH v3 2/12 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.
---
Changes in v3: None
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.21.0
PATCH v3 3/12 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.
---
Changes in v3: None
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.21.0
PATCH v3 4/12 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.
---
Changes in v3:
- merge adjacent #ifndefs
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 | 4 +++ 4 files changed, 46 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 +4 -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) {
@@ -451,6 +452,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 +473,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.21.0
PATCH v3 5/12 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.
---
Changes in v3: None
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.21.0
PATCH v3 6/12 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.
---
Changes in v3: None
configs/db-88f6281-bp-nand_defconfig | 1 + configs/db-88f6281-bp-spi_defconfig | 1 + 2 files changed, 2 insertions(+)
configs/db-88f6281-bp-nand_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
configs/db-88f6281-bp-spi_defconfig +1 -0
@@ -49,6 +49,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
Signature · 1 line
2.21.0
PATCH v3 7/12 ARM: kirkwood: enable CONFIG_DM_USB for {dream, guru, sheeva}plug
In reply to Chris PackhamEnable CONFIG_DM_USB and where possible CONFIG_BLK.
---mvebu_mmc.c hasn't been converted to DM so it's not possible to use CONFIG_BLK when CONFIG_MMC is enabled.
Changes in v3: None
configs/dreamplug_defconfig | 2 ++ configs/guruplug_defconfig | 2 ++ configs/sheevaplug_defconfig | 1 + 3 files changed, 5 insertions(+)
configs/dreamplug_defconfig +2 -0
@@ -25,6 +25,7 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dreamplug" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y CONFIG_MVSATA_IDE=y +CONFIG_BLK=y # CONFIG_MMC is not set CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y
@@ -38,5 +39,6 @@ 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
configs/guruplug_defconfig +2 -0
@@ -31,6 +31,7 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-guruplug-server-plus" CONFIG_ENV_IS_IN_NAND=y CONFIG_DM=y CONFIG_MVSATA_IDE=y +CONFIG_BLK=y # CONFIG_MMC is not set CONFIG_MVGBE=y CONFIG_MII=y
@@ -38,6 +39,7 @@ CONFIG_DM_RTC=y CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_LZMA=y
configs/sheevaplug_defconfig +1 -0
@@ -39,6 +39,7 @@ CONFIG_DM_RTC=y CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_LZMA=y
Signature · 1 line
2.21.0
PATCH v3 8/12 ARM: kirkwood: enable CONFIG_DM_USB for dns325
In reply to Chris PackhamEnable CONFIG_DM_USB and CONFIG_BLK.
---
Changes in v3: None
configs/dns325_defconfig | 2 ++ 1 file changed, 2 insertions(+)
configs/dns325_defconfig +2 -0
@@ -30,6 +30,7 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dns325" CONFIG_ENV_IS_IN_NAND=y CONFIG_DM=y CONFIG_MVSATA_IDE=y +CONFIG_BLK=y # CONFIG_MMC is not set CONFIG_MVGBE=y CONFIG_MII=y
@@ -37,5 +38,6 @@ CONFIG_DM_RTC=y CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y
Signature · 1 line
2.21.0
PATCH v3 9/12 ARM: kirkwood: enable CONFIG_DM_USB for ds109
In reply to Chris PackhamEnable CONFIG_DM_USB and CONFIG_BLK.
---
Changes in v3: None
configs/ds109_defconfig | 2 ++ 1 file changed, 2 insertions(+)
configs/ds109_defconfig +2 -0
@@ -20,6 +20,7 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ds109" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y CONFIG_MVSATA_IDE=y +CONFIG_BLK=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_MVTWSI=y # CONFIG_MMC is not set
@@ -35,5 +36,6 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_FS_EXT4=y
Signature · 1 line
2.21.0
PATCH v3 10/12 ARM: kirkwood: enable CONFIG_DM_USB for goflexhome
In reply to Chris PackhamEnable CONFIG_DM_USB and CONFIG_BLK.
---
Changes in v3: None
configs/goflexhome_defconfig | 2 ++ 1 file changed, 2 insertions(+)
configs/goflexhome_defconfig +2 -0
@@ -31,6 +31,7 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-goflexnet" CONFIG_ENV_IS_IN_NAND=y CONFIG_DM=y CONFIG_MVSATA_IDE=y +CONFIG_BLK=y # CONFIG_MMC is not set CONFIG_MVGBE=y CONFIG_MII=y
@@ -38,5 +39,6 @@ CONFIG_DM_RTC=y CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y
Signature · 1 line
2.21.0
PATCH v3 11/12 ARM: kirkwood: enable CONFIG_DM_USB for lschlv2 and lsxhl
In reply to Chris PackhamEnable CONFIG_DM_USB and CONFIG_BLK.
---
Changes in v3: None
configs/lschlv2_defconfig | 2 ++ configs/lsxhl_defconfig | 2 ++ 2 files changed, 4 insertions(+)
configs/lschlv2_defconfig +2 -0
@@ -27,6 +27,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_MVSATA_IDE=y +CONFIG_BLK=y # CONFIG_MMC is not set CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y
@@ -38,4 +39,5 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y
configs/lsxhl_defconfig +2 -0
@@ -27,6 +27,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_MVSATA_IDE=y +CONFIG_BLK=y # CONFIG_MMC is not set CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y
@@ -38,4 +39,5 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y
Signature · 1 line
2.21.0
PATCH v3 11/12 ARM: kirkwood: enable CONFIG_DM_USB for lschlv2 and lsxhl
Hi Chris,
Am 2019-03-13 08:47, schrieb Chris Packham:
Quoted 4 lines
Enable
CONFIG_DM_USBandCONFIG_BLK.Signed-off-by Chris Packham <[email protected]>Reviewed-by Stefan Roese <[email protected]>
works at least after I switch off the dcache, but that another issue ;)
Thanks,
-michael
Quoted 44 lines
---
Changes in v3: None
configs/lschlv2_defconfig | 2 ++ configs/lsxhl_defconfig | 2 ++ 2 files changed, 4 insertions(+)configs/lschlv2_defconfig +2
-0@@ -27,6 +27,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_MVSATA_IDE=y +CONFIG_BLK=y # CONFIG_MMC is not set CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y@@ -38,4 +39,5 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=yconfigs/lsxhl_defconfig +2
-0@@ -27,6 +27,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_MVSATA_IDE=y +CONFIG_BLK=y # CONFIG_MMC is not set CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y@@ -38,4 +39,5 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y
PATCH v3 12/12 ARM: kirkwood: enable CONFIG_DM_USB for nas220
In reply to Chris PackhamEnable CONFIG_DM_USB and CONFIG_BLK.
---
Changes in v3: None
configs/nas220_defconfig | 2 ++ 1 file changed, 2 insertions(+)
configs/nas220_defconfig +2 -0
@@ -31,6 +31,7 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-blackarmor-nas220" CONFIG_ENV_IS_IN_NAND=y CONFIG_DM=y CONFIG_MVSATA_IDE=y +CONFIG_BLK=y # CONFIG_MMC is not set CONFIG_MVGBE=y CONFIG_MII=y
@@ -38,5 +39,6 @@ CONFIG_DM_RTC=y CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y
Signature · 1 line
2.21.0
v3 cover ARM: kirkwood: migrate to DM_USB
In reply to Chris PackhamHi Chris,
Quoted 9 lines · Chris Packham
This is my initial series to convert the kirkwood platforms to
DM_USB.I've been testing on an old kirkwood eval board which the first patch adds. I'd really appreciate some testing on other kirkwood platforms.
Changes in v3:
- incorporate review feedback (except forDM_SERIAL) from Stefan
- merge adjacent #ifndefs
Quoted 13 lines
Chris Packham (12):
ARM: kirkwood: add db-88f6281-bp board
ARM: kirkwood: renameKW_CPU_WIN_BASEtoMVEBU_CPU_WIN_BASE
ARM: kirkwood: removeKW_DEFADR_PCI_IO_REMAP
ARM: kirkwood: switch to using mvebu mbus
ARM: kirkwood: removekw_config_adr_windows
ARM: kirkwood: enableCONFIG_DM_USBon db-88f6281-bp
ARM: kirkwood: enableCONFIG_DM_USBfor {dream,guru,sheeva}plug
ARM: kirkwood: enableCONFIG_DM_USBfor dns325
ARM: kirkwood: enableCONFIG_DM_USBfor ds109
ARM: kirkwood: enableCONFIG_DM_USBfor goflexhome
ARM: kirkwood: enableCONFIG_DM_USBfor lschlv2 and lsxhl
ARM: kirkwood: enableCONFIG_DM_USBfor nas220
[...]
Still working fine on Dreamplug on top of the cache and SPI fixes.
Regards,
Leigh.