* [PATCH v1] ARM i.MX6Q: fix network configuration for Protonic PRTI6G board
@ 2020-12-04 10:20 Oleksij Rempel
2020-12-07 9:38 ` Sascha Hauer
0 siblings, 1 reply; 2+ messages in thread
From: Oleksij Rempel @ 2020-12-04 10:20 UTC (permalink / raw)
To: barebox; +Cc: Oleksij Rempel, david
By default the iMX6UL is configured to output clock on the ENET1_TX_CLK
pin. Since on the Protonic PRTI6G board the PHY is actual refclock provider, we
should change the clock source to the external clock.
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
arch/arm/boards/protonic-imx6/board.c | 25 +++++++++++++++++++++++++
include/mfd/imx6q-iomuxc-gpr.h | 18 ++++++++++++++++++
2 files changed, 43 insertions(+)
diff --git a/arch/arm/boards/protonic-imx6/board.c b/arch/arm/boards/protonic-imx6/board.c
index daae9a527c..a718d54df4 100644
--- a/arch/arm/boards/protonic-imx6/board.c
+++ b/arch/arm/boards/protonic-imx6/board.c
@@ -11,8 +11,11 @@
#include <i2c/i2c.h>
#include <mach/bbu.h>
#include <mach/imx6.h>
+#include <mfd/imx6q-iomuxc-gpr.h>
+#include <mfd/syscon.h>
#include <net.h>
#include <of_device.h>
+#include <regmap.h>
#include <sys/mount.h>
#include <sys/stat.h>
#include <unistd.h>
@@ -577,6 +580,27 @@ static int prt_imx6_init_victgo(struct prt_imx6_priv *priv)
return prt_imx6_init_kvg_power(priv, PW_MODE_KVG_NEW);
}
+static int prt_imx6_init_prti6g(struct prt_imx6_priv *priv)
+{
+ struct regmap *gpr;
+
+ gpr = syscon_regmap_lookup_by_compatible("fsl,imx6ul-iomuxc-gpr");
+ if (!IS_ERR(gpr)) {
+ int ret;
+
+ /* Configure FEC1 to use 50MHz clock provided by the PHY */
+ ret = regmap_update_bits(gpr, IOMUXC_GPR1,
+ IMX6UL_GPR1_ENET1_CLK_DIR | IMX6UL_GPR1_ENET1_CLK_SEL,
+ IMX6UL_GPR1_ENET1_CLK_SEL);
+ if (ret)
+ dev_err(priv->dev, "regmap error\n");
+ } else {
+ dev_err(priv->dev, "failed to find fsl,imx6ul-iomux-gpr regmap\n");
+ }
+
+ return 0;
+}
+
static int prt_imx6_init_kvg_new(struct prt_imx6_priv *priv)
{
return prt_imx6_init_kvg_power(priv, PW_MODE_KVG_NEW);
@@ -923,6 +947,7 @@ static const struct prt_machine_data prt_imx6_cfg_prti6g[] = {
.hw_rev = 0,
.i2c_addr = 0x51,
.i2c_adapter = 0,
+ .init = prt_imx6_init_prti6g,
.flags = PRT_IMX6_BOOTSRC_EMMC,
}, {
.hw_id = UINT_MAX
diff --git a/include/mfd/imx6q-iomuxc-gpr.h b/include/mfd/imx6q-iomuxc-gpr.h
index b2c9da6579..2e7aa6dc7a 100644
--- a/include/mfd/imx6q-iomuxc-gpr.h
+++ b/include/mfd/imx6q-iomuxc-gpr.h
@@ -344,4 +344,22 @@
#define IMX6Q_GPR13_SATA_PHY_1_MED (0x1 << 0)
#define IMX6Q_GPR13_SATA_PHY_1_SLOW (0x2 << 0)
+/* For imx6ul iomux gpr register field define */
+/* IMX6UL_GPR1_ENET*_CLK_DIR:
+ * 0 - ENET1_TX_CLK output driver is disabled when configured for ALT1
+ * 1 - ENET1_TX_CLK output driver is enabled when configured for ALT1
+ */
+#define IMX6UL_GPR1_ENET2_CLK_DIR (0x1 << 18)
+#define IMX6UL_GPR1_ENET1_CLK_DIR (0x1 << 17)
+
+/* IMX6UL_GPR1_ENET*_CLK_SEL:
+ * 0 - ENET TX reference clock driven by ref_enetpll. This clock is also
+ * output to pins via the IOMUX. ENET_REF_CLK2 function.
+ * 1 - Gets ENET2 TX reference clk from the ENET2_TX_CLK pin. In this use case,
+ * an external OSC provides the clock for both the external PHY and the
+ * internal controller.
+ */
+#define IMX6UL_GPR1_ENET2_CLK_SEL (0x1 << 14)
+#define IMX6UL_GPR1_ENET1_CLK_SEL (0x1 << 13)
+
#endif /* __LINUX_IMX6Q_IOMUXC_GPR_H */
--
2.29.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH v1] ARM i.MX6Q: fix network configuration for Protonic PRTI6G board
2020-12-04 10:20 [PATCH v1] ARM i.MX6Q: fix network configuration for Protonic PRTI6G board Oleksij Rempel
@ 2020-12-07 9:38 ` Sascha Hauer
0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2020-12-07 9:38 UTC (permalink / raw)
To: Oleksij Rempel; +Cc: barebox, david
On Fri, Dec 04, 2020 at 11:20:33AM +0100, Oleksij Rempel wrote:
> By default the iMX6UL is configured to output clock on the ENET1_TX_CLK
> pin. Since on the Protonic PRTI6G board the PHY is actual refclock provider, we
> should change the clock source to the external clock.
>
> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
> ---
> arch/arm/boards/protonic-imx6/board.c | 25 +++++++++++++++++++++++++
> include/mfd/imx6q-iomuxc-gpr.h | 18 ++++++++++++++++++
> 2 files changed, 43 insertions(+)
Applied, thanks
Sascha
>
> diff --git a/arch/arm/boards/protonic-imx6/board.c b/arch/arm/boards/protonic-imx6/board.c
> index daae9a527c..a718d54df4 100644
> --- a/arch/arm/boards/protonic-imx6/board.c
> +++ b/arch/arm/boards/protonic-imx6/board.c
> @@ -11,8 +11,11 @@
> #include <i2c/i2c.h>
> #include <mach/bbu.h>
> #include <mach/imx6.h>
> +#include <mfd/imx6q-iomuxc-gpr.h>
> +#include <mfd/syscon.h>
> #include <net.h>
> #include <of_device.h>
> +#include <regmap.h>
> #include <sys/mount.h>
> #include <sys/stat.h>
> #include <unistd.h>
> @@ -577,6 +580,27 @@ static int prt_imx6_init_victgo(struct prt_imx6_priv *priv)
> return prt_imx6_init_kvg_power(priv, PW_MODE_KVG_NEW);
> }
>
> +static int prt_imx6_init_prti6g(struct prt_imx6_priv *priv)
> +{
> + struct regmap *gpr;
> +
> + gpr = syscon_regmap_lookup_by_compatible("fsl,imx6ul-iomuxc-gpr");
> + if (!IS_ERR(gpr)) {
> + int ret;
> +
> + /* Configure FEC1 to use 50MHz clock provided by the PHY */
> + ret = regmap_update_bits(gpr, IOMUXC_GPR1,
> + IMX6UL_GPR1_ENET1_CLK_DIR | IMX6UL_GPR1_ENET1_CLK_SEL,
> + IMX6UL_GPR1_ENET1_CLK_SEL);
> + if (ret)
> + dev_err(priv->dev, "regmap error\n");
> + } else {
> + dev_err(priv->dev, "failed to find fsl,imx6ul-iomux-gpr regmap\n");
> + }
> +
> + return 0;
> +}
> +
> static int prt_imx6_init_kvg_new(struct prt_imx6_priv *priv)
> {
> return prt_imx6_init_kvg_power(priv, PW_MODE_KVG_NEW);
> @@ -923,6 +947,7 @@ static const struct prt_machine_data prt_imx6_cfg_prti6g[] = {
> .hw_rev = 0,
> .i2c_addr = 0x51,
> .i2c_adapter = 0,
> + .init = prt_imx6_init_prti6g,
> .flags = PRT_IMX6_BOOTSRC_EMMC,
> }, {
> .hw_id = UINT_MAX
> diff --git a/include/mfd/imx6q-iomuxc-gpr.h b/include/mfd/imx6q-iomuxc-gpr.h
> index b2c9da6579..2e7aa6dc7a 100644
> --- a/include/mfd/imx6q-iomuxc-gpr.h
> +++ b/include/mfd/imx6q-iomuxc-gpr.h
> @@ -344,4 +344,22 @@
> #define IMX6Q_GPR13_SATA_PHY_1_MED (0x1 << 0)
> #define IMX6Q_GPR13_SATA_PHY_1_SLOW (0x2 << 0)
>
> +/* For imx6ul iomux gpr register field define */
> +/* IMX6UL_GPR1_ENET*_CLK_DIR:
> + * 0 - ENET1_TX_CLK output driver is disabled when configured for ALT1
> + * 1 - ENET1_TX_CLK output driver is enabled when configured for ALT1
> + */
> +#define IMX6UL_GPR1_ENET2_CLK_DIR (0x1 << 18)
> +#define IMX6UL_GPR1_ENET1_CLK_DIR (0x1 << 17)
> +
> +/* IMX6UL_GPR1_ENET*_CLK_SEL:
> + * 0 - ENET TX reference clock driven by ref_enetpll. This clock is also
> + * output to pins via the IOMUX. ENET_REF_CLK2 function.
> + * 1 - Gets ENET2 TX reference clk from the ENET2_TX_CLK pin. In this use case,
> + * an external OSC provides the clock for both the external PHY and the
> + * internal controller.
> + */
> +#define IMX6UL_GPR1_ENET2_CLK_SEL (0x1 << 14)
> +#define IMX6UL_GPR1_ENET1_CLK_SEL (0x1 << 13)
> +
> #endif /* __LINUX_IMX6Q_IOMUXC_GPR_H */
> --
> 2.29.2
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-07 9:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-04 10:20 [PATCH v1] ARM i.MX6Q: fix network configuration for Protonic PRTI6G board Oleksij Rempel
2020-12-07 9:38 ` Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox