Switch from the driver model to the SYS model for I2C.

2 files changed, 31 insertions, 41 deletions

diff --git a/recipes-bsp/u-boot/u-boot-2016.09.01/mtcdt/i2c.patch b/recipes-bsp/u-boot/u-boot-2016.09.01/mtcdt/i2c.patch
index ba9ca44..a5087ea 100644
--- a/recipes-bsp/u-boot/u-boot-2016.09.01/mtcdt/i2c.patch
+++ b/recipes-bsp/u-boot/u-boot-2016.09.01/mtcdt/i2c.patch
@@ -108,7 +108,7 @@ diff -raNu old/include/i2c.h new/include/i2c.h
  void i2c_soft_delay(void);
  #endif
 -#else
-+#else if !defined(CONFIG_DM_I2C_COMPAT)
++#elif !defined(CONFIG_DM_I2C_COMPAT)
  
  /*
   * Probe the given I2C chip address.  Returns 0 if a chip responded,
diff --git a/recipes-bsp/u-boot/u-boot-2016.09.01/mtcdt/mtcdt.patch b/recipes-bsp/u-boot/u-boot-2016.09.01/mtcdt/mtcdt.patch
index 800bdc7..d294bb2 100644
--- a/recipes-bsp/u-boot/u-boot-2016.09.01/mtcdt/mtcdt.patch
+++ b/recipes-bsp/u-boot/u-boot-2016.09.01/mtcdt/mtcdt.patch
@@ -1,7 +1,7 @@
 diff -raNu old/include/configs/at91sam9x5ek.h new/include/configs/at91sam9x5ek.h
 --- old/include/configs/at91sam9x5ek.h	2017-05-04 13:59:37.381346896 -0500
-+++ new/include/configs/at91sam9x5ek.h	2017-05-05 08:32:35.950118228 -0500
-@@ -9,9 +9,12 @@
++++ new/include/configs/at91sam9x5ek.h	2017-05-09 17:44:27.064308078 -0500
+@@ -9,9 +9,11 @@
  #ifndef __CONFIG_H__
  #define __CONFIG_H__
  
@@ -11,21 +11,19 @@ diff -raNu old/include/configs/at91sam9x5ek.h new/include/configs/at91sam9x5ek.h
 -#define CONFIG_SYS_TEXT_BASE		0x26f00000
 +#define USE_MTCDT
 +#define CONFIG_SYS_TEXT_BASE		0x2ef00000
-+ 
  
  /* ARM asynchronous clock */
  #define CONFIG_SYS_AT91_SLOW_CLOCK	32768
-@@ -26,6 +29,9 @@
+@@ -26,6 +28,8 @@
  #define CONFIG_BOARD_EARLY_INIT_F
  #define CONFIG_DISPLAY_CPUINFO
  
-+
 +#define CONFIG_MISC_INIT_R       /* enable platform-dependent misc_init_r() */
 +
  /* general purpose I/O */
  #define CONFIG_ATMEL_LEGACY		/* required until (g)pio is fixed */
  #define CONFIG_AT91_GPIO
-@@ -36,6 +42,8 @@
+@@ -36,6 +40,8 @@
  #define CONFIG_USART_ID		ATMEL_ID_SYS
  
  /* LCD */
@@ -34,7 +32,7 @@ diff -raNu old/include/configs/at91sam9x5ek.h new/include/configs/at91sam9x5ek.h
  #define CONFIG_LCD
  #define LCD_BPP			LCD_COLOR16
  #define LCD_OUTPUT_BPP		24
-@@ -46,8 +54,15 @@
+@@ -46,7 +52,13 @@
  #define CONFIG_ATMEL_HLCD
  #define CONFIG_ATMEL_LCD_RGB565
  #define CONFIG_SYS_CONSOLE_IS_IN_ENV
@@ -43,34 +41,26 @@ diff -raNu old/include/configs/at91sam9x5ek.h new/include/configs/at91sam9x5ek.h
 +/* check for keypress even if bootdelay is 0 */
 +#define CONFIG_ZERO_BOOTDELAY_CHECK
  
- 
 +/*STATUS LED*/
 +#define BOOT_STATUS_LED AT91_PIN_PA24
-+
+ 
  /*
   * BOOTP options
-  */
-@@ -59,10 +74,16 @@
- /* no NOR flash */
+@@ -60,10 +72,10 @@
  #define CONFIG_SYS_NO_FLASH
  
