diff options
| author | Tom Rini <trini@konsulko.com> | 2020-12-11 15:55:17 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-12-11 15:55:17 -0500 |
| commit | 5a1a8a63be8f7262a300eddafb18020926b12fb6 (patch) | |
| tree | f0cbc27a29ed0d61a6303fa0fe854a868020ff8c /drivers/clk | |
| parent | 298a62960f0cbdb23384b5f51e1abc39e3341a65 (diff) | |
| parent | bb5eedbc7fbddc7849bb10a239facac29b615c1c (diff) | |
| download | u-boot-5a1a8a63be8f7262a300eddafb18020926b12fb6.tar.gz | |
Merge tag 'u-boot-atmel-fixes-2021.01-b' of https://gitlab.denx.de/u-boot/custodians/u-boot-atmelWIP/11Dec2020
Second set of u-boot-atmel fixes for 2021.01 cycle
This set includes very important fixes for: MMC booting on several
boards, drive strength on sam9x60ek mmc lines, compile issues for
timer.c old driver, removal of unwanted access to sam9x60 bit for
oscillator bypass mode, and eeproms read on sama5d2_icp.
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/at91/sam9x60.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/clk/at91/sam9x60.c b/drivers/clk/at91/sam9x60.c index c3235f565d..9e9a643d62 100644 --- a/drivers/clk/at91/sam9x60.c +++ b/drivers/clk/at91/sam9x60.c @@ -382,7 +382,6 @@ static int sam9x60_clk_probe(struct udevice *dev) const char *p[10]; unsigned int cm[10], m[10], *tmpclkmux, *tmpmux; struct clk clk, *c; - bool main_osc_bypass; int ret, muxallocindex = 0, clkmuxallocindex = 0, i; static const struct clk_range r = { 0, 0 }; @@ -440,8 +439,6 @@ static int sam9x60_clk_probe(struct udevice *dev) if (ret) goto fail; - main_osc_bypass = dev_read_bool(dev, "atmel,main-osc-bypass"); - /* Register main rc oscillator. */ c = at91_clk_main_rc(base, clk_names[ID_MAIN_RC_OSC], clk_names[ID_MAIN_RC]); @@ -453,7 +450,7 @@ static int sam9x60_clk_probe(struct udevice *dev) /* Register main oscillator. */ c = at91_clk_main_osc(base, clk_names[ID_MAIN_OSC], - clk_names[ID_MAIN_XTAL], main_osc_bypass); + clk_names[ID_MAIN_XTAL], false); if (IS_ERR(c)) { ret = PTR_ERR(c); goto fail; |