Le vendredi 12 mai 2017 à 22:33 -0400, Tom Rini a écrit :
While there are a few different OMAP4 SoCs, today we always set CONFIG_OMAP4430 and CONFIG_OMAP44XX. Convert the few test of CONFIG_OMAP4430 to CONFIG_OMAP44XX.
I don't have any omap4 device in hands these days, but I definitely agree with the intent. If this is not merged when I get access back to my device (in approx. 1 month), I will test and report back.
Cc: Marek Vasut marex@denx.de Cc: Paul Kocialkowski contact@paulk.fr Signed-off-by: Tom Rini trini@konsulko.com
drivers/usb/musb-new/linux-compat.h | 2 +- drivers/usb/musb-new/omap2430.c | 2 +- drivers/usb/musb/omap3.c | 4 ++-- include/configs/kc1.h | 5 ----- include/configs/ti_omap4_common.h | 4 ---- scripts/config_whitelist.txt | 1 - 6 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/drivers/usb/musb-new/linux-compat.h b/drivers/usb/musb- new/linux-compat.h index 92449775799f..4dae83ed6850 100644 --- a/drivers/usb/musb-new/linux-compat.h +++ b/drivers/usb/musb-new/linux-compat.h @@ -30,7 +30,7 @@ #define CONFIG_SOC_OMAP3430 #endif
-#ifdef CONFIG_OMAP4430 +#ifdef CONFIG_OMAP44XX #define CONFIG_ARCH_OMAP4 #endif
diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb- new/omap2430.c index 684ad9539af5..ba22dfe6cb09 100644 --- a/drivers/usb/musb-new/omap2430.c +++ b/drivers/usb/musb-new/omap2430.c @@ -441,7 +441,7 @@ static int omap2430_musb_enable(struct musb *musb) twl6030_usb_device_settings(); #endif
-#ifdef CONFIG_OMAP4430 +#ifdef CONFIG_OMAP44XX u32 *usbotghs_control = (u32 *)((*ctrl)-
control_usbotghs_ctrl);
*usbotghs_control = USBOTGHS_CONTROL_AVALID | USBOTGHS_CONTROL_VBUSVALID | USBOTGHS_CONTROL_IDDIG; diff --git a/drivers/usb/musb/omap3.c b/drivers/usb/musb/omap3.c index 99b4291a27d8..57889ef0e7d2 100644 --- a/drivers/usb/musb/omap3.c +++ b/drivers/usb/musb/omap3.c @@ -55,7 +55,7 @@ static struct omap3_otg_regs *otg; #define OMAP3_OTG_SYSSTATUS_RESETDONE 0x0001
/* OMAP4430 has an internal PHY, use it */ -#ifdef CONFIG_OMAP4430 +#ifdef CONFIG_OMAP44XX #define OMAP3_OTG_INTERFSEL_OMAP 0x0000 #else #define OMAP3_OTG_INTERFSEL_OMAP 0x0001 @@ -122,7 +122,7 @@ int musb_platform_init(void) musb_cfg.extvbus = omap3_evm_need_extvbus(); #endif
-#ifdef CONFIG_OMAP4430 +#ifdef CONFIG_OMAP44XX u32 *usbotghs_control = (u32 *)((*ctrl)->control_usbotghs_ctrl); *usbotghs_control = 0x15; diff --git a/include/configs/kc1.h b/include/configs/kc1.h index 939bd6c8129e..39c750c15e01 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -24,11 +24,6 @@ #define CONFIG_SYS_PL310_BASE 0x48242000
/*
- Platform
- */
-#define CONFIG_OMAP4430
-/*
- Board
*/
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index b85db500b574..1a6551e24d20 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -12,10 +12,6 @@ #ifndef __CONFIG_TI_OMAP4_COMMON_H #define __CONFIG_TI_OMAP4_COMMON_H
-/*
- High Level Configuration Options
- */
-#define CONFIG_OMAP4430 1 /* which is in a 4430 */ #define CONFIG_MISC_INIT_R
#ifndef CONFIG_SYS_L2CACHE_OFF diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 4382b6aa1a1f..93ee3035d183 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1992,7 +1992,6 @@ CONFIG_OMAP3_MICRON_DDR CONFIG_OMAP3_RX51 CONFIG_OMAP3_SPI_D0_D1_SWAPPED CONFIG_OMAP3_ZOOM1 -CONFIG_OMAP4430 CONFIG_OMAP_EHCI_PHY1_RESET_GPIO CONFIG_OMAP_EHCI_PHY2_RESET_GPIO CONFIG_OMAP_EHCI_PHY3_RESET_GPIO