mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH v5 15/54] ARM: i.MX: Split shared CCM code into a separate file
Date: Tue, 12 Jun 2018 13:52:31 -0700	[thread overview]
Message-ID: <20180612205310.25745-16-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20180612205310.25745-1-andrew.smirnov@gmail.com>

Both i.MX8 and i.MX7 have similar CCMs, so move any code that can be
shared into a separate file.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 arch/arm/mach-imx/include/mach/ccm.h          | 20 +++++++++++++++++++
 .../arm/mach-imx/include/mach/imx7-ccm-regs.h | 16 +--------------
 2 files changed, 21 insertions(+), 15 deletions(-)
 create mode 100644 arch/arm/mach-imx/include/mach/ccm.h

diff --git a/arch/arm/mach-imx/include/mach/ccm.h b/arch/arm/mach-imx/include/mach/ccm.h
new file mode 100644
index 000000000..32254a85b
--- /dev/null
+++ b/arch/arm/mach-imx/include/mach/ccm.h
@@ -0,0 +1,20 @@
+#ifndef __IMX_CCM_H__
+
+/* 0 <= n <= 190 */
+#define CCM_CCGRn_SET(n)	(0x4004 + 16 * (n))
+#define CCM_CCGRn_CLR(n)	(0x4008 + 16 * (n))
+
+/* 0 <= n <= 120 */
+#define CCM_TARGET_ROOTn(n)	(0x8000 + 128 * (n))
+
+#define CCM_TARGET_ROOTn_MUX(x)		((x) << 24)
+#define CCM_TARGET_ROOTn_ENABLE		BIT(28)
+
+
+#define CCM_CCGR_SETTINGn(n, s)  ((s) << ((n) * 4))
+#define CCM_CCGR_SETTINGn_NOT_NEEDED(n)		CCM_CCGR_SETTINGn(n, 0b00)
+#define CCM_CCGR_SETTINGn_NEEDED_RUN(n)		CCM_CCGR_SETTINGn(n, 0b01)
+#define CCM_CCGR_SETTINGn_NEEDED_RUN_WAIT(n)	CCM_CCGR_SETTINGn(n, 0b10)
+#define CCM_CCGR_SETTINGn_NEEDED(n)		CCM_CCGR_SETTINGn(n, 0b11)
+
+#endif
\ No newline at end of file
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 97fe240fc..43b9425df 100644
--- a/arch/arm/mach-imx/include/mach/imx7-ccm-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx7-ccm-regs.h
@@ -1,25 +1,11 @@
 #ifndef __MACH_IMX7_CCM_REGS_H__
 #define __MACH_IMX7_CCM_REGS_H__
 
-/* 0 <= n <= 190 */
-#define CCM_CCGRn_SET(n)	(0x4004 + 16 * (n))
-#define CCM_CCGRn_CLR(n)	(0x4008 + 16 * (n))
+#include "ccm.h"
 
 #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)
