Skip to contentSkip to conversation

mx28: Rename regs-power.h to regs-power-mx28.h

PATCH New Marek Vasut 2 participants 3 messages Nov 25, 2012

Subsystems (2)
Arm (32-bit) Arm i.MX and Layerscape
lore
Share & tools
lore

Marek Vasut

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
Cc Stefano Babic <[email protected]>
---
 arch/arm/include/asm/arch-mxs/imx-regs.h                        |    7 +++++--
 .../include/asm/arch-mxs/{regs-power.h => regs-power-mx28.h}    |    0
 2 files changed, 5 insertions(+), 2 deletions(-)
 rename arch/arm/include/asm/arch-mxs/{regs-power.h => regs-power-mx28.h} (100%)
arch/arm/include/asm/arch-mxs/imx-regs.h +5 -2
index 5e1901e..9764041 100644
@@ -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__ */
arch/arm/include/asm/arch-mxs/regs-power-mx28.h renamed from arch/arm/include/asm/arch-mxs/regs-power.h +0 -0
similarity index 100%
rename from arch/arm/include/asm/arch-mxs/regs-power.h
rename to arch/arm/include/asm/arch-mxs/regs-power-mx28.h
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 mx28: Rename regs-power.h to regs-power-mx28.h

Quoted 8 lines · Marek Vasut

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 <[email protected]>
Cc Stefano Babic <[email protected]>

This is done in my tree too; please wait me to finish my port and we merge it.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
E-mail: otavio at ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
author
#2 lore raw

PATCH 1/1 mx28: Rename regs-power.h to regs-power-mx28.h

Dear Otavio Salvador,

Quoted 7 lines · Marek Vasut
Quoted 6 lines

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.

Quoted 5 lines
Quoted 2 lines
Signed-off-by Marek Vasut <[email protected]>
Cc Stefano Babic <[email protected]>

This is done in my tree too; please wait me to finish my port and we merge it.

Again, you are trying to block upstream development because it breaks your out- of-tree port. This can not be done, sorry.

Best regards,
Marek Vasut