configs: kirkwood: ds109: switch to DM_I2C

PATCH New Chris Packham 2 participants 8 messages Aug 7, 2018 – Nov 20, 2018

lore

Share & tools

lore

Chris Packham

author

2018-08-07 07:41 UTC #0 lore raw

PATCH v3 1/3 configs: kirkwood: ds109: switch to DM_I2C

Enable DM_I2C and I2C_MVTSWI for the ds109 board.

Signed-off-by Chris Packham <[email protected]>

---

Changes in v3: None
Changes in v2:
- new

 configs/ds109_defconfig | 2 ++
 1 file changed, 2 insertions(+)

configs/ds109_defconfig +2 -0

index c9207433b374..fd10e6e3c36e 100644
@@ -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

Signature · 1 line

2.18.0

Chris Packham

author

2018-08-07 07:41 UTC #1 lore raw

PATCH v3 2/3 configs: move RTC_MV config from mv-plug-common.h to boards

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 <[email protected]>

---

Changes in v3: None
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(-)

include/configs/dreamplug.h +4 -0

index 1c94bf9fa1bf..742232d2d660 100644
@@ -27,6 +27,10 @@
  */
 #include "mv-plug-common.h"
 
+#ifdef CONFIG_CMD_DATE
+#define CONFIG_RTC_MV
+#endif /* CONFIG_CMD_DATE */
+
 /*
  *  Environment variables configurations
  */

include/configs/ds109.h +4 -0

index c06f0058deb5..f8d663714239 100644
@@ -30,6 +30,10 @@
  */
 #include "mv-plug-common.h"
 
+#ifdef CONFIG_CMD_DATE
+#define CONFIG_RTC_MV
+#endif /* CONFIG_CMD_DATE */
+
 /*
  *  Environment variables configurations
  */

include/configs/guruplug.h +4 -0

index 739ab320f637..3ce021abea84 100644
@@ -25,6 +25,10 @@
  */
 #include "mv-plug-common.h"
 
+#ifdef CONFIG_CMD_DATE
+#define CONFIG_RTC_MV
+#endif /* CONFIG_CMD_DATE */
+
 /*
  *  Environment variables configurations
  */

include/configs/mv-plug-common.h +0 -7

index 81c07a889a36..f424e2cc6c52 100644
@@ -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 */

include/configs/sheevaplug.h +4 -0

index deec71734dc7..12e38b3f12dc 100644
@@ -29,6 +29,10 @@
  */
 #include "mv-plug-common.h"
 
+#ifdef CONFIG_CMD_DATE
+#define CONFIG_RTC_MV
+#endif /* CONFIG_CMD_DATE */
+
 /*
  *  Environment variables configurations
  */

Signature · 1 line

2.18.0

Chris Packham

author

2018-08-07 07:41 UTC #2 lore raw

PATCH v3 3/3 configs: kirkwood: Move RTC_MV to DM and Kconfig

In reply to Chris Packham

Now that there is DM support in the RTC_MV driver update board configs to use it.

Signed-off-by Chris Packham <[email protected]>

---
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 v3:
- rebase against u-boot#master

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 | 5 ++++-
 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, 30 insertions(+), 49 deletions(-)

configs/SBx81LIFKW_defconfig +2 -0

index 348f861a143b..c786120e7fd4 100644
@@ -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

configs/dns325_defconfig +4 -1

index f0ed20992887..d77f7766ee92 100644
@@ -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

configs/dreamplug_defconfig +4 -1

index 8090c9a37793..d7428ae9cd9e 100644
@@ -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

configs/ds109_defconfig +4 -1

index fd10e6e3c36e..6428614c93c3 100644
@@ -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

configs/goflexhome_defconfig +4 -1

index c0894c05ea4b..41d896a72504 100644
@@ -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

configs/guruplug_defconfig +4 -1

index da3895d4db9a..d77922e2a7d9 100644
@@ -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

configs/nas220_defconfig +4 -1

index ddf5689bf474..4ae69fe71aae 100644
@@ -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

configs/sheevaplug_defconfig +4 -1

index d27698fcce31..b965ff442a84 100644
@@ -5,6 +5,7 @@ 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

@@ -18,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

@@ -29,9 +29,12 @@ 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

include/configs/SBx81LIFKW.h +0 -5

index bcc2c201d222..24712662d433 100644
@@ -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 */

include/configs/dns325.h +0 -7

