summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Smirnov <andrew.smirnov@gmail.com>2018-06-19 18:21:54 -0700
committerSascha Hauer <s.hauer@pengutronix.de>2018-06-21 12:55:59 +0200
commit43a56c8ad539f744a5508a0036ca3a96762ba208 (patch)
tree023a2326f522ed9fecf3ecbec3880ba66f2415d9
parent44de85bc35aa2a405d3183ac958819230f842c9d (diff)
downloadbarebox-43a56c8ad539f744a5508a0036ca3a96762ba208.tar.gz
barebox-43a56c8ad539f744a5508a0036ca3a96762ba208.tar.xz
ARM: i.MX: rdu2: Make use of imx_setup_pad()
While at it, also remove pinux configuration for RX pin (completely unused) and fix strange setup_uart()'s indentation. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/boards/zii-imx6q-rdu2/lowlevel.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/boards/zii-imx6q-rdu2/lowlevel.c b/arch/arm/boards/zii-imx6q-rdu2/lowlevel.c
index 6b9c719c6d..a5ac6f64c2 100644
--- a/arch/arm/boards/zii-imx6q-rdu2/lowlevel.c
+++ b/arch/arm/boards/zii-imx6q-rdu2/lowlevel.c
@@ -19,6 +19,7 @@
#include <mach/generic.h>
#include <mach/imx6.h>
#include <mach/xload.h>
+#include <mach/iomux-mx6.h>
#include <asm/barebox-arm.h>
struct reginit {
@@ -255,12 +256,7 @@ static inline void setup_uart(void)
{
void __iomem *iomuxbase = IOMEM(MX6_IOMUXC_BASE_ADDR);
- writel(0x1b0b1, iomuxbase + 0x0650);
- writel(3, iomuxbase + 0x0280);
-
- writel(0x1b0b1, iomuxbase + 0x0654);
- writel(3, iomuxbase + 0x0284);
- writel(1, iomuxbase + 0x0920);
+ imx_setup_pad(iomuxbase, MX6Q_PAD_CSI0_DAT10__UART1_TXD);
imx6_uart_setup_ll();
@@ -278,7 +274,7 @@ static noinline void rdu2_sram_setup(void)
imx6_ungate_all_peripherals();
if (IS_ENABLED(CONFIG_DEBUG_LL))
- setup_uart();
+ setup_uart();
arm_setup_stack(0x00920000 - 8);
relocate_to_current_adr();