diff options
author | Tom Rini <trini@konsulko.com> | 2022-09-20 15:49:36 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-09-20 15:49:36 +0300 |
commit | 245746e8e09a408fc5f72762b3d430c3ecd60dfc (patch) | |
tree | 50fad5ea00b28b32516a6334f2c79b789039a58a /drivers/clk | |
parent | e9a1ff9724348408144c7f1c5b5cc26130ba46e5 (diff) | |
parent | 7086defa048cc5303291b592192a18d69c6510cf (diff) | |
download | u-boot-245746e8e09a408fc5f72762b3d430c3ecd60dfc.tar.xz |
Merge tag 'u-boot-at91-2023.01-a' of https://source.denx.de/u-boot/custodians/u-boot-at91 into next
First set of u-boot-at91 features for the 2023.01 cycle:
This feature set includes the important update on PIO4 pinctrl driver
that solves a long time mismatch between Linux and U-boot, related on
the unification of pinctrl and gpio driver support, now respecting the
pinctrl bindings ABI; and also support for pinctrl subnodes. The feature
set also adds support for PDA screen detection for sam9x60_curiosity
board , one fix for SD-Card reinsertion and one fix for sam9x60 clocks.
Diffstat (limited to 'drivers/clk')
-rw-r--r-- | drivers/clk/at91/sam9x60.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/at91/sam9x60.c b/drivers/clk/at91/sam9x60.c index 4d00ee2ddc..6b5486c6c9 100644 --- a/drivers/clk/at91/sam9x60.c +++ b/drivers/clk/at91/sam9x60.c @@ -265,10 +265,10 @@ static const struct { u8 id; u8 cid; } sam9x60_systemck[] = { - { .n = "ddrck", .p = "mck_pres", .id = 2, .cid = ID_DDR, }, + { .n = "ddrck", .p = "mck_div", .id = 2, .cid = ID_DDR, }, { .n = "pck0", .p = "prog0", .id = 8, .cid = ID_PCK0, }, { .n = "pck1", .p = "prog1", .id = 9, .cid = ID_PCK1, }, - { .n = "qspick", .p = "mck_pres", .id = 19, .cid = ID_QSPI, }, + { .n = "qspick", .p = "mck_div", .id = 19, .cid = ID_QSPI, }, }; /** |