index 0d52ffb4d7e9..8658c80fdccd 100644
@@ -54,13 +54,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
  */

include/configs/dreamplug.h +0 -4

index 742232d2d660..1c94bf9fa1bf 100644
@@ -27,10 +27,6 @@
  */
 #include "mv-plug-common.h"
 
-#ifdef CONFIG_CMD_DATE
-#define CONFIG_RTC_MV
-#endif /* CONFIG_CMD_DATE */
-
 /*
  *  Environment variables configurations
  */

include/configs/ds109.h +0 -4

index f8d663714239..c06f0058deb5 100644
@@ -30,10 +30,6 @@
  */
 #include "mv-plug-common.h"
 
-#ifdef CONFIG_CMD_DATE
-#define CONFIG_RTC_MV
-#endif /* CONFIG_CMD_DATE */
-
 /*
  *  Environment variables configurations
  */

include/configs/goflexhome.h +0 -7

index 29e104f3c657..1d69a4e51802 100644
@@ -93,11 +93,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 */

include/configs/guruplug.h +0 -4

index 3ce021abea84..739ab320f637 100644
@@ -25,10 +25,6 @@
  */
 #include "mv-plug-common.h"
 
-#ifdef CONFIG_CMD_DATE
-#define CONFIG_RTC_MV
-#endif /* CONFIG_CMD_DATE */
-
 /*
  *  Environment variables configurations
  */

include/configs/nas220.h +0 -7

index b37705e26e5f..ca5cb2a838e8 100644
@@ -107,13 +107,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 */

include/configs/sheevaplug.h +0 -4

index 12e38b3f12dc..deec71734dc7 100644
@@ -29,10 +29,6 @@
  */
 #include "mv-plug-common.h"
 
-#ifdef CONFIG_CMD_DATE
-#define CONFIG_RTC_MV
-#endif /* CONFIG_CMD_DATE */
-
 /*
  *  Environment variables configurations
  */

Signature · 1 line

2.18.0

Stefan Roese

2018-09-19 12:11 UTC #3 lore raw

PATCH v3 1/3 configs: kirkwood: ds109: switch to DM_I2C

In reply to Chris Packham

Quoted 18 lines · Chris Packham

Enable DM_I2C and I2C_MVTSWI for the ds109 board.
Signed-off-by Chris Packham <[email protected]>
---
Changes in v3: None
Changes in v2:
- new
  configs/ds109_defconfig | 2 ++
  1 file changed, 2 insertions(+)
configs/ds109_defconfig +0 -0
index c9207433b374..fd10e6e3c36e 100644

configs/ds109_defconfig CONFIG_ISO_PARTITION=y · line 25

Quoted 8 lines

configs/ds109_defconfig +2 -0

@@ -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

Unfortunately this series does not apply any more (again). I'm currently pushing my Marvell branch upstream and would like to get the first batch of patches accepted. After Tom has pulled these patches, please rebase on top of this new master.

Thanks,
Stefan

Stefan Roese

2018-11-20 06:59 UTC #4 lore raw

PATCH v3 1/3 configs: kirkwood: ds109: switch to DM_I2C

Hi Chris,

Quoted 24 lines · Stefan Roese

Quoted 23 lines · Chris Packham
Enable DM_I2C and I2C_MVTSWI for the ds109 board.
Signed-off-by Chris Packham <[email protected]>
---
Changes in v3: None
Changes in v2:
- new
   configs/ds109_defconfig | 2 ++
   1 file changed, 2 insertions(+)
configs/ds109_defconfig +2 -0
index c9207433b374..fd10e6e3c36e 100644
@@ -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

Quoted 8 lines

configs/ds109_defconfig CONFIG_ISO_PARTITION=y · line 25
Quoted 3 lines
configs/ds109_defconfig +0 -0
   CONFIG_SPI_FLASH=y
   CONFIG_SPI_FLASH_BAR=y
Unfortunately this series does not apply any more (again). I'm currently pushing my Marvell branch upstream and would like to get the first batch of patches accepted. After Tom has pulled these patches, please rebase on top of this new master.

The new merge window is open and I'm trying to get all pending Marvell patches handled. Chris, could you please rebase this series on top of latest mainline? It still does not apply clean any more.

Thanks,
Stefan

Chris Packham

author

2018-11-20 07:52 UTC #5 lore raw

PATCH v3 1/3 configs: kirkwood: ds109: switch to DM_I2C

Hi Stefan,