-#define CCM_CCGR_SETTINGn_NEEDED_RUN(n)		CCM_CCGR_SETTINGn(n, 0b01)
-#define CCM_CCGR_SETTINGn_NEEDED_RUN_WAIT(n)	CCM_CCGR_SETTINGn(n, 0b10)
-#define CCM_CCGR_SETTINGn_NEEDED(n)		CCM_CCGR_SETTINGn(n, 0b11)
-
-/* 0 <= n <= 120 */
-#define CCM_TARGET_ROOTn(n)	(0x8000 + 128 * (n))
-
-#define CCM_TARGET_ROOTn_MUX(x)		((x) << 24)
-#define CCM_TARGET_ROOTn_ENABLE		BIT(28)
-
 #define CLOCK_ROOT_INDEX(x)	(((x) - 0x8000) / 128)
 
 /*
-- 
2.17.0


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

  parent reply	other threads:[~2018-06-12 20:54 UTC|newest]

Thread overview: 63+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-12 20:52 [PATCH v5 00/54] ARM: i.MX8MQ and EVK support Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 01/54] ARM: i.MX: xload: Fix compiler warning Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 02/54] ARM: i.MX: compile arm32 specific errata only for CPU32 Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 03/54] ARM: Add i.MX8 support Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 04/54] aarch64: Add i.MX8 debug UART support Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 05/54] Include our own include/dt-bindings Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 06/54] mci: imx-esdhc: use dma mapping functions Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 07/54] net: fec_imx: remove unnecessary DMA sync ops Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 08/54] net: fec_imx: Use dma mapping functions Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 09/54] net: fec_imx: Make use of IS_ALIGNED Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 10/54] clock: Add i.MX8MQ clock driver Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 11/54] serial: i.MX: Add i.MX8 support Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 12/54] mmc: i.MX esdhc: " Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 13/54] gpio: i.MX: Add i.MX8mq support Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 14/54] ARM: i.MX: ocotp: Add i.MX8MQ support Andrey Smirnov
2018-06-12 20:52 ` Andrey Smirnov [this message]
2018-06-12 20:52 ` [PATCH v5 16/54] ARM: i.MX: Add IOMUX pad constants for i.MX8 Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 17/54] ARM: i.MX: Add basic CCM " Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 18/54] ARM: Add constants and helpers for system counter interface Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 19/54] clocksource: armv8-timer: Convert explicit assembly into helpers Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 20/54] ARM: i.MX8: Initialize system counter Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 21/54] ARM: i.MX: boot: Fix address casting on 64-bit platforms Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 22/54] ARM: boot: Add trivial i.MX8 support Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 23/54] ARM: i.MX: xload-esdhc: Rework to make code be less i.MX6-specific Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 24/54] ARM: i.MX: xload-esdhc: Allow custom buffer address, device offset Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 25/54] ARM: i.MX: xload-esdhc: Add support for i.MX8 Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 26/54] pinctrl: i.MX: " Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 27/54] Documentation: imx: Change block size for 'dd' to 1024 Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 28/54] Documentation: i.MX: Add missing <soctype> Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 29/54] clocksource: armv8-timer: Make armv8_clocksource_read() static Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 30/54] clocksource: armv8-timer: Make use of postcore_platform_driver() Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 31/54] Port <linux/iopoll.h> from U-Boot Andrey Smirnov
2018-06-13  8:12   ` Sascha Hauer
2018-06-13 12:29     ` Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 32/54] common/clock: Move delay and timeout functions to lib/ Andrey Smirnov
2018-06-13  8:19   ` Sascha Hauer
2018-06-13 12:26     ` Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 33/54] clock: Use udelay() to implement mdelay() Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 34/54] ARM: i.MX8: Add DDRC PHY and DDR CTL base addresses Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 35/54] Kbuild: Add $(quote) Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 36/54] Add builtin firmware support Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 37/54] ARM: i.MX8: Add DDRC PHY support code Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 38/54] ARM: Specify HAVE_PBL_IMAGE for CPU_64 Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 39/54] ARM: lib64: Make string functions aware of MMU configuration Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 40/54] ARM: mmu: Make use of dsb() and isb() helpers Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 41/54] ARM: cache: Remove unused cache ops struct Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 42/54] ARM: no-mmu: Disable building for ARMv8 Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 43/54] ARM: interrupts64: Include ESR value in exception traceback Andrey Smirnov
2018-06-12 20:53 ` [PATCH v5 44/54] ARM: mmu64: Trivial code simplification Andrey Smirnov
2018-06-12 20:53 ` [PATCH v5 45/54] ARM: mmu64: Make use of create_table() Andrey Smirnov
2018-06-12 20:53 ` [PATCH v5 46/54] ARM: mmu64: Convert flags in arch_remap_range() Andrey Smirnov
2018-06-12 20:53 ` [PATCH v5 47/54] ARM: include: dma: Add missing no-MMU stubs Andrey Smirnov
2018-06-12 20:53 ` [PATCH v5 48/54] scripts: imx-image: Drop error return from write_dcd() Andrey Smirnov
2018-06-12 20:53 ` [PATCH v5 49/54] scripts: imx-image: Limit v2 header size to HEADER_LEN Andrey Smirnov
2018-06-12 20:53 ` [PATCH v5 50/54] scripts: imx-image: Use a loop to create multiple header copies Andrey Smirnov
2018-06-12 20:53 ` [PATCH v5 51/54] scripts: imx-image: Share the code to write barebox header Andrey Smirnov
2018-06-12 20:53 ` [PATCH v5 52/54] scripts: imx-image: Add i.MX8MQ support Andrey Smirnov
2018-06-12 20:53 ` [PATCH v5 53/54] ARM: i.MX8: Add i.MX8mq EVK support Andrey Smirnov
2018-06-13  8:49   ` Christian Hemp
2018-06-13 12:33     ` Andrey Smirnov
2018-06-12 20:53 ` [PATCH v5 54/54] ARM: Introduce imx_v8_defconfig Andrey Smirnov
2018-06-13  8:24 ` [PATCH v5 00/54] ARM: i.MX8MQ and EVK support Sascha Hauer
2018-06-13 12:29   ` Andrey Smirnov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180612205310.25745-16-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox