| Message ID | 20180529211320.10257-2-michael@walle.cc |
|---|---|
| State | Accepted |
| Commit | 134a6b6884c1faa893256ac5b02a301d0be863c8 |
| Delegated to: | Stefan Roese |
| Headers | show |
| Series | [U-Boot,1/2] enable CONFIG_DISTRO_DEFAULTS for LS-CHLv2 board | expand |
On 29.05.2018 23:13, Michael Walle wrote: > This patch shows how to enable driver model support for the LS-CHLv2 and > LS-XHL boards. > > There are a couple of open questions: > - do I need the u-boot,dm-pre-reloc tags in the device tree? This property is only needed for SPL build targets - which Kirkwood currently is not (AFAIK). > - should mach/config.h define CONFIG_DM_SEQ_ALIAS? No. It defaults to "y" already. And we should not move options into the config headers anymore but put them into the Kconfig system instead. > - how can we split this patch or are there any other pending patches > which does the same and I didn't catch these. I see no need to split this patch. There are the patches from Chris moving Kirkwood to device-tree - which you most likely already know. Most of them are applied. > This patch is based on the http://git.denx.de/u-boot-marvell.git (master > branch) and needs the following patches, which are still pending: > https://patchwork.ozlabs.org/patch/909618/ > https://patchwork.ozlabs.org/patch/909617/ > https://patchwork.ozlabs.org/patch/909973/ > > Signed-off-by: Michael Walle <michael@walle.cc> > Tested-by: Michael Walle <michael@walle.cc> I think there is no need to add the "Tested-by" tag for the patch author. It should be obvious that you have tested this patch. Thanks, Stefan
On 29.05.2018 23:13, Michael Walle wrote: > This patch shows how to enable driver model support for the LS-CHLv2 and > LS-XHL boards. > > There are a couple of open questions: > - do I need the u-boot,dm-pre-reloc tags in the device tree? > - should mach/config.h define CONFIG_DM_SEQ_ALIAS? > - how can we split this patch or are there any other pending patches > which does the same and I didn't catch these. > > This patch is based on the http://git.denx.de/u-boot-marvell.git (master > branch) and needs the following patches, which are still pending: > https://patchwork.ozlabs.org/patch/909618/ > https://patchwork.ozlabs.org/patch/909617/ > https://patchwork.ozlabs.org/patch/909973/ > > Signed-off-by: Michael Walle <michael@walle.cc> > Tested-by: Michael Walle <michael@walle.cc> Applied to u-boot-marvell/master. Thanks, Stefan
diff --git a/arch/arm/dts/kirkwood-lsxl.dtsi b/arch/arm/dts/kirkwood-lsxl.dtsi index 92b11c75b8..479a750d1d 100644 --- a/arch/arm/dts/kirkwood-lsxl.dtsi +++ b/arch/arm/dts/kirkwood-lsxl.dtsi @@ -8,6 +8,10 @@ stdout-path = &uart0; }; + aliases { + spi0 = &spi0; + }; + ocp@f1000000 { pinctrl: pin-controller@10000 { pmx_power_hdd: pmx-power-hdd { diff --git a/arch/arm/mach-kirkwood/include/mach/config.h b/arch/arm/mach-kirkwood/include/mach/config.h index 98639114db..d2dc1c2e68 100644 --- a/arch/arm/mach-kirkwood/include/mach/config.h +++ b/arch/arm/mach-kirkwood/include/mach/config.h @@ -59,7 +59,6 @@ * SPI Flash configuration */ #ifdef CONFIG_CMD_SF -#define CONFIG_HARD_SPI 1 #ifndef CONFIG_ENV_SPI_BUS # define CONFIG_ENV_SPI_BUS 0 #endif diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig index f2763221a1..23e57e61c5 100644 --- a/configs/lschlv2_defconfig +++ b/configs/lschlv2_defconfig @@ -23,14 +23,17 @@ CONFIG_CMD_USB=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_DM=y CONFIG_MVSATA_IDE=y # CONFIG_MMC is not set +CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_NETDEVICES=y CONFIG_MVGBE=y CONFIG_SYS_NS16550=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig index b523b68284..73e13d0880 100644 --- a/configs/lsxhl_defconfig +++ b/configs/lsxhl_defconfig @@ -23,14 +23,17 @@ CONFIG_CMD_USB=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_DM=y CONFIG_MVSATA_IDE=y # CONFIG_MMC is not set +CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_NETDEVICES=y CONFIG_MVGBE=y CONFIG_SYS_NS16550=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y