diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-31 16:06:24 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-31 16:06:24 -0400 |
| commit | bbaf56eda0e63d6d28fbccae0f112ef88203eb4d (patch) | |
| tree | 000dcfe358920f071df9bc458b4f41c92d4f06d9 /drivers | |
| parent | 08c41ca1efe4d720f242fe7c7a931e5c5857716e (diff) | |
| parent | 0c0cdc86103a1f579cb9f86a3c7c076abb383542 (diff) | |
| download | u-boot-bbaf56eda0e63d6d28fbccae0f112ef88203eb4d.tar.gz | |
Merge tag 'u-boot-amlogic-20190731' of https://gitlab.denx.de/u-boot/custodians/u-boot-amlogicWIP/31Jul2019
- sync Amlogic G12A DT with linux 5.3-rc1
- add support for 4GiB DRAM memory
- add support for Amlogic G12B based Odroid-N2
- small duplicate logic fix for gxbb clock driver
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clk/meson/gxbb.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c index 2cb53fb92d..abb5337e78 100644 --- a/drivers/clk/meson/gxbb.c +++ b/drivers/clk/meson/gxbb.c @@ -823,10 +823,7 @@ static ulong meson_clk_set_rate_by_id(struct clk *clk, unsigned long id, case CLKID_MPLL1: case CLKID_MPLL2: case CLKID_CLK81: - if (current_rate != rate) - return -EINVAL; - - return 0; + return -EINVAL; case CLKID_VPU: return meson_clk_set_rate_by_id(clk, meson_mux_get_parent(clk, CLKID_VPU), rate, |