Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54e9e087 authored by Holger Brunck's avatar Holger Brunck Committed by David S. Miller
Browse files

net/wan/fsl_ucc_hdlc: call qe_setbrg only for loopback mode 



We can't assume that we are always in loopback mode if rx and tx clock
have the same clock source. If we want to use HDLC busmode we also have
the same clock source but we are not in loopback mode. So move the
setting of the baudrate generator after the check for property for the
loopback mode.

Signed-off-by: default avatarHolger Brunck <holger.brunck@keymile.com>
Cc: Zhao Qiang <qiang.zhao@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5b8aad93

drivers/net/wan/fsl_ucc_hdlc.c

+3 −4
Original line number Diff line number Diff line
@@ -113,6 +113,9 @@ static int uhdlc_init(struct ucc_hdlc_private *priv) 
	/* Loopback mode */

	if (priv->loopback) {

		dev_info(priv->dev, "Loopback Mode\n");

		/* use the same clock when work in loopback */

		qe_setbrg(ut_info->uf_info.rx_clock, 20000000, 1);



		gumr = ioread32be(&priv->uf_regs->gumr);

		gumr |= (UCC_FAST_GUMR_LOOPBACK | UCC_FAST_GUMR_CDS |

			 UCC_FAST_GUMR_TCI);
@@ -1021,10 +1024,6 @@ static int ucc_hdlc_probe(struct platform_device *pdev) 
		return -EINVAL;

	}



	/* use the same clock when work in loopback */

	if (ut_info->uf_info.rx_clock == ut_info->uf_info.tx_clock)

		qe_setbrg(ut_info->uf_info.rx_clock, 20000000, 1);



	ret = of_address_to_resource(np, 0, &res);

	if (ret)

		return -EINVAL;