eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'u-boot-atmel-2021.07-b' of https://source.denx.de/u-boot/custodians/u-boot-atmel

Browse Source 
Second set of u-boot-atmel features for 2021.07 cycle:

This small feature set include support for 5th PIO bank on pio4 pinctrl
driver and a fix for the SPL on sama5d3.
This commit is contained in:
Tom Rini
2021-04-19 11:34:17 -04:00
parent 58b504e5e1 b0080ae1bb
commit 5fa1e2ffeb
3 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/dts/sama5d3.dtsi
View File

@@ -1320,6 +1320,7 @@
reg = <0xfffffe30 0xf>;
interrupts = <3 IRQ_TYPE_LEVEL_HIGH 5>;
clocks = <&mck>;
u-boot,dm-pre-reloc;
};
watchdog@fffffe40 {

2
arch/arm/dts/sama7g5.dtsi
View File

@@ -63,7 +63,7 @@
#size-cells = <1>;
pioA: pinctrl@e0014000 {
compatible = "atmel,sama5d2-gpio";
compatible = "microchip,sama7g5-gpio";
reg = <0xe0014000 0x800>;
gpio-controller;
#gpio-cells = <2>;

22
drivers/gpio/atmel_pio4.c
View File

@@ -173,8 +173,15 @@ int atmel_pio4_get_pio_input(u32 port, u32 pin)
#if CONFIG_IS_ENABLED(DM_GPIO)
/**
* struct atmel_pioctrl_data - Atmel PIO controller (pinmux + gpio) data struct
* @nbanks: number of PIO banks
* @last_bank_count: number of lines in the last bank (can be less than
* the rest of the banks).
*/
struct atmel_pioctrl_data {
u32 nbanks;
u32 last_bank_count;
};
struct atmel_pio4_plat {
@@ -313,6 +320,12 @@ static int atmel_pio4_probe(struct udevice *dev)
NULL);
uc_priv->gpio_count = nbanks * ATMEL_PIO_NPINS_PER_BANK;
/* if last bank has limited number of pins, adjust accordingly */
if (pioctrl_data->last_bank_count != ATMEL_PIO_NPINS_PER_BANK) {
uc_priv->gpio_count -= ATMEL_PIO_NPINS_PER_BANK;
uc_priv->gpio_count += pioctrl_data->last_bank_count;
}
return 0;
}
@@ -322,12 +335,21 @@ static int atmel_pio4_probe(struct udevice *dev)
*/
static const struct atmel_pioctrl_data atmel_sama5d2_pioctrl_data = {
.nbanks = 4,
.last_bank_count = ATMEL_PIO_NPINS_PER_BANK,
};
static const struct atmel_pioctrl_data microchip_sama7g5_pioctrl_data = {
.nbanks = 5,
.last_bank_count = 8, /* 5th bank has only 8 lines on sama7g5 */
};
static const struct udevice_id atmel_pio4_ids[] = {
{
.compatible = "atmel,sama5d2-gpio",
.data = (ulong)&atmel_sama5d2_pioctrl_data,
}, {
.compatible = "microchip,sama7g5-gpio",
.data = (ulong)&microchip_sama7g5_pioctrl_data,
},
{}
};