From: Tom Rini <trini@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 05/10] am33xx: add ti814x specific register definitions
Date: Mon, 18 Feb 2013 10:18:42 -0500 [thread overview]
Message-ID: <20130218151842.GC29026@bill-the-cat> (raw)
In-Reply-To: <87txpaofbi.fsf@dell.be.48ers.dk>
On Sun, Feb 17, 2013 at 09:28:33PM +0100, Peter Korsgaard wrote:
> >>>>> "Matt" == Matt Porter <mporter@ti.com> writes:
>
> Matt> Support the ti814x specific register definitions within
> Matt> arch-am33xx.
>
> Matt> Signed-off-by: Matt Porter <mporter@ti.com>
> Matt> ---
> Matt> arch/arm/cpu/armv7/am33xx/sys_info.c | 3 +++
> Matt> arch/arm/include/asm/arch-am33xx/cpu.h | 11 +++++----
> Matt> arch/arm/include/asm/arch-am33xx/hardware.h | 32 +++++++++++++++++++++++++++
> Matt> arch/arm/include/asm/arch-am33xx/omap.h | 7 ++++++
> Matt> arch/arm/include/asm/arch-am33xx/spl.h | 5 +++++
> Matt> 5 files changed, 54 insertions(+), 4 deletions(-)
>
> Matt> diff --git a/arch/arm/include/asm/arch-am33xx/hardware.h b/arch/arm/include/asm/arch-am33xx/hardware.h
> Matt> index 41ab2c0..786c159 100644
> Matt> --- a/arch/arm/include/asm/arch-am33xx/hardware.h
> Matt> +++ b/arch/arm/include/asm/arch-am33xx/hardware.h
> Matt> @@ -20,9 +20,14 @@
> Matt> #define __AM33XX_HARDWARE_H
>
> Matt> #include <asm/arch/omap.h>
> Matt> +#include <config.h>
>
> Quite some of the base addresses are similar, but I wonder if it
> wouldn't be cleaner to simply have a hardware-am33xx.h /
> hardware-ti814x.h instead of all these ifdef / elif?
Since I suspect the things common from ti814x and am33xx are also common
to ti816x (which has been left as an exercise to whomever needs that
next), I think we can re-structure this into something like that, but
keeping the common parts within hardware.h still.
> Matt> /* Control Module Base Address */
> Matt> +#ifdef CONFIG_AM33XX
> Matt> #define CTRL_BASE 0x44E10000
> Matt> #define CTRL_DEVICE_BASE 0x44E10600
> Matt> +#elif defined(CONFIG_TI814X)
> Matt> +#define CTRL_BASE 0x48140000
> Matt> +#endif
>
> No CTRL_DEVICE_BASE on ti814x?
I think this is a side-effect of Matt not supporting the things attached
to it (USB in the case of am335x).
> Matt> --- a/arch/arm/include/asm/arch-am33xx/spl.h
> Matt> +++ b/arch/arm/include/asm/arch-am33xx/spl.h
> Matt> @@ -25,8 +25,13 @@
>
> Matt> #define BOOT_DEVICE_XIP 2
> Matt> #define BOOT_DEVICE_NAND 5
> Matt> +#ifdef CONFIG_AM33XX
> Matt> #define BOOT_DEVICE_MMC1 8
> Matt> #define BOOT_DEVICE_MMC2 9 /* eMMC or daughter card */
> Matt> +#elif defined(CONFIG_TI814X)
> Matt> +#define BOOT_DEVICE_MMC1 9
> Matt> +#define BOOT_DEVICE_MMC2 8 /* ROM only supports 2nd instance */
>
> Argh! Couldn't we just swap the meaning of mmc1/mmc2 or would that be
> too confusing?
IMHO, that will lead to further confusion down the line. I talked with
Matt about this before and well, it's funky.
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130218/8a90135f/attachment.pgp>
next prev parent reply other threads:[~2013-02-18 15:18 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-13 14:43 [U-Boot] [PATCH 00/10] Add TI814x EVM Support Matt Porter
2013-02-13 14:43 ` [U-Boot] [PATCH 01/10] am33xx: convert defines from am33xx-specific to generic names Matt Porter
2013-02-15 16:36 ` Tom Rini
2013-02-13 14:43 ` [U-Boot] [PATCH 02/10] am33xx: refactor emif4/ddr to support multiple EMIF instances Matt Porter
2013-02-15 16:37 ` Tom Rini
2013-02-13 14:43 ` [U-Boot] [PATCH 03/10] am33xx: refactor am33xx clocks and add ti814x support Matt Porter
2013-02-15 16:37 ` Tom Rini
[not found] ` <2cc71ab85c654e688082a434442f08d8@DLEE74.ent.ti.com>
2013-02-15 21:16 ` Matt Porter
2013-02-17 20:17 ` Peter Korsgaard
2013-02-25 14:31 ` Matt Porter
2013-02-13 14:43 ` [U-Boot] [PATCH 04/10] am33xx: refactor am33xx mux support " Matt Porter
2013-02-15 16:37 ` Tom Rini
2013-02-17 20:18 ` Peter Korsgaard
[not found] ` <463068779ea9433098998cd260b4c550@DFLE73.ent.ti.com>
2013-02-25 14:32 ` Matt Porter
2013-02-13 14:43 ` [U-Boot] [PATCH 05/10] am33xx: add ti814x specific register definitions Matt Porter
2013-02-15 16:37 ` Tom Rini
2013-02-17 20:28 ` Peter Korsgaard
2013-02-18 15:18 ` Tom Rini [this message]
2013-02-18 15:21 ` Peter Korsgaard
2013-02-21 22:08 ` Brian Hutchinson
2013-02-22 15:37 ` Peter Korsgaard
2013-02-22 15:51 ` Tom Rini
2013-02-22 16:34 ` Peter Korsgaard
[not found] ` <bc703446ae2c4dc79a6097dc28327030@DLEE74.ent.ti.com>
2013-02-25 14:46 ` Matt Porter
2013-02-13 14:44 ` [U-Boot] [PATCH 06/10] am33xx: add dmm support to emif4 library Matt Porter
2013-02-15 16:38 ` Tom Rini
2013-02-13 14:44 ` [U-Boot] [PATCH 07/10] ti814x_evm: add ti814x evm board support Matt Porter
2013-02-15 16:38 ` Tom Rini
[not found] ` <e0c6e2fe1afd4a5887b85c5b7d1877ce@DLEE74.ent.ti.com>
2013-02-15 21:19 ` Matt Porter
2013-02-13 14:44 ` [U-Boot] [PATCH 08/10] ns16550: enable quirks for ti814x Matt Porter
2013-02-15 16:38 ` Tom Rini
2013-02-13 14:44 ` [U-Boot] [PATCH 09/10] ti814x_evm: enable ti814x evm build Matt Porter
2013-02-15 16:39 ` Tom Rini
2013-02-15 21:20 ` Matt Porter
2013-02-13 14:44 ` [U-Boot] [PATCH 10/10] MAINTAINERS: add ti814x_evm maintainer Matt Porter
2013-02-15 16:39 ` Tom Rini
2013-02-15 21:21 ` Matt Porter
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=20130218151842.GC29026@bill-the-cat \
--to=trini@ti.com \
--cc=u-boot@lists.denx.de \
/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