diff options
| author | Tom Rini <trini@konsulko.com> | 2022-06-30 15:21:52 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-06-30 15:21:52 -0400 |
| commit | 284c1a9b4b91120385c346a1924628a695314905 (patch) | |
| tree | e3a479c46238483b11d17323fcba1acd9b1e1537 /drivers | |
| parent | c5e7003aa86e1bfc7371d41509e8d34cafdfeb6c (diff) | |
| parent | c1cadac7933cbc3f81e9096843bffff8751baff9 (diff) | |
| download | u-boot-284c1a9b4b91120385c346a1924628a695314905.tar.gz u-boot-284c1a9b4b91120385c346a1924628a695314905.tar.bz2 u-boot-284c1a9b4b91120385c346a1924628a695314905.zip | |
Merge tag 'u-boot-at91-2022.10-a' of https://source.denx.de/u-boot/custodians/u-boot-at91 into next
First set of u-boot-at91 features for the 2022.10 cycle:
This feature set includes mostly fixes and alignments: DT alignment with
Linux for sama7g5, removal of invalid eeprom compatibles, removal of
extra debug_uart_init calls for all at91 boards, support for pio4 driver
pioE bank, and other minor fixes and enhancements for sam9x60 and
sama5d2_icp boards.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpio/atmel_pio4.c | 5 | ||||
| -rw-r--r-- | drivers/misc/i2c_eeprom.c | 8 |
2 files changed, 5 insertions, 8 deletions
diff --git a/drivers/gpio/atmel_pio4.c b/drivers/gpio/atmel_pio4.c index bea609db9d..77a76c1d50 100644 --- a/drivers/gpio/atmel_pio4.c +++ b/drivers/gpio/atmel_pio4.c @@ -36,6 +36,11 @@ static struct atmel_pio4_port *atmel_pio4_port_base(u32 port) case AT91_PIO_PORTD: base = (struct atmel_pio4_port *)ATMEL_BASE_PIOD; break; +#if (ATMEL_PIO_PORTS > 4) + case AT91_PIO_PORTE: + base = (struct atmel_pio4_port *)ATMEL_BASE_PIOE; + break; +#endif default: printf("Error: Atmel PIO4: Failed to get PIO base of port#%d!\n", port); diff --git a/drivers/misc/i2c_eeprom.c b/drivers/misc/i2c_eeprom.c index 4302e180ac..bdd7e018cc 100644 --- a/drivers/misc/i2c_eeprom.c +++ b/drivers/misc/i2c_eeprom.c @@ -170,13 +170,6 @@ static const struct i2c_eeprom_drv_data eeprom_data = { .offset_len = 1, }; -static const struct i2c_eeprom_drv_data mc24aa02e48_data = { - .size = 256, - .pagesize = 8, - .addr_offset_mask = 0, - .offset_len = 1, -}; - static const struct i2c_eeprom_drv_data atmel24c01a_data = { .size = 128, .pagesize = 8, @@ -264,7 +257,6 @@ static const struct i2c_eeprom_drv_data atmel24c512_data = { static const struct udevice_id i2c_eeprom_std_ids[] = { { .compatible = "i2c-eeprom", (ulong)&eeprom_data }, - { .compatible = "microchip,24aa02e48", (ulong)&mc24aa02e48_data }, { .compatible = "atmel,24c01", (ulong)&atmel24c01a_data }, { .compatible = "atmel,24c01a", (ulong)&atmel24c01a_data }, { .compatible = "atmel,24c02", (ulong)&atmel24c02_data }, |