summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/include/mach
diff options
context:
space:
mode:
authorAhmad Fatoum <a.fatoum@pengutronix.de>2020-07-01 11:11:15 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2020-07-11 06:15:43 +0200
commit1ecfb8ec3eb58ba04cea2cbb56604c16676afd1a (patch)
tree7a3ecb2fe2a53c6aa73e7a86ce495e25aa3c6085 /arch/arm/mach-at91/include/mach
parenteb54e4fc5acde09095b1092ca8740be18d48fe24 (diff)
downloadbarebox-1ecfb8ec3eb58ba04cea2cbb56604c16676afd1a.tar.gz
barebox-1ecfb8ec3eb58ba04cea2cbb56604c16676afd1a.tar.xz
ARM: at91: debug_ll: remove duplicated IS_ENABLED(CONFIG_DEBUG_LL) condition
There are three users of at91_dbgu_setup_ll and all already call this function only when IS_ENABLED(CONFIG_DEBUG_LL). Remove the duplicated condition from the function itself. This allows us to use the function for pbl_set_console use later on, even with DEBUG_LL disabled. Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-at91/include/mach')
-rw-r--r--arch/arm/mach-at91/include/mach/at91_dbgu.h34
1 files changed, 16 insertions, 18 deletions
diff --git a/arch/arm/mach-at91/include/mach/at91_dbgu.h b/arch/arm/mach-at91/include/mach/at91_dbgu.h
index 0ba9cdae10..29aaa2dfe1 100644
--- a/arch/arm/mach-at91/include/mach/at91_dbgu.h
+++ b/arch/arm/mach-at91/include/mach/at91_dbgu.h
@@ -94,30 +94,28 @@ static inline void at91_dbgu_setup_ll(void __iomem *dbgu_base,
unsigned mck,
unsigned baudrate)
{
- if (IS_ENABLED(CONFIG_DEBUG_LL)) {
- u32 brgr = mck / (baudrate * 16);
+ u32 brgr = mck / (baudrate * 16);
- if ((mck / (baudrate * 16)) % 10 >= 5)
- brgr++;
+ if ((mck / (baudrate * 16)) % 10 >= 5)
+ brgr++;
- writel(~0, dbgu_base + AT91_DBGU_IDR);
+ writel(~0, dbgu_base + AT91_DBGU_IDR);
- writel(AT91_DBGU_RSTRX
- | AT91_DBGU_RSTTX
- | AT91_DBGU_RXDIS
- | AT91_DBGU_TXDIS,
- dbgu_base + AT91_DBGU_CR);
+ writel(AT91_DBGU_RSTRX
+ | AT91_DBGU_RSTTX
+ | AT91_DBGU_RXDIS
+ | AT91_DBGU_TXDIS,
+ dbgu_base + AT91_DBGU_CR);
- writel(brgr, dbgu_base + AT91_DBGU_BRGR);
+ writel(brgr, dbgu_base + AT91_DBGU_BRGR);
- writel(AT91_DBGU_PAR_NONE
- | AT91_DBGU_CHMODE_NORMAL
- | AT91_DBGU_CHRL_8BIT
- | AT91_DBGU_NBSTOP_1BIT,
- dbgu_base + AT91_DBGU_MR);
+ writel(AT91_DBGU_PAR_NONE
+ | AT91_DBGU_CHMODE_NORMAL
+ | AT91_DBGU_CHRL_8BIT
+ | AT91_DBGU_NBSTOP_1BIT,
+ dbgu_base + AT91_DBGU_MR);
- writel(AT91_DBGU_RXEN | AT91_DBGU_TXEN, dbgu_base + AT91_DBGU_CR);
- }
+ writel(AT91_DBGU_RXEN | AT91_DBGU_TXEN, dbgu_base + AT91_DBGU_CR);
}
#endif