mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-27 06:18:13 +00:00
Koen Kooi
130 lines
4.6 KiB
Diff
130 lines
4.6 KiB
Diff
From 44ab86140417f173835e19bed62d6832023f2914 Mon Sep 17 00:00:00 2001
|
|
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
|
|
Date: Wed, 17 Aug 2011 16:02:55 +0200
|
|
Subject: [PATCH] OMAP: Fix linking error in twl-common.c for OMAP2/3/4 only builds
|
|
|
|
Commit b22f954 (OMAP4: Move common twl6030 configuration to twl-common)
|
|
caused compile failures for code for OMAP arch which is not selected by
|
|
the config.
|
|
|
|
Fixes issues like:
|
|
With CONFIG_ARCH_OMAP3=y and CONFIG_ARCH_OMAP4=n, I'm getting this:
|
|
|
|
arch/arm/mach-omap2/built-in.o:(.data+0xf99c): undefined reference to `omap4430_phy_init'
|
|
arch/arm/mach-omap2/built-in.o:(.data+0xf9a0): undefined reference to `omap4430_phy_exit'
|
|
arch/arm/mach-omap2/built-in.o:(.data+0xf9a4): undefined reference to `omap4430_phy_power'
|
|
arch/arm/mach-omap2/built-in.o:(.data+0xf9a8): undefined reference to `omap4430_phy_set_clk'
|
|
arch/arm/mach-omap2/built-in.o:(.data+0xf9ac): undefined reference to `omap4430_phy_suspend'
|
|
|
|
Fix the problem by moving the code to ifdef sections for omap3 and omap4.
|
|
|
|
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
|
|
[tony@atomide.com: updated comments]
|
|
Signed-off-by: Tony Lindgren <tony@atomide.com>
|
|
---
|
|
arch/arm/mach-omap2/twl-common.c | 77 ++++++++++++++++++++------------------
|
|
1 files changed, 41 insertions(+), 36 deletions(-)
|
|
|
|
diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c
|
|
index 3aaa46f..58409c0 100644
|
|
--- a/arch/arm/mach-omap2/twl-common.c
|
|
+++ b/arch/arm/mach-omap2/twl-common.c
|
|
@@ -48,14 +48,7 @@ void __init omap_pmic_init(int bus, u32 clkrate,
|
|
omap_register_i2c_bus(bus, clkrate, &pmic_i2c_board_info, 1);
|
|
}
|
|
|
|
-static struct twl4030_usb_data omap4_usb_pdata = {
|
|
- .phy_init = omap4430_phy_init,
|
|
- .phy_exit = omap4430_phy_exit,
|
|
- .phy_power = omap4430_phy_power,
|
|
- .phy_set_clock = omap4430_phy_set_clk,
|
|
- .phy_suspend = omap4430_phy_suspend,
|
|
-};
|
|
-
|
|
+#if defined(CONFIG_ARCH_OMAP3)
|
|
static struct twl4030_usb_data omap3_usb_pdata = {
|
|
.usb_mode = T2_USB_MODE_ULPI,
|
|
};
|
|
@@ -122,6 +115,45 @@ static struct regulator_init_data omap3_vpll2_idata = {
|
|
.consumer_supplies = omap3_vpll2_supplies,
|
|
};
|
|
|
|
+void __init omap3_pmic_get_config(struct twl4030_platform_data *pmic_data,
|
|
+ u32 pdata_flags, u32 regulators_flags)
|
|
+{
|
|
+ if (!pmic_data->irq_base)
|
|
+ pmic_data->irq_base = TWL4030_IRQ_BASE;
|
|
+ if (!pmic_data->irq_end)
|
|
+ pmic_data->irq_end = TWL4030_IRQ_END;
|
|
+
|
|
+ /* Common platform data configurations */
|
|
+ if (pdata_flags & TWL_COMMON_PDATA_USB && !pmic_data->usb)
|
|
+ pmic_data->usb = &omap3_usb_pdata;
|
|
+
|
|
+ if (pdata_flags & TWL_COMMON_PDATA_BCI && !pmic_data->bci)
|
|
+ pmic_data->bci = &omap3_bci_pdata;
|
|
+
|
|
+ if (pdata_flags & TWL_COMMON_PDATA_MADC && !pmic_data->madc)
|
|
+ pmic_data->madc = &omap3_madc_pdata;
|
|
+
|
|
+ if (pdata_flags & TWL_COMMON_PDATA_AUDIO && !pmic_data->codec)
|
|
+ pmic_data->codec = &omap3_codec_pdata;
|
|
+
|
|
+ /* Common regulator configurations */
|
|
+ if (regulators_flags & TWL_COMMON_REGULATOR_VDAC && !pmic_data->vdac)
|
|
+ pmic_data->vdac = &omap3_vdac_idata;
|
|
+
|
|
+ if (regulators_flags & TWL_COMMON_REGULATOR_VPLL2 && !pmic_data->vpll2)
|
|
+ pmic_data->vpll2 = &omap3_vpll2_idata;
|
|
+}
|
|
+#endif /* CONFIG_ARCH_OMAP3 */
|
|
+
|
|
+#if defined(CONFIG_ARCH_OMAP4)
|
|
+static struct twl4030_usb_data omap4_usb_pdata = {
|
|
+ .phy_init = omap4430_phy_init,
|
|
+ .phy_exit = omap4430_phy_exit,
|
|
+ .phy_power = omap4430_phy_power,
|
|
+ .phy_set_clock = omap4430_phy_set_clk,
|
|
+ .phy_suspend = omap4430_phy_suspend,
|
|
+};
|
|
+
|
|
static struct regulator_init_data omap4_vdac_idata = {
|
|
.constraints = {
|
|
.min_uV = 1800000,
|
|
@@ -274,31 +306,4 @@ void __init omap4_pmic_get_config(struct twl4030_platform_data *pmic_data,
|
|
pmic_data->clk32kg = &omap4_clk32kg_idata;
|
|
}
|
|
|
|
-void __init omap3_pmic_get_config(struct twl4030_platform_data *pmic_data,
|
|
- u32 pdata_flags, u32 regulators_flags)
|
|
-{
|
|
- if (!pmic_data->irq_base)
|
|
- pmic_data->irq_base = TWL4030_IRQ_BASE;
|
|
- if (!pmic_data->irq_end)
|
|
- pmic_data->irq_end = TWL4030_IRQ_END;
|
|
-
|
|
- /* Common platform data configurations */
|
|
- if (pdata_flags & TWL_COMMON_PDATA_USB && !pmic_data->usb)
|
|
- pmic_data->usb = &omap3_usb_pdata;
|
|
-
|
|
- if (pdata_flags & TWL_COMMON_PDATA_BCI && !pmic_data->bci)
|
|
- pmic_data->bci = &omap3_bci_pdata;
|
|
-
|
|
- if (pdata_flags & TWL_COMMON_PDATA_MADC && !pmic_data->madc)
|
|
- pmic_data->madc = &omap3_madc_pdata;
|
|
-
|
|
- if (pdata_flags & TWL_COMMON_PDATA_AUDIO && !pmic_data->codec)
|
|
- pmic_data->codec = &omap3_codec_pdata;
|
|
-
|
|
- /* Common regulator configurations */
|
|
- if (regulators_flags & TWL_COMMON_REGULATOR_VDAC && !pmic_data->vdac)
|
|
- pmic_data->vdac = &omap3_vdac_idata;
|
|
-
|
|
- if (regulators_flags & TWL_COMMON_REGULATOR_VPLL2 && !pmic_data->vpll2)
|
|
- pmic_data->vpll2 = &omap3_vpll2_idata;
|
|
-}
|
|
+#endif /* CONFIG_ARCH_OMAP4 */
|
|
--
|
|
1.7.2.5
|
|
|