Quoted 37 lines · Stefan Roese

Hi Chris,
Quoted 24 lines · Stefan Roese
Quoted 23 lines · Chris Packham
Enable DM_I2C and I2C_MVTSWI for the ds109 board.
Signed-off-by Chris Packham <[email protected]>
---
Changes in v3: None
Changes in v2:
- new
   configs/ds109_defconfig | 2 ++
   1 file changed, 2 insertions(+)
configs/ds109_defconfig +2 -0
index c9207433b374..fd10e6e3c36e 100644
@@ -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
Quoted 8 lines
configs/ds109_defconfig CONFIG_ISO_PARTITION=y · line 25
Quoted 3 lines
configs/ds109_defconfig +0 -0
   CONFIG_SPI_FLASH=y
   CONFIG_SPI_FLASH_BAR=y
Unfortunately this series does not apply any more (again). I'm currently pushing my Marvell branch upstream and would like to get the first batch of patches accepted. After Tom has pulled these patches, please rebase on top of this new master.

Quoted 4 lines

The new merge window is open and I'm trying to get all pending Marvell patches handled. Chris, could you please rebase this series on top of latest mainline? It still does not apply clean any more.

This as already been applied as
http://git.denx.de/?p=u-boot.git;a=commit;h=f596efb7

Stefan Roese

2018-11-20 07:56 UTC #6 lore raw

PATCH v3 1/3 configs: kirkwood: ds109: switch to DM_I2C

Quoted 40 lines · Chris Packham

Hi Stefan,
Quoted 37 lines · Stefan Roese
Hi Chris,
Quoted 32 lines · Stefan Roese
Quoted 18 lines · Chris Packham
Enable DM_I2C and I2C_MVTSWI for the ds109 board.
Signed-off-by Chris Packham <[email protected]>
---
Changes in v3: None
Changes in v2:
- new
    configs/ds109_defconfig | 2 ++
    1 file changed, 2 insertions(+)
configs/ds109_defconfig +0 -0
index c9207433b374..fd10e6e3c36e 100644
configs/ds109_defconfig CONFIG_ISO_PARTITION=y · line 25
Quoted 8 lines
configs/ds109_defconfig +2 -0
@@ -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
Unfortunately this series does not apply any more (again). I'm currently pushing my Marvell branch upstream and would like to get the first batch of patches accepted. After Tom has pulled these patches, please rebase on top of this new master.

Quoted 7 lines

Quoted 4 lines
The new merge window is open and I'm trying to get all pending Marvell patches handled. Chris, could you please rebase this series on top of latest mainline? It still does not apply clean any more.
This as already been applied as
http://git.denx.de/?p=u-boot.git;a=commit;h=f596efb7

Ah, right. All 3 patches from this series? None is missing currently?

Thanks,
Stefan

Chris Packham

author

2018-11-20 08:01 UTC #7 lore raw

PATCH v3 1/3 configs: kirkwood: ds109: switch to DM_I2C

Quoted 47 lines · Stefan Roese

Quoted 45 lines · Chris Packham
Hi Stefan,
Quoted 41 lines · Stefan Roese
Hi Chris,
Quoted 24 lines · Stefan Roese
Quoted 23 lines · Chris Packham
Enable DM_I2C and I2C_MVTSWI for the ds109 board.
Signed-off-by Chris Packham <[email protected]>
---
Changes in v3: None
Changes in v2:
- new
    configs/ds109_defconfig | 2 ++
    1 file changed, 2 insertions(+)
configs/ds109_defconfig +2 -0
index c9207433b374..fd10e6e3c36e 100644
@@ -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
Quoted 8 lines
configs/ds109_defconfig CONFIG_ISO_PARTITION=y · line 25
Quoted 3 lines
configs/ds109_defconfig +0 -0
    CONFIG_SPI_FLASH=y
    CONFIG_SPI_FLASH_BAR=y
Unfortunately this series does not apply any more (again). I'm currently pushing my Marvell branch upstream and would like to get the first batch of patches accepted. After Tom has pulled these patches, please rebase on top of this new master.
The new merge window is open and I'm trying to get all pending Marvell patches handled. Chris, could you please rebase this series on top of latest mainline? It still does not apply clean any more.

Quoted 4 lines

Quoted 2 lines
This as already been applied as
http://git.denx.de/?p=u-boot.git;a=commit;h=f596efb7
Ah, right. All 3 patches from this series? None is missing currently?

Yes they were all applied.