--/*
+ /*
 - * Command line configuration.
-+/* Needed to build the core directory */
-+#define CONFIG_DM
-+
-+/* Compat needed or i2c read/write/init is not defined */
-+#define CONFIG_DM_I2C_COMPAT
-+
-+/* Required to prevent conflicting definitions of
-+ * I2C_GET_BUS and I2C_SET_BUS
++ * Defined by .config (configs/at91sam9x5ek)
++ * #define CONFIG_CMD_I2C
   */
 -#define CONFIG_CMD_NAND
-+#define CONFIG_DM_I2C
- 
+-
++#define CONFIG_SYS_I2C
  /*
   * define CONFIG_USB_EHCI to enable USB Hi-Speed (aka 2.0)
-@@ -72,7 +93,7 @@
+  * NB: in this case, USB 1.1 devices won't be recognized.
+@@ -72,7 +84,7 @@
  /* SDRAM */
  #define CONFIG_NR_DRAM_BANKS		1
  #define CONFIG_SYS_SDRAM_BASE		0x20000000
@@ -79,7 +69,7 @@ diff -raNu old/include/configs/at91sam9x5ek.h new/include/configs/at91sam9x5ek.h
  
  #define CONFIG_SYS_INIT_SP_ADDR \
  	(CONFIG_SYS_SDRAM_BASE + 4 * 1024 - GENERATED_GBL_DATA_SIZE)
-@@ -94,13 +115,30 @@
+@@ -94,13 +106,30 @@
  /* our CLE is AD22 */
  #define CONFIG_SYS_NAND_MASK_CLE	(1 << 22)
  #define CONFIG_SYS_NAND_ENABLE_PIN	AT91_PIN_PD4
@@ -96,23 +86,23 @@ diff -raNu old/include/configs/at91sam9x5ek.h new/include/configs/at91sam9x5ek.h
 +#define CONFIG_PMECC_CAP		4
  #define CONFIG_PMECC_SECTOR_SIZE	512
 +/* 
-++ * CONFIG_PMECC_INDEX_TABLE_OFFSET has been replaced by:
-++ *  ATMEL_PMECC_INDEX_OFFSET_512 and
-++ *  ATMEL_PMECC_INDEX_OFFSET_1024
-++ *
-++ * Which is used depends on:
-++ * host->pmecc_sector_size == 512
-++ *
-++ * 2012.10:
-++ * #define CONFIG_PMECC_INDEX_TABLE_OFFSET	0x8000
-++ * 2016.03 (at91sam9x5.h):
-++ * 182:#define ATMEL_PMECC_INDEX_OFFSET_512	0x8000
-++ */
++ * CONFIG_PMECC_INDEX_TABLE_OFFSET has been replaced by:
++ *  ATMEL_PMECC_INDEX_OFFSET_512 and
++ *  ATMEL_PMECC_INDEX_OFFSET_1024
++ *
++ * Which as used depends on:
++ * host->pmecc_sector_size == 512
++ *
++ * 2012.10:
++ * #define CONFIG_PMECC_INDEX_TABLE_OFFSET	0x8000
++ * 2016.03 (at91sam9x5.h):
++ * 182:#define ATMEL_PMECC_INDEX_OFFSET_512	0x8000
++ */
 +
  
  #define CONFIG_CMD_NAND_TRIMFFS
  
-@@ -147,20 +185,36 @@
+@@ -147,20 +176,36 @@
  #endif
  #endif
  
@@ -154,7 +144,7 @@ diff -raNu old/include/configs/at91sam9x5ek.h new/include/configs/at91sam9x5ek.h
  #elif defined(CONFIG_SYS_USE_SPIFLASH)
  /* bootstrap + u-boot + env + linux in spi flash */
  #define CONFIG_ENV_IS_IN_SPI_FLASH
-@@ -197,6 +251,9 @@
+@@ -197,6 +242,9 @@
  				"8M(bootstrap/uboot/kernel)ro,-(rootfs) " \
  				"root=/dev/mmcblk0p2 " \
  				"rw rootfstype=ext4 rootwait"
@@ -164,7 +154,7 @@ diff -raNu old/include/configs/at91sam9x5ek.h new/include/configs/at91sam9x5ek.h
  #else
  #define CONFIG_BOOTARGS							\
  	"console=ttyS0,115200 earlyprintk "				\
-@@ -274,4 +331,20 @@
+@@ -274,4 +322,20 @@
  
  #endif