diff options
author | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2013-05-29 12:38:12 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2013-06-08 14:00:05 -0400 |
commit | e4020aa9a8f37d860024fe8a8c8441f003606d2b (patch) | |
tree | 79f083b18729b10a14f362adfe92c510c821b5c0 /arch/arm/mach-omap2 | |
parent | 20d49e9ccfece526db755940721aa13e331936d4 (diff) |
ARM: OMAP5: Enable build and frameowrk initialisations
Include the OMAP5 data files in build. Initialise the voltage, power,
clock domains.
Cc: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/Makefile | 4 | ||||
-rw-r--r-- | arch/arm/mach-omap2/io.c | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 55a9d6777683..27448ab320fd 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile | |||
@@ -127,6 +127,7 @@ obj-$(CONFIG_ARCH_OMAP4) += voltagedomains44xx_data.o | |||
127 | obj-$(CONFIG_SOC_AM33XX) += $(voltagedomain-common) | 127 | obj-$(CONFIG_SOC_AM33XX) += $(voltagedomain-common) |
128 | obj-$(CONFIG_SOC_AM33XX) += voltagedomains33xx_data.o | 128 | obj-$(CONFIG_SOC_AM33XX) += voltagedomains33xx_data.o |
129 | obj-$(CONFIG_SOC_OMAP5) += $(voltagedomain-common) | 129 | obj-$(CONFIG_SOC_OMAP5) += $(voltagedomain-common) |
130 | obj-$(CONFIG_SOC_OMAP5) += voltagedomains54xx_data.o | ||
130 | 131 | ||
131 | # OMAP powerdomain framework | 132 | # OMAP powerdomain framework |
132 | powerdomain-common += powerdomain.o powerdomain-common.o | 133 | powerdomain-common += powerdomain.o powerdomain-common.o |
@@ -141,6 +142,7 @@ obj-$(CONFIG_ARCH_OMAP4) += powerdomains44xx_data.o | |||
141 | obj-$(CONFIG_SOC_AM33XX) += $(powerdomain-common) | 142 | obj-$(CONFIG_SOC_AM33XX) += $(powerdomain-common) |
142 | obj-$(CONFIG_SOC_AM33XX) += powerdomains33xx_data.o | 143 | obj-$(CONFIG_SOC_AM33XX) += powerdomains33xx_data.o |
143 | obj-$(CONFIG_SOC_OMAP5) += $(powerdomain-common) | 144 | obj-$(CONFIG_SOC_OMAP5) += $(powerdomain-common) |
145 | obj-$(CONFIG_SOC_OMAP5) += powerdomains54xx_data.o | ||
144 | 146 | ||
145 | # PRCM clockdomain control | 147 | # PRCM clockdomain control |
146 | clockdomain-common += clockdomain.o | 148 | clockdomain-common += clockdomain.o |
@@ -156,6 +158,7 @@ obj-$(CONFIG_ARCH_OMAP4) += clockdomains44xx_data.o | |||
156 | obj-$(CONFIG_SOC_AM33XX) += $(clockdomain-common) | 158 | obj-$(CONFIG_SOC_AM33XX) += $(clockdomain-common) |
157 | obj-$(CONFIG_SOC_AM33XX) += clockdomains33xx_data.o | 159 | obj-$(CONFIG_SOC_AM33XX) += clockdomains33xx_data.o |
158 | obj-$(CONFIG_SOC_OMAP5) += $(clockdomain-common) | 160 | obj-$(CONFIG_SOC_OMAP5) += $(clockdomain-common) |
161 | obj-$(CONFIG_SOC_OMAP5) += clockdomains54xx_data.o | ||
159 | 162 | ||
160 | # Clock framework | 163 | # Clock framework |
161 | obj-$(CONFIG_ARCH_OMAP2) += $(clock-common) clock2xxx.o | 164 | obj-$(CONFIG_ARCH_OMAP2) += $(clock-common) clock2xxx.o |
@@ -198,6 +201,7 @@ obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_2xxx_3xxx_interconnect_data.o | |||
198 | obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_3xxx_data.o | 201 | obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_3xxx_data.o |
199 | obj-$(CONFIG_SOC_AM33XX) += omap_hwmod_33xx_data.o | 202 | obj-$(CONFIG_SOC_AM33XX) += omap_hwmod_33xx_data.o |
200 | obj-$(CONFIG_ARCH_OMAP4) += omap_hwmod_44xx_data.o | 203 | obj-$(CONFIG_ARCH_OMAP4) += omap_hwmod_44xx_data.o |
204 | obj-$(CONFIG_SOC_OMAP5) += omap_hwmod_54xx_data.o | ||
201 | 205 | ||
202 | # EMU peripherals | 206 | # EMU peripherals |
203 | obj-$(CONFIG_OMAP3_EMU) += emu.o | 207 | obj-$(CONFIG_OMAP3_EMU) += emu.o |
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 09abf99e9e57..ce54b4fb6641 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c | |||
@@ -631,7 +631,13 @@ void __init omap5_init_early(void) | |||
631 | omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE)); | 631 | omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE)); |
632 | omap_prm_base_init(); | 632 | omap_prm_base_init(); |
633 | omap_cm_base_init(); | 633 | omap_cm_base_init(); |
634 | omap44xx_prm_init(); | ||
634 | omap5xxx_check_revision(); | 635 | omap5xxx_check_revision(); |
636 | omap54xx_voltagedomains_init(); | ||
637 | omap54xx_powerdomains_init(); | ||
638 | omap54xx_clockdomains_init(); | ||
639 | omap54xx_hwmod_init(); | ||
640 | omap_hwmod_init_postsetup(); | ||
635 | } | 641 | } |
636 | #endif | 642 | #endif |
637 | 643 | ||