diff options
author | Tom Rini <trini@konsulko.com> | 2022-06-20 14:40:59 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-06-20 14:40:59 -0400 |
commit | 52af0101be55da74a32e9b169864508101f886fe (patch) | |
tree | 0027962a3a4e43a1e29fa7411934501b75fe811b /drivers/spi | |
parent | 78533a1ce87786d2ba9be70e657b09cded1267e1 (diff) | |
parent | 568a226f87655fd5339514f66413c2ad72f65d6f (diff) | |
download | u-boot-52af0101be55da74a32e9b169864508101f886fe.tar.gz |
Merge branch 'master' into next
Merge in v2022.07-rc5.
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/nxp_fspi.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/spi/nxp_fspi.c b/drivers/spi/nxp_fspi.c index 607c953987b..579d6bac9b1 100644 --- a/drivers/spi/nxp_fspi.c +++ b/drivers/spi/nxp_fspi.c @@ -866,9 +866,6 @@ static int nxp_fspi_default_setup(struct nxp_fspi *f) u32 reg; #if CONFIG_IS_ENABLED(CLK) - /* disable and unprepare clock to avoid glitch pass to controller */ - nxp_fspi_clk_disable_unprep(f); - /* the default frequency, we will change it later if necessary. */ ret = clk_set_rate(&f->clk, 20000000); if (ret < 0) |