diff options
| author | Marek Vasut <marex@denx.de> | 2012-11-24 14:15:51 +0000 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2012-12-04 09:01:04 +0100 |
| commit | 893aabbead3a6f9cca3cc9aaf7fa7c8c160dcf69 (patch) | |
| tree | 7161c0728fd209c5d809556b797086447cc8ede6 /arch/arm/include/asm/arch-mxs | |
| parent | 3642b1c1478897ea8cb51772df39c2f4b5385477 (diff) | |
| download | talos-obmc-uboot-893aabbead3a6f9cca3cc9aaf7fa7c8c160dcf69.tar.gz talos-obmc-uboot-893aabbead3a6f9cca3cc9aaf7fa7c8c160dcf69.zip | |
mx28: Rename regs-power.h to regs-power-mx28.h
The i.MX23 has different register layout and bit placement in the
power supply. Thus, in order to be able to add support for MX23,
rename the MX28's regs-power.h to regs-power-mx28.h . Moreover,
add ifdef around inclusion of regs-*-mx28.h in imx-regs.h so the
MX23 boards will include proper set of registers.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'arch/arm/include/asm/arch-mxs')
| -rw-r--r-- | arch/arm/include/asm/arch-mxs/imx-regs.h | 7 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-mxs/regs-power-mx28.h (renamed from arch/arm/include/asm/arch-mxs/regs-power.h) | 0 |
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/include/asm/arch-mxs/imx-regs.h b/arch/arm/include/asm/arch-mxs/imx-regs.h index 5e1901e6c4..9764041b48 100644 --- a/arch/arm/include/asm/arch-mxs/imx-regs.h +++ b/arch/arm/include/asm/arch-mxs/imx-regs.h @@ -26,7 +26,6 @@ #include <asm/arch/regs-apbh.h> #include <asm/arch/regs-base.h> #include <asm/arch/regs-bch.h> -#include <asm/arch/regs-clkctrl-mx28.h> #include <asm/arch/regs-digctl.h> #include <asm/arch/regs-gpmi.h> #include <asm/arch/regs-i2c.h> @@ -34,9 +33,13 @@ #include <asm/arch/regs-lradc.h> #include <asm/arch/regs-ocotp.h> #include <asm/arch/regs-pinctrl.h> -#include <asm/arch/regs-power.h> #include <asm/arch/regs-rtc.h> #include <asm/arch/regs-ssp.h> #include <asm/arch/regs-timrot.h> +#ifdef CONFIG_MX28 +#include <asm/arch/regs-clkctrl-mx28.h> +#include <asm/arch/regs-power-mx28.h> +#endif + #endif /* __IMX_REGS_H__ */ diff --git a/arch/arm/include/asm/arch-mxs/regs-power.h b/arch/arm/include/asm/arch-mxs/regs-power-mx28.h index 257ee88e82..257ee88e82 100644 --- a/arch/arm/include/asm/arch-mxs/regs-power.h +++ b/arch/arm/include/asm/arch-mxs/regs-power-mx28.h |
