omap3: Drop CONFIG_OMAP3_EVM, switch to CONFIG_TARGET_OMAP3_EVM when needed
We make use of CONFIG_OMAP3_EVM today to know when to do a specific tweak in MUSB. This can be tested on via CONFIG_TARGET_OMAP3_EVM instead, so switch there so we can drop the now unused symbol CONFIG_OMAP3_EVM. In investigating what to do about the symbol usage we see that the cairo board defines the same function, but never called it (as it does not define CONFIG_OMAP3_EVM) and was just returning anyhow, so drop that function from that board. Cc: "Albert ARIBAUD (3ADEV)" <albert.aribaud@3adev.fr> Cc: Marek Vasut <marex@denx.de> Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
d87f82967f
commit
864896be3b
@ -25,18 +25,6 @@
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
/*
|
||||
* MUSB port on OMAP3EVM Rev >= E requires extvbus programming.
|
||||
*/
|
||||
u8 omap3_evm_need_extvbus(void)
|
||||
{
|
||||
u8 retval = 0;
|
||||
|
||||
/* TODO: verify if cairo handheld platform needs extvbus programming */
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
/*
|
||||
* Routine: board_init
|
||||
* Description: Early hardware init.
|
||||
|
@ -118,7 +118,7 @@ int musb_platform_init(void)
|
||||
stdby &= ~OMAP3_OTG_FORCESTDBY_STANDBY;
|
||||
writel(stdby, &otg->forcestdby);
|
||||
|
||||
#ifdef CONFIG_OMAP3_EVM
|
||||
#ifdef CONFIG_TARGET_OMAP3_EVM
|
||||
musb_cfg.extvbus = omap3_evm_need_extvbus();
|
||||
#endif
|
||||
|
||||
|
@ -32,7 +32,7 @@
|
||||
|
||||
int musb_platform_init(void);
|
||||
|
||||
#ifdef CONFIG_OMAP3_EVM
|
||||
#ifdef CONFIG_TARGET_OMAP3_EVM
|
||||
extern u8 omap3_evm_need_extvbus(void);
|
||||
#endif
|
||||
|
||||
|
@ -87,8 +87,6 @@
|
||||
|
||||
#define CONFIG_SDRC /* The chip has SDRC controller */
|
||||
|
||||
#define CONFIG_OMAP3_EVM /* This is a OMAP3 EVM */
|
||||
|
||||
/*
|
||||
* Clock related definitions
|
||||
*/
|
||||
|
@ -1981,7 +1981,6 @@ CONFIG_OF_STDOUT_PATH
|
||||
CONFIG_OF_SUPPORT_OLD_DEVICE_TREES
|
||||
CONFIG_OMAP3_AM3517CRANE
|
||||
CONFIG_OMAP3_DEVKIT8000
|
||||
CONFIG_OMAP3_EVM
|
||||
CONFIG_OMAP3_GPIO_2
|
||||
CONFIG_OMAP3_GPIO_3
|
||||
CONFIG_OMAP3_GPIO_4
|
||||
|
Loading…
Reference in New Issue
Block a user