mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 1/2] i.MX: Fix MX7_UART2_BASE_ADDR
@ 2018-01-10 16:31 Andrey Smirnov
  2018-01-10 16:31 ` [PATCH 2/2] i.MX7: Add CCM definitions for UART2 Andrey Smirnov
  2018-01-11  8:43 ` [PATCH 1/2] i.MX: Fix MX7_UART2_BASE_ADDR Sascha Hauer
  0 siblings, 2 replies; 3+ messages in thread
From: Andrey Smirnov @ 2018-01-10 16:31 UTC (permalink / raw)
  To: barebox; +Cc: Andrey Smirnov

Despite what the Reference Manual says, experiment on i.MX7 SabreSD
shows that that UART2's base is located at offset 0x90000. This is
also corroborated by the offset used in dts/src/arm/imx7s.dtsi in
uart2.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 arch/arm/mach-imx/include/mach/imx7-regs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-imx/include/mach/imx7-regs.h b/arch/arm/mach-imx/include/mach/imx7-regs.h
index 8774c32d7..8625d0b61 100644
--- a/arch/arm/mach-imx/include/mach/imx7-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx7-regs.h
@@ -78,7 +78,7 @@
 #define MX7_ECSPI2_BASE_ADDR		(MX7_AIPS3_BASE_ADDR + 0x30000)
 #define MX7_ECSPI3_BASE_ADDR		(MX7_AIPS3_BASE_ADDR + 0x40000)
 #define MX7_UART1_BASE_ADDR		(MX7_AIPS3_BASE_ADDR + 0x60000)
-#define MX7_UART2_BASE_ADDR		(MX7_AIPS3_BASE_ADDR + 0x70000)
+#define MX7_UART2_BASE_ADDR		(MX7_AIPS3_BASE_ADDR + 0x90000)
 #define MX7_UART3_BASE_ADDR		(MX7_AIPS3_BASE_ADDR + 0x80000)
 #define MX7_SAI1_BASE_ADDR		(MX7_AIPS3_BASE_ADDR + 0xA0000)
 #define MX7_SAI2_BASE_ADDR		(MX7_AIPS3_BASE_ADDR + 0xB0000)
-- 
2.14.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH 2/2] i.MX7: Add CCM definitions for UART2
  2018-01-10 16:31 [PATCH 1/2] i.MX: Fix MX7_UART2_BASE_ADDR Andrey Smirnov
@ 2018-01-10 16:31 ` Andrey Smirnov
  2018-01-11  8:43 ` [PATCH 1/2] i.MX: Fix MX7_UART2_BASE_ADDR Sascha Hauer
  1 sibling, 0 replies; 3+ messages in thread
From: Andrey Smirnov @ 2018-01-10 16:31 UTC (permalink / raw)
  To: barebox; +Cc: Andrey Smirnov

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 arch/arm/mach-imx/include/mach/imx7-ccm-regs.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/mach-imx/include/mach/imx7-ccm-regs.h b/arch/arm/mach-imx/include/mach/imx7-ccm-regs.h
index a4217cca5..97fe240fc 100644
--- a/arch/arm/mach-imx/include/mach/imx7-ccm-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx7-ccm-regs.h
@@ -6,6 +6,7 @@
 #define CCM_CCGRn_CLR(n)	(0x4008 + 16 * (n))
 
 #define CCM_CCGR_UART1		148
+#define CCM_CCGR_UART2		149
 
 #define CCM_CCGR_SETTINGn(n, s)  ((s) << ((n) * 4))
 #define CCM_CCGR_SETTINGn_NOT_NEEDED(n)		CCM_CCGR_SETTINGn(n, 0b00)
@@ -28,5 +29,7 @@
 #define UART1_CLK_ROOT		CLOCK_ROOT_INDEX(0xaf80)
 #define UART1_CLK_ROOT__OSC_24M CCM_TARGET_ROOTn_MUX(0b000)
 
+#define UART2_CLK_ROOT		CLOCK_ROOT_INDEX(0xb000)
+#define UART2_CLK_ROOT__OSC_24M CCM_TARGET_ROOTn_MUX(0b000)
 
 #endif
-- 
2.14.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH 1/2] i.MX: Fix MX7_UART2_BASE_ADDR
  2018-01-10 16:31 [PATCH 1/2] i.MX: Fix MX7_UART2_BASE_ADDR Andrey Smirnov
  2018-01-10 16:31 ` [PATCH 2/2] i.MX7: Add CCM definitions for UART2 Andrey Smirnov
@ 2018-01-11  8:43 ` Sascha Hauer
  1 sibling, 0 replies; 3+ messages in thread
From: Sascha Hauer @ 2018-01-11  8:43 UTC (permalink / raw)
  To: Andrey Smirnov; +Cc: barebox

On Wed, Jan 10, 2018 at 08:31:14AM -0800, Andrey Smirnov wrote:
> Despite what the Reference Manual says, experiment on i.MX7 SabreSD
> shows that that UART2's base is located at offset 0x90000. This is
> also corroborated by the offset used in dts/src/arm/imx7s.dtsi in
> uart2.
> 
> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
> ---
>  arch/arm/mach-imx/include/mach/imx7-regs.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks

Sascha

> 
> diff --git a/arch/arm/mach-imx/include/mach/imx7-regs.h b/arch/arm/mach-imx/include/mach/imx7-regs.h
> index 8774c32d7..8625d0b61 100644
> --- a/arch/arm/mach-imx/include/mach/imx7-regs.h
> +++ b/arch/arm/mach-imx/include/mach/imx7-regs.h
> @@ -78,7 +78,7 @@
>  #define MX7_ECSPI2_BASE_ADDR		(MX7_AIPS3_BASE_ADDR + 0x30000)
>  #define MX7_ECSPI3_BASE_ADDR		(MX7_AIPS3_BASE_ADDR + 0x40000)
>  #define MX7_UART1_BASE_ADDR		(MX7_AIPS3_BASE_ADDR + 0x60000)
> -#define MX7_UART2_BASE_ADDR		(MX7_AIPS3_BASE_ADDR + 0x70000)
> +#define MX7_UART2_BASE_ADDR		(MX7_AIPS3_BASE_ADDR + 0x90000)
>  #define MX7_UART3_BASE_ADDR		(MX7_AIPS3_BASE_ADDR + 0x80000)
>  #define MX7_SAI1_BASE_ADDR		(MX7_AIPS3_BASE_ADDR + 0xA0000)
>  #define MX7_SAI2_BASE_ADDR		(MX7_AIPS3_BASE_ADDR + 0xB0000)
> -- 
> 2.14.3
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 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] 3+ messages in thread

end of thread, other threads:[~2018-01-11  8:43 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-10 16:31 [PATCH 1/2] i.MX: Fix MX7_UART2_BASE_ADDR Andrey Smirnov
2018-01-10 16:31 ` [PATCH 2/2] i.MX7: Add CCM definitions for UART2 Andrey Smirnov
2018-01-11  8:43 ` [PATCH 1/2] i.MX: Fix MX7_UART2_BASE_ADDR Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox