[U-Boot] [PATCH v2 1/3] configs: kirkwood: ds109: switch to DM_I2C
Enable DM_I2C and I2C_MVTSWI for the ds109 board.
Signed-off-by: Chris Packham judge.packham@gmail.com ---
Changes in v2: - new
configs/ds109_defconfig | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/configs/ds109_defconfig b/configs/ds109_defconfig index c9207433b374..fd10e6e3c36e 100644 --- a/configs/ds109_defconfig +++ b/configs/ds109_defconfig @@ -18,6 +18,8 @@ CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_MVSATA_IDE=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_MVTWSI=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y
To aid in migrating CONFIG_RTC_MV to Kconfig move the definition of it from mv-plug-common.h to the board config headers that nest it.
Signed-off-by: Chris Packham judge.packham@gmail.com ---
Changes in v2: None
include/configs/dreamplug.h | 4 ++++ include/configs/ds109.h | 4 ++++ include/configs/guruplug.h | 4 ++++ include/configs/mv-plug-common.h | 7 ------- include/configs/sheevaplug.h | 4 ++++ 5 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 1c94bf9fa1bf..742232d2d660 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -27,6 +27,10 @@ */ #include "mv-plug-common.h"
+#ifdef CONFIG_CMD_DATE +#define CONFIG_RTC_MV +#endif /* CONFIG_CMD_DATE */ + /* * Environment variables configurations */ diff --git a/include/configs/ds109.h b/include/configs/ds109.h index c06f0058deb5..f8d663714239 100644 --- a/include/configs/ds109.h +++ b/include/configs/ds109.h @@ -30,6 +30,10 @@ */ #include "mv-plug-common.h"
+#ifdef CONFIG_CMD_DATE +#define CONFIG_RTC_MV +#endif /* CONFIG_CMD_DATE */ + /* * Environment variables configurations */ diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index 04b7e944a461..27096fbb20f3 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -27,6 +27,10 @@ */ #include "mv-plug-common.h"
+#ifdef CONFIG_CMD_DATE +#define CONFIG_RTC_MV +#endif /* CONFIG_CMD_DATE */ + /* * Environment variables configurations */ diff --git a/include/configs/mv-plug-common.h b/include/configs/mv-plug-common.h index 81c07a889a36..f424e2cc6c52 100644 --- a/include/configs/mv-plug-common.h +++ b/include/configs/mv-plug-common.h @@ -22,11 +22,4 @@ */ #include "mv-common.h"
-/* - * RTC driver configuration - */ -#ifdef CONFIG_CMD_DATE -#define CONFIG_RTC_MV -#endif /* CONFIG_CMD_DATE */ - #endif /* _CONFIG_MARVELL_PLUG_H */ diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index dc6375841ed8..bf684babebf3 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -31,6 +31,10 @@ */ #include "mv-plug-common.h"
+#ifdef CONFIG_CMD_DATE +#define CONFIG_RTC_MV +#endif /* CONFIG_CMD_DATE */ + /* * Environment variables configurations */
Now that there is DM support in the RTC_MV driver update board configs to use it.
Signed-off-by: Chris Packham judge.packham@gmail.com --- I haven't removed this from the whitelist because the nsa310s board lacks device-tree support. Once that board is converted the non-DM code can be removed from RTC_MV and the whitelist updated.
Changes in v2: None
configs/SBx81LIFKW_defconfig | 2 ++ configs/dns325_defconfig | 5 ++++- configs/dreamplug_defconfig | 5 ++++- configs/ds109_defconfig | 5 ++++- configs/goflexhome_defconfig | 5 ++++- configs/guruplug_defconfig | 5 ++++- configs/nas220_defconfig | 5 ++++- configs/sheevaplug_defconfig | 7 +++++-- include/configs/SBx81LIFKW.h | 5 ----- include/configs/dns325.h | 7 ------- include/configs/dreamplug.h | 4 ---- include/configs/ds109.h | 4 ---- include/configs/goflexhome.h | 7 ------- include/configs/guruplug.h | 4 ---- include/configs/nas220.h | 7 ------- include/configs/sheevaplug.h | 4 ---- 16 files changed, 31 insertions(+), 50 deletions(-)
diff --git a/configs/SBx81LIFKW_defconfig b/configs/SBx81LIFKW_defconfig index 348f861a143b..c786120e7fd4 100644 --- a/configs/SBx81LIFKW_defconfig +++ b/configs/SBx81LIFKW_defconfig @@ -35,5 +35,7 @@ CONFIG_MV88E61XX_SWITCH=y CONFIG_MV88E61XX_CPU_PORT=10 CONFIG_MV88E61XX_PHY_PORTS=0x003 CONFIG_MV88E61XX_FIXED_PORTS=0x300 +CONFIG_DM_RTC=y +CONFIG_RTC_MV=y CONFIG_SPI=y CONFIG_KIRKWOOD_SPI=y diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig index f0ed20992887..d77f7766ee92 100644 --- a/configs/dns325_defconfig +++ b/configs/dns325_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_DNS325=y CONFIG_IDENT_STRING="\nD-Link DNS-325" CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dns325" +# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 CONFIG_CONSOLE_MUX=y # CONFIG_DISPLAY_BOARDINFO is not set @@ -16,7 +17,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y -CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_CMD_JFFS2=y @@ -26,10 +26,13 @@ CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_DM=y CONFIG_MVSATA_IDE=y # CONFIG_MMC is not set CONFIG_NETDEVICES=y CONFIG_MVGBE=y +CONFIG_DM_RTC=y +CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig index 8090c9a37793..d7428ae9cd9e 100644 --- a/configs/dreamplug_defconfig +++ b/configs/dreamplug_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_DREAMPLUG=y CONFIG_IDENT_STRING="\nMarvell-DreamPlug" CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dreamplug" +# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y @@ -15,19 +16,21 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y -CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_DM=y CONFIG_MVSATA_IDE=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_NETDEVICES=y CONFIG_MVGBE=y +CONFIG_DM_RTC=y +CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_KIRKWOOD_SPI=y diff --git a/configs/ds109_defconfig b/configs/ds109_defconfig index fd10e6e3c36e..6428614c93c3 100644 --- a/configs/ds109_defconfig +++ b/configs/ds109_defconfig @@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_DS109=y CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ds109" +# CONFIG_SYS_MALLOC_F is not set CONFIG_HUSH_PARSER=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_IDE=y @@ -12,11 +13,11 @@ CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y -CONFIG_CMD_DATE=y CONFIG_CMD_FAT=y CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_DM=y CONFIG_MVSATA_IDE=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_MVTWSI=y @@ -26,6 +27,8 @@ CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_NETDEVICES=y CONFIG_MVGBE=y +CONFIG_DM_RTC=y +CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_KIRKWOOD_SPI=y diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig index c0894c05ea4b..41d896a72504 100644 --- a/configs/goflexhome_defconfig +++ b/configs/goflexhome_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_GOFLEXHOME=y CONFIG_IDENT_STRING="\nSeagate GoFlex Home" CONFIG_DEFAULT_DEVICE_TREE="kirkwood-goflexnet" +# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 CONFIG_CONSOLE_MUX=y # CONFIG_DISPLAY_BOARDINFO is not set @@ -16,7 +17,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y -CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y @@ -27,10 +27,13 @@ CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_DM=y CONFIG_MVSATA_IDE=y # CONFIG_MMC is not set CONFIG_NETDEVICES=y CONFIG_MVGBE=y +CONFIG_DM_RTC=y +CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig index da3895d4db9a..d77922e2a7d9 100644 --- a/configs/guruplug_defconfig +++ b/configs/guruplug_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_GURUPLUG=y CONFIG_IDENT_STRING="\nMarvell-GuruPlug" CONFIG_DEFAULT_DEVICE_TREE="kirkwood-guruplug-server-plus" +# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y @@ -16,7 +17,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y -CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y @@ -27,10 +27,13 @@ CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_DM=y CONFIG_MVSATA_IDE=y # CONFIG_MMC is not set CONFIG_NETDEVICES=y CONFIG_MVGBE=y +CONFIG_DM_RTC=y +CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig index ddf5689bf474..4ae69fe71aae 100644 --- a/configs/nas220_defconfig +++ b/configs/nas220_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_NAS220=y CONFIG_IDENT_STRING="\nNAS 220" CONFIG_DEFAULT_DEVICE_TREE="kirkwood-blackarmor-nas220" +# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y @@ -16,7 +17,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y -CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y @@ -27,10 +27,13 @@ CONFIG_EFI_PARTITION=y # CONFIG_PARTITION_UUIDS is not set CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_DM=y CONFIG_MVSATA_IDE=y # CONFIG_MMC is not set CONFIG_NETDEVICES=y CONFIG_MVGBE=y +CONFIG_DM_RTC=y +CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index d77d198f1867..b965ff442a84 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -1,9 +1,11 @@ CONFIG_ARM=y +CONFIG_SYS_THUMB_BUILD=y CONFIG_KIRKWOOD=y CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_SHEEVAPLUG=y CONFIG_IDENT_STRING="\nMarvell-Sheevaplug" CONFIG_DEFAULT_DEVICE_TREE="kirkwood-sheevaplug" +# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y @@ -17,7 +19,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y -CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y @@ -28,12 +29,14 @@ CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_DM=y CONFIG_MVSATA_IDE=y CONFIG_NETDEVICES=y CONFIG_MVGBE=y +CONFIG_DM_RTC=y +CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_LZMA=y -CONFIG_SYS_THUMB_BUILD=y diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h index bcc2c201d222..24712662d433 100644 --- a/include/configs/SBx81LIFKW.h +++ b/include/configs/SBx81LIFKW.h @@ -109,11 +109,6 @@ #define CONFIG_ENV_OVERWRITE /* ethaddr can be reprogrammed */ #endif /* CONFIG_CMD_NET */
-/* - * Time settings - */ -#define CONFIG_RTC_MV - #define CONFIG_SYS_LOAD_ADDR 0x1000000 /* default location for tftp and bootm */
#endif /* _CONFIG_SBX81LIFKW_H */ diff --git a/include/configs/dns325.h b/include/configs/dns325.h index dec71038bf21..c00981a8ef3d 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -56,13 +56,6 @@ #define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET #endif
-/* - * RTC driver configuration - */ -#ifdef CONFIG_CMD_DATE -#define CONFIG_RTC_MV -#endif - /* * Enable GPI0 support */ diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 742232d2d660..1c94bf9fa1bf 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -27,10 +27,6 @@ */ #include "mv-plug-common.h"
-#ifdef CONFIG_CMD_DATE -#define CONFIG_RTC_MV -#endif /* CONFIG_CMD_DATE */ - /* * Environment variables configurations */ diff --git a/include/configs/ds109.h b/include/configs/ds109.h index f8d663714239..c06f0058deb5 100644 --- a/include/configs/ds109.h +++ b/include/configs/ds109.h @@ -30,10 +30,6 @@ */ #include "mv-plug-common.h"
-#ifdef CONFIG_CMD_DATE -#define CONFIG_RTC_MV -#endif /* CONFIG_CMD_DATE */ - /* * Environment variables configurations */ diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index 8b05e0a53d71..93ed1237be97 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -96,11 +96,4 @@ #define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET #endif /*CONFIG_MVSATA_IDE*/
-/* - * * RTC driver configuration - * */ -#ifdef CONFIG_CMD_DATE -#define CONFIG_RTC_MV -#endif /* CONFIG_CMD_DATE */ - #endif /* _CONFIG_GOFLEXHOME_H */ diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index 27096fbb20f3..04b7e944a461 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -27,10 +27,6 @@ */ #include "mv-plug-common.h"
-#ifdef CONFIG_CMD_DATE -#define CONFIG_RTC_MV -#endif /* CONFIG_CMD_DATE */ - /* * Environment variables configurations */ diff --git a/include/configs/nas220.h b/include/configs/nas220.h index b9449a4a40f9..185d3313e280 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -109,13 +109,6 @@ * EFI partition */
-/* - * Date Time - */ -#ifdef CONFIG_CMD_DATE -#define CONFIG_RTC_MV -#endif /* CONFIG_CMD_DATE */ - #define CONFIG_KIRKWOOD_GPIO
#endif /* _CONFIG_NAS220_H */ diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index bf684babebf3..dc6375841ed8 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -31,10 +31,6 @@ */ #include "mv-plug-common.h"
-#ifdef CONFIG_CMD_DATE -#define CONFIG_RTC_MV -#endif /* CONFIG_CMD_DATE */ - /* * Environment variables configurations */
Hi Chris,
On 29.06.2018 00:38, Chris Packham wrote:
Now that there is DM support in the RTC_MV driver update board configs to use it.
Signed-off-by: Chris Packham judge.packham@gmail.com
I'm a bit late this time in the release cycle. This one does not apply any more to master. Could you please rebase this patch and send a new version (or the series)?
Thanks, Stefan
On Tue, Aug 7, 2018 at 12:12 AM Stefan Roese sr@denx.de wrote:
Hi Chris,
On 29.06.2018 00:38, Chris Packham wrote:
Now that there is DM support in the RTC_MV driver update board configs to use it.
Signed-off-by: Chris Packham judge.packham@gmail.com
I'm a bit late this time in the release cycle. This one does not apply any more to master. Could you please rebase this patch and send a new version (or the series)?
Will do. Should be pretty straight forward.
participants (2)
-
Chris Packham -
Stefan Roese