diff options
| author | Tom Rini | 2019-10-08 18:43:56 -0400 |
|---|---|---|
| committer | Tom Rini | 2019-10-08 18:43:56 -0400 |
| commit | 9d536fe8ae7672bdee091f9100389b6f3e53cfc6 (patch) | |
| tree | 44e383adff8d7a2ef7ca5cccbcdefd214912c7ca /drivers | |
| parent | 8679be295682878177097557867929caa8e26b98 (diff) | |
| parent | 0cf837f34bd9de2c9cb2cb100f1e5f7e59826ac1 (diff) | |
Merge tag 'u-boot-atmel-2020.01-a' of https://gitlab.denx.de/u-boot/custodians/u-boot-atmel
First set of u-boot-atmel features and fixes for 2020.01 cycle
The feature set includes support for two new boards from Microchip AT91:
The sama5d27_wlsom1_ek , an evaluation kit which includes the SAMA5D2
SOC packaged in a 256 MB LPDDR2 SIP, on a SOM including wireless, which
is placed on evaluation kit with sd-card, ethernet, LCD, Camera sensor,
QSPI, etc
The sam9x60ek, an evaluation kit for the new SoC based on ARM926j , the
SAM9X60 . The evaluation kit includes NAND flash, QSPI, Ethernet, Audio,
Camera sensor connector, etc.
The full support for sam9x60ek will come at a later time. There are
still missing bits regarding the clock support and power management
controller.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clk/at91/clk-utmi.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/atmel_sdhci.c | 1 | ||||
| -rw-r--r-- | drivers/net/macb.c | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/drivers/clk/at91/clk-utmi.c b/drivers/clk/at91/clk-utmi.c index e8506099fd3..18af0bfeaad 100644 --- a/drivers/clk/at91/clk-utmi.c +++ b/drivers/clk/at91/clk-utmi.c @@ -10,7 +10,7 @@ #include <syscon.h> #include <linux/io.h> #include <mach/at91_pmc.h> -#include <mach/sama5_sfr.h> +#include <mach/at91_sfr.h> #include "pmc.h" /* diff --git a/drivers/mmc/atmel_sdhci.c b/drivers/mmc/atmel_sdhci.c index d930ed8da0e..2b797c9bd40 100644 --- a/drivers/mmc/atmel_sdhci.c +++ b/drivers/mmc/atmel_sdhci.c @@ -112,6 +112,7 @@ static int atmel_sdhci_bind(struct udevice *dev) static const struct udevice_id atmel_sdhci_ids[] = { { .compatible = "atmel,sama5d2-sdhci" }, + { .compatible = "microchip,sam9x60-sdhci" }, { } }; diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 377188e361c..1a532b0e5a4 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -1321,6 +1321,7 @@ static const struct macb_config sifive_config = { static const struct udevice_id macb_eth_ids[] = { { .compatible = "cdns,macb" }, { .compatible = "cdns,at91sam9260-macb" }, + { .compatible = "cdns,sam9x60-macb" }, { .compatible = "atmel,sama5d2-gem" }, { .compatible = "atmel,sama5d3-gem" }, { .compatible = "atmel,sama5d4-gem", .data = (ulong)&sama5d4_config }, |