[Armadeus-commitlog] armadeus/u-boot branch, armadeus-2020.07, updated. 10c6280ffaa385b193438fea8da99e9a29e1cfc7

[Sébastien S. <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus/u-boot".

The branch, armadeus-2020.07 has been updated
       via  10c6280ffaa385b193438fea8da99e9a29e1cfc7 (commit)
       via  aad659bd7ca6b386b747a2bee6f42057ee9208db (commit)
      from  cb18cae6ce5d68f995dcdd3b1da2eb91126cc922 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 10c6280ffaa385b193438fea8da99e9a29e1cfc7
Author: Sébastien Szymanski <seb...@ar...>
Date:   Tue Nov 2 11:39:40 2021 +0100

    i2c: mxc: get proper clock rate when !DM_I2C

commit aad659bd7ca6b386b747a2bee6f42057ee9208db
Author: Peng Fan <pen...@nx...>
Date:   Sat Jun 27 15:48:04 2020 +0800

    clk: imx8mm: fix clk set parent
    
    Fix clk set parent, so we could still have correct clocks after
    parent changing.
    
    Signed-off-by: Peng Fan <pen...@nx...>
    (cherry picked from commit 7ddb4ef3e178ddea1ad117b9a14357b13afb6e92)

-----------------------------------------------------------------------

Summary of changes:
 drivers/clk/imx/clk-imx8mm.c | 5 ++++-
 drivers/i2c/mxc_i2c.c        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c
index 66c9601b0c..d609fad7ac 100644
--- a/drivers/clk/imx/clk-imx8mm.c
+++ b/drivers/clk/imx/clk-imx8mm.c
@@ -191,7 +191,10 @@ static int imx8mm_clk_set_parent(struct clk *clk, struct clk *parent)
 	if (ret)
 		return ret;
 
-	return clk_set_parent(c, cp);
+	ret = clk_set_parent(c, cp);
+	c->dev->parent = cp->dev;
+
+	return ret;
 }
 
 static struct clk_ops imx8mm_clk_ops = {
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index 3b0d27e6cd..fa184d6d6e 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -153,7 +153,7 @@ static uint8_t i2c_imx_get_clk(struct mxc_i2c_bus *i2c_bus, unsigned int rate)
 #endif
 
 	/* Divider value calculation */
-#if CONFIG_IS_ENABLED(CLK)
+#if CONFIG_IS_ENABLED(CLK) && CONFIG_IS_ENABLED(DM_I2C)
 	i2c_clk_rate = clk_get_rate(&i2c_bus->per_clk);
 #else
 	i2c_clk_rate = mxc_get_clock(MXC_I2C_CLK);


hooks/post-receive
-- 
armadeus/u-boot