[U-Boot] [PATCH 0/2] ARM: DRA7/AM57xx: Get rid of CONFIG_AM57XX
CONFIG_AM57XX is redundant as DRA7 and AM57xx uses the same SoC type. This series removes this config.
Nishanth Menon (2): usb: xhci: Remove assumption of DWC instance based on DRA7 SoC type ARM: DRA7x/AM57xx: Get rid of CONFIG_AM57XX
arch/arm/include/asm/arch-omap5/clock.h | 2 +- arch/arm/include/asm/arch-omap5/hardware.h | 2 +- arch/arm/include/asm/arch-omap5/omap.h | 6 +++--- arch/arm/mach-omap2/omap5/boot.c | 2 +- arch/arm/mach-omap2/omap5/hw_data.c | 4 ++-- drivers/mmc/omap_hsmmc.c | 5 ++--- drivers/power/palmas.c | 2 +- drivers/spi/ti_qspi.c | 2 +- drivers/usb/dwc3/ti_usb_phy.c | 4 ++-- include/configs/am57xx_evm.h | 2 +- include/linux/usb/xhci-omap.h | 4 ++-- scripts/config_whitelist.txt | 1 - 12 files changed, 17 insertions(+), 19 deletions(-)
From: Nishanth Menon nm@ti.com
Both AM57xx and DRA7xx share the same set of base addresses for DWC controllers. The usage however differ with DWC2 instance used typically in AM57xx evms while DWC1 instances used in DRA7x platforms.
Use TARGET_SOC config to differentiate so that CONFIG_AM57XX can be dropped.
Eventually, this needs to be dt-fied.
Signed-off-by: Nishanth Menon nm@ti.com Signed-off-by: Lokesh Vutla lokeshvutla@ti.com --- include/linux/usb/xhci-omap.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/usb/xhci-omap.h b/include/linux/usb/xhci-omap.h index cb166e6..9de80d7 100644 --- a/include/linux/usb/xhci-omap.h +++ b/include/linux/usb/xhci-omap.h @@ -10,11 +10,11 @@ #ifndef _ASM_ARCH_XHCI_OMAP_H_ #define _ASM_ARCH_XHCI_OMAP_H_
-#ifdef CONFIG_DRA7XX +#ifdef CONFIG_TARGET_DRA7XX_EVM #define OMAP_XHCI_BASE 0x488d0000 #define OMAP_OCP1_SCP_BASE 0x4A081000 #define OMAP_OTG_WRAPPER_BASE 0x488c0000 -#elif defined CONFIG_AM57XX +#elif defined CONFIG_TARGET_AM57XX_EVM #define OMAP_XHCI_BASE 0x48890000 #define OMAP_OCP1_SCP_BASE 0x4A084c00 #define OMAP_OTG_WRAPPER_BASE 0x48880000
On Tue, Nov 29, 2016 at 03:21:59PM +0530, Lokesh Vutla wrote:
From: Nishanth Menon nm@ti.com
Both AM57xx and DRA7xx share the same set of base addresses for DWC controllers. The usage however differ with DWC2 instance used typically in AM57xx evms while DWC1 instances used in DRA7x platforms.
Use TARGET_SOC config to differentiate so that CONFIG_AM57XX can be dropped.
Eventually, this needs to be dt-fied.
Signed-off-by: Nishanth Menon nm@ti.com Signed-off-by: Lokesh Vutla lokeshvutla@ti.com
Reviewed-by: Tom Rini trini@konsulko.com
On Tue, Nov 29, 2016 at 03:21:59PM +0530, Lokesh Vutla wrote:
From: Nishanth Menon nm@ti.com
Both AM57xx and DRA7xx share the same set of base addresses for DWC controllers. The usage however differ with DWC2 instance used typically in AM57xx evms while DWC1 instances used in DRA7x platforms.
Use TARGET_SOC config to differentiate so that CONFIG_AM57XX can be dropped.
Eventually, this needs to be dt-fied.
Signed-off-by: Nishanth Menon nm@ti.com Signed-off-by: Lokesh Vutla lokeshvutla@ti.com Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
From: Nishanth Menon nm@ti.com
CONFIG_AM57XX is just an unnecessary macro that is redundant given So, remove the same instead of spreading through out the u-boot source code and getting in the way to maintain common code for DRA7x family.
Acked-by: Andrew F. Davis afd@ti.com Signed-off-by: Nishanth Menon nm@ti.com Signed-off-by: Lokesh Vutla lokeshvutla@ti.com --- arch/arm/include/asm/arch-omap5/clock.h | 2 +- arch/arm/include/asm/arch-omap5/hardware.h | 2 +- arch/arm/include/asm/arch-omap5/omap.h | 6 +++--- arch/arm/mach-omap2/omap5/boot.c | 2 +- arch/arm/mach-omap2/omap5/hw_data.c | 4 ++-- drivers/mmc/omap_hsmmc.c | 5 ++--- drivers/power/palmas.c | 2 +- drivers/spi/ti_qspi.c | 2 +- drivers/usb/dwc3/ti_usb_phy.c | 4 ++-- include/configs/am57xx_evm.h | 2 +- scripts/config_whitelist.txt | 1 - 11 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/arch/arm/include/asm/arch-omap5/clock.h b/arch/arm/include/asm/arch-omap5/clock.h index d104ad2..7ea7199 100644 --- a/arch/arm/include/asm/arch-omap5/clock.h +++ b/arch/arm/include/asm/arch-omap5/clock.h @@ -377,7 +377,7 @@ */ #define CONFIG_DEFAULT_OMAP_RESET_TIME_MAX_USEC 31219
-#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) +#if defined(CONFIG_DRA7XX) #define V_OSCK 20000000 /* Clock output from T2 */ #else #define V_OSCK 19200000 /* Clock output from T2 */ diff --git a/arch/arm/include/asm/arch-omap5/hardware.h b/arch/arm/include/asm/arch-omap5/hardware.h index a5bd600..d24d645 100644 --- a/arch/arm/include/asm/arch-omap5/hardware.h +++ b/arch/arm/include/asm/arch-omap5/hardware.h @@ -24,7 +24,7 @@ #define GPMC_BASE 0x50000000
/* EDMA3 Base address for DRA7XX and AM57XX */ -#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) +#if defined(CONFIG_DRA7XX) #define EDMA3_BASE 0x43300000 #endif
diff --git a/arch/arm/include/asm/arch-omap5/omap.h b/arch/arm/include/asm/arch-omap5/omap.h index ef8e975..b5e5519 100644 --- a/arch/arm/include/asm/arch-omap5/omap.h +++ b/arch/arm/include/asm/arch-omap5/omap.h @@ -29,13 +29,13 @@ #define CONTROL_CORE_ID_CODE 0x4A002204 #define CONTROL_WKUP_ID_CODE 0x4AE0C204
-#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) +#if defined(CONFIG_DRA7XX) #define CONTROL_ID_CODE CONTROL_WKUP_ID_CODE #else #define CONTROL_ID_CODE CONTROL_CORE_ID_CODE #endif
-#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) +#if defined(CONFIG_DRA7XX) #define DRA7_USB_OTG_SS1_BASE 0x48890000 #define DRA7_USB_OTG_SS1_GLUE_BASE 0x48880000 #define DRA7_USB3_PHY1_PLL_CTRL 0x4A084C00 @@ -185,7 +185,7 @@ struct s32ktimer { * much larger) and do not, at this time, make use of the additional * space. */ -#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) +#if defined(CONFIG_DRA7XX) #define NON_SECURE_SRAM_START 0x40300000 #define NON_SECURE_SRAM_END 0x40380000 /* Not inclusive */ #define NON_SECURE_SRAM_IMG_END 0x4037E000 diff --git a/arch/arm/mach-omap2/omap5/boot.c b/arch/arm/mach-omap2/omap5/boot.c index 583becc..18750b8 100644 --- a/arch/arm/mach-omap2/omap5/boot.c +++ b/arch/arm/mach-omap2/omap5/boot.c @@ -12,7 +12,7 @@ #include <spl.h>
static u32 boot_devices[] = { -#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) +#if defined(CONFIG_DRA7XX) BOOT_DEVICE_MMC2, BOOT_DEVICE_NAND, BOOT_DEVICE_MMC1, diff --git a/arch/arm/mach-omap2/omap5/hw_data.c b/arch/arm/mach-omap2/omap5/hw_data.c index 8e7480e..58991d7 100644 --- a/arch/arm/mach-omap2/omap5/hw_data.c +++ b/arch/arm/mach-omap2/omap5/hw_data.c @@ -472,7 +472,7 @@ void enable_basic_clocks(void) void enable_basic_uboot_clocks(void) { u32 const clk_domains_essential[] = { -#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) +#if defined(CONFIG_DRA7XX) (*prcm)->cm_ipu_clkstctrl, #endif 0 @@ -488,7 +488,7 @@ void enable_basic_uboot_clocks(void) (*prcm)->cm_l4per_i2c2_clkctrl, (*prcm)->cm_l4per_i2c3_clkctrl, (*prcm)->cm_l4per_i2c4_clkctrl, -#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) +#if defined(CONFIG_DRA7XX) (*prcm)->cm_ipu_i2c5_clkctrl, #else (*prcm)->cm_l4per_i2c5_clkctrl, diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c index 0d824a6..876f72e 100644 --- a/drivers/mmc/omap_hsmmc.c +++ b/drivers/mmc/omap_hsmmc.c @@ -671,8 +671,7 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio, case 1: priv_data->base_addr = (struct hsmmc *)OMAP_HSMMC2_BASE; #if (defined(CONFIG_OMAP44XX) || defined(CONFIG_OMAP54XX) || \ - defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) || \ - defined(CONFIG_AM33XX) || \ + defined(CONFIG_DRA7XX) || defined(CONFIG_AM33XX) || \ defined(CONFIG_AM43XX) || defined(CONFIG_SOC_KEYSTONE)) && \ defined(CONFIG_HSMMC2_8BIT) /* Enable 8-bit interface for eMMC on OMAP4/5 or DRA7XX */ @@ -683,7 +682,7 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio, #ifdef OMAP_HSMMC3_BASE case 2: priv_data->base_addr = (struct hsmmc *)OMAP_HSMMC3_BASE; -#if (defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX)) && defined(CONFIG_HSMMC3_8BIT) +#if defined(CONFIG_DRA7XX) && defined(CONFIG_HSMMC3_8BIT) /* Enable 8-bit interface for eMMC on DRA7XX */ host_caps_val |= MMC_MODE_8BIT; #endif diff --git a/drivers/power/palmas.c b/drivers/power/palmas.c index 70cc6e9..4f9a62c 100644 --- a/drivers/power/palmas.c +++ b/drivers/power/palmas.c @@ -46,7 +46,7 @@ int palmas_mmc1_poweron_ldo(uint voltage) { u8 val = 0;
-#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) +#if defined(CONFIG_DRA7XX) /* * Currently valid for the dra7xx_evm board: * Set TPS659038 LDO1 to 3.0 V diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c index da04886..6f9f983 100644 --- a/drivers/spi/ti_qspi.c +++ b/drivers/spi/ti_qspi.c @@ -383,7 +383,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
priv->base = (struct ti_qspi_regs *)QSPI_BASE; priv->mode = mode; -#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) +#if defined(CONFIG_DRA7XX) priv->ctrl_mod_mmap = (void *)CORE_CTRL_IO; priv->slave.memory_map = (void *)MMAP_START_ADDR_DRA; priv->fclk = QSPI_DRA7XX_FCLK; diff --git a/drivers/usb/dwc3/ti_usb_phy.c b/drivers/usb/dwc3/ti_usb_phy.c index 4159e5a..218a8e5 100644 --- a/drivers/usb/dwc3/ti_usb_phy.c +++ b/drivers/usb/dwc3/ti_usb_phy.c @@ -193,7 +193,7 @@ void ti_usb2_phy_power(struct ti_usb_phy *phy, int on) val = readl(phy->usb2_phy_power);
if (on) { -#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) +#if defined(CONFIG_DRA7XX) if (phy->index == 1) val &= ~OMAP_CTRL_USB2_PHY_PD; else @@ -205,7 +205,7 @@ void ti_usb2_phy_power(struct ti_usb_phy *phy, int on) AM437X_CTRL_USB2_OTGSESSEND_EN); #endif } else { -#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) +#if defined(CONFIG_DRA7XX) if (phy->index == 1) val |= OMAP_CTRL_USB2_PHY_PD; else diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index d009900..12e58fb 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -12,7 +12,7 @@ #ifndef __CONFIG_AM57XX_EVM_H #define __CONFIG_AM57XX_EVM_H
-#define CONFIG_AM57XX +#define CONFIG_DRA7XX
#ifdef CONFIG_SPL_BUILD #define CONFIG_IODELAY_RECALIBRATION diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d6b2a45..487d11a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -86,7 +86,6 @@ CONFIG_AM335X_USB1 CONFIG_AM335X_USB1_MODE CONFIG_AM33XX CONFIG_AM437X_USB2PHY2_HOST -CONFIG_AM57XX CONFIG_AMBAPP_IOAREA CONFIG_AMCC_DEF_ENV CONFIG_AMCC_DEF_ENV_NOR_UPD
On Tue, Nov 29, 2016 at 03:22:00PM +0530, Lokesh Vutla wrote:
From: Nishanth Menon nm@ti.com
CONFIG_AM57XX is just an unnecessary macro that is redundant given So, remove the same instead of spreading through out the u-boot source code and getting in the way to maintain common code for DRA7x family.
Acked-by: Andrew F. Davis afd@ti.com Signed-off-by: Nishanth Menon nm@ti.com Signed-off-by: Lokesh Vutla lokeshvutla@ti.com
Reviewed-by: Tom Rini trini@konsulko.com
On Tue, Nov 29, 2016 at 03:22:00PM +0530, Lokesh Vutla wrote:
From: Nishanth Menon nm@ti.com
CONFIG_AM57XX is just an unnecessary macro that is redundant given So, remove the same instead of spreading through out the u-boot source code and getting in the way to maintain common code for DRA7x family.
Acked-by: Andrew F. Davis afd@ti.com Signed-off-by: Nishanth Menon nm@ti.com Signed-off-by: Lokesh Vutla lokeshvutla@ti.com Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
participants (2)
-
Lokesh Vutla -
Tom Rini