Message ID | 20200527125637.149189-16-jagan@amarulasolutions.com |
---|---|
State | New |
Headers | show |
Series |
|
Related | show |
Hi Jagan, On 27/05/20 6:26 pm, Jagan Teki wrote: > DM, DM_SPI and other driver model migration deadlines > are expired for this board. > > Drop it. > > Cc: Lokesh Vutla <lokeshvutla@ti.com> > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Please hold this patch. I see patches in ML for converting to DM https://patchwork.ozlabs.org/project/uboot/list/?series=180809 Thanks and regards, Lokesh > --- > Changes for v2: > - none > > arch/arm/mach-omap2/omap4/Kconfig | 4 - > board/ti/panda/Kconfig | 12 -- > board/ti/panda/MAINTAINERS | 6 - > board/ti/panda/Makefile | 6 - > board/ti/panda/panda.c | 346 ------------------------------ > board/ti/panda/panda_mux_data.h | 86 -------- > configs/omap4_panda_defconfig | 42 ---- > include/configs/omap4_panda.h | 34 --- > 8 files changed, 536 deletions(-) > delete mode 100644 board/ti/panda/Kconfig > delete mode 100644 board/ti/panda/MAINTAINERS > delete mode 100644 board/ti/panda/Makefile > delete mode 100644 board/ti/panda/panda.c > delete mode 100644 board/ti/panda/panda_mux_data.h > delete mode 100644 configs/omap4_panda_defconfig > delete mode 100644 include/configs/omap4_panda.h > > diff --git a/arch/arm/mach-omap2/omap4/Kconfig b/arch/arm/mach-omap2/omap4/Kconfig > index 899289b645..4cc360f38a 100644 > --- a/arch/arm/mach-omap2/omap4/Kconfig > +++ b/arch/arm/mach-omap2/omap4/Kconfig > @@ -4,9 +4,6 @@ choice > prompt "OMAP4 board select" > optional > > -config TARGET_OMAP4_PANDA > - bool "TI OMAP4 PandaBoard" > - > config TARGET_OMAP4_SDP4430 > bool "TI OMAP4 SDP4430" > > @@ -18,7 +15,6 @@ endchoice > config SYS_SOC > default "omap4" > > -source "board/ti/panda/Kconfig" > source "board/ti/sdp4430/Kconfig" > source "board/amazon/kc1/Kconfig" > > diff --git a/board/ti/panda/Kconfig b/board/ti/panda/Kconfig > deleted file mode 100644 > index 8f277b612a..0000000000 > --- a/board/ti/panda/Kconfig > +++ /dev/null > @@ -1,12 +0,0 @@ > -if TARGET_OMAP4_PANDA > - > -config SYS_BOARD > - default "panda" > - > -config SYS_VENDOR > - default "ti" > - > -config SYS_CONFIG_NAME > - default "omap4_panda" > - > -endif > diff --git a/board/ti/panda/MAINTAINERS b/board/ti/panda/MAINTAINERS > deleted file mode 100644 > index 2142368271..0000000000 > --- a/board/ti/panda/MAINTAINERS > +++ /dev/null > @@ -1,6 +0,0 @@ > -PANDA BOARD > -M: Lokesh Vutla <lokeshvutla@ti.com> > -S: Maintained > -F: board/ti/panda/ > -F: include/configs/omap4_panda.h > -F: configs/omap4_panda_defconfig > diff --git a/board/ti/panda/Makefile b/board/ti/panda/Makefile > deleted file mode 100644 > index dd2ff33afa..0000000000 > --- a/board/ti/panda/Makefile > +++ /dev/null > @@ -1,6 +0,0 @@ > -# SPDX-License-Identifier: GPL-2.0+ > -# > -# (C) Copyright 2000, 2001, 2002 > -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. > - > -obj-y := panda.o > diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c > deleted file mode 100644 > index 9ebecfdbf5..0000000000 > --- a/board/ti/panda/panda.c > +++ /dev/null > @@ -1,346 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0+ > -/* > - * (C) Copyright 2010 > - * Texas Instruments Incorporated, <www.ti.com> > - * Steve Sakoman <steve@sakoman.com> > - */ > -#include <common.h> > -#include <init.h> > -#include <log.h> > -#include <net.h> > -#include <asm/mach-types.h> > -#include <asm/arch/sys_proto.h> > -#include <asm/arch/mmc_host_def.h> > -#include <asm/arch/clock.h> > -#include <asm/arch/gpio.h> > -#include <asm/gpio.h> > -#include <env.h> > -#include <twl6030.h> > - > -#include "panda_mux_data.h" > - > -#ifdef CONFIG_USB_EHCI_HCD > -#include <usb.h> > -#include <asm/arch/ehci.h> > -#include <asm/ehci-omap.h> > -#endif > - > -#define PANDA_ULPI_PHY_TYPE_GPIO 182 > -#define PANDA_BOARD_ID_1_GPIO 101 > -#define PANDA_ES_BOARD_ID_1_GPIO 48 > -#define PANDA_BOARD_ID_2_GPIO 171 > -#define PANDA_ES_BOARD_ID_3_GPIO 3 > -#define PANDA_ES_BOARD_ID_4_GPIO 2 > - > -DECLARE_GLOBAL_DATA_PTR; > - > -const struct omap_sysinfo sysinfo = { > - "Board: OMAP4 Panda\n" > -}; > - > -struct omap4_scrm_regs *const scrm = (struct omap4_scrm_regs *)0x4a30a000; > - > -/** > - * @brief board_init > - * > - * @return 0 > - */ > -int board_init(void) > -{ > - gpmc_init(); > - > - gd->bd->bi_arch_number = MACH_TYPE_OMAP4_PANDA; > - gd->bd->bi_boot_params = (0x80000000 + 0x100); /* boot param addr */ > - > - return 0; > -} > - > -int board_eth_init(bd_t *bis) > -{ > - return 0; > -} > - > -/* > -* Routine: get_board_revision > -* Description: Detect if we are running on a panda revision A1-A6, > -* or an ES panda board. This can be done by reading > -* the level of GPIOs and checking the processor revisions. > -* This should result in: > -* Panda 4430: > -* GPIO171, GPIO101, GPIO182: 0 1 1 => A1-A5 > -* GPIO171, GPIO101, GPIO182: 1 0 1 => A6 > -* Panda ES: > -* GPIO2, GPIO3, GPIO171, GPIO48, GPIO182: 0 0 0 1 1 => B1/B2 > -* GPIO2, GPIO3, GPIO171, GPIO48, GPIO182: 0 0 1 1 1 => B3 > -*/ > -int get_board_revision(void) > -{ > - int board_id0, board_id1, board_id2; > - int board_id3, board_id4; > - int board_id; > - > - int processor_rev = omap_revision(); > - > - /* Setup the mux for the common board ID pins (gpio 171 and 182) */ > - writew((IEN | M3), (*ctrl)->control_padconf_core_base + UNIPRO_TX0); > - writew((IEN | M3), (*ctrl)->control_padconf_core_base + FREF_CLK2_OUT); > - > - board_id0 = gpio_get_value(PANDA_ULPI_PHY_TYPE_GPIO); > - board_id2 = gpio_get_value(PANDA_BOARD_ID_2_GPIO); > - > - if ((processor_rev >= OMAP4460_ES1_0 && > - processor_rev <= OMAP4460_ES1_1)) { > - /* > - * Setup the mux for the ES specific board ID pins (gpio 101, > - * 2 and 3. > - */ > - writew((IEN | M3), (*ctrl)->control_padconf_core_base + > - GPMC_A24); > - writew((IEN | M3), (*ctrl)->control_padconf_core_base + > - UNIPRO_RY0); > - writew((IEN | M3), (*ctrl)->control_padconf_core_base + > - UNIPRO_RX1); > - > - board_id1 = gpio_get_value(PANDA_ES_BOARD_ID_1_GPIO); > - board_id3 = gpio_get_value(PANDA_ES_BOARD_ID_3_GPIO); > - board_id4 = gpio_get_value(PANDA_ES_BOARD_ID_4_GPIO); > - > -#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG > - env_set("board_name", "panda-es"); > -#endif > - board_id = ((board_id4 << 4) | (board_id3 << 3) | > - (board_id2 << 2) | (board_id1 << 1) | (board_id0)); > - } else { > - /* Setup the mux for the Ax specific board ID pins (gpio 101) */ > - writew((IEN | M3), (*ctrl)->control_padconf_core_base + > - FREF_CLK2_OUT); > - > - board_id1 = gpio_get_value(PANDA_BOARD_ID_1_GPIO); > - board_id = ((board_id2 << 2) | (board_id1 << 1) | (board_id0)); > - > -#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG > - if ((board_id >= 0x3) && (processor_rev == OMAP4430_ES2_3)) > - env_set("board_name", "panda-a4"); > -#endif > - } > - > - return board_id; > -} > - > -/** > - * is_panda_es_rev_b3() - Detect if we are running on rev B3 of panda board ES > - * > - * > - * Detect if we are running on B3 version of ES panda board, > - * This can be done by reading the level of GPIO 171 and checking the > - * processor revisions. > - * GPIO171: 1 => Panda ES Rev B3 > - * > - * Return : return 1 if Panda ES Rev B3 , else return 0 > - */ > -u8 is_panda_es_rev_b3(void) > -{ > - int processor_rev = omap_revision(); > - int ret = 0; > - > - if ((processor_rev >= OMAP4460_ES1_0 && > - processor_rev <= OMAP4460_ES1_1)) { > - > - /* Setup the mux for the common board ID pins (gpio 171) */ > - writew((IEN | M3), > - (*ctrl)->control_padconf_core_base + UNIPRO_TX0); > - > - /* if processor_rev is panda ES and GPIO171 is 1,it is rev b3 */ > - ret = gpio_get_value(PANDA_BOARD_ID_2_GPIO); > - } > - return ret; > -} > - > -#ifdef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS > -/* > - * emif_get_reg_dump() - emif_get_reg_dump strong function > - * > - * @emif_nr - emif base > - * @regs - reg dump of timing values > - * > - * Strong function to override emif_get_reg_dump weak function in sdram_elpida.c > - */ > -void emif_get_reg_dump(u32 emif_nr, const struct emif_regs **regs) > -{ > - u32 omap4_rev = omap_revision(); > - > - /* Same devices and geometry on both EMIFs */ > - if (omap4_rev == OMAP4430_ES1_0) > - *regs = &emif_regs_elpida_380_mhz_1cs; > - else if (omap4_rev == OMAP4430_ES2_0) > - *regs = &emif_regs_elpida_200_mhz_2cs; > - else if (omap4_rev == OMAP4430_ES2_3) > - *regs = &emif_regs_elpida_400_mhz_1cs; > - else if (omap4_rev < OMAP4470_ES1_0) { > - if(is_panda_es_rev_b3()) > - *regs = &emif_regs_elpida_400_mhz_1cs; > - else > - *regs = &emif_regs_elpida_400_mhz_2cs; > - } > - else > - *regs = &emif_regs_elpida_400_mhz_1cs; > -} > - > -void emif_get_dmm_regs(const struct dmm_lisa_map_regs > - **dmm_lisa_regs) > -{ > - u32 omap_rev = omap_revision(); > - > - if (omap_rev == OMAP4430_ES1_0) > - *dmm_lisa_regs = &lisa_map_2G_x_1_x_2; > - else if (omap_rev == OMAP4430_ES2_3) > - *dmm_lisa_regs = &lisa_map_2G_x_2_x_2; > - else if (omap_rev < OMAP4460_ES1_0) > - *dmm_lisa_regs = &lisa_map_2G_x_2_x_2; > - else > - *dmm_lisa_regs = &ma_lisa_map_2G_x_2_x_2; > -} > - > -#endif > - > -/** > - * @brief misc_init_r - Configure Panda board specific configurations > - * such as power configurations, ethernet initialization as phase2 of > - * boot sequence > - * > - * @return 0 > - */ > -int misc_init_r(void) > -{ > - int phy_type; > - u32 auxclk, altclksrc; > - > - /* EHCI is not supported on ES1.0 */ > - if (omap_revision() == OMAP4430_ES1_0) > - return 0; > - > - get_board_revision(); > - > - gpio_direction_input(PANDA_ULPI_PHY_TYPE_GPIO); > - phy_type = gpio_get_value(PANDA_ULPI_PHY_TYPE_GPIO); > - > - if (phy_type == 1) { > - /* ULPI PHY supplied by auxclk3 derived from sys_clk */ > - debug("ULPI PHY supplied by auxclk3\n"); > - > - auxclk = readl(&scrm->auxclk3); > - /* Select sys_clk */ > - auxclk &= ~AUXCLK_SRCSELECT_MASK; > - auxclk |= AUXCLK_SRCSELECT_SYS_CLK << AUXCLK_SRCSELECT_SHIFT; > - /* Set the divisor to 2 */ > - auxclk &= ~AUXCLK_CLKDIV_MASK; > - auxclk |= AUXCLK_CLKDIV_2 << AUXCLK_CLKDIV_SHIFT; > - /* Request auxilary clock #3 */ > - auxclk |= AUXCLK_ENABLE_MASK; > - > - writel(auxclk, &scrm->auxclk3); > - } else { > - /* ULPI PHY supplied by auxclk1 derived from PER dpll */ > - debug("ULPI PHY supplied by auxclk1\n"); > - > - auxclk = readl(&scrm->auxclk1); > - /* Select per DPLL */ > - auxclk &= ~AUXCLK_SRCSELECT_MASK; > - auxclk |= AUXCLK_SRCSELECT_PER_DPLL << AUXCLK_SRCSELECT_SHIFT; > - /* Set the divisor to 16 */ > - auxclk &= ~AUXCLK_CLKDIV_MASK; > - auxclk |= AUXCLK_CLKDIV_16 << AUXCLK_CLKDIV_SHIFT; > - /* Request auxilary clock #3 */ > - auxclk |= AUXCLK_ENABLE_MASK; > - > - writel(auxclk, &scrm->auxclk1); > - } > - > - altclksrc = readl(&scrm->altclksrc); > - > - /* Activate alternate system clock supplier */ > - altclksrc &= ~ALTCLKSRC_MODE_MASK; > - altclksrc |= ALTCLKSRC_MODE_ACTIVE; > - > - /* enable clocks */ > - altclksrc |= ALTCLKSRC_ENABLE_INT_MASK | ALTCLKSRC_ENABLE_EXT_MASK; > - > - writel(altclksrc, &scrm->altclksrc); > - > - omap_die_id_usbethaddr(); > - > - return 0; > -} > - > -void set_muxconf_regs(void) > -{ > - do_set_mux((*ctrl)->control_padconf_core_base, > - core_padconf_array_essential, > - sizeof(core_padconf_array_essential) / > - sizeof(struct pad_conf_entry)); > - > - do_set_mux((*ctrl)->control_padconf_wkup_base, > - wkup_padconf_array_essential, > - sizeof(wkup_padconf_array_essential) / > - sizeof(struct pad_conf_entry)); > - > - if (omap_revision() >= OMAP4460_ES1_0) > - do_set_mux((*ctrl)->control_padconf_wkup_base, > - wkup_padconf_array_essential_4460, > - sizeof(wkup_padconf_array_essential_4460) / > - sizeof(struct pad_conf_entry)); > -} > - > -#if defined(CONFIG_MMC) > -int board_mmc_init(bd_t *bis) > -{ > - return omap_mmc_init(0, 0, 0, -1, -1); > -} > - > -#if !defined(CONFIG_SPL_BUILD) > -void board_mmc_power_init(void) > -{ > - twl6030_power_mmc_init(0); > -} > -#endif > -#endif > - > -#ifdef CONFIG_USB_EHCI_HCD > - > -static struct omap_usbhs_board_data usbhs_bdata = { > - .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, > - .port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED, > - .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED, > -}; > - > -int ehci_hcd_init(int index, enum usb_init_type init, > - struct ehci_hccr **hccr, struct ehci_hcor **hcor) > -{ > - int ret; > - unsigned int utmi_clk; > - > - /* Now we can enable our port clocks */ > - utmi_clk = readl((void *)CM_L3INIT_HSUSBHOST_CLKCTRL); > - utmi_clk |= HSUSBHOST_CLKCTRL_CLKSEL_UTMI_P1_MASK; > - setbits_le32((void *)CM_L3INIT_HSUSBHOST_CLKCTRL, utmi_clk); > - > - ret = omap_ehci_hcd_init(index, &usbhs_bdata, hccr, hcor); > - if (ret < 0) > - return ret; > - > - return 0; > -} > - > -int ehci_hcd_stop(int index) > -{ > - return omap_ehci_hcd_stop(); > -} > -#endif > - > -/* > - * get_board_rev() - get board revision > - */ > -u32 get_board_rev(void) > -{ > - return 0x20; > -} > diff --git a/board/ti/panda/panda_mux_data.h b/board/ti/panda/panda_mux_data.h > deleted file mode 100644 > index ad9e36525b..0000000000 > --- a/board/ti/panda/panda_mux_data.h > +++ /dev/null > @@ -1,86 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0+ */ > -/* > - * (C) Copyright 2010 > - * Texas Instruments Incorporated, <www.ti.com> > - * > - * Balaji Krishnamoorthy <balajitk@ti.com> > - * Aneesh V <aneesh@ti.com> > - */ > -#ifndef _PANDA_MUX_DATA_H_ > -#define _PANDA_MUX_DATA_H_ > - > -#include <asm/arch/mux_omap4.h> > - > - > -const struct pad_conf_entry core_padconf_array_essential[] = { > - > -{GPMC_AD0, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_dat0 */ > -{GPMC_AD1, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_dat1 */ > -{GPMC_AD2, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_dat2 */ > -{GPMC_AD3, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_dat3 */ > -{GPMC_AD4, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_dat4 */ > -{GPMC_AD5, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_dat5 */ > -{GPMC_AD6, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_dat6 */ > -{GPMC_AD7, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_dat7 */ > -{GPMC_NOE, (PTU | IEN | OFF_EN | OFF_OUT_PTD | M1)}, /* sdmmc2_clk */ > -{GPMC_NWE, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_cmd */ > -{SDMMC1_CLK, (PTU | OFF_EN | OFF_OUT_PTD | M0)}, /* sdmmc1_clk */ > -{SDMMC1_CMD, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M0)}, /* sdmmc1_cmd */ > -{SDMMC1_DAT0, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M0)}, /* sdmmc1_dat0 */ > -{SDMMC1_DAT1, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M0)}, /* sdmmc1_dat1 */ > -{SDMMC1_DAT2, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M0)}, /* sdmmc1_dat2 */ > -{SDMMC1_DAT3, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M0)}, /* sdmmc1_dat3 */ > -{SDMMC1_DAT4, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M0)}, /* sdmmc1_dat4 */ > -{SDMMC1_DAT5, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M0)}, /* sdmmc1_dat5 */ > -{SDMMC1_DAT6, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M0)}, /* sdmmc1_dat6 */ > -{SDMMC1_DAT7, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M0)}, /* sdmmc1_dat7 */ > -{I2C1_SCL, (PTU | IEN | M0)}, /* i2c1_scl */ > -{I2C1_SDA, (PTU | IEN | M0)}, /* i2c1_sda */ > -{I2C2_SCL, (PTU | IEN | M0)}, /* i2c2_scl */ > -{I2C2_SDA, (PTU | IEN | M0)}, /* i2c2_sda */ > -{I2C3_SCL, (PTU | IEN | M0)}, /* i2c3_scl */ > -{I2C3_SDA, (PTU | IEN | M0)}, /* i2c3_sda */ > -{I2C4_SCL, (PTU | IEN | M0)}, /* i2c4_scl */ > -{I2C4_SDA, (PTU | IEN | M0)}, /* i2c4_sda */ > -{UART3_CTS_RCTX, (PTU | IEN | M0)}, /* uart3_tx */ > -{UART3_RTS_SD, (M0)}, /* uart3_rts_sd */ > -{UART3_RX_IRRX, (IEN | M0)}, /* uart3_rx */ > -{UART3_TX_IRTX, (M0)}, /* uart3_tx */ > -{USBB1_ULPITLL_CLK, (PTD | IEN | OFF_EN | OFF_PD | OFF_IN | M4)},/* usbb1_ulpiphy_clk */ > -{USBB1_ULPITLL_STP, (OFF_EN | OFF_OUT_PTD | M4)}, /* usbb1_ulpiphy_stp */ > -{USBB1_ULPITLL_DIR, (IEN | OFF_EN | OFF_PD | OFF_IN | M4)}, /* usbb1_ulpiphy_dir */ > -{USBB1_ULPITLL_NXT, (IEN | OFF_EN | OFF_PD | OFF_IN | M4)}, /* usbb1_ulpiphy_nxt */ > -{USBB1_ULPITLL_DAT0, (IEN | OFF_EN | OFF_PD | OFF_IN | M4)}, /* usbb1_ulpiphy_dat0 */ > -{USBB1_ULPITLL_DAT1, (IEN | OFF_EN | OFF_PD | OFF_IN | M4)}, /* usbb1_ulpiphy_dat1 */ > -{USBB1_ULPITLL_DAT2, (IEN | OFF_EN | OFF_PD | OFF_IN | M4)}, /* usbb1_ulpiphy_dat2 */ > -{USBB1_ULPITLL_DAT3, (IEN | OFF_EN | OFF_PD | OFF_IN | M4)}, /* usbb1_ulpiphy_dat3 */ > -{USBB1_ULPITLL_DAT4, (IEN | OFF_EN | OFF_PD | OFF_IN | M4)}, /* usbb1_ulpiphy_dat4 */ > -{USBB1_ULPITLL_DAT5, (IEN | OFF_EN | OFF_PD | OFF_IN | M4)}, /* usbb1_ulpiphy_dat5 */ > -{USBB1_ULPITLL_DAT6, (IEN | OFF_EN | OFF_PD | OFF_IN | M4)}, /* usbb1_ulpiphy_dat6 */ > -{USBB1_ULPITLL_DAT7, (IEN | OFF_EN | OFF_PD | OFF_IN | M4)}, /* usbb1_ulpiphy_dat7 */ > -{USBB1_HSIC_DATA, (IEN | OFF_EN | OFF_PD | OFF_IN | M0)}, /* usbb1_hsic_data */ > -{USBB1_HSIC_STROBE, (IEN | OFF_EN | OFF_PD | OFF_IN | M0)}, /* usbb1_hsic_strobe */ > -{USBC1_ICUSB_DP, (IEN | M0)}, /* usbc1_icusb_dp */ > -{USBC1_ICUSB_DM, (IEN | M0)}, /* usbc1_icusb_dm */ > -{UNIPRO_TY2, (PTU | IEN | M3)}, /* gpio_1 */ > -{GPMC_WAIT1, (PTD | OFF_EN | OFF_PD | OFF_OUT_PTD | M3)}, /* gpio_62 */ > -{FREF_CLK2_OUT, (PTU | IEN | M3)}, /* gpio_182 */ > - > -}; > - > -const struct pad_conf_entry wkup_padconf_array_essential[] = { > - > -{PAD1_SR_SCL, (PTU | IEN | M0)}, /* sr_scl */ > -{PAD0_SR_SDA, (PTU | IEN | M0)}, /* sr_sda */ > -{PAD1_SYS_32K, (IEN | M0)}, /* sys_32k */ > -{PAD0_FREF_CLK3_OUT, (M0)}, /* fref_clk3_out */ > - > -}; > - > -const struct pad_conf_entry wkup_padconf_array_essential_4460[] = { > - > -{PAD1_FREF_CLK4_REQ, (M3)}, /* gpio_wk7 for TPS: Mode 3 */ > - > -}; > - > -#endif /* _PANDA_MUX_DATA_H_ */ > diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig > deleted file mode 100644 > index 3ac6319d2d..0000000000 > --- a/configs/omap4_panda_defconfig > +++ /dev/null > @@ -1,42 +0,0 @@ > -CONFIG_ARM=y > -CONFIG_ARCH_OMAP2PLUS=y > -CONFIG_OMAP44XX=y > -CONFIG_TARGET_OMAP4_PANDA=y > -CONFIG_SPL=y > -CONFIG_SPL_TEXT_BASE=0x40300000 > -CONFIG_DISTRO_DEFAULTS=y > -CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd" > -CONFIG_SYS_CONSOLE_IS_IN_ENV=y > -CONFIG_SYS_CONSOLE_INFO_QUIET=y > -CONFIG_VERSION_VARIABLE=y > -# CONFIG_SPL_FS_EXT4 is not set > -# CONFIG_SPL_I2C_SUPPORT is not set > -# CONFIG_SPL_NAND_SUPPORT is not set > -CONFIG_SPL_OS_BOOT=y > -CONFIG_CMD_SPL=y > -CONFIG_CMD_ASKENV=y > -CONFIG_CMD_GPIO=y > -CONFIG_CMD_I2C=y > -CONFIG_CMD_MMC=y > -CONFIG_CMD_SPI=y > -CONFIG_CMD_USB=y > -# CONFIG_CMD_SETEXPR is not set > -# CONFIG_CMD_NFS is not set > -CONFIG_CMD_EXT4_WRITE=y > -CONFIG_ENV_IS_IN_FAT=y > -CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" > -CONFIG_SYS_RELOC_GD_ENV_ADDR=y > -CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y > -CONFIG_MMC_OMAP_HS=y > -CONFIG_CONS_INDEX=3 > -CONFIG_SYS_NS16550=y > -CONFIG_SPI=y > -CONFIG_OMAP3_SPI=y > -CONFIG_USB=y > -CONFIG_USB_EHCI_HCD=y > -CONFIG_USB_MUSB_UDC=y > -CONFIG_USB_OMAP3=y > -CONFIG_USB_GADGET=y > -CONFIG_USB_HOST_ETHER=y > -CONFIG_USB_ETHER_SMSC95XX=y > -CONFIG_OF_LIBFDT=y > diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h > deleted file mode 100644 > index 835b7c299e..0000000000 > --- a/include/configs/omap4_panda.h > +++ /dev/null > @@ -1,34 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0+ */ > -/* > - * (C) Copyright 2010 > - * Texas Instruments Incorporated. > - * Steve Sakoman <steve@sakoman.com> > - * > - * Configuration settings for the TI OMAP4 Panda board. > - * See ti_omap4_common.h for OMAP4 common part > - */ > - > -#ifndef __CONFIG_PANDA_H > -#define __CONFIG_PANDA_H > - > -/* > - * High Level Configuration Options > - */ > - > -/* USB UHH support options */ > -#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 1 > -#define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 62 > - > -/* USB Networking options */ > - > -#define CONFIG_UBOOT_ENABLE_PADS_ALL > - > -#include <configs/ti_omap4_common.h> > - > -/* GPIO */ > - > -/* ENV related config options */ > - > -#define CONFIG_ENV_OVERWRITE > - > -#endif /* __CONFIG_PANDA_H */ >
On Fri, Jun 5, 2020 at 10:01 AM Lokesh Vutla <lokeshvutla@ti.com> wrote: > > Hi Jagan, > > On 27/05/20 6:26 pm, Jagan Teki wrote: > > DM, DM_SPI and other driver model migration deadlines > > are expired for this board. > > > > Drop it. > > > > Cc: Lokesh Vutla <lokeshvutla@ti.com> > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > > Please hold this patch. I see patches in ML for converting to DM > https://patchwork.ozlabs.org/project/uboot/list/?series=180809 Please note that this patch didn't have DM_SPI/SPI_FLASH enabled, if so please add it next version? Jagan.
On Sat, Jun 13, 2020 at 7:24 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > On Fri, Jun 5, 2020 at 10:01 AM Lokesh Vutla <lokeshvutla@ti.com> wrote: > > > > Hi Jagan, > > > > On 27/05/20 6:26 pm, Jagan Teki wrote: > > > DM, DM_SPI and other driver model migration deadlines > > > are expired for this board. > > > > > > Drop it. > > > > > > Cc: Lokesh Vutla <lokeshvutla@ti.com> > > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > > > > Please hold this patch. I see patches in ML for converting to DM > > https://patchwork.ozlabs.org/project/uboot/list/?series=180809 > > Please note that this patch didn't have DM_SPI/SPI_FLASH enabled, if > so please add it next version? The panda board doesn't have SPI flash why does it need to be enabled?
On Sun, 14 Jun, 2020, 01:02 Peter Robinson, <pbrobinson@gmail.com> wrote: > On Sat, Jun 13, 2020 at 7:24 PM Jagan Teki <jagan@amarulasolutions.com> > wrote: > > > > On Fri, Jun 5, 2020 at 10:01 AM Lokesh Vutla <lokeshvutla@ti.com> wrote: > > > > > > Hi Jagan, > > > > > > On 27/05/20 6:26 pm, Jagan Teki wrote: > > > > DM, DM_SPI and other driver model migration deadlines > > > > are expired for this board. > > > > > > > > Drop it. > > > > > > > > Cc: Lokesh Vutla <lokeshvutla@ti.com> > > > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > > > > > > Please hold this patch. I see patches in ML for converting to DM > > > https://patchwork.ozlabs.org/project/uboot/list/?series=180809 > > > > Please note that this patch didn't have DM_SPI/SPI_FLASH enabled, if > > so please add it next version? > > The panda board doesn't have SPI flash why does it need to be enabled? > Haha.. then why the defconfig has CONFIG_SPI=y CONFIG_OMAP3_SPI=y >
On Sun, Jun 14, 2020 at 01:05:53AM +0530, Jagan Teki wrote: > On Sun, 14 Jun, 2020, 01:02 Peter Robinson, <pbrobinson@gmail.com> wrote: > > > On Sat, Jun 13, 2020 at 7:24 PM Jagan Teki <jagan@amarulasolutions.com> > > wrote: > > > > > > On Fri, Jun 5, 2020 at 10:01 AM Lokesh Vutla <lokeshvutla@ti.com> wrote: > > > > > > > > Hi Jagan, > > > > > > > > On 27/05/20 6:26 pm, Jagan Teki wrote: > > > > > DM, DM_SPI and other driver model migration deadlines > > > > > are expired for this board. > > > > > > > > > > Drop it. > > > > > > > > > > Cc: Lokesh Vutla <lokeshvutla@ti.com> > > > > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > > > > > > > > Please hold this patch. I see patches in ML for converting to DM > > > > https://patchwork.ozlabs.org/project/uboot/list/?series=180809 > > > > > > Please note that this patch didn't have DM_SPI/SPI_FLASH enabled, if > > > so please add it next version? > > > > The panda board doesn't have SPI flash why does it need to be enabled? > > > > Haha.. then why the defconfig has > > CONFIG_SPI=y > CONFIG_OMAP3_SPI=y SPI flash no, SPI exposed on the header? Probably so.
On Sun, 14 Jun, 2020, 01:09 Tom Rini, <trini@konsulko.com> wrote: > On Sun, Jun 14, 2020 at 01:05:53AM +0530, Jagan Teki wrote: > > On Sun, 14 Jun, 2020, 01:02 Peter Robinson, <pbrobinson@gmail.com> > wrote: > > > > > On Sat, Jun 13, 2020 at 7:24 PM Jagan Teki <jagan@amarulasolutions.com > > > > > wrote: > > > > > > > > On Fri, Jun 5, 2020 at 10:01 AM Lokesh Vutla <lokeshvutla@ti.com> > wrote: > > > > > > > > > > Hi Jagan, > > > > > > > > > > On 27/05/20 6:26 pm, Jagan Teki wrote: > > > > > > DM, DM_SPI and other driver model migration deadlines > > > > > > are expired for this board. > > > > > > > > > > > > Drop it. > > > > > > > > > > > > Cc: Lokesh Vutla <lokeshvutla@ti.com> > > > > > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > > > > > > > > > > Please hold this patch. I see patches in ML for converting to DM > > > > > https://patchwork.ozlabs.org/project/uboot/list/?series=180809 > > > > > > > > Please note that this patch didn't have DM_SPI/SPI_FLASH enabled, if > > > > so please add it next version? > > > > > > The panda board doesn't have SPI flash why does it need to be enabled? > > > > > > > Haha.. then why the defconfig has > > > > CONFIG_SPI=y > > CONFIG_OMAP3_SPI=y > > SPI flash no, SPI exposed on the header? Probably so. > Well, in either way SPI driver required so I would like see DM_SPI enabled on that new patch. >
>> > > > > > DM, DM_SPI and other driver model migration deadlines >> > > > > > are expired for this board. >> > > > > > >> > > > > > Drop it. >> > > > > > >> > > > > > Cc: Lokesh Vutla <lokeshvutla@ti.com> >> > > > > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> >> > > > > >> > > > > Please hold this patch. I see patches in ML for converting to DM >> > > > > https://patchwork.ozlabs.org/project/uboot/list/?series=180809 >> > > > >> > > > Please note that this patch didn't have DM_SPI/SPI_FLASH enabled, if >> > > > so please add it next version? >> > > >> > > The panda board doesn't have SPI flash why does it need to be enabled? >> > > >> > >> > Haha.. then why the defconfig has >> > >> > CONFIG_SPI=y >> > CONFIG_OMAP3_SPI=y >> >> SPI flash no, SPI exposed on the header? Probably so. > > > Well, in either way SPI driver required so I would like see DM_SPI enabled on that new patch. No, it's not required, it's a custom option for bootm needing either a custom DT or an overlay. Having SPI enabled only bloats the build while not providing any useful functionality by default.
On Sun, Jun 14, 2020 at 12:15:59AM +0100, Peter Robinson wrote: > >> > > > > > DM, DM_SPI and other driver model migration deadlines > >> > > > > > are expired for this board. > >> > > > > > > >> > > > > > Drop it. > >> > > > > > > >> > > > > > Cc: Lokesh Vutla <lokeshvutla@ti.com> > >> > > > > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > >> > > > > > >> > > > > Please hold this patch. I see patches in ML for converting to DM > >> > > > > https://patchwork.ozlabs.org/project/uboot/list/?series=180809 > >> > > > > >> > > > Please note that this patch didn't have DM_SPI/SPI_FLASH enabled, if > >> > > > so please add it next version? > >> > > > >> > > The panda board doesn't have SPI flash why does it need to be enabled? > >> > > > >> > > >> > Haha.. then why the defconfig has > >> > > >> > CONFIG_SPI=y > >> > CONFIG_OMAP3_SPI=y > >> > >> SPI flash no, SPI exposed on the header? Probably so. > > > > > > Well, in either way SPI driver required so I would like see DM_SPI enabled on that new patch. > > No, it's not required, it's a custom option for bootm needing either a > custom DT or an overlay. Having SPI enabled only bloats the build > while not providing any useful functionality by default. Does enabling SPI so that you can twiddle stuff on a Pi bloat it? No, because sometimes you want an easy interface. Same thing here. That said, it's up to the maintainer of the platform which way they care to go here since Pandaboards aren't all that popular anymore.
diff --git a/arch/arm/mach-omap2/omap4/Kconfig b/arch/arm/mach-omap2/omap4/Kconfig index 899289b645..4cc360f38a 100644 --- a/arch/arm/mach-omap2/omap4/Kconfig +++ b/arch/arm/mach-omap2/omap4/Kconfig @@ -4,9 +4,6 @@ choice prompt "OMAP4 board select" optional -config TARGET_OMAP4_PANDA - bool "TI OMAP4 PandaBoard" - config TARGET_OMAP4_SDP4430 bool "TI OMAP4 SDP4430" @@ -18,7 +15,6 @@ endchoice config SYS_SOC default "omap4" -source "board/ti/panda/Kconfig" source "board/ti/sdp4430/Kconfig" source "board/amazon/kc1/Kconfig" diff --git a/board/ti/panda/Kconfig b/board/ti/panda/Kconfig deleted file mode 100644 index 8f277b612a..0000000000 --- a/board/ti/panda/Kconfig +++ /dev/null @@ -1,12 +0,0 @@ -if TARGET_OMAP4_PANDA - -config SYS_BOARD - default "panda" - -config SYS_VENDOR - default "ti" - -config SYS_CONFIG_NAME - default "omap4_panda" - -endif diff --git a/board/ti/panda/MAINTAINERS b/board/ti/panda/MAINTAINERS deleted file mode 100644 index 2142368271..0000000000 --- a/board/ti/panda/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -PANDA BOARD -M: Lokesh Vutla <lokeshvutla@ti.com> -S: Maintained -F: board/ti/panda/ -F: include/configs/omap4_panda.h -F: configs/omap4_panda_defconfig diff --git a/board/ti/panda/Makefile b/board/ti/panda/Makefile deleted file mode 100644 index dd2ff33afa..0000000000 --- a/board/ti/panda/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2000, 2001, 2002 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. - -obj-y := panda.o diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c deleted file mode 100644 index 9ebecfdbf5..0000000000 --- a/board/ti/panda/panda.c +++ /dev/null @@ -1,346 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * (C) Copyright 2010 - * Texas Instruments Incorporated, <www.ti.com> - * Steve Sakoman <steve@sakoman.com> - */ -#include <common.h> -#include <init.h> -#include <log.h> -#include <net.h> -#include <asm/mach-types.h> -#include <asm/arch/sys_proto.h> -#include <asm/arch/mmc_host_def.h> -#include <asm/arch/clock.h> -#include <asm/arch/gpio.h> -#include <asm/gpio.h> -#include <env.h> -#include <twl6030.h> - -#include "panda_mux_data.h" - -#ifdef CONFIG_USB_EHCI_HCD -#include <usb.h> -#include <asm/arch/ehci.h> -#include <asm/ehci-omap.h> -#endif - -#define PANDA_ULPI_PHY_TYPE_GPIO 182 -#define PANDA_BOARD_ID_1_GPIO 101 -#define PANDA_ES_BOARD_ID_1_GPIO 48 -#define PANDA_BOARD_ID_2_GPIO 171 -#define PANDA_ES_BOARD_ID_3_GPIO 3 -#define PANDA_ES_BOARD_ID_4_GPIO 2 - -DECLARE_GLOBAL_DATA_PTR; - -const struct omap_sysinfo sysinfo = { - "Board: OMAP4 Panda\n" -}; - -struct omap4_scrm_regs *const scrm = (struct omap4_scrm_regs *)0x4a30a000; - -/** - * @brief board_init - * - * @return 0 - */ -int board_init(void) -{ - gpmc_init(); - - gd->bd->bi_arch_number = MACH_TYPE_OMAP4_PANDA; - gd->bd->bi_boot_params = (0x80000000 + 0x100); /* boot param addr */ - - return 0; -} - -int board_eth_init(bd_t *bis) -{ - return 0; -} - -/* -* Routine: get_board_revision -* Description: Detect if we are running on a panda revision A1-A6, -* or an ES panda board. This can be done by reading -* the level of GPIOs and checking the processor revisions. -* This should result in: -* Panda 4430: -* GPIO171, GPIO101, GPIO182: 0 1 1 => A1-A5 -* GPIO171, GPIO101, GPIO182: 1 0 1 => A6 -* Panda ES: -* GPIO2, GPIO3, GPIO171, GPIO48, GPIO182: 0 0 0 1 1 => B1/B2 -* GPIO2, GPIO3, GPIO171, GPIO48, GPIO182: 0 0 1 1 1 => B3 -*/ -int get_board_revision(void) -{ - int board_id0, board_id1, board_id2; - int board_id3, board_id4; - int board_id; - - int processor_rev = omap_revision(); - - /* Setup the mux for the common board ID pins (gpio 171 and 182) */ - writew((IEN | M3), (*ctrl)->control_padconf_core_base + UNIPRO_TX0); - writew((IEN | M3), (*ctrl)->control_padconf_core_base + FREF_CLK2_OUT); - - board_id0 = gpio_get_value(PANDA_ULPI_PHY_TYPE_GPIO); - board_id2 = gpio_get_value(PANDA_BOARD_ID_2_GPIO); - - if ((processor_rev >= OMAP4460_ES1_0 && - processor_rev <= OMAP4460_ES1_1)) { - /* - * Setup the mux for the ES specific board ID pins (gpio 101, - * 2 and 3. - */ - writew((IEN | M3), (*ctrl)->control_padconf_core_base + - GPMC_A24); - writew((IEN | M3), (*ctrl)->control_padconf_core_base + - UNIPRO_RY0); - writew((IEN | M3), (*ctrl)->control_padconf_core_base + - UNIPRO_RX1); - - board_id1 = gpio_get_value(PANDA_ES_BOARD_ID_1_GPIO); - board_id3 = gpio_get_value(PANDA_ES_BOARD_ID_3_GPIO); - board_id4 = gpio_get_value(PANDA_ES_BOARD_ID_4_GPIO); - -#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - env_set("board_name", "panda-es"); -#endif - board_id = ((board_id4 << 4) | (board_id3 << 3) | - (board_id2 << 2) | (board_id1 << 1) | (board_id0)); - } else { - /* Setup the mux for the Ax specific board ID pins (gpio 101) */ - writew((IEN | M3), (*ctrl)->control_padconf_core_base + - FREF_CLK2_OUT); - - board_id1 = gpio_get_value(PANDA_BOARD_ID_1_GPIO); - board_id = ((board_id2 << 2) | (board_id1 << 1) | (board_id0)); - -#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - if ((board_id >= 0x3) && (processor_rev == OMAP4430_ES2_3)) - env_set("board_name", "panda-a4"); -#endif - } - - return board_id; -} - -/** - * is_panda_es_rev_b3() - Detect if we are running on rev B3 of panda board ES - * - * - * Detect if we are running on B3 version of ES panda board, - * This can be done by reading the level of GPIO 171 and checking the - * processor revisions. - * GPIO171: 1 => Panda ES Rev B3 - * - * Return : return 1 if Panda ES Rev B3 , else return 0 - */ -u8 is_panda_es_rev_b3(void) -{ - int processor_rev = omap_revision(); - int ret = 0; - - if ((processor_rev >= OMAP4460_ES1_0 && - processor_rev <= OMAP4460_ES1_1)) { - - /* Setup the mux for the common board ID pins (gpio 171) */ - writew((IEN | M3), - (*ctrl)->control_padconf_core_base + UNIPRO_TX0); - - /* if processor_rev is panda ES and GPIO171 is 1,it is rev b3 */ - ret = gpio_get_value(PANDA_BOARD_ID_2_GPIO); - } - return ret; -} - -#ifdef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS -/* - * emif_get_reg_dump() - emif_get_reg_dump strong function - * - * @emif_nr - emif base - * @regs - reg dump of timing values - * - * Strong function to override emif_get_reg_dump weak function in sdram_elpida.c - */ -void emif_get_reg_dump(u32 emif_nr, const struct emif_regs **regs) -{ - u32 omap4_rev = omap_revision(); - - /* Same devices and geometry on both EMIFs */ - if (omap4_rev == OMAP4430_ES1_0) - *regs = &emif_regs_elpida_380_mhz_1cs; - else if (omap4_rev == OMAP4430_ES2_0) - *regs = &emif_regs_elpida_200_mhz_2cs; - else if (omap4_rev == OMAP4430_ES2_3) - *regs = &emif_regs_elpida_400_mhz_1cs; - else if (omap4_rev < OMAP4470_ES1_0) { - if(is_panda_es_rev_b3()) - *regs = &emif_regs_elpida_400_mhz_1cs; - else - *regs = &emif_regs_elpida_400_mhz_2cs; - } - else - *regs = &emif_regs_elpida_400_mhz_1cs; -} - -void emif_get_dmm_regs(const struct dmm_lisa_map_regs - **dmm_lisa_regs) -{ - u32 omap_rev = omap_revision(); - - if (omap_rev == OMAP4430_ES1_0) - *dmm_lisa_regs = &lisa_map_2G_x_1_x_2; - else if (omap_rev == OMAP4430_ES2_3) - *dmm_lisa_regs = &lisa_map_2G_x_2_x_2; - else if (omap_rev < OMAP4460_ES1_0) - *dmm_lisa_regs = &lisa_map_2G_x_2_x_2; - else - *dmm_lisa_regs = &ma_lisa_map_2G_x_2_x_2; -} - -#endif - -/** - * @brief misc_init_r - Configure Panda board specific configurations - * such as power configurations, ethernet initialization as phase2 of - * boot sequence - * - * @return 0 - */ -int misc_init_r(void) -{ - int phy_type; - u32 auxclk, altclksrc; - - /* EHCI is not supported on ES1.0 */ - if (omap_revision() == OMAP4430_ES1_0) - return 0; - - get_board_revision(); - - gpio_direction_input(PANDA_ULPI_PHY_TYPE_GPIO); - phy_type = gpio_get_value(PANDA_ULPI_PHY_TYPE_GPIO); - - if (phy_type == 1) { - /* ULPI PHY supplied by auxclk3 derived from sys_clk */ - debug("ULPI PHY supplied by auxclk3\n"); - - auxclk = readl(&scrm->auxclk3); - /* Select sys_clk */ - auxclk &= ~AUXCLK_SRCSELECT_MASK; - auxclk |= AUXCLK_SRCSELECT_SYS_CLK << AUXCLK_SRCSELECT_SHIFT; - /* Set the divisor to 2 */ - auxclk &= ~AUXCLK_CLKDIV_MASK; - auxclk |= AUXCLK_CLKDIV_2 << AUXCLK_CLKDIV_SHIFT; - /* Request auxilary clock #3 */ - auxclk |= AUXCLK_ENABLE_MASK; - - writel(auxclk, &scrm->auxclk3); - } else { - /* ULPI PHY supplied by auxclk1 derived from PER dpll */ - debug("ULPI PHY supplied by auxclk1\n"); - - auxclk = readl(&scrm->auxclk1); - /* Select per DPLL */ - auxclk &= ~AUXCLK_SRCSELECT_MASK; - auxclk |= AUXCLK_SRCSELECT_PER_DPLL << AUXCLK_SRCSELECT_SHIFT; - /* Set the divisor to 16 */ - auxclk &= ~AUXCLK_CLKDIV_MASK; - auxclk |= AUXCLK_CLKDIV_16 << AUXCLK_CLKDIV_SHIFT; - /* Request auxilary clock #3 */ - auxclk |= AUXCLK_ENABLE_MASK; - - writel(auxclk, &scrm->auxclk1); - } - - altclksrc = readl(&scrm->altclksrc); - - /* Activate alternate system clock supplier */ - altclksrc &= ~ALTCLKSRC_MODE_MASK; - altclksrc |= ALTCLKSRC_MODE_ACTIVE; - - /* enable clocks */ - altclksrc |= ALTCLKSRC_ENABLE_INT_MASK | ALTCLKSRC_ENABLE_EXT_MASK; - - writel(altclksrc, &scrm->altclksrc); - - omap_die_id_usbethaddr(); - - return 0; -} - -void set_muxconf_regs(void) -{ - do_set_mux((*ctrl)->control_padconf_core_base, - core_padconf_array_essential, - sizeof(core_padconf_array_essential) / - sizeof(struct pad_conf_entry)); - - do_set_mux((*ctrl)->control_padconf_wkup_base, - wkup_padconf_array_essential, - sizeof(wkup_padconf_array_essential) / - sizeof(struct pad_conf_entry)); - - if (omap_revision() >= OMAP4460_ES1_0) - do_set_mux((*ctrl)->control_padconf_wkup_base, - wkup_padconf_array_essential_4460, - sizeof(wkup_padconf_array_essential_4460) / - sizeof(struct pad_conf_entry)); -} - -#if defined(CONFIG_MMC) -int board_mmc_init(bd_t *bis) -{ - return omap_mmc_init(0, 0, 0, -1, -1); -} - -#if !defined(CONFIG_SPL_BUILD) -void board_mmc_power_init(void) -{ - twl6030_power_mmc_init(0); -} -#endif -#endif - -#ifdef CONFIG_USB_EHCI_HCD - -static struct omap_usbhs_board_data usbhs_bdata = { - .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, - .port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED, - .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED, -}; - -int ehci_hcd_init(int index, enum usb_init_type init, - struct ehci_hccr **hccr, struct ehci_hcor **hcor) -{ - int ret; - unsigned int utmi_clk; - - /* Now we can enable our port clocks */ - utmi_clk = readl((void *)CM_L3INIT_HSUSBHOST_CLKCTRL); - utmi_clk |= HSUSBHOST_CLKCTRL_CLKSEL_UTMI_P1_MASK; - setbits_le32((void *)CM_L3INIT_HSUSBHOST_CLKCTRL, utmi_clk); - - ret = omap_ehci_hcd_init(index, &usbhs_bdata, hccr, hcor); - if (ret < 0) - return ret; - - return 0; -} - -int ehci_hcd_stop(int index) -{ - return omap_ehci_hcd_stop(); -} -#endif - -/* - * get_board_rev() - get board revision - */ -u32 get_board_rev(void) -{ - return 0x20; -} diff --git a/board/ti/panda/panda_mux_data.h b/board/ti/panda/panda_mux_data.h deleted file mode 100644 index ad9e36525b..0000000000 --- a/board/ti/panda/panda_mux_data.h +++ /dev/null @@ -1,86 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * (C) Copyright 2010 - * Texas Instruments Incorporated, <www.ti.com> - * - * Balaji Krishnamoorthy <balajitk@ti.com> - * Aneesh V <aneesh@ti.com> - */ -#ifndef _PANDA_MUX_DATA_H_ -#define _PANDA_MUX_DATA_H_ - -#include <asm/arch/mux_omap4.h> - - -const struct pad_conf_entry core_padconf_array_essential[] = { - -{GPMC_AD0, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_dat0 */ -{GPMC_AD1, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_dat1 */ -{GPMC_AD2, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_dat2 */ -{GPMC_AD3, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_dat3 */ -{GPMC_AD4, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_dat4 */ -{GPMC_AD5, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_dat5 */ -{GPMC_AD6, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_dat6 */ -{GPMC_AD7, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_dat7 */ -{GPMC_NOE, (PTU | IEN | OFF_EN | OFF_OUT_PTD | M1)}, /* sdmmc2_clk */ -{GPMC_NWE, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_cmd */ -{SDMMC1_CLK, (PTU | OFF_EN | OFF_OUT_PTD | M0)}, /* sdmmc1_clk */ -{SDMMC1_CMD, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M0)}, /* sdmmc1_cmd */ -{SDMMC1_DAT0, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M0)}, /* sdmmc1_dat0 */ -{SDMMC1_DAT1, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M0)}, /* sdmmc1_dat1 */ -{SDMMC1_DAT2, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M0)}, /* sdmmc1_dat2 */ -{SDMMC1_DAT3, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M0)}, /* sdmmc1_dat3 */ -{SDMMC1_DAT4, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M0)}, /* sdmmc1_dat4 */ -{SDMMC1_DAT5, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M0)}, /* sdmmc1_dat5 */ -{SDMMC1_DAT6, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M0)}, /* sdmmc1_dat6 */ -{SDMMC1_DAT7, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M0)}, /* sdmmc1_dat7 */ -{I2C1_SCL, (PTU | IEN | M0)}, /* i2c1_scl */ -{I2C1_SDA, (PTU | IEN | M0)}, /* i2c1_sda */ -{I2C2_SCL, (PTU | IEN | M0)}, /* i2c2_scl */ -{I2C2_SDA, (PTU | IEN | M0)}, /* i2c2_sda */ -{I2C3_SCL, (PTU | IEN | M0)}, /* i2c3_scl */ -{I2C3_SDA, (PTU | IEN | M0)}, /* i2c3_sda */ -{I2C4_SCL, (PTU | IEN | M0)}, /* i2c4_scl */ -{I2C4_SDA, (PTU | IEN | M0)}, /* i2c4_sda */ -{UART3_CTS_RCTX, (PTU | IEN | M0)}, /* uart3_tx */ -{UART3_RTS_SD, (M0)}, /* uart3_rts_sd */ -{UART3_RX_IRRX, (IEN | M0)}, /* uart3_rx */ -{UART3_TX_IRTX, (M0)}, /* uart3_tx */ -{USBB1_ULPITLL_CLK, (PTD | IEN | OFF_EN | OFF_PD | OFF_IN | M4)},/* usbb1_ulpiphy_clk */ -{USBB1_ULPITLL_STP, (OFF_EN | OFF_OUT_PTD | M4)}, /* usbb1_ulpiphy_stp */ -{USBB1_ULPITLL_DIR, (IEN | OFF_EN | OFF_PD | OFF_IN | M4)}, /* usbb1_ulpiphy_dir */ -{USBB1_ULPITLL_NXT, (IEN | OFF_EN | OFF_PD | OFF_IN | M4)}, /* usbb1_ulpiphy_nxt */ -{USBB1_ULPITLL_DAT0, (IEN | OFF_EN | OFF_PD | OFF_IN | M4)}, /* usbb1_ulpiphy_dat0 */ -{USBB1_ULPITLL_DAT1, (IEN | OFF_EN | OFF_PD | OFF_IN | M4)}, /* usbb1_ulpiphy_dat1 */ -{USBB1_ULPITLL_DAT2, (IEN | OFF_EN | OFF_PD | OFF_IN | M4)}, /* usbb1_ulpiphy_dat2 */ -{USBB1_ULPITLL_DAT3, (IEN | OFF_EN | OFF_PD | OFF_IN | M4)}, /* usbb1_ulpiphy_dat3 */ -{USBB1_ULPITLL_DAT4, (IEN | OFF_EN | OFF_PD | OFF_IN | M4)}, /* usbb1_ulpiphy_dat4 */ -{USBB1_ULPITLL_DAT5, (IEN | OFF_EN | OFF_PD | OFF_IN | M4)}, /* usbb1_ulpiphy_dat5 */ -{USBB1_ULPITLL_DAT6, (IEN | OFF_EN | OFF_PD | OFF_IN | M4)}, /* usbb1_ulpiphy_dat6 */ -{USBB1_ULPITLL_DAT7, (IEN | OFF_EN | OFF_PD | OFF_IN | M4)}, /* usbb1_ulpiphy_dat7 */ -{USBB1_HSIC_DATA, (IEN | OFF_EN | OFF_PD | OFF_IN | M0)}, /* usbb1_hsic_data */ -{USBB1_HSIC_STROBE, (IEN | OFF_EN | OFF_PD | OFF_IN | M0)}, /* usbb1_hsic_strobe */ -{USBC1_ICUSB_DP, (IEN | M0)}, /* usbc1_icusb_dp */ -{USBC1_ICUSB_DM, (IEN | M0)}, /* usbc1_icusb_dm */ -{UNIPRO_TY2, (PTU | IEN | M3)}, /* gpio_1 */ -{GPMC_WAIT1, (PTD | OFF_EN | OFF_PD | OFF_OUT_PTD | M3)}, /* gpio_62 */ -{FREF_CLK2_OUT, (PTU | IEN | M3)}, /* gpio_182 */ - -}; - -const struct pad_conf_entry wkup_padconf_array_essential[] = { - -{PAD1_SR_SCL, (PTU | IEN | M0)}, /* sr_scl */ -{PAD0_SR_SDA, (PTU | IEN | M0)}, /* sr_sda */ -{PAD1_SYS_32K, (IEN | M0)}, /* sys_32k */ -{PAD0_FREF_CLK3_OUT, (M0)}, /* fref_clk3_out */ - -}; - -const struct pad_conf_entry wkup_padconf_array_essential_4460[] = { - -{PAD1_FREF_CLK4_REQ, (M3)}, /* gpio_wk7 for TPS: Mode 3 */ - -}; - -#endif /* _PANDA_MUX_DATA_H_ */ diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig deleted file mode 100644 index 3ac6319d2d..0000000000 --- a/configs/omap4_panda_defconfig +++ /dev/null @@ -1,42 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_OMAP2PLUS=y -CONFIG_OMAP44XX=y -CONFIG_TARGET_OMAP4_PANDA=y -CONFIG_SPL=y -CONFIG_SPL_TEXT_BASE=0x40300000 -CONFIG_DISTRO_DEFAULTS=y -CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd" -CONFIG_SYS_CONSOLE_IS_IN_ENV=y -CONFIG_SYS_CONSOLE_INFO_QUIET=y -CONFIG_VERSION_VARIABLE=y -# CONFIG_SPL_FS_EXT4 is not set -# CONFIG_SPL_I2C_SUPPORT is not set -# CONFIG_SPL_NAND_SUPPORT is not set -CONFIG_SPL_OS_BOOT=y -CONFIG_CMD_SPL=y -CONFIG_CMD_ASKENV=y -CONFIG_CMD_GPIO=y -CONFIG_CMD_I2C=y -CONFIG_CMD_MMC=y -CONFIG_CMD_SPI=y -CONFIG_CMD_USB=y -# CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set -CONFIG_CMD_EXT4_WRITE=y -CONFIG_ENV_IS_IN_FAT=y -CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" -CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y -CONFIG_MMC_OMAP_HS=y -CONFIG_CONS_INDEX=3 -CONFIG_SYS_NS16550=y -CONFIG_SPI=y -CONFIG_OMAP3_SPI=y -CONFIG_USB=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_MUSB_UDC=y -CONFIG_USB_OMAP3=y -CONFIG_USB_GADGET=y -CONFIG_USB_HOST_ETHER=y -CONFIG_USB_ETHER_SMSC95XX=y -CONFIG_OF_LIBFDT=y diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h deleted file mode 100644 index 835b7c299e..0000000000 --- a/include/configs/omap4_panda.h +++ /dev/null @@ -1,34 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * (C) Copyright 2010 - * Texas Instruments Incorporated. - * Steve Sakoman <steve@sakoman.com> - * - * Configuration settings for the TI OMAP4 Panda board. - * See ti_omap4_common.h for OMAP4 common part - */ - -#ifndef __CONFIG_PANDA_H -#define __CONFIG_PANDA_H - -/* - * High Level Configuration Options - */ - -/* USB UHH support options */ -#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 1 -#define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 62 - -/* USB Networking options */ - -#define CONFIG_UBOOT_ENABLE_PADS_ALL - -#include <configs/ti_omap4_common.h> - -/* GPIO */ - -/* ENV related config options */ - -#define CONFIG_ENV_OVERWRITE - -#endif /* __CONFIG_PANDA_H */
DM, DM_SPI and other driver model migration deadlines are expired for this board. Drop it. Cc: Lokesh Vutla <lokeshvutla@ti.com> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- Changes for v2: - none arch/arm/mach-omap2/omap4/Kconfig | 4 - board/ti/panda/Kconfig | 12 -- board/ti/panda/MAINTAINERS | 6 - board/ti/panda/Makefile | 6 - board/ti/panda/panda.c | 346 ------------------------------ board/ti/panda/panda_mux_data.h | 86 -------- configs/omap4_panda_defconfig | 42 ---- include/configs/omap4_panda.h | 34 --- 8 files changed, 536 deletions(-) delete mode 100644 board/ti/panda/Kconfig delete mode 100644 board/ti/panda/MAINTAINERS delete mode 100644 board/ti/panda/Makefile delete mode 100644 board/ti/panda/panda.c delete mode 100644 board/ti/panda/panda_mux_data.h delete mode 100644 configs/omap4_panda_defconfig delete mode 100644 include/configs/omap4_panda.h