]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
arm: ti: Remove omap4 platform support
authorTom Rini <trini@konsulko.com>
Mon, 15 Jul 2024 19:35:53 +0000 (13:35 -0600)
committerTom Rini <trini@konsulko.com>
Tue, 23 Jul 2024 16:37:48 +0000 (10:37 -0600)
There are no longer any OMAP4 platforms in U-Boot, remove the related
functionality.

Signed-off-by: Tom Rini <trini@konsulko.com>
38 files changed:
arch/arm/include/asm/arch-omap4/clock.h [deleted file]
arch/arm/include/asm/arch-omap4/cpu.h [deleted file]
arch/arm/include/asm/arch-omap4/ehci.h [deleted file]
arch/arm/include/asm/arch-omap4/gpio.h [deleted file]
arch/arm/include/asm/arch-omap4/hardware.h [deleted file]
arch/arm/include/asm/arch-omap4/i2c.h [deleted file]
arch/arm/include/asm/arch-omap4/mem.h [deleted file]
arch/arm/include/asm/arch-omap4/mmc_host_def.h [deleted file]
arch/arm/include/asm/arch-omap4/mux_omap4.h [deleted file]
arch/arm/include/asm/arch-omap4/omap.h [deleted file]
arch/arm/include/asm/arch-omap4/spl.h [deleted file]
arch/arm/include/asm/arch-omap4/sys_proto.h [deleted file]
arch/arm/include/asm/omap_common.h
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/emif-common.c
arch/arm/mach-omap2/omap4/Kconfig [deleted file]
arch/arm/mach-omap2/omap4/Makefile [deleted file]
arch/arm/mach-omap2/omap4/boot.c [deleted file]
arch/arm/mach-omap2/omap4/emif.c [deleted file]
arch/arm/mach-omap2/omap4/hw_data.c [deleted file]
arch/arm/mach-omap2/omap4/hwinit.c [deleted file]
arch/arm/mach-omap2/omap4/prcm-regs.c [deleted file]
arch/arm/mach-omap2/omap4/sdram_elpida.c [deleted file]
common/spl/Kconfig
drivers/i2c/Kconfig
drivers/mmc/Kconfig
drivers/mmc/omap_hsmmc.c
drivers/power/Kconfig
drivers/power/Makefile
drivers/power/twl6030.c [deleted file]
drivers/serial/ns16550.c
drivers/usb/musb-new/linux-compat.h
drivers/usb/musb-new/musb_core.c
drivers/usb/musb-new/musb_core.h
drivers/usb/musb-new/omap2430.c
drivers/usb/musb/omap3.c
include/twl6030.h [deleted file]

diff --git a/arch/arm/include/asm/arch-omap4/clock.h b/arch/arm/include/asm/arch-omap4/clock.h
deleted file mode 100644 (file)
index 50436e8..0000000
+++ /dev/null
@@ -1,249 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2010
- * Texas Instruments, <www.ti.com>
- *
- * Aneesh V <aneesh@ti.com>
- */
-#ifndef _CLOCKS_OMAP4_H_
-#define _CLOCKS_OMAP4_H_
-
-/*
- * Assuming a maximum of 1.5 GHz ARM speed and a minimum of 2 cycles per
- * loop, allow for a minimum of 2 ms wait (in reality the wait will be
- * much more than that)
- */
-#define LDELAY         1000000
-
-/* CM_DLL_CTRL */
-#define CM_DLL_CTRL_OVERRIDE_SHIFT     0
-#define CM_DLL_CTRL_OVERRIDE_MASK      (1 << 0)
-#define CM_DLL_CTRL_NO_OVERRIDE                0
-
-/* CM_CLKMODE_DPLL */
-#define CM_CLKMODE_DPLL_REGM4XEN_SHIFT         11
-#define CM_CLKMODE_DPLL_REGM4XEN_MASK          (1 << 11)
-#define CM_CLKMODE_DPLL_LPMODE_EN_SHIFT                10
-#define CM_CLKMODE_DPLL_LPMODE_EN_MASK         (1 << 10)
-#define CM_CLKMODE_DPLL_RELOCK_RAMP_EN_SHIFT   9
-#define CM_CLKMODE_DPLL_RELOCK_RAMP_EN_MASK    (1 << 9)
-#define CM_CLKMODE_DPLL_DRIFTGUARD_EN_SHIFT    8
-#define CM_CLKMODE_DPLL_DRIFTGUARD_EN_MASK     (1 << 8)
-#define CM_CLKMODE_DPLL_RAMP_RATE_SHIFT                5
-#define CM_CLKMODE_DPLL_RAMP_RATE_MASK         (0x7 << 5)
-#define CM_CLKMODE_DPLL_EN_SHIFT               0
-#define CM_CLKMODE_DPLL_EN_MASK                        (0x7 << 0)
-
-#define CM_CLKMODE_DPLL_DPLL_EN_SHIFT          0
-#define CM_CLKMODE_DPLL_DPLL_EN_MASK           7
-
-#define DPLL_EN_STOP                   1
-#define DPLL_EN_MN_BYPASS              4
-#define DPLL_EN_LOW_POWER_BYPASS       5
-#define DPLL_EN_FAST_RELOCK_BYPASS     6
-#define DPLL_EN_LOCK                   7
-
-/* CM_IDLEST_DPLL fields */
-#define ST_DPLL_CLK_MASK               1
-
-/* CM_CLKSEL_DPLL */
-#define CM_CLKSEL_DPLL_DPLL_SD_DIV_SHIFT       24
-#define CM_CLKSEL_DPLL_DPLL_SD_DIV_MASK                (0xFF << 24)
-#define CM_CLKSEL_DPLL_M_SHIFT                 8
-#define CM_CLKSEL_DPLL_M_MASK                  (0x7FF << 8)
-#define CM_CLKSEL_DPLL_N_SHIFT                 0
-#define CM_CLKSEL_DPLL_N_MASK                  0x7F
-#define CM_CLKSEL_DCC_EN_SHIFT                 22
-#define CM_CLKSEL_DCC_EN_MASK                  (1 << 22)
-
-/* CM_SYS_CLKSEL */
-#define CM_SYS_CLKSEL_SYS_CLKSEL_MASK  7
-
-/* CM_CLKSEL_CORE */
-#define CLKSEL_CORE_SHIFT      0
-#define CLKSEL_L3_SHIFT                4
-#define CLKSEL_L4_SHIFT                8
-
-#define CLKSEL_CORE_X2_DIV_1   0
-#define CLKSEL_L3_CORE_DIV_2   1
-#define CLKSEL_L4_L3_DIV_2     1
-
-/* CM_ABE_PLL_REF_CLKSEL */
-#define CM_ABE_PLL_REF_CLKSEL_CLKSEL_SHIFT     0
-#define CM_ABE_PLL_REF_CLKSEL_CLKSEL_MASK      1
-#define CM_ABE_PLL_REF_CLKSEL_CLKSEL_SYSCLK    0
-#define CM_ABE_PLL_REF_CLKSEL_CLKSEL_32KCLK    1
-
-/* CM_BYPCLK_DPLL_IVA */
-#define CM_BYPCLK_DPLL_IVA_CLKSEL_SHIFT                0
-#define CM_BYPCLK_DPLL_IVA_CLKSEL_MASK         3
-
-#define DPLL_IVA_CLKSEL_CORE_X2_DIV_2          1
-
-/* CM_SHADOW_FREQ_CONFIG1 */
-#define SHADOW_FREQ_CONFIG1_FREQ_UPDATE_MASK   1
-#define SHADOW_FREQ_CONFIG1_DLL_OVERRIDE_MASK  4
-#define SHADOW_FREQ_CONFIG1_DLL_RESET_MASK     8
-
-#define SHADOW_FREQ_CONFIG1_DPLL_EN_SHIFT      8
-#define SHADOW_FREQ_CONFIG1_DPLL_EN_MASK       (7 << 8)
-
-#define SHADOW_FREQ_CONFIG1_M2_DIV_SHIFT       11
-#define SHADOW_FREQ_CONFIG1_M2_DIV_MASK                (0x1F << 11)
-
-/*CM_<clock_domain>__CLKCTRL */
-#define CD_CLKCTRL_CLKTRCTRL_SHIFT             0
-#define CD_CLKCTRL_CLKTRCTRL_MASK              3
-
-#define CD_CLKCTRL_CLKTRCTRL_NO_SLEEP          0
-#define CD_CLKCTRL_CLKTRCTRL_SW_SLEEP          1
-#define CD_CLKCTRL_CLKTRCTRL_SW_WKUP           2
-#define CD_CLKCTRL_CLKTRCTRL_HW_AUTO           3
-
-/* CM_<clock_domain>_<module>_CLKCTRL */
-#define MODULE_CLKCTRL_MODULEMODE_SHIFT                0
-#define MODULE_CLKCTRL_MODULEMODE_MASK         3
-#define MODULE_CLKCTRL_IDLEST_SHIFT            16
-#define MODULE_CLKCTRL_IDLEST_MASK             (3 << 16)
-
-#define MODULE_CLKCTRL_MODULEMODE_SW_DISABLE           0
-#define MODULE_CLKCTRL_MODULEMODE_HW_AUTO              1
-#define MODULE_CLKCTRL_MODULEMODE_SW_EXPLICIT_EN       2
-
-#define MODULE_CLKCTRL_IDLEST_FULLY_FUNCTIONAL 0
-#define MODULE_CLKCTRL_IDLEST_TRANSITIONING    1
-#define MODULE_CLKCTRL_IDLEST_IDLE             2
-#define MODULE_CLKCTRL_IDLEST_DISABLED         3
-
-/* CM_L4PER_GPIO4_CLKCTRL */
-#define GPIO4_CLKCTRL_OPTFCLKEN_MASK           (1 << 8)
-
-/* CM_L3INIT_HSMMCn_CLKCTRL */
-#define HSMMC_CLKCTRL_CLKSEL_MASK              (1 << 24)
-
-/* CM_WKUP_GPTIMER1_CLKCTRL */
-#define GPTIMER1_CLKCTRL_CLKSEL_MASK           (1 << 24)
-
-/* CM_CAM_ISS_CLKCTRL */
-#define ISS_CLKCTRL_OPTFCLKEN_MASK             (1 << 8)
-
-/* CM_DSS_DSS_CLKCTRL */
-#define DSS_CLKCTRL_OPTFCLKEN_MASK             0xF00
-
-/* CM_COREAON_USB_PHY_CORE_CLKCTRL */
-#define USBPHY_CORE_CLKCTRL_OPTFCLKEN_CLK32K   (1 << 8)
-
-/* CM_L3INIT_USBPHY_CLKCTRL */
-#define USBPHY_CLKCTRL_OPTFCLKEN_PHY_48M_MASK  (1 << 8)
-
-/* CM_MPU_MPU_CLKCTRL */
-#define MPU_CLKCTRL_CLKSEL_EMIF_DIV_MODE_SHIFT 24
-#define MPU_CLKCTRL_CLKSEL_EMIF_DIV_MODE_MASK  (1 << 24)
-#define MPU_CLKCTRL_CLKSEL_ABE_DIV_MODE_SHIFT  25
-#define MPU_CLKCTRL_CLKSEL_ABE_DIV_MODE_MASK   (1 << 25)
-
-/* Clock frequencies */
-#define OMAP_SYS_CLK_IND_38_4_MHZ      6
-
-/* PRM_VC_VAL_BYPASS */
-#define PRM_VC_I2C_CHANNEL_FREQ_KHZ    400
-
-/* PMIC */
-#define SMPS_I2C_SLAVE_ADDR    0x12
-/* TWL6030 SMPS */
-#define SMPS_REG_ADDR_VCORE1   0x55
-#define SMPS_REG_ADDR_VCORE2   0x5B
-#define SMPS_REG_ADDR_VCORE3   0x61
-/* TWL6032 SMPS */
-#define SMPS_REG_ADDR_SMPS1    0x55
-#define SMPS_REG_ADDR_SMPS2    0x5B
-#define SMPS_REG_ADDR_SMPS5    0x49
-
-#define PHOENIX_SMPS_BASE_VOLT_STD_MODE_UV             607700
-#define PHOENIX_SMPS_BASE_VOLT_STD_MODE_WITH_OFFSET_UV 709000
-
-/* TPS */
-#define TPS62361_I2C_SLAVE_ADDR                0x60
-#define TPS62361_REG_ADDR_SET0         0x0
-#define TPS62361_REG_ADDR_SET1         0x1
-#define TPS62361_REG_ADDR_SET2         0x2
-#define TPS62361_REG_ADDR_SET3         0x3
-#define TPS62361_REG_ADDR_CTRL         0x4
-#define TPS62361_REG_ADDR_TEMP         0x5
-#define TPS62361_REG_ADDR_RMP_CTRL     0x6
-#define TPS62361_REG_ADDR_CHIP_ID      0x8
-#define TPS62361_REG_ADDR_CHIP_ID_2    0x9
-
-#define TPS62361_BASE_VOLT_MV  500
-#define TPS62361_VSEL0_GPIO    7
-
-/* AUXCLKx reg fields */
-#define AUXCLK_ENABLE_MASK             (1 << 8)
-#define AUXCLK_SRCSELECT_SHIFT         1
-#define AUXCLK_SRCSELECT_MASK          (3 << 1)
-#define AUXCLK_CLKDIV_SHIFT            16
-#define AUXCLK_CLKDIV_MASK             (0xF << 16)
-
-#define AUXCLK_SRCSELECT_SYS_CLK       0
-#define AUXCLK_SRCSELECT_CORE_DPLL     1
-#define AUXCLK_SRCSELECT_PER_DPLL      2
-#define AUXCLK_SRCSELECT_ALTERNATE     3
-
-#define AUXCLK_CLKDIV_2                        1
-#define AUXCLK_CLKDIV_16               0xF
-
-/* ALTCLKSRC */
-#define ALTCLKSRC_MODE_MASK            3
-#define ALTCLKSRC_ENABLE_INT_MASK      4
-#define ALTCLKSRC_ENABLE_EXT_MASK      8
-
-#define ALTCLKSRC_MODE_ACTIVE          1
-
-#define DPLL_NO_LOCK   0
-#define DPLL_LOCK      1
-
-/* Clock Defines */
-#define V_OSCK                 38400000        /* Clock output from T2 */
-#define V_SCLK                   V_OSCK
-
-struct omap4_scrm_regs {
-       u32 revision;           /* 0x0000 */
-       u32 pad00[63];
-       u32 clksetuptime;       /* 0x0100 */
-       u32 pmicsetuptime;      /* 0x0104 */
-       u32 pad01[2];
-       u32 altclksrc;          /* 0x0110 */
-       u32 pad02[2];
-       u32 c2cclkm;            /* 0x011c */
-       u32 pad03[56];
-       u32 extclkreq;          /* 0x0200 */
-       u32 accclkreq;          /* 0x0204 */
-       u32 pwrreq;             /* 0x0208 */
-       u32 pad04[1];
-       u32 auxclkreq0;         /* 0x0210 */
-       u32 auxclkreq1;         /* 0x0214 */
-       u32 auxclkreq2;         /* 0x0218 */
-       u32 auxclkreq3;         /* 0x021c */
-       u32 auxclkreq4;         /* 0x0220 */
-       u32 auxclkreq5;         /* 0x0224 */
-       u32 pad05[3];
-       u32 c2cclkreq;          /* 0x0234 */
-       u32 pad06[54];
-       u32 auxclk0;            /* 0x0310 */
-       u32 auxclk1;            /* 0x0314 */
-       u32 auxclk2;            /* 0x0318 */
-       u32 auxclk3;            /* 0x031c */
-       u32 auxclk4;            /* 0x0320 */
-       u32 auxclk5;            /* 0x0324 */
-       u32 pad07[54];
-       u32 rsttime_reg;        /* 0x0400 */
-       u32 pad08[6];
-       u32 c2crstctrl;         /* 0x041c */
-       u32 extpwronrstctrl;    /* 0x0420 */
-       u32 pad09[59];
-       u32 extwarmrstst_reg;   /* 0x0510 */
-       u32 apewarmrstst_reg;   /* 0x0514 */
-       u32 pad10[1];
-       u32 c2cwarmrstst_reg;   /* 0x051C */
-};
-#endif /* _CLOCKS_OMAP4_H_ */
diff --git a/arch/arm/include/asm/arch-omap4/cpu.h b/arch/arm/include/asm/arch-omap4/cpu.h
deleted file mode 100644 (file)
index 4c9ed45..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2006-2010
- * Texas Instruments, <www.ti.com>
- */
-
-#ifndef _CPU_H
-#define _CPU_H
-
-#if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__))
-#include <asm/types.h>
-#endif /* !(__KERNEL_STRICT_NAMES || __ASSEMBLY__) */
-
-#include <asm/arch/hardware.h>
-
-#ifndef __KERNEL_STRICT_NAMES
-#ifndef __ASSEMBLY__
-struct gptimer {
-       u32 tidr;               /* 0x00 r */
-       u8 res[0xc];
-       u32 tiocp_cfg;          /* 0x10 rw */
-       u32 tistat;             /* 0x14 r */
-       u32 tisr;               /* 0x18 rw */
-       u32 tier;               /* 0x1c rw */
-       u32 twer;               /* 0x20 rw */
-       u32 tclr;               /* 0x24 rw */
-       u32 tcrr;               /* 0x28 rw */
-       u32 tldr;               /* 0x2c rw */
-       u32 ttgr;               /* 0x30 rw */
-       u32 twpc;               /* 0x34 r */
-       u32 tmar;               /* 0x38 rw */
-       u32 tcar1;              /* 0x3c r */
-       u32 tcicr;              /* 0x40 rw */
-       u32 tcar2;              /* 0x44 r */
-};
-#endif /* __ASSEMBLY__ */
-#endif /* __KERNEL_STRICT_NAMES */
-
-/* enable sys_clk NO-prescale /1 */
-#define GPT_EN                 ((0x0 << 2) | (0x1 << 1) | (0x1 << 0))
-
-/* Watchdog */
-#ifndef __KERNEL_STRICT_NAMES
-#ifndef __ASSEMBLY__
-struct watchdog {
-       u8 res1[0x34];
-       u32 wwps;               /* 0x34 r */
-       u8 res2[0x10];
-       u32 wspr;               /* 0x48 rw */
-};
-#endif /* __ASSEMBLY__ */
-#endif /* __KERNEL_STRICT_NAMES */
-
-#define WD_UNLOCK1             0xAAAA
-#define WD_UNLOCK2             0x5555
-
-#define TCLR_ST                        (0x1 << 0)
-#define TCLR_AR                        (0x1 << 1)
-#define TCLR_PRE               (0x1 << 5)
-
-/* I2C base */
-#define I2C_BASE1              (OMAP44XX_L4_PER_BASE + 0x70000)
-#define I2C_BASE2              (OMAP44XX_L4_PER_BASE + 0x72000)
-#define I2C_BASE3              (OMAP44XX_L4_PER_BASE + 0x60000)
-#define I2C_BASE4              (OMAP44XX_L4_PER_BASE + 0x350000)
-
-/* MUSB base */
-#define MUSB_BASE              (OMAP44XX_L4_CORE_BASE + 0xAB000)
-
-/* OMAP4 GPIO registers */
-#define OMAP_GPIO_REVISION             0x0000
-#define OMAP_GPIO_SYSCONFIG            0x0010
-#define OMAP_GPIO_SYSSTATUS            0x0114
-#define OMAP_GPIO_IRQSTATUS1           0x0118
-#define OMAP_GPIO_IRQSTATUS2           0x0128
-#define OMAP_GPIO_IRQENABLE2           0x012c
-#define OMAP_GPIO_IRQENABLE1           0x011c
-#define OMAP_GPIO_WAKE_EN              0x0120
-#define OMAP_GPIO_CTRL                 0x0130
-#define OMAP_GPIO_OE                   0x0134
-#define OMAP_GPIO_DATAIN               0x0138
-#define OMAP_GPIO_DATAOUT              0x013c
-#define OMAP_GPIO_LEVELDETECT0         0x0140
-#define OMAP_GPIO_LEVELDETECT1         0x0144
-#define OMAP_GPIO_RISINGDETECT         0x0148
-#define OMAP_GPIO_FALLINGDETECT                0x014c
-#define OMAP_GPIO_DEBOUNCE_EN          0x0150
-#define OMAP_GPIO_DEBOUNCE_VAL         0x0154
-#define OMAP_GPIO_CLEARIRQENABLE1      0x0160
-#define OMAP_GPIO_SETIRQENABLE1                0x0164
-#define OMAP_GPIO_CLEARWKUENA          0x0180
-#define OMAP_GPIO_SETWKUENA            0x0184
-#define OMAP_GPIO_CLEARDATAOUT         0x0190
-#define OMAP_GPIO_SETDATAOUT           0x0194
-
-/*
- * PRCM
- */
-
-/* PRM */
-#define PRM_BASE               0x4A306000
-#define PRM_DEVICE_BASE                (PRM_BASE + 0x1B00)
-
-#define PRM_RSTCTRL            PRM_DEVICE_BASE
-#define PRM_RSTCTRL_RESET      0x01
-#define PRM_RSTST              (PRM_DEVICE_BASE + 0x4)
-#define PRM_RSTST_WARM_RESET_MASK      0x07EA
-
-#endif /* _CPU_H */
diff --git a/arch/arm/include/asm/arch-omap4/ehci.h b/arch/arm/include/asm/arch-omap4/ehci.h
deleted file mode 100644 (file)
index e8fe88f..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * OMAP EHCI port support
- * Based on LINUX KERNEL
- * drivers/usb/host/ehci-omap.c and drivers/mfd/omap-usb-host.c
- *
- * Copyright (C) 2011 Texas Instruments Incorporated - https://www.ti.com
- * Author: Govindraj R <govindraj.raja@ti.com>
- */
-
-#ifndef _OMAP4_EHCI_H_
-#define _OMAP4_EHCI_H_
-
-#define OMAP_EHCI_BASE                         (OMAP44XX_L4_CORE_BASE + 0x64C00)
-#define OMAP_UHH_BASE                          (OMAP44XX_L4_CORE_BASE + 0x64000)
-#define OMAP_USBTLL_BASE                       (OMAP44XX_L4_CORE_BASE + 0x62000)
-
-/* UHH, TLL and opt clocks */
-#define CM_L3INIT_HSUSBHOST_CLKCTRL            0x4A009358UL
-
-#define HSUSBHOST_CLKCTRL_CLKSEL_UTMI_P1_MASK  (1 << 24)
-
-/* TLL Register Set */
-#define OMAP_USBTLL_SYSCONFIG_SIDLEMODE                (1 << 3)
-#define OMAP_USBTLL_SYSCONFIG_ENAWAKEUP                (1 << 2)
-#define OMAP_USBTLL_SYSCONFIG_SOFTRESET                (1 << 1)
-#define OMAP_USBTLL_SYSCONFIG_CACTIVITY                (1 << 8)
-#define OMAP_USBTLL_SYSSTATUS_RESETDONE                1
-
-#define OMAP_UHH_SYSCONFIG_SOFTRESET           1
-#define OMAP_UHH_SYSSTATUS_EHCI_RESETDONE      (1 << 2)
-#define OMAP_UHH_SYSCONFIG_NOIDLE              (1 << 2)
-#define OMAP_UHH_SYSCONFIG_NOSTDBY             (1 << 4)
-
-#define OMAP_UHH_SYSCONFIG_VAL (OMAP_UHH_SYSCONFIG_NOIDLE | \
-                                       OMAP_UHH_SYSCONFIG_NOSTDBY)
-
-#endif /* _OMAP4_EHCI_H_ */
diff --git a/arch/arm/include/asm/arch-omap4/gpio.h b/arch/arm/include/asm/arch-omap4/gpio.h
deleted file mode 100644 (file)
index aceb3e2..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Copyright (c) 2009 Wind River Systems, Inc.
- * Tom Rix <Tom.Rix@windriver.com>
- *
- * This work is derived from the linux 2.6.27 kernel source
- * To fetch, use the kernel repository
- * git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
- * Use the v2.6.27 tag.
- *
- * Below is the original's header including its copyright
- *
- *  linux/arch/arm/plat-omap/gpio.c
- *
- * Support functions for OMAP GPIO
- *
- * Copyright (C) 2003-2005 Nokia Corporation
- * Written by Juha Yrjölä <juha.yrjola@nokia.com>
- */
-#ifndef _GPIO_OMAP4_H
-#define _GPIO_OMAP4_H
-
-#include <asm/omap_gpio.h>
-
-#define OMAP_MAX_GPIO                  192
-
-#define OMAP44XX_GPIO1_BASE            0x4A310000
-#define OMAP44XX_GPIO2_BASE            0x48055000
-#define OMAP44XX_GPIO3_BASE            0x48057000
-#define OMAP44XX_GPIO4_BASE            0x48059000
-#define OMAP44XX_GPIO5_BASE            0x4805B000
-#define OMAP44XX_GPIO6_BASE            0x4805D000
-
-#endif /* _GPIO_OMAP4_H */
diff --git a/arch/arm/include/asm/arch-omap4/hardware.h b/arch/arm/include/asm/arch-omap4/hardware.h
deleted file mode 100644 (file)
index 67e3dae..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * hardware.h
- *
- * hardware specific header
- *
- * Copyright (C) 2013, Texas Instruments, Incorporated - https://www.ti.com/
- */
-
-#ifndef __OMAP_HARDWARE_H
-#define __OMAP_HARDWARE_H
-
-#include <asm/arch/omap.h>
-
-/*
- * Common hardware definitions
- */
-
-/* BCH Error Location Module */
-#define ELM_BASE                       0x48078000
-
-/* GPMC Base address */
-#define GPMC_BASE                      0x50000000
-
-#endif
diff --git a/arch/arm/include/asm/arch-omap4/i2c.h b/arch/arm/include/asm/arch-omap4/i2c.h
deleted file mode 100644 (file)
index c8f2f97..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2004-2010
- * Texas Instruments, <www.ti.com>
- */
-#ifndef _OMAP4_I2C_H_
-#define _OMAP4_I2C_H_
-
-#define I2C_DEFAULT_BASE       I2C_BASE1
-
-#endif /* _OMAP4_I2C_H_ */
diff --git a/arch/arm/include/asm/arch-omap4/mem.h b/arch/arm/include/asm/arch-omap4/mem.h
deleted file mode 100644 (file)
index 3026a00..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2006-2008
- * Texas Instruments, <www.ti.com>
- *
- * Author
- *             Mansoor Ahamed <mansoor.ahamed@ti.com>
- *
- * Initial Code from:
- *             Richard Woodruff <r-woodruff2@ti.com>
- */
-
-#ifndef _MEM_H_
-#define _MEM_H_
-
-/*
- * GPMC settings -
- * Definitions is as per the following format
- * #define <PART>_GPMC_CONFIG<x> <value>
- * Where:
- * PART is the part name e.g. STNOR - Intel Strata Flash
- * x is GPMC config registers from 1 to 6 (there will be 6 macros)
- * Value is corresponding value
- *
- * For every valid PRCM configuration there should be only one definition of
- * the same. if values are independent of the board, this definition will be
- * present in this file if values are dependent on the board, then this should
- * go into corresponding mem-boardName.h file
- *
- * Currently valid part Names are (PART):
- * M_NAND - Micron NAND
- * STNOR - STMicrolelctronics M29W128GL
- */
-#define GPMC_SIZE_256M         0x0
-#define GPMC_SIZE_128M         0x8
-#define GPMC_SIZE_64M          0xC
-#define GPMC_SIZE_32M          0xE
-#define GPMC_SIZE_16M          0xF
-
-#define M_NAND_GPMC_CONFIG1    0x00000800
-#define M_NAND_GPMC_CONFIG2    0x001e1e00
-#define M_NAND_GPMC_CONFIG3    0x001e1e00
-#define M_NAND_GPMC_CONFIG4    0x16051807
-#define M_NAND_GPMC_CONFIG5    0x00151e1e
-#define M_NAND_GPMC_CONFIG6    0x16000f80
-#define M_NAND_GPMC_CONFIG7    0x00000008
-
-#define STNOR_GPMC_CONFIG1     0x00001200
-#define STNOR_GPMC_CONFIG2     0x00101000
-#define STNOR_GPMC_CONFIG3     0x00030301
-#define STNOR_GPMC_CONFIG4     0x10041004
-#define STNOR_GPMC_CONFIG5     0x000C1010
-#define STNOR_GPMC_CONFIG6     0x08070280
-#define STNOR_GPMC_CONFIG7     0x00000F48
-
-/* max number of GPMC Chip Selects */
-#define GPMC_MAX_CS            8
-/* max number of GPMC regs */
-#define GPMC_MAX_REG           7
-
-#endif /* endif _MEM_H_ */
diff --git a/arch/arm/include/asm/arch-omap4/mmc_host_def.h b/arch/arm/include/asm/arch-omap4/mmc_host_def.h
deleted file mode 100644 (file)
index d067799..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * (C) Copyright 2010
- * Texas Instruments, <www.ti.com>
- * Syed Mohammed Khasim <khasim@ti.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation's version 2 of
- * the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#ifndef MMC_HOST_DEF_H
-#define MMC_HOST_DEF_H
-
-#include <asm/omap_mmc.h>
-
-/*
- * OMAP HSMMC register definitions
- */
-
-#define OMAP_HSMMC1_BASE       0x4809C000
-#define OMAP_HSMMC2_BASE       0x480B4000
-#define OMAP_HSMMC3_BASE       0x480AD000
-
-#endif /* MMC_HOST_DEF_H */
diff --git a/arch/arm/include/asm/arch-omap4/mux_omap4.h b/arch/arm/include/asm/arch-omap4/mux_omap4.h
deleted file mode 100644 (file)
index 854203c..0000000
+++ /dev/null
@@ -1,328 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2004-2009
- * Texas Instruments Incorporated
- * Richard Woodruff            <r-woodruff2@ti.com>
- * Aneesh V                    <aneesh@ti.com>
- * Balaji Krishnamoorthy       <balajitk@ti.com>
- */
-#ifndef _MUX_OMAP4_H_
-#define _MUX_OMAP4_H_
-
-#include <asm/types.h>
-
-struct pad_conf_entry {
-
-       u16 offset;
-
-       u16 val;
-
-};
-
-#ifdef CONFIG_OFF_PADCONF
-#define OFF_PD          (1 << 12)
-#define OFF_PU          (3 << 12)
-#define OFF_OUT_PTD     (0 << 10)
-#define OFF_OUT_PTU     (2 << 10)
-#define OFF_IN          (1 << 10)
-#define OFF_OUT         (0 << 10)
-#define OFF_EN          (1 << 9)
-#else
-#define OFF_PD          (0 << 12)
-#define OFF_PU          (0 << 12)
-#define OFF_OUT_PTD     (0 << 10)
-#define OFF_OUT_PTU     (0 << 10)
-#define OFF_IN          (0 << 10)
-#define OFF_OUT         (0 << 10)
-#define OFF_EN          (0 << 9)
-#endif
-
-#define IEN             (1 << 8)
-#define IDIS            (0 << 8)
-#define PTU             (3 << 3)
-#define PTD             (1 << 3)
-#define EN              (1 << 3)
-#define DIS             (0 << 3)
-
-#define M0              0
-#define M1              1
-#define M2              2
-#define M3              3
-#define M4              4
-#define M5              5
-#define M6              6
-#define M7              7
-
-#define SAFE_MODE      M7
-
-#ifdef CONFIG_OFF_PADCONF
-#define OFF_IN_PD       (OFF_PD | OFF_IN | OFF_EN)
-#define OFF_IN_PU       (OFF_PU | OFF_IN | OFF_EN)
-#define OFF_OUT_PD      (OFF_OUT_PTD | OFF_OUT | OFF_EN)
-#define OFF_OUT_PU      (OFF_OUT_PTU | OFF_OUT | OFF_EN)
-#else
-#define OFF_IN_PD       0
-#define OFF_IN_PU       0
-#define OFF_OUT_PD      0
-#define OFF_OUT_PU      0
-#endif
-
-#define CORE_REVISION          0x0000
-#define CORE_HWINFO            0x0004
-#define CORE_SYSCONFIG         0x0010
-#define GPMC_AD0               0x0040
-#define GPMC_AD1               0x0042
-#define GPMC_AD2               0x0044
-#define GPMC_AD3               0x0046
-#define GPMC_AD4               0x0048
-#define GPMC_AD5               0x004A
-#define GPMC_AD6               0x004C
-#define GPMC_AD7               0x004E
-#define GPMC_AD8               0x0050
-#define GPMC_AD9               0x0052
-#define GPMC_AD10              0x0054
-#define GPMC_AD11              0x0056
-#define GPMC_AD12              0x0058
-#define GPMC_AD13              0x005A
-#define GPMC_AD14              0x005C
-#define GPMC_AD15              0x005E
-#define GPMC_A16               0x0060
-#define GPMC_A17               0x0062
-#define GPMC_A18               0x0064
-#define GPMC_A19               0x0066
-#define GPMC_A20               0x0068
-#define GPMC_A21               0x006A
-#define GPMC_A22               0x006C
-#define GPMC_A23               0x006E
-#define GPMC_A24               0x0070
-#define GPMC_A25               0x0072
-#define GPMC_NCS0              0x0074
-#define GPMC_NCS1              0x0076
-#define GPMC_NCS2              0x0078
-#define GPMC_NCS3              0x007A
-#define GPMC_NWP               0x007C
-#define GPMC_CLK               0x007E
-#define GPMC_NADV_ALE          0x0080
-#define GPMC_NOE               0x0082
-#define GPMC_NWE               0x0084
-#define GPMC_NBE0_CLE          0x0086
-#define GPMC_NBE1              0x0088
-#define GPMC_WAIT0             0x008A
-#define GPMC_WAIT1             0x008C
-#define C2C_DATA11             0x008E
-#define C2C_DATA12             0x0090
-#define C2C_DATA13             0x0092
-#define C2C_DATA14             0x0094
-#define C2C_DATA15             0x0096
-#define HDMI_HPD               0x0098
-#define HDMI_CEC               0x009A
-#define HDMI_DDC_SCL           0x009C
-#define HDMI_DDC_SDA           0x009E
-#define CSI21_DX0              0x00A0
-#define CSI21_DY0              0x00A2
-#define CSI21_DX1              0x00A4
-#define CSI21_DY1              0x00A6
-#define CSI21_DX2              0x00A8
-#define CSI21_DY2              0x00AA
-#define CSI21_DX3              0x00AC
-#define CSI21_DY3              0x00AE
-#define CSI21_DX4              0x00B0
-#define CSI21_DY4              0x00B2
-#define CSI22_DX0              0x00B4
-#define CSI22_DY0              0x00B6
-#define CSI22_DX1              0x00B8
-#define CSI22_DY1              0x00BA
-#define CAM_SHUTTER            0x00BC
-#define CAM_STROBE             0x00BE
-#define CAM_GLOBALRESET                0x00C0
-#define USBB1_ULPITLL_CLK      0x00C2
-#define USBB1_ULPITLL_STP      0x00C4
-#define USBB1_ULPITLL_DIR      0x00C6
-#define USBB1_ULPITLL_NXT      0x00C8
-#define USBB1_ULPITLL_DAT0     0x00CA
-#define USBB1_ULPITLL_DAT1     0x00CC
-#define USBB1_ULPITLL_DAT2     0x00CE
-#define USBB1_ULPITLL_DAT3     0x00D0
-#define USBB1_ULPITLL_DAT4     0x00D2
-#define USBB1_ULPITLL_DAT5     0x00D4
-#define USBB1_ULPITLL_DAT6     0x00D6
-#define USBB1_ULPITLL_DAT7     0x00D8
-#define USBB1_HSIC_DATA                0x00DA
-#define USBB1_HSIC_STROBE      0x00DC
-#define USBC1_ICUSB_DP         0x00DE
-#define USBC1_ICUSB_DM         0x00E0
-#define SDMMC1_CLK             0x00E2
-#define SDMMC1_CMD             0x00E4
-#define SDMMC1_DAT0            0x00E6
-#define SDMMC1_DAT1            0x00E8
-#define SDMMC1_DAT2            0x00EA
-#define SDMMC1_DAT3            0x00EC
-#define SDMMC1_DAT4            0x00EE
-#define SDMMC1_DAT5            0x00F0
-#define SDMMC1_DAT6            0x00F2
-#define SDMMC1_DAT7            0x00F4
-#define ABE_MCBSP2_CLKX                0x00F6
-#define ABE_MCBSP2_DR          0x00F8
-#define ABE_MCBSP2_DX          0x00FA
-#define ABE_MCBSP2_FSX         0x00FC
-#define ABE_MCBSP1_CLKX                0x00FE
-#define ABE_MCBSP1_DR          0x0100
-#define ABE_MCBSP1_DX          0x0102
-#define ABE_MCBSP1_FSX         0x0104
-#define ABE_PDM_UL_DATA                0x0106
-#define ABE_PDM_DL_DATA                0x0108
-#define ABE_PDM_FRAME          0x010A
-#define ABE_PDM_LB_CLK         0x010C
-#define ABE_CLKS               0x010E
-#define ABE_DMIC_CLK1          0x0110
-#define ABE_DMIC_DIN1          0x0112
-#define ABE_DMIC_DIN2          0x0114
-#define ABE_DMIC_DIN3          0x0116
-#define UART2_CTS              0x0118
-#define UART2_RTS              0x011A
-#define UART2_RX               0x011C
-#define UART2_TX               0x011E
-#define HDQ_SIO                        0x0120
-#define I2C1_SCL               0x0122
-#define I2C1_SDA               0x0124
-#define I2C2_SCL               0x0126
-#define I2C2_SDA               0x0128
-#define I2C3_SCL               0x012A
-#define I2C3_SDA               0x012C
-#define I2C4_SCL               0x012E
-#define I2C4_SDA               0x0130
-#define MCSPI1_CLK             0x0132
-#define MCSPI1_SOMI            0x0134
-#define MCSPI1_SIMO            0x0136
-#define MCSPI1_CS0             0x0138
-#define MCSPI1_CS1             0x013A
-#define MCSPI1_CS2             0x013C
-#define MCSPI1_CS3             0x013E
-#define UART3_CTS_RCTX         0x0140
-#define UART3_RTS_SD           0x0142
-#define UART3_RX_IRRX          0x0144
-#define UART3_TX_IRTX          0x0146
-#define SDMMC5_CLK             0x0148
-#define SDMMC5_CMD             0x014A
-#define SDMMC5_DAT0            0x014C
-#define SDMMC5_DAT1            0x014E
-#define SDMMC5_DAT2            0x0150
-#define SDMMC5_DAT3            0x0152
-#define MCSPI4_CLK             0x0154
-#define MCSPI4_SIMO            0x0156
-#define MCSPI4_SOMI            0x0158
-#define MCSPI4_CS0             0x015A
-#define UART4_RX               0x015C
-#define UART4_TX               0x015E
-#define USBB2_ULPITLL_CLK      0x0160
-#define USBB2_ULPITLL_STP      0x0162
-#define USBB2_ULPITLL_DIR      0x0164
-#define USBB2_ULPITLL_NXT      0x0166
-#define USBB2_ULPITLL_DAT0     0x0168
-#define USBB2_ULPITLL_DAT1     0x016A
-#define USBB2_ULPITLL_DAT2     0x016C
-#define USBB2_ULPITLL_DAT3     0x016E
-#define USBB2_ULPITLL_DAT4     0x0170
-#define USBB2_ULPITLL_DAT5     0x0172
-#define USBB2_ULPITLL_DAT6     0x0174
-#define USBB2_ULPITLL_DAT7     0x0176
-#define USBB2_HSIC_DATA                0x0178
-#define USBB2_HSIC_STROBE      0x017A
-#define UNIPRO_TX0             0x017C
-#define UNIPRO_TY0             0x017E
-#define UNIPRO_TX1             0x0180
-#define UNIPRO_TY1             0x0182
-#define UNIPRO_TX2             0x0184
-#define UNIPRO_TY2             0x0186
-#define UNIPRO_RX0             0x0188
-#define UNIPRO_RY0             0x018A
-#define UNIPRO_RX1             0x018C
-#define UNIPRO_RY1             0x018E
-#define UNIPRO_RX2             0x0190
-#define UNIPRO_RY2             0x0192
-#define USBA0_OTG_CE           0x0194
-#define USBA0_OTG_DP           0x0196
-#define USBA0_OTG_DM           0x0198
-#define FREF_CLK1_OUT          0x019A
-#define FREF_CLK2_OUT          0x019C
-#define SYS_NIRQ1              0x019E
-#define SYS_NIRQ2              0x01A0
-#define SYS_BOOT0              0x01A2
-#define SYS_BOOT1              0x01A4
-#define SYS_BOOT2              0x01A6
-#define SYS_BOOT3              0x01A8
-#define SYS_BOOT4              0x01AA
-#define SYS_BOOT5              0x01AC
-#define DPM_EMU0               0x01AE
-#define DPM_EMU1               0x01B0
-#define DPM_EMU2               0x01B2
-#define DPM_EMU3               0x01B4
-#define DPM_EMU4               0x01B6
-#define DPM_EMU5               0x01B8
-#define DPM_EMU6               0x01BA
-#define DPM_EMU7               0x01BC
-#define DPM_EMU8               0x01BE
-#define DPM_EMU9               0x01C0
-#define DPM_EMU10              0x01C2
-#define DPM_EMU11              0x01C4
-#define DPM_EMU12              0x01C6
-#define DPM_EMU13              0x01C8
-#define DPM_EMU14              0x01CA
-#define DPM_EMU15              0x01CC
-#define DPM_EMU16              0x01CE
-#define DPM_EMU17              0x01D0
-#define DPM_EMU18              0x01D2
-#define DPM_EMU19              0x01D4
-#define WAKEUPEVENT_0          0x01D8
-#define WAKEUPEVENT_1          0x01DC
-#define WAKEUPEVENT_2          0x01E0
-#define WAKEUPEVENT_3          0x01E4
-#define WAKEUPEVENT_4          0x01E8
-#define WAKEUPEVENT_5          0x01EC
-#define WAKEUPEVENT_6          0x01F0
-
-#define WKUP_REVISION          0x0000
-#define WKUP_HWINFO            0x0004
-#define WKUP_SYSCONFIG         0x0010
-#define PAD0_SIM_IO            0x0040
-#define PAD1_SIM_CLK           0x0042
-#define PAD0_SIM_RESET         0x0044
-#define PAD1_SIM_CD            0x0046
-#define PAD0_SIM_PWRCTRL               0x0048
-#define PAD1_SR_SCL            0x004A
-#define PAD0_SR_SDA            0x004C
-#define PAD1_FREF_XTAL_IN              0x004E
-#define PAD0_FREF_SLICER_IN    0x0050
-#define PAD1_FREF_CLK_IOREQ    0x0052
-#define PAD0_FREF_CLK0_OUT             0x0054
-#define PAD1_FREF_CLK3_REQ             0x0056
-#define PAD0_FREF_CLK3_OUT             0x0058
-#define PAD1_FREF_CLK4_REQ             0x005A
-#define PAD0_FREF_CLK4_OUT             0x005C
-#define PAD1_SYS_32K           0x005E
-#define PAD0_SYS_NRESPWRON             0x0060
-#define PAD1_SYS_NRESWARM              0x0062
-#define PAD0_SYS_PWR_REQ               0x0064
-#define PAD1_SYS_PWRON_RESET   0x0066
-#define PAD0_SYS_BOOT6         0x0068
-#define PAD1_SYS_BOOT7         0x006A
-#define PAD0_JTAG_NTRST                0x006C
-#define PAD1_JTAG_TCK          0x006D
-#define PAD0_JTAG_RTCK         0x0070
-#define PAD1_JTAG_TMS_TMSC             0x0072
-#define PAD0_JTAG_TDI          0x0074
-#define PAD1_JTAG_TDO          0x0076
-#define PADCONF_WAKEUPEVENT_0  0x007C
-#define CONTROL_SMART1NOPMIO_PADCONF_0         0x05A0
-#define CONTROL_SMART1NOPMIO_PADCONF_1         0x05A4
-#define PADCONF_MODE           0x05A8
-#define CONTROL_XTAL_OSCILLATOR                        0x05AC
-#define CONTROL_CONTROL_I2C_2                  0x0604
-#define CONTROL_CONTROL_JTAG                   0x0608
-#define CONTROL_CONTROL_SYS                    0x060C
-#define CONTROL_SPARE_RW               0x0614
-#define CONTROL_SPARE_R                0x0618
-#define CONTROL_SPARE_R_C0             0x061C
-
-#define CONTROL_WKUP_PAD1_FREF_CLK4_REQ        0x4A31E05A
-#endif /* _MUX_OMAP4_H_ */
diff --git a/arch/arm/include/asm/arch-omap4/omap.h b/arch/arm/include/asm/arch-omap4/omap.h
deleted file mode 100644 (file)
index 8919088..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2010
- * Texas Instruments, <www.ti.com>
- *
- * Authors:
- *     Aneesh V <aneesh@ti.com>
- *
- * Derived from OMAP3 work by
- *     Richard Woodruff <r-woodruff2@ti.com>
- *     Syed Mohammed Khasim <x0khasim@ti.com>
- */
-
-#ifndef _OMAP4_H_
-#define _OMAP4_H_
-
-#if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__))
-#include <asm/types.h>
-#endif /* !(__KERNEL_STRICT_NAMES || __ASSEMBLY__) */
-
-#include <linux/sizes.h>
-
-/*
- * L4 Peripherals - L4 Wakeup and L4 Core now
- */
-#define OMAP44XX_L4_CORE_BASE  0x4A000000
-#define OMAP44XX_L4_WKUP_BASE  0x4A300000
-#define OMAP44XX_L4_PER_BASE   0x48000000
-
-#define OMAP44XX_DRAM_ADDR_SPACE_START 0x80000000
-#define OMAP44XX_DRAM_ADDR_SPACE_END   0xD0000000
-#define DRAM_ADDR_SPACE_START  OMAP44XX_DRAM_ADDR_SPACE_START
-#define DRAM_ADDR_SPACE_END    OMAP44XX_DRAM_ADDR_SPACE_END
-
-/* CONTROL_ID_CODE */
-#define CONTROL_ID_CODE                0x4A002204
-
-#define OMAP4_CONTROL_ID_CODE_ES1_0    0x0B85202F
-#define OMAP4_CONTROL_ID_CODE_ES2_0    0x1B85202F
-#define OMAP4_CONTROL_ID_CODE_ES2_1    0x3B95C02F
-#define OMAP4_CONTROL_ID_CODE_ES2_2    0x4B95C02F
-#define OMAP4_CONTROL_ID_CODE_ES2_3    0x6B95C02F
-#define OMAP4460_CONTROL_ID_CODE_ES1_0 0x0B94E02F
-#define OMAP4460_CONTROL_ID_CODE_ES1_1 0x2B94E02F
-#define OMAP4470_CONTROL_ID_CODE_ES1_0 0x0B97502F
-
-/* UART */
-#define UART1_BASE             (OMAP44XX_L4_PER_BASE + 0x6a000)
-#define UART2_BASE             (OMAP44XX_L4_PER_BASE + 0x6c000)
-#define UART3_BASE             (OMAP44XX_L4_PER_BASE + 0x20000)
-
-/* General Purpose Timers */
-#define GPT1_BASE              (OMAP44XX_L4_WKUP_BASE + 0x18000)
-#define GPT2_BASE              (OMAP44XX_L4_PER_BASE  + 0x32000)
-#define GPT3_BASE              (OMAP44XX_L4_PER_BASE  + 0x34000)
-
-/* Watchdog Timer2 - MPU watchdog */
-#define WDT2_BASE              (OMAP44XX_L4_WKUP_BASE + 0x14000)
-
-/*
- * Hardware Register Details
- */
-
-/* Watchdog Timer */
-#define WD_UNLOCK1             0xAAAA
-#define WD_UNLOCK2             0x5555
-
-/* GP Timer */
-#define TCLR_ST                        (0x1 << 0)
-#define TCLR_AR                        (0x1 << 1)
-#define TCLR_PRE               (0x1 << 5)
-
-/* Control Module */
-#define LDOSRAM_ACTMODE_VSET_IN_MASK   (0x1F << 5)
-#define LDOSRAM_VOLT_CTRL_OVERRIDE     0x0401040f
-#define CONTROL_EFUSE_1_OVERRIDE       0x1C4D0110
-#define CONTROL_EFUSE_2_OVERRIDE       0x99084000
-
-/* LPDDR2 IO regs */
-#define CONTROL_LPDDR2IO_SLEW_125PS_DRV8_PULL_DOWN     0x1C1C1C1C
-#define CONTROL_LPDDR2IO_SLEW_325PS_DRV8_GATE_KEEPER   0x9E9E9E9E
-#define CONTROL_LPDDR2IO_SLEW_315PS_DRV12_PULL_DOWN    0x7C7C7C7C
-#define LPDDR2IO_GR10_WD_MASK                          (3 << 17)
-#define CONTROL_LPDDR2IO_3_VAL         0xA0888C0F
-
-/* CONTROL_EFUSE_2 */
-#define CONTROL_EFUSE_2_NMOS_PMOS_PTV_CODE_1           0x00ffc000
-
-#define MMC1_PWRDNZ                                    (1 << 26)
-#define MMC1_PBIASLITE_PWRDNZ                          (1 << 22)
-#define MMC1_PBIASLITE_VMODE                           (1 << 21)
-
-#ifndef __ASSEMBLY__
-
-struct s32ktimer {
-       unsigned char res[0x10];
-       unsigned int s32k_cr;   /* 0x10 */
-};
-
-#define DEVICE_TYPE_SHIFT (0x8)
-#define DEVICE_TYPE_MASK (0x7 << DEVICE_TYPE_SHIFT)
-
-#endif /* __ASSEMBLY__ */
-
-/*
- * Non-secure SRAM Addresses
- * Non-secure RAM starts at 0x40300000 for GP devices. But we keep SRAM_BASE
- * at 0x40304000(EMU base) so that our code works for both EMU and GP
- */
-#define NON_SECURE_SRAM_START  0x40304000
-#define NON_SECURE_SRAM_END    0x4030E000      /* Not inclusive */
-#define NON_SECURE_SRAM_IMG_END        0x4030C000
-#define SRAM_SCRATCH_SPACE_ADDR        (NON_SECURE_SRAM_IMG_END - SZ_1K)
-/* base address for indirect vectors (internal boot mode) */
-#define SRAM_ROM_VECT_BASE     0x4030D000
-
-/* ABB settings */
-#define OMAP_ABB_SETTLING_TIME         50
-#define OMAP_ABB_CLOCK_CYCLES          16
-
-/* ABB tranxdone mask */
-#define OMAP_ABB_MPU_TXDONE_MASK       (0x1 << 7)
-
-#define OMAP44XX_SAR_RAM_BASE          0x4a326000
-#define OMAP_REBOOT_REASON_OFFSET      0xA0C
-#define OMAP_REBOOT_REASON_SIZE                0x0F
-
-/* Boot parameters */
-#ifndef __ASSEMBLY__
-struct omap_boot_parameters {
-       unsigned int boot_message;
-       unsigned int boot_device_descriptor;
-       unsigned char boot_device;
-       unsigned char reset_reason;
-       unsigned char ch_flags;
-};
-
-int omap_reboot_mode(char *mode, unsigned int length);
-int omap_reboot_mode_clear(void);
-int omap_reboot_mode_store(char *mode);
-#endif
-
-#endif
diff --git a/arch/arm/include/asm/arch-omap4/spl.h b/arch/arm/include/asm/arch-omap4/spl.h
deleted file mode 100644 (file)
index d24944a..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2012
- * Texas Instruments, <www.ti.com>
- */
-#ifndef        _ASM_ARCH_SPL_H_
-#define        _ASM_ARCH_SPL_H_
-
-#define BOOT_DEVICE_NONE       0x00
-#define BOOT_DEVICE_XIP                0x01
-#define BOOT_DEVICE_XIPWAIT    0x02
-#define BOOT_DEVICE_NAND       0x03
-#define BOOT_DEVICE_ONENAND    0x04
-#define BOOT_DEVICE_MMC1       0x05
-#define BOOT_DEVICE_MMC2       0x06
-#define BOOT_DEVICE_MMC2_2     0x07
-#define BOOT_DEVICE_UART       0x43
-#define BOOT_DEVICE_USB                0x45
-
-#define MMC_BOOT_DEVICES_START BOOT_DEVICE_MMC1
-#define MMC_BOOT_DEVICES_END   BOOT_DEVICE_MMC2_2
-#endif
diff --git a/arch/arm/include/asm/arch-omap4/sys_proto.h b/arch/arm/include/asm/arch-omap4/sys_proto.h
deleted file mode 100644 (file)
index b2a6887..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2010
- * Texas Instruments, <www.ti.com>
- */
-
-#ifndef _SYS_PROTO_H_
-#define _SYS_PROTO_H_
-
-#include <asm/arch/omap.h>
-#include <asm/arch/clock.h>
-#include <asm/io.h>
-#include <asm/omap_common.h>
-#include <linux/mtd/omap_gpmc.h>
-#include <asm/arch/mux_omap4.h>
-#include <asm/ti-common/sys_proto.h>
-
-#ifdef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
-extern const struct emif_regs emif_regs_elpida_200_mhz_2cs;
-extern const struct emif_regs emif_regs_elpida_380_mhz_1cs;
-extern const struct emif_regs emif_regs_elpida_400_mhz_1cs;
-extern const struct emif_regs emif_regs_elpida_400_mhz_2cs;
-extern const struct dmm_lisa_map_regs lisa_map_2G_x_1_x_2;
-extern const struct dmm_lisa_map_regs lisa_map_2G_x_2_x_2;
-extern const struct dmm_lisa_map_regs ma_lisa_map_2G_x_2_x_2;
-#else
-extern const struct lpddr2_device_details elpida_2G_S4_details;
-extern const struct lpddr2_device_details elpida_4G_S4_details;
-#endif
-
-#ifdef CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
-extern const struct lpddr2_device_timings jedec_default_timings;
-#else
-extern const struct lpddr2_device_timings elpida_2G_S4_timings;
-#endif
-
-struct omap_sysinfo {
-       char *board_string;
-};
-extern const struct omap_sysinfo sysinfo;
-
-void gpmc_init(void);
-void watchdog_init(void);
-u32 get_device_type(void);
-void do_set_mux(u32 base, struct pad_conf_entry const *array, int size);
-void set_muxconf_regs(void);
-u32 wait_on_value(u32, u32, void *, u32);
-void sdelay(unsigned long);
-void setup_early_clocks(void);
-void prcm_init(void);
-void do_board_detect(void);
-void bypass_dpll(u32 const base);
-void freq_update_core(void);
-u32 get_sys_clk_freq(void);
-u32 omap4_ddr_clk(void);
-void cancel_out(u32 *num, u32 *den, u32 den_limit);
-void sdram_init(void);
-u32 omap_sdram_size(void);
-u32 cortex_rev(void);
-void save_omap_boot_params(void);
-void init_omap_revision(void);
-void do_io_settings(void);
-void sri2c_init(void);
-int omap_vc_bypass_send_value(u8 sa, u8 reg_addr, u8 reg_data);
-u32 warm_reset(void);
-void force_emif_self_refresh(void);
-void setup_warmreset_time(void);
-
-#define OMAP4_SERVICE_PL310_CONTROL_REG_SET    0x102
-
-#endif
index 9945eeb66b8465543cdd058e3407ee5a2d7de418..5e74f41dd97f91bb9ea9406b8d45ca801a537188 100644 (file)
@@ -490,7 +490,7 @@ struct omap_sys_ctrl_regs {
        u32 ctrl_core_sma_sw_1;
 };
 
-#if defined(CONFIG_OMAP44XX) || defined(CONFIG_OMAP54XX)
+#if defined(CONFIG_OMAP54XX)
 struct dpll_params {
        u32 m;
        u32 n;
@@ -523,7 +523,7 @@ struct dpll_regs {
        u32 cm_div_h23_dpll;
        u32 cm_div_h24_dpll;
 };
-#endif /* CONFIG_OMAP44XX || CONFIG_OMAP54XX */
+#endif /* CONFIG_OMAP54XX */
 
 struct dplls {
        const struct dpll_params *mpu;
@@ -547,7 +547,7 @@ struct pmic_data {
        int (*pmic_write)(u8 sa, u8 reg_addr, u8 reg_data);
 };
 
-#if defined(CONFIG_OMAP44XX) || defined(CONFIG_OMAP54XX)
+#if defined(CONFIG_OMAP54XX)
 enum {
        OPP_LOW,
        OPP_NOM,
@@ -593,7 +593,7 @@ struct vcores_data {
        struct volts eve;
        struct volts iva;
 };
-#endif /* CONFIG_OMAP44XX || CONFIG_OMAP54XX */
+#endif /* CONFIG_OMAP54XX */
 
 extern struct prcm_regs const **prcm;
 extern struct prcm_regs const omap5_es1_prcm;
@@ -626,7 +626,7 @@ const struct dpll_params *get_iva_dpll_params(struct dplls const *);
 const struct dpll_params *get_usb_dpll_params(struct dplls const *);
 const struct dpll_params *get_abe_dpll_params(struct dplls const *);
 
-#if defined(CONFIG_OMAP44XX) || defined(CONFIG_OMAP54XX)
+#if defined(CONFIG_OMAP54XX)
 void do_enable_clocks(u32 const *clk_domains,
                      u32 const *clk_modules_hw_auto,
                      u32 const *clk_modules_explicit_en,
@@ -635,7 +635,7 @@ void do_enable_clocks(u32 const *clk_domains,
 void do_disable_clocks(u32 const *clk_domains,
                       u32 const *clk_modules_disable,
                       u8 wait_for_disable);
-#endif /* CONFIG_OMAP44XX || CONFIG_OMAP54XX */
+#endif /* CONFIG_OMAP54XX */
 
 void do_enable_ipu_clocks(u32 const *clk_domains,
                          u32 const *clk_modules_hw_auto,
@@ -653,9 +653,9 @@ void enable_basic_uboot_clocks(void);
 void enable_usb_clocks(int index);
 void disable_usb_clocks(int index);
 
-#if defined(CONFIG_OMAP44XX) || defined(CONFIG_OMAP54XX)
+#if defined(CONFIG_OMAP54XX)
 void scale_vcores(struct vcores_data const *);
-#endif /* CONFIG_OMAP44XX || CONFIG_OMAP54XX */
+#endif /* CONFIG_OMAP54XX */
 int get_voltrail_opp(int rail_offset);
 u32 get_offset_code(u32 volt_offset, struct pmic_data *pmic);
 void do_scale_vcore(u32 vcore_reg, u32 volt_mv, struct pmic_data *pmic);
index 8465b5426d817d851fc14e32bf036ec61be97890..c07dd68e6cee59921981a16ebc04d75724a3bf7e 100644 (file)
@@ -29,29 +29,6 @@ config OMAP34XX
        imply SYS_THUMB_BUILD
        imply TWL4030_POWER
 
-config OMAP44XX
-       bool "OMAP44XX SoC"
-       select DM_EVENT
-       select SPL_USE_TINY_PRINTF
-       select SPL_SYS_NO_VECTOR_TABLE if SPL
-       imply NAND_OMAP_ELM
-       imply NAND_OMAP_GPMC
-       imply SPL_DISPLAY_PRINT
-       imply SPL_FS_EXT4
-       imply SPL_FS_FAT
-       imply SPL_GPIO
-       imply SPL_I2C
-       imply SPL_LIBCOMMON_SUPPORT
-       imply SPL_LIBDISK_SUPPORT
-       imply SPL_LIBGENERIC_SUPPORT
-       imply SPL_MMC
-       imply SPL_NAND_SIMPLE
-       imply SPL_NAND_SUPPORT
-       imply SPL_POWER
-       imply SPL_SERIAL
-       imply SYS_I2C_OMAP24XX
-       imply SYS_THUMB_BUILD
-
 config OMAP54XX
        bool "OMAP54XX SoC"
        select ARM_CORTEX_A15_CVE_2017_5715
@@ -162,7 +139,7 @@ config SYS_AUTOMATIC_SDRAM_DETECTION
        bool
 
 choice
-       depends on OMAP44XX || OMAP54XX
+       depends on OMAP54XX
        prompt "Static or dynamic DDR timing calculations"
        default SYS_EMIF_PRECALCULATED_TIMING_REGS
        help
@@ -181,8 +158,6 @@ endchoice
 
 source "arch/arm/mach-omap2/omap3/Kconfig"
 
-source "arch/arm/mach-omap2/omap4/Kconfig"
-
 source "arch/arm/mach-omap2/omap5/Kconfig"
 
 source "arch/arm/mach-omap2/am33xx/Kconfig"
index 8c10c694dffbea33e1165cf863fa0bbe6480d56f..d683c64566a1103549791f477aeda71415983cf4 100644 (file)
@@ -5,7 +5,6 @@
 
 obj-$(if $(filter am33xx,$(SOC)),y) += am33xx/
 obj-$(CONFIG_OMAP34XX) += omap3/
-obj-$(CONFIG_OMAP44XX) += omap4/
 obj-$(CONFIG_OMAP54XX) += omap5/
 
 obj-y  += reset.o
@@ -19,7 +18,7 @@ endif
 obj-y  += utils.o
 
 obj-y  += sysinfo-common.o
-ifneq ($(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),)
+ifdef CONFIG_OMAP54XX
 obj-y  += hwinit-common.o
 obj-y  += clocks-common.o
 obj-y  += emif-common.o
index 4d431e20779d8f620046c5c2c64c574abdeff02f..a60eb990f0b48fc31bfeff456e3f6269cdb54c2c 100644 (file)
@@ -202,7 +202,6 @@ void emif_update_timings(u32 base, const struct emif_regs *regs)
        }
 }
 
-#ifndef CONFIG_OMAP44XX
 static void omap5_ddr3_leveling(u32 base, const struct emif_regs *regs)
 {
        struct emif_reg_struct *emif = (struct emif_reg_struct *)base;
@@ -510,7 +509,6 @@ static void ddr3_init(u32 base, const struct emif_regs *regs)
        else
                dra7_ddr3_init(base, regs);
 }
-#endif
 
 #ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
 #define print_timing_reg(reg) debug(#reg" - 0x%08x\n", (reg))
@@ -1292,10 +1290,8 @@ static void do_sdram_init(u32 base)
                if (emif_sdram_type(regs->sdram_config) ==
                    EMIF_SDRAM_TYPE_LPDDR2)
                        lpddr2_init(base, regs);
-#ifndef CONFIG_OMAP44XX
                else
                        ddr3_init(base, regs);
-#endif
        }
 #ifdef CONFIG_OMAP54XX
        if (warm_reset() && (emif_sdram_type(regs->sdram_config) ==
diff --git a/arch/arm/mach-omap2/omap4/Kconfig b/arch/arm/mach-omap2/omap4/Kconfig
deleted file mode 100644 (file)
index 3f91c4c..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-if OMAP44XX
-
-config SYS_SOC
-       default "omap4"
-
-
-endif
diff --git a/arch/arm/mach-omap2/omap4/Makefile b/arch/arm/mach-omap2/omap4/Makefile
deleted file mode 100644 (file)
index 0ed3fc7..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000-2010
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-
-obj-y  += boot.o
-obj-y  += sdram_elpida.o
-obj-y  += hwinit.o
-obj-y  += emif.o
-obj-y  += prcm-regs.o
-obj-y  += hw_data.o
diff --git a/arch/arm/mach-omap2/omap4/boot.c b/arch/arm/mach-omap2/omap4/boot.c
deleted file mode 100644 (file)
index a60249f..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * OMAP4 boot
- *
- * Copyright (C) 2015 Paul Kocialkowski <contact@paulk.fr>
- */
-
-#include <asm/io.h>
-#include <asm/omap_common.h>
-#include <asm/arch/sys_proto.h>
-#include <spl.h>
-
-static u32 boot_devices[] = {
-       BOOT_DEVICE_MMC2,
-       BOOT_DEVICE_XIP,
-       BOOT_DEVICE_XIPWAIT,
-       BOOT_DEVICE_NAND,
-       BOOT_DEVICE_XIPWAIT,
-       BOOT_DEVICE_MMC1,
-       BOOT_DEVICE_ONENAND,
-       BOOT_DEVICE_ONENAND,
-       BOOT_DEVICE_MMC2,
-       BOOT_DEVICE_ONENAND,
-       BOOT_DEVICE_XIPWAIT,
-       BOOT_DEVICE_NAND,
-       BOOT_DEVICE_NAND,
-       BOOT_DEVICE_MMC1,
-       BOOT_DEVICE_ONENAND,
-       BOOT_DEVICE_MMC2,
-       BOOT_DEVICE_XIP,
-       BOOT_DEVICE_XIPWAIT,
-       BOOT_DEVICE_NAND,
-       BOOT_DEVICE_MMC1,
-       BOOT_DEVICE_MMC1,
-       BOOT_DEVICE_ONENAND,
-       BOOT_DEVICE_MMC2,
-       BOOT_DEVICE_XIP,
-       BOOT_DEVICE_MMC2_2,
-       BOOT_DEVICE_NAND,
-       BOOT_DEVICE_MMC2_2,
-       BOOT_DEVICE_MMC1,
-       BOOT_DEVICE_MMC2_2,
-       BOOT_DEVICE_MMC2_2,
-       BOOT_DEVICE_NONE,
-       BOOT_DEVICE_XIPWAIT,
-};
-
-u32 omap_sys_boot_device(void)
-{
-       u32 sys_boot;
-
-       /* Grab the first 5 bits of the status register for SYS_BOOT. */
-       sys_boot = readl((u32 *) (*ctrl)->control_status) & ((1 << 5) - 1);
-
-       if (sys_boot >= (sizeof(boot_devices) / sizeof(u32)))
-               return BOOT_DEVICE_NONE;
-
-       return boot_devices[sys_boot];
-}
-
-int omap_reboot_mode(char *mode, unsigned int length)
-{
-       unsigned int limit;
-       unsigned int i;
-
-       if (length < 2)
-               return -1;
-
-       if (!warm_reset())
-               return -1;
-
-       limit = (length < OMAP_REBOOT_REASON_SIZE) ? length :
-               OMAP_REBOOT_REASON_SIZE;
-
-       for (i = 0; i < (limit - 1); i++)
-               mode[i] = readb((u8 *)(OMAP44XX_SAR_RAM_BASE +
-                       OMAP_REBOOT_REASON_OFFSET + i));
-
-       mode[i] = '\0';
-
-       return 0;
-}
-
-int omap_reboot_mode_clear(void)
-{
-       writeb(0, (u8 *)(OMAP44XX_SAR_RAM_BASE + OMAP_REBOOT_REASON_OFFSET));
-
-       return 0;
-}
-
-int omap_reboot_mode_store(char *mode)
-{
-       unsigned int i;
-
-       for (i = 0; i < (OMAP_REBOOT_REASON_SIZE - 1) && mode[i] != '\0'; i++)
-               writeb(mode[i], (u8 *)(OMAP44XX_SAR_RAM_BASE +
-                       OMAP_REBOOT_REASON_OFFSET + i));
-
-       writeb('\0', (u8 *)(OMAP44XX_SAR_RAM_BASE +
-               OMAP_REBOOT_REASON_OFFSET + i));
-
-       return 0;
-}
diff --git a/arch/arm/mach-omap2/omap4/emif.c b/arch/arm/mach-omap2/omap4/emif.c
deleted file mode 100644 (file)
index 5b0d3b5..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * EMIF programming
- *
- * (C) Copyright 2010
- * Texas Instruments, <www.ti.com>
- *
- * Aneesh V <aneesh@ti.com>
- */
-
-#include <asm/emif.h>
-#include <asm/arch/sys_proto.h>
-#include <asm/utils.h>
-
-#ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
-u32 *const T_num = (u32 *)OMAP_SRAM_SCRATCH_EMIF_T_NUM;
-u32 *const T_den = (u32 *)OMAP_SRAM_SCRATCH_EMIF_T_DEN;
-#endif
-
-#ifdef CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
-/* Base AC Timing values specified by JESD209-2 for 400MHz operation */
-static const struct lpddr2_ac_timings timings_jedec_400_mhz = {
-       .max_freq = 400000000,
-       .RL = 6,
-       .tRPab = 21,
-       .tRCD = 18,
-       .tWR = 15,
-       .tRASmin = 42,
-       .tRRD = 10,
-       .tWTRx2 = 15,
-       .tXSR = 140,
-       .tXPx2 = 15,
-       .tRFCab = 130,
-       .tRTPx2 = 15,
-       .tCKE = 3,
-       .tCKESR = 15,
-       .tZQCS = 90,
-       .tZQCL = 360,
-       .tZQINIT = 1000,
-       .tDQSCKMAXx2 = 11,
-       .tRASmax = 70,
-       .tFAW = 50
-};
-
-/* Base AC Timing values specified by JESD209-2 for 200 MHz operation */
-static const struct lpddr2_ac_timings timings_jedec_200_mhz = {
-       .max_freq = 200000000,
-       .RL = 3,
-       .tRPab = 21,
-       .tRCD = 18,
-       .tWR = 15,
-       .tRASmin = 42,
-       .tRRD = 10,
-       .tWTRx2 = 20,
-       .tXSR = 140,
-       .tXPx2 = 15,
-       .tRFCab = 130,
-       .tRTPx2 = 15,
-       .tCKE = 3,
-       .tCKESR = 15,
-       .tZQCS = 90,
-       .tZQCL = 360,
-       .tZQINIT = 1000,
-       .tDQSCKMAXx2 = 11,
-       .tRASmax = 70,
-       .tFAW = 50
-};
-
-/*
- * Min tCK values specified by JESD209-2
- * Min tCK specifies the minimum duration of some AC timing parameters in terms
- * of the number of cycles. If the calculated number of cycles based on the
- * absolute time value is less than the min tCK value, min tCK value should
- * be used instead. This typically happens at low frequencies.
- */
-static const struct lpddr2_min_tck min_tck_jedec = {
-       .tRL = 3,
-       .tRP_AB = 3,
-       .tRCD = 3,
-       .tWR = 3,
-       .tRAS_MIN = 3,
-       .tRRD = 2,
-       .tWTR = 2,
-       .tXP = 2,
-       .tRTP = 2,
-       .tCKE = 3,
-       .tCKESR = 3,
-       .tFAW = 8
-};
-
-static const struct lpddr2_ac_timings *jedec_ac_timings[MAX_NUM_SPEEDBINS] = {
-       &timings_jedec_200_mhz,
-       &timings_jedec_400_mhz
-};
-
-const struct lpddr2_device_timings jedec_default_timings = {
-       .ac_timings = jedec_ac_timings,
-       .min_tck = &min_tck_jedec
-};
-
-void emif_get_device_timings(u32 emif_nr,
-               const struct lpddr2_device_timings **cs0_device_timings,
-               const struct lpddr2_device_timings **cs1_device_timings)
-{
-       /* Assume Identical devices on EMIF1 & EMIF2 */
-       *cs0_device_timings = &jedec_default_timings;
-       *cs1_device_timings = &jedec_default_timings;
-}
-#endif /* CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS */
diff --git a/arch/arm/mach-omap2/omap4/hw_data.c b/arch/arm/mach-omap2/omap4/hw_data.c
deleted file mode 100644 (file)
index a81d765..0000000
+++ /dev/null
@@ -1,460 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- *
- * HW data initialization for OMAP4
- *
- * (C) Copyright 2013
- * Texas Instruments, <www.ti.com>
- *
- * Sricharan R <r.sricharan@ti.com>
- */
-#include <asm/arch/omap.h>
-#include <asm/arch/sys_proto.h>
-#include <asm/omap_common.h>
-#include <asm/arch/clock.h>
-#include <asm/omap_gpio.h>
-#include <asm/io.h>
-
-struct prcm_regs const **prcm =
-                       (struct prcm_regs const **) OMAP_SRAM_SCRATCH_PRCM_PTR;
-struct dplls const **dplls_data =
-                       (struct dplls const **) OMAP_SRAM_SCRATCH_DPLLS_PTR;
-struct vcores_data const **omap_vcores =
-               (struct vcores_data const **) OMAP_SRAM_SCRATCH_VCORES_PTR;
-struct omap_sys_ctrl_regs const **ctrl =
-       (struct omap_sys_ctrl_regs const **)OMAP_SRAM_SCRATCH_SYS_CTRL;
-
-/*
- * The M & N values in the following tables are created using the
- * following tool:
- * tools/omap/clocks_get_m_n.c
- * Please use this tool for creating the table for any new frequency.
- */
-
-/*
- * dpll locked at 1400 MHz MPU clk at 700 MHz(OPP100) - DCC OFF
- * OMAP4460 OPP_NOM frequency
- */
-static const struct dpll_params mpu_dpll_params_1400mhz[NUM_SYS_CLKS] = {
-       {175, 2, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1},        /* 12 MHz   */
-       {700, 12, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1},       /* 13 MHz   */
-       {125, 2, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1},        /* 16.8 MHz */
-       {401, 10, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1},       /* 19.2 MHz */
-       {350, 12, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1},       /* 26 MHz   */
-       {700, 26, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1},       /* 27 MHz   */
-       {638, 34, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1}        /* 38.4 MHz */
-};
-
-/*
- * dpll locked at 1600 MHz - MPU clk at 800 MHz(OPP Turbo 4430)
- * OMAP4430 OPP_TURBO frequency
- * OMAP4470 OPP_NOM frequency
- */
-static const struct dpll_params mpu_dpll_params_1600mhz[NUM_SYS_CLKS] = {
-       {200, 2, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1},        /* 12 MHz   */
-       {800, 12, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1},       /* 13 MHz   */
-       {619, 12, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1},       /* 16.8 MHz */
-       {125, 2, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1},        /* 19.2 MHz */
-       {400, 12, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1},       /* 26 MHz   */
-       {800, 26, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1},       /* 27 MHz   */
-       {125, 5, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1}         /* 38.4 MHz */
-};
-
-/*
- * dpll locked at 1200 MHz - MPU clk at 600 MHz
- * OMAP4430 OPP_NOM frequency
- */
-static const struct dpll_params mpu_dpll_params_1200mhz[NUM_SYS_CLKS] = {
-       {50, 0, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1},         /* 12 MHz   */
-       {600, 12, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1},       /* 13 MHz   */
-       {250, 6, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1},        /* 16.8 MHz */
-       {125, 3, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1},        /* 19.2 MHz */
-       {300, 12, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1},       /* 26 MHz   */
-       {200, 8, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1},        /* 27 MHz   */
-       {125, 7, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1}         /* 38.4 MHz */
-};
-
-/* OMAP4460 OPP_NOM frequency */
-/* OMAP4470 OPP_NOM (Low Power) frequency */
-static const struct dpll_params core_dpll_params_1600mhz[NUM_SYS_CLKS] = {
-       {200, 2, 1, 5, 8, 4, 6, 5, -1, -1, -1, -1},     /* 12 MHz   */
-       {800, 12, 1, 5, 8, 4, 6, 5, -1, -1, -1, -1},    /* 13 MHz   */
-       {619, 12, 1, 5, 8, 4, 6, 5, -1, -1, -1, -1},    /* 16.8 MHz */
-       {125, 2, 1, 5, 8, 4, 6, 5, -1, -1, -1, -1},     /* 19.2 MHz */
-       {400, 12, 1, 5, 8, 4, 6, 5, -1, -1, -1, -1},    /* 26 MHz   */
-       {800, 26, 1, 5, 8, 4, 6, 5, -1, -1, -1, -1},    /* 27 MHz   */
-       {125, 5, 1, 5, 8, 4, 6, 5, -1, -1, -1, -1}      /* 38.4 MHz */
-};
-
-/* OMAP4430 ES1 OPP_NOM frequency */
-static const struct dpll_params core_dpll_params_es1_1524mhz[NUM_SYS_CLKS] = {
-       {127, 1, 1, 5, 8, 4, 6, 5, -1, -1, -1, -1},     /* 12 MHz   */
-       {762, 12, 1, 5, 8, 4, 6, 5, -1, -1, -1, -1},    /* 13 MHz   */
-       {635, 13, 1, 5, 8, 4, 6, 5, -1, -1, -1, -1},    /* 16.8 MHz */
-       {635, 15, 1, 5, 8, 4, 6, 5, -1, -1, -1, -1},    /* 19.2 MHz */
-       {381, 12, 1, 5, 8, 4, 6, 5, -1, -1, -1, -1},    /* 26 MHz   */
-       {254, 8, 1, 5, 8, 4, 6, 5, -1, -1, -1, -1},     /* 27 MHz   */
-       {496, 24, 1, 5, 8, 4, 6, 5, -1, -1, -1, -1}     /* 38.4 MHz */
-};
-
-/* OMAP4430 ES2.X OPP_NOM frequency */
-static const struct dpll_params
-               core_dpll_params_es2_1600mhz_ddr200mhz[NUM_SYS_CLKS] = {
-       {200, 2, 2, 5, 8, 4, 6, 5, -1, -1, -1, -1},     /* 12 MHz   */
-       {800, 12, 2, 5, 8, 4, 6, 5, -1, -1, -1, -1},    /* 13 MHz   */
-       {619, 12, 2, 5, 8, 4, 6, 5, -1, -1, -1, -1},    /* 16.8 MHz */
-       {125, 2, 2, 5, 8, 4, 6, 5, -1, -1, -1, -1},     /* 19.2 MHz */
-       {400, 12, 2, 5, 8, 4, 6, 5, -1, -1, -1, -1},    /* 26 MHz   */
-       {800, 26, 2, 5, 8, 4, 6, 5, -1, -1, -1, -1},    /* 27 MHz   */
-       {125, 5, 2, 5, 8, 4, 6, 5, -1, -1, -1, -1}      /* 38.4 MHz */
-};
-
-static const struct dpll_params per_dpll_params_1536mhz[NUM_SYS_CLKS] = {
-       {64, 0, 8, 6, 12, 9, 4, 5, -1, -1, -1, -1},     /* 12 MHz   */
-       {768, 12, 8, 6, 12, 9, 4, 5, -1, -1, -1, -1},   /* 13 MHz   */
-       {320, 6, 8, 6, 12, 9, 4, 5, -1, -1, -1, -1},    /* 16.8 MHz */
-       {40, 0, 8, 6, 12, 9, 4, 5, -1, -1, -1, -1},     /* 19.2 MHz */
-       {384, 12, 8, 6, 12, 9, 4, 5, -1, -1, -1, -1},   /* 26 MHz   */
-       {256, 8, 8, 6, 12, 9, 4, 5, -1, -1, -1, -1},    /* 27 MHz   */
-       {20, 0, 8, 6, 12, 9, 4, 5, -1, -1, -1, -1}      /* 38.4 MHz */
-};
-
-static const struct dpll_params iva_dpll_params_1862mhz[NUM_SYS_CLKS] = {
-       {931, 11, -1, -1, 4, 7, -1, -1, -1, -1, -1, -1},        /* 12 MHz   */
-       {931, 12, -1, -1, 4, 7, -1, -1, -1, -1, -1, -1},        /* 13 MHz   */
-       {665, 11, -1, -1, 4, 7, -1, -1, -1, -1, -1, -1},        /* 16.8 MHz */
-       {727, 14, -1, -1, 4, 7, -1, -1, -1, -1, -1, -1},        /* 19.2 MHz */
-       {931, 25, -1, -1, 4, 7, -1, -1, -1, -1, -1, -1},        /* 26 MHz   */
-       {931, 26, -1, -1, 4, 7, -1, -1, -1, -1, -1, -1},        /* 27 MHz   */
-       {291, 11, -1, -1, 4, 7, -1, -1, -1, -1, -1, -1}         /* 38.4 MHz */
-};
-
-/* ABE M & N values with sys_clk as source */
-#ifdef CONFIG_SYS_OMAP_ABE_SYSCK
-static const struct dpll_params
-               abe_dpll_params_sysclk_196608khz[NUM_SYS_CLKS] = {
-       {49, 5, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1},  /* 12 MHz   */
-       {68, 8, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1},  /* 13 MHz   */
-       {35, 5, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1},  /* 16.8 MHz */
-       {46, 8, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1},  /* 19.2 MHz */
-       {34, 8, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1},  /* 26 MHz   */
-       {29, 7, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1},  /* 27 MHz   */
-       {64, 24, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1}  /* 38.4 MHz */
-};
-#else
-/* ABE M & N values with 32K clock as source */
-static const struct dpll_params abe_dpll_params_32k_196608khz = {
-       750, 0, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1
-};
-#endif
-
-static const struct dpll_params usb_dpll_params_1920mhz[NUM_SYS_CLKS] = {
-       {80, 0, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1},         /* 12 MHz   */
-       {960, 12, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1},       /* 13 MHz   */
-       {400, 6, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1},        /* 16.8 MHz */
-       {50, 0, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1},         /* 19.2 MHz */
-       {480, 12, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1},       /* 26 MHz   */
-       {320, 8, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1},        /* 27 MHz   */
-       {25, 0, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1}          /* 38.4 MHz */
-};
-
-struct dplls omap4430_dplls_es1 = {
-       .mpu = mpu_dpll_params_1200mhz,
-       .core = core_dpll_params_es1_1524mhz,
-       .per = per_dpll_params_1536mhz,
-       .iva = iva_dpll_params_1862mhz,
-#ifdef CONFIG_SYS_OMAP_ABE_SYSCK
-       .abe = abe_dpll_params_sysclk_196608khz,
-#else
-       .abe = &abe_dpll_params_32k_196608khz,
-#endif
-       .usb = usb_dpll_params_1920mhz,
-       .ddr = NULL
-};
-
-struct dplls omap4430_dplls_es20 = {
-       .mpu = mpu_dpll_params_1200mhz,
-       .core = core_dpll_params_es2_1600mhz_ddr200mhz,
-       .per = per_dpll_params_1536mhz,
-       .iva = iva_dpll_params_1862mhz,
-#ifdef CONFIG_SYS_OMAP_ABE_SYSCK
-       .abe = abe_dpll_params_sysclk_196608khz,
-#else
-       .abe = &abe_dpll_params_32k_196608khz,
-#endif
-       .usb = usb_dpll_params_1920mhz,
-       .ddr = NULL
-};
-
-struct dplls omap4430_dplls = {
-       .mpu = mpu_dpll_params_1200mhz,
-       .core = core_dpll_params_1600mhz,
-       .per = per_dpll_params_1536mhz,
-       .iva = iva_dpll_params_1862mhz,
-#ifdef CONFIG_SYS_OMAP_ABE_SYSCK
-       .abe = abe_dpll_params_sysclk_196608khz,
-#else
-       .abe = &abe_dpll_params_32k_196608khz,
-#endif
-       .usb = usb_dpll_params_1920mhz,
-       .ddr = NULL
-};
-
-struct dplls omap4460_dplls = {
-       .mpu = mpu_dpll_params_1400mhz,
-       .core = core_dpll_params_1600mhz,
-       .per = per_dpll_params_1536mhz,
-       .iva = iva_dpll_params_1862mhz,
-#ifdef CONFIG_SYS_OMAP_ABE_SYSCK
-       .abe = abe_dpll_params_sysclk_196608khz,
-#else
-       .abe = &abe_dpll_params_32k_196608khz,
-#endif
-       .usb = usb_dpll_params_1920mhz,
-       .ddr = NULL
-};
-
-struct dplls omap4470_dplls = {
-       .mpu = mpu_dpll_params_1600mhz,
-       .core = core_dpll_params_1600mhz,
-       .per = per_dpll_params_1536mhz,
-       .iva = iva_dpll_params_1862mhz,
-#ifdef CONFIG_SYS_OMAP_ABE_SYSCK
-       .abe = abe_dpll_params_sysclk_196608khz,
-#else
-       .abe = &abe_dpll_params_32k_196608khz,
-#endif
-       .usb = usb_dpll_params_1920mhz,
-       .ddr = NULL
-};
-
-struct pmic_data twl6030_4430es1 = {
-       .base_offset = PHOENIX_SMPS_BASE_VOLT_STD_MODE_UV,
-       .step = 12660, /* 12.66 mV represented in uV */
-       /* The code starts at 1 not 0 */
-       .start_code = 1,
-       .i2c_slave_addr = SMPS_I2C_SLAVE_ADDR,
-       .pmic_bus_init  = sri2c_init,
-       .pmic_write     = omap_vc_bypass_send_value,
-};
-
-/* twl6030 struct is used for TWL6030 and TWL6032 PMIC */
-struct pmic_data twl6030 = {
-       .base_offset = PHOENIX_SMPS_BASE_VOLT_STD_MODE_WITH_OFFSET_UV,
-       .step = 12660, /* 12.66 mV represented in uV */
-       /* The code starts at 1 not 0 */
-       .start_code = 1,
-       .i2c_slave_addr = SMPS_I2C_SLAVE_ADDR,
-       .pmic_bus_init  = sri2c_init,
-       .pmic_write     = omap_vc_bypass_send_value,
-};
-
-struct pmic_data tps62361 = {
-       .base_offset = TPS62361_BASE_VOLT_MV,
-       .step = 10000, /* 10 mV represented in uV */
-       .start_code = 0,
-       .gpio = TPS62361_VSEL0_GPIO,
-       .gpio_en = 1,
-       .i2c_slave_addr = SMPS_I2C_SLAVE_ADDR,
-       .pmic_bus_init  = sri2c_init,
-       .pmic_write     = omap_vc_bypass_send_value,
-};
-
-struct vcores_data omap4430_volts_es1 = {
-       .mpu.value[OPP_NOM] = 1325,
-       .mpu.addr = SMPS_REG_ADDR_VCORE1,
-       .mpu.pmic = &twl6030_4430es1,
-
-       .core.value[OPP_NOM] = 1200,
-       .core.addr = SMPS_REG_ADDR_VCORE3,
-       .core.pmic = &twl6030_4430es1,
-
-       .mm.value[OPP_NOM] = 1200,
-       .mm.addr = SMPS_REG_ADDR_VCORE2,
-       .mm.pmic = &twl6030_4430es1,
-};
-
-struct vcores_data omap4430_volts = {
-       .mpu.value[OPP_NOM] = 1325,
-       .mpu.addr = SMPS_REG_ADDR_VCORE1,
-       .mpu.pmic = &twl6030,
-
-       .core.value[OPP_NOM] = 1200,
-       .core.addr = SMPS_REG_ADDR_VCORE3,
-       .core.pmic = &twl6030,
-
-       .mm.value[OPP_NOM] = 1200,
-       .mm.addr = SMPS_REG_ADDR_VCORE2,
-       .mm.pmic = &twl6030,
-};
-
-struct vcores_data omap4460_volts = {
-       .mpu.value[OPP_NOM] = 1203,
-       .mpu.addr = TPS62361_REG_ADDR_SET1,
-       .mpu.pmic = &tps62361,
-
-       .core.value[OPP_NOM] = 1200,
-       .core.addr = SMPS_REG_ADDR_VCORE1,
-       .core.pmic = &twl6030,
-
-       .mm.value[OPP_NOM] = 1200,
-       .mm.addr = SMPS_REG_ADDR_VCORE2,
-       .mm.pmic = &twl6030,
-};
-
-/*
- * Take closest integer part of the mV value corresponding to a TWL6032 SMPS
- * voltage selection code. Aligned with OMAP4470 ES1.0 OCA V.0.7.
- */
-struct vcores_data omap4470_volts = {
-       .mpu.value[OPP_NOM] = 1202,
-       .mpu.addr = SMPS_REG_ADDR_SMPS1,
-       .mpu.pmic = &twl6030,
-
-       .core.value[OPP_NOM] = 1126,
-       .core.addr = SMPS_REG_ADDR_SMPS2,
-       .core.pmic = &twl6030,
-
-       .mm.value[OPP_NOM] = 1139,
-       .mm.addr = SMPS_REG_ADDR_SMPS5,
-       .mm.pmic = &twl6030,
-};
-
-/*
- * Enable essential clock domains, modules and
- * do some additional special settings needed
- */
-void enable_basic_clocks(void)
-{
-       u32 const clk_domains_essential[] = {
-               (*prcm)->cm_l4per_clkstctrl,
-               (*prcm)->cm_l3init_clkstctrl,
-               (*prcm)->cm_memif_clkstctrl,
-               (*prcm)->cm_l4cfg_clkstctrl,
-               0
-       };
-
-       u32 const clk_modules_hw_auto_essential[] = {
-               (*prcm)->cm_l3_gpmc_clkctrl,
-               (*prcm)->cm_memif_emif_1_clkctrl,
-               (*prcm)->cm_memif_emif_2_clkctrl,
-               (*prcm)->cm_l4cfg_l4_cfg_clkctrl,
-               (*prcm)->cm_wkup_gpio1_clkctrl,
-               (*prcm)->cm_l4per_gpio2_clkctrl,
-               (*prcm)->cm_l4per_gpio3_clkctrl,
-               (*prcm)->cm_l4per_gpio4_clkctrl,
-               (*prcm)->cm_l4per_gpio5_clkctrl,
-               (*prcm)->cm_l4per_gpio6_clkctrl,
-               0
-       };
-
-       u32 const clk_modules_explicit_en_essential[] = {
-               (*prcm)->cm_wkup_gptimer1_clkctrl,
-               (*prcm)->cm_l3init_hsmmc1_clkctrl,
-               (*prcm)->cm_l3init_hsmmc2_clkctrl,
-               (*prcm)->cm_l4per_gptimer2_clkctrl,
-               (*prcm)->cm_wkup_wdtimer2_clkctrl,
-               (*prcm)->cm_l4per_uart3_clkctrl,
-               (*prcm)->cm_l4per_i2c1_clkctrl,
-               (*prcm)->cm_l4per_i2c2_clkctrl,
-               (*prcm)->cm_l4per_i2c3_clkctrl,
-               (*prcm)->cm_l4per_i2c4_clkctrl,
-               0
-       };
-
-       /* Enable optional additional functional clock for GPIO4 */
-       setbits_le32((*prcm)->cm_l4per_gpio4_clkctrl,
-                       GPIO4_CLKCTRL_OPTFCLKEN_MASK);
-
-       /* Enable 96 MHz clock for MMC1 & MMC2 */
-       setbits_le32((*prcm)->cm_l3init_hsmmc1_clkctrl,
-                       HSMMC_CLKCTRL_CLKSEL_MASK);
-       setbits_le32((*prcm)->cm_l3init_hsmmc2_clkctrl,
-                       HSMMC_CLKCTRL_CLKSEL_MASK);
-
-       /* Select 32KHz clock as the source of GPTIMER1 */
-       setbits_le32((*prcm)->cm_wkup_gptimer1_clkctrl,
-                       GPTIMER1_CLKCTRL_CLKSEL_MASK);
-
-       /* Enable optional 48M functional clock for USB PHY */
-       setbits_le32((*prcm)->cm_l3init_usbphy_clkctrl,
-                       USBPHY_CLKCTRL_OPTFCLKEN_PHY_48M_MASK);
-
-       /* Enable 32 KHz clock for USB PHY */
-       setbits_le32((*prcm)->cm_coreaon_usb_phy1_core_clkctrl,
-                       USBPHY_CORE_CLKCTRL_OPTFCLKEN_CLK32K);
-
-       do_enable_clocks(clk_domains_essential,
-                        clk_modules_hw_auto_essential,
-                        clk_modules_explicit_en_essential,
-                        1);
-}
-
-void enable_basic_uboot_clocks(void)
-{
-       u32 const clk_domains_essential[] = {
-               0
-       };
-
-       u32 const clk_modules_hw_auto_essential[] = {
-               (*prcm)->cm_l3init_hsusbotg_clkctrl,
-               (*prcm)->cm_l3init_usbphy_clkctrl,
-               (*prcm)->cm_clksel_usb_60mhz,
-               (*prcm)->cm_l3init_hsusbtll_clkctrl,
-               0
-       };
-
-       u32 const clk_modules_explicit_en_essential[] = {
-               (*prcm)->cm_l4per_mcspi1_clkctrl,
-               (*prcm)->cm_l3init_hsusbhost_clkctrl,
-               0
-       };
-
-       do_enable_clocks(clk_domains_essential,
-                        clk_modules_hw_auto_essential,
-                        clk_modules_explicit_en_essential,
-                        1);
-}
-
-void hw_data_init(void)
-{
-       u32 omap_rev = omap_revision();
-
-       (*prcm) = &omap4_prcm;
-
-       switch (omap_rev) {
-
-       case OMAP4430_ES1_0:
-       *dplls_data = &omap4430_dplls_es1;
-       *omap_vcores = &omap4430_volts_es1;
-       break;
-
-       case OMAP4430_ES2_0:
-       *dplls_data = &omap4430_dplls_es20;
-       *omap_vcores = &omap4430_volts;
-       break;
-
-       case OMAP4430_ES2_1:
-       case OMAP4430_ES2_2:
-       case OMAP4430_ES2_3:
-       *dplls_data = &omap4430_dplls;
-       *omap_vcores = &omap4430_volts;
-       break;
-
-       case OMAP4460_ES1_0:
-       case OMAP4460_ES1_1:
-       *dplls_data = &omap4460_dplls;
-       *omap_vcores = &omap4460_volts;
-       break;
-
-       case OMAP4470_ES1_0:
-       *dplls_data = &omap4470_dplls;
-       *omap_vcores = &omap4470_volts;
-       break;
-
-       default:
-               printf("\n INVALID OMAP REVISION ");
-       }
-
-       *ctrl = &omap4_ctrl;
-}
diff --git a/arch/arm/mach-omap2/omap4/hwinit.c b/arch/arm/mach-omap2/omap4/hwinit.c
deleted file mode 100644 (file)
index e3e6cc8..0000000
+++ /dev/null
@@ -1,186 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- *
- * Common functions for OMAP4 based boards
- *
- * (C) Copyright 2010
- * Texas Instruments, <www.ti.com>
- *
- * Author :
- *     Aneesh V        <aneesh@ti.com>
- *     Steve Sakoman   <steve@sakoman.com>
- */
-#include <palmas.h>
-#include <asm/armv7.h>
-#include <asm/arch/cpu.h>
-#include <asm/arch/sys_proto.h>
-#include <linux/sizes.h>
-#include <asm/emif.h>
-#include <asm/arch/gpio.h>
-#include <asm/omap_common.h>
-
-u32 *const omap_si_rev = (u32 *)OMAP_SRAM_SCRATCH_OMAP_REV;
-
-static const struct gpio_bank gpio_bank_44xx[6] = {
-       { (void *)OMAP44XX_GPIO1_BASE },
-       { (void *)OMAP44XX_GPIO2_BASE },
-       { (void *)OMAP44XX_GPIO3_BASE },
-       { (void *)OMAP44XX_GPIO4_BASE },
-       { (void *)OMAP44XX_GPIO5_BASE },
-       { (void *)OMAP44XX_GPIO6_BASE },
-};
-
-const struct gpio_bank *const omap_gpio_bank = gpio_bank_44xx;
-
-#ifdef CONFIG_SPL_BUILD
-/*
- * Some tuning of IOs for optimal power and performance
- */
-void do_io_settings(void)
-{
-       u32 lpddr2io;
-
-       u32 omap4_rev = omap_revision();
-
-       if (omap4_rev == OMAP4430_ES1_0)
-               lpddr2io = CONTROL_LPDDR2IO_SLEW_125PS_DRV8_PULL_DOWN;
-       else if (omap4_rev == OMAP4430_ES2_0)
-               lpddr2io = CONTROL_LPDDR2IO_SLEW_325PS_DRV8_GATE_KEEPER;
-       else
-               lpddr2io = CONTROL_LPDDR2IO_SLEW_315PS_DRV12_PULL_DOWN;
-
-       /* EMIF1 */
-       writel(lpddr2io, (*ctrl)->control_lpddr2io1_0);
-       writel(lpddr2io, (*ctrl)->control_lpddr2io1_1);
-       /* No pull for GR10 as per hw team's recommendation */
-       writel(lpddr2io & ~LPDDR2IO_GR10_WD_MASK,
-               (*ctrl)->control_lpddr2io1_2);
-       writel(CONTROL_LPDDR2IO_3_VAL, (*ctrl)->control_lpddr2io1_3);
-
-       /* EMIF2 */
-       writel(lpddr2io, (*ctrl)->control_lpddr2io2_0);
-       writel(lpddr2io, (*ctrl)->control_lpddr2io2_1);
-       /* No pull for GR10 as per hw team's recommendation */
-       writel(lpddr2io & ~LPDDR2IO_GR10_WD_MASK,
-               (*ctrl)->control_lpddr2io2_2);
-       writel(CONTROL_LPDDR2IO_3_VAL, (*ctrl)->control_lpddr2io2_3);
-
-       /*
-        * Some of these settings (TRIM values) come from eFuse and are
-        * in turn programmed in the eFuse at manufacturing time after
-        * calibration of the device. Do the software over-ride only if
-        * the device is not correctly trimmed
-        */
-       if (!(readl((*ctrl)->control_std_fuse_opp_bgap) & 0xFFFF)) {
-
-               writel(LDOSRAM_VOLT_CTRL_OVERRIDE,
-                       (*ctrl)->control_ldosram_iva_voltage_ctrl);
-
-               writel(LDOSRAM_VOLT_CTRL_OVERRIDE,
-                       (*ctrl)->control_ldosram_mpu_voltage_ctrl);
-
-               writel(LDOSRAM_VOLT_CTRL_OVERRIDE,
-                       (*ctrl)->control_ldosram_core_voltage_ctrl);
-       }
-
-       /*
-        * Over-ride the register
-        *      i. unconditionally for all 4430
-        *      ii. only if un-trimmed for 4460
-        */
-       if (!readl((*ctrl)->control_efuse_1))
-               writel(CONTROL_EFUSE_1_OVERRIDE, (*ctrl)->control_efuse_1);
-
-       if ((omap4_rev < OMAP4460_ES1_0) || !readl((*ctrl)->control_efuse_2))
-               writel(CONTROL_EFUSE_2_OVERRIDE, (*ctrl)->control_efuse_2);
-}
-#endif /* CONFIG_SPL_BUILD */
-
-/* dummy fuction for omap4 */
-void config_data_eye_leveling_samples(u32 emif_base)
-{
-}
-
-void init_omap_revision(void)
-{
-       /*
-        * For some of the ES2/ES1 boards ID_CODE is not reliable:
-        * Also, ES1 and ES2 have different ARM revisions
-        * So use ARM revision for identification
-        */
-       unsigned int arm_rev = cortex_rev();
-
-       switch (arm_rev) {
-       case MIDR_CORTEX_A9_R0P1:
-               *omap_si_rev = OMAP4430_ES1_0;
-               break;
-       case MIDR_CORTEX_A9_R1P2:
-               switch (readl(CONTROL_ID_CODE)) {
-               case OMAP4_CONTROL_ID_CODE_ES2_0:
-                       *omap_si_rev = OMAP4430_ES2_0;
-                       break;
-               case OMAP4_CONTROL_ID_CODE_ES2_1:
-                       *omap_si_rev = OMAP4430_ES2_1;
-                       break;
-               case OMAP4_CONTROL_ID_CODE_ES2_2:
-                       *omap_si_rev = OMAP4430_ES2_2;
-                       break;
-               default:
-                       *omap_si_rev = OMAP4430_ES2_0;
-                       break;
-               }
-               break;
-       case MIDR_CORTEX_A9_R1P3:
-               *omap_si_rev = OMAP4430_ES2_3;
-               break;
-       case MIDR_CORTEX_A9_R2P10:
-               switch (readl(CONTROL_ID_CODE)) {
-               case OMAP4470_CONTROL_ID_CODE_ES1_0:
-                       *omap_si_rev = OMAP4470_ES1_0;
-                       break;
-               case OMAP4460_CONTROL_ID_CODE_ES1_1:
-                       *omap_si_rev = OMAP4460_ES1_1;
-                       break;
-               case OMAP4460_CONTROL_ID_CODE_ES1_0:
-               default:
-                       *omap_si_rev = OMAP4460_ES1_0;
-                       break;
-               }
-               break;
-       default:
-               *omap_si_rev = OMAP4430_SILICON_ID_INVALID;
-               break;
-       }
-}
-
-void omap_die_id(unsigned int *die_id)
-{
-       die_id[0] = readl((*ctrl)->control_std_fuse_die_id_0);
-       die_id[1] = readl((*ctrl)->control_std_fuse_die_id_1);
-       die_id[2] = readl((*ctrl)->control_std_fuse_die_id_2);
-       die_id[3] = readl((*ctrl)->control_std_fuse_die_id_3);
-}
-
-#ifndef CONFIG_SYS_L2CACHE_OFF
-void v7_outer_cache_enable(void)
-{
-       omap_smc1(OMAP4_SERVICE_PL310_CONTROL_REG_SET, 1);
-}
-
-void v7_outer_cache_disable(void)
-{
-       omap_smc1(OMAP4_SERVICE_PL310_CONTROL_REG_SET, 0);
-}
-#endif /* !CONFIG_SYS_L2CACHE_OFF */
-
-void vmmc_pbias_config(uint voltage)
-{
-       u32 value = 0;
-
-       value = readl((*ctrl)->control_pbiaslite);
-       value &= ~(MMC1_PBIASLITE_PWRDNZ | MMC1_PWRDNZ);
-       writel(value, (*ctrl)->control_pbiaslite);
-       value = readl((*ctrl)->control_pbiaslite);
-       value |= MMC1_PBIASLITE_VMODE | MMC1_PBIASLITE_PWRDNZ | MMC1_PWRDNZ;
-       writel(value, (*ctrl)->control_pbiaslite);
-}
diff --git a/arch/arm/mach-omap2/omap4/prcm-regs.c b/arch/arm/mach-omap2/omap4/prcm-regs.c
deleted file mode 100644 (file)
index eaf98b3..0000000
+++ /dev/null
@@ -1,306 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- *
- * HW regs data for OMAP4
- *
- * (C) Copyright 2013
- * Texas Instruments, <www.ti.com>
- *
- * Sricharan R <r.sricharan@ti.com>
- */
-
-#include <asm/omap_common.h>
-
-struct prcm_regs const omap4_prcm = {
-       /* cm1.ckgen */
-       .cm_clksel_core  = 0x4a004100,
-       .cm_clksel_abe = 0x4a004108,
-       .cm_dll_ctrl = 0x4a004110,
-       .cm_clkmode_dpll_core = 0x4a004120,
-       .cm_idlest_dpll_core = 0x4a004124,
-       .cm_autoidle_dpll_core = 0x4a004128,
-       .cm_clksel_dpll_core = 0x4a00412c,
-       .cm_div_m2_dpll_core = 0x4a004130,
-       .cm_div_m3_dpll_core = 0x4a004134,
-       .cm_div_m4_dpll_core = 0x4a004138,
-       .cm_div_m5_dpll_core = 0x4a00413c,
-       .cm_div_m6_dpll_core = 0x4a004140,
-       .cm_div_m7_dpll_core = 0x4a004144,
-       .cm_ssc_deltamstep_dpll_core = 0x4a004148,
-       .cm_ssc_modfreqdiv_dpll_core = 0x4a00414c,
-       .cm_emu_override_dpll_core = 0x4a004150,
-       .cm_clkmode_dpll_mpu = 0x4a004160,
-       .cm_idlest_dpll_mpu = 0x4a004164,
-       .cm_autoidle_dpll_mpu = 0x4a004168,
-       .cm_clksel_dpll_mpu = 0x4a00416c,
-       .cm_div_m2_dpll_mpu = 0x4a004170,
-       .cm_ssc_deltamstep_dpll_mpu = 0x4a004188,
-       .cm_ssc_modfreqdiv_dpll_mpu = 0x4a00418c,
-       .cm_bypclk_dpll_mpu = 0x4a00419c,
-       .cm_clkmode_dpll_iva = 0x4a0041a0,
-       .cm_idlest_dpll_iva = 0x4a0041a4,
-       .cm_autoidle_dpll_iva = 0x4a0041a8,
-       .cm_clksel_dpll_iva = 0x4a0041ac,
-       .cm_div_m4_dpll_iva = 0x4a0041b8,
-       .cm_div_m5_dpll_iva = 0x4a0041bc,
-       .cm_ssc_deltamstep_dpll_iva = 0x4a0041c8,
-       .cm_ssc_modfreqdiv_dpll_iva = 0x4a0041cc,
-       .cm_bypclk_dpll_iva = 0x4a0041dc,
-       .cm_clkmode_dpll_abe = 0x4a0041e0,
-       .cm_idlest_dpll_abe = 0x4a0041e4,
-       .cm_autoidle_dpll_abe = 0x4a0041e8,
-       .cm_clksel_dpll_abe = 0x4a0041ec,
-       .cm_div_m2_dpll_abe = 0x4a0041f0,
-       .cm_div_m3_dpll_abe = 0x4a0041f4,
-       .cm_ssc_deltamstep_dpll_abe = 0x4a004208,
-       .cm_ssc_modfreqdiv_dpll_abe = 0x4a00420c,
-       .cm_clkmode_dpll_ddrphy = 0x4a004220,
-       .cm_idlest_dpll_ddrphy = 0x4a004224,
-       .cm_autoidle_dpll_ddrphy = 0x4a004228,
-       .cm_clksel_dpll_ddrphy = 0x4a00422c,
-       .cm_div_m2_dpll_ddrphy = 0x4a004230,
-       .cm_div_m4_dpll_ddrphy = 0x4a004238,
-       .cm_div_m5_dpll_ddrphy = 0x4a00423c,
-       .cm_div_m6_dpll_ddrphy = 0x4a004240,
-       .cm_ssc_deltamstep_dpll_ddrphy = 0x4a004248,
-       .cm_shadow_freq_config1 = 0x4a004260,
-       .cm_mpu_mpu_clkctrl = 0x4a004320,
-
-       /* cm1.dsp */
-       .cm_dsp_clkstctrl = 0x4a004400,
-       .cm_dsp_dsp_clkctrl = 0x4a004420,
-
-       /* cm1.abe */
-       .cm1_abe_clkstctrl = 0x4a004500,
-       .cm1_abe_l4abe_clkctrl = 0x4a004520,
-       .cm1_abe_aess_clkctrl = 0x4a004528,
-       .cm1_abe_pdm_clkctrl = 0x4a004530,
-       .cm1_abe_dmic_clkctrl = 0x4a004538,
-       .cm1_abe_mcasp_clkctrl = 0x4a004540,
-       .cm1_abe_mcbsp1_clkctrl = 0x4a004548,
-       .cm1_abe_mcbsp2_clkctrl = 0x4a004550,
-       .cm1_abe_mcbsp3_clkctrl = 0x4a004558,
-       .cm1_abe_slimbus_clkctrl = 0x4a004560,
-       .cm1_abe_timer5_clkctrl = 0x4a004568,
-       .cm1_abe_timer6_clkctrl = 0x4a004570,
-       .cm1_abe_timer7_clkctrl = 0x4a004578,
-       .cm1_abe_timer8_clkctrl = 0x4a004580,
-       .cm1_abe_wdt3_clkctrl = 0x4a004588,
-
-       /* cm2.ckgen */
-       .cm_clksel_mpu_m3_iss_root = 0x4a008100,
-       .cm_clksel_usb_60mhz = 0x4a008104,
-       .cm_scale_fclk = 0x4a008108,
-       .cm_core_dvfs_perf1 = 0x4a008110,
-       .cm_core_dvfs_perf2 = 0x4a008114,
-       .cm_core_dvfs_perf3 = 0x4a008118,
-       .cm_core_dvfs_perf4 = 0x4a00811c,
-       .cm_core_dvfs_current = 0x4a008124,
-       .cm_iva_dvfs_perf_tesla = 0x4a008128,
-       .cm_iva_dvfs_perf_ivahd = 0x4a00812c,
-       .cm_iva_dvfs_perf_abe = 0x4a008130,
-       .cm_iva_dvfs_current = 0x4a008138,
-       .cm_clkmode_dpll_per = 0x4a008140,
-       .cm_idlest_dpll_per = 0x4a008144,
-       .cm_autoidle_dpll_per = 0x4a008148,
-       .cm_clksel_dpll_per = 0x4a00814c,
-       .cm_div_m2_dpll_per = 0x4a008150,
-       .cm_div_m3_dpll_per = 0x4a008154,
-       .cm_div_m4_dpll_per = 0x4a008158,
-       .cm_div_m5_dpll_per = 0x4a00815c,
-       .cm_div_m6_dpll_per = 0x4a008160,
-       .cm_div_m7_dpll_per = 0x4a008164,
-       .cm_ssc_deltamstep_dpll_per = 0x4a008168,
-       .cm_ssc_modfreqdiv_dpll_per = 0x4a00816c,
-       .cm_emu_override_dpll_per = 0x4a008170,
-       .cm_clkmode_dpll_usb = 0x4a008180,
-       .cm_idlest_dpll_usb = 0x4a008184,
-       .cm_autoidle_dpll_usb = 0x4a008188,
-       .cm_clksel_dpll_usb = 0x4a00818c,
-       .cm_div_m2_dpll_usb = 0x4a008190,
-       .cm_ssc_deltamstep_dpll_usb = 0x4a0081a8,
-       .cm_ssc_modfreqdiv_dpll_usb = 0x4a0081ac,
-       .cm_clkdcoldo_dpll_usb = 0x4a0081b4,
-       .cm_clkmode_dpll_unipro = 0x4a0081c0,
-       .cm_idlest_dpll_unipro = 0x4a0081c4,
-       .cm_autoidle_dpll_unipro = 0x4a0081c8,
-       .cm_clksel_dpll_unipro = 0x4a0081cc,
-       .cm_div_m2_dpll_unipro = 0x4a0081d0,
-       .cm_ssc_deltamstep_dpll_unipro = 0x4a0081e8,
-       .cm_ssc_modfreqdiv_dpll_unipro = 0x4a0081ec,
-       .cm_coreaon_usb_phy1_core_clkctrl = 0x4a008640,
-
-       /* cm2.core */
-       .cm_l3_1_clkstctrl = 0x4a008700,
-       .cm_l3_1_dynamicdep = 0x4a008708,
-       .cm_l3_1_l3_1_clkctrl = 0x4a008720,
-       .cm_l3_2_clkstctrl = 0x4a008800,
-       .cm_l3_2_dynamicdep = 0x4a008808,
-       .cm_l3_2_l3_2_clkctrl = 0x4a008820,
-       .cm_l3_gpmc_clkctrl = 0x4a008828,
-       .cm_l3_2_ocmc_ram_clkctrl = 0x4a008830,
-       .cm_mpu_m3_clkstctrl = 0x4a008900,
-       .cm_mpu_m3_staticdep = 0x4a008904,
-       .cm_mpu_m3_dynamicdep = 0x4a008908,
-       .cm_mpu_m3_mpu_m3_clkctrl = 0x4a008920,
-       .cm_sdma_clkstctrl = 0x4a008a00,
-       .cm_sdma_staticdep = 0x4a008a04,
-       .cm_sdma_dynamicdep = 0x4a008a08,
-       .cm_sdma_sdma_clkctrl = 0x4a008a20,
-       .cm_memif_clkstctrl = 0x4a008b00,
-       .cm_memif_dmm_clkctrl = 0x4a008b20,
-       .cm_memif_emif_fw_clkctrl = 0x4a008b28,
-       .cm_memif_emif_1_clkctrl = 0x4a008b30,
-       .cm_memif_emif_2_clkctrl = 0x4a008b38,
-       .cm_memif_dll_clkctrl = 0x4a008b40,
-       .cm_memif_emif_h1_clkctrl = 0x4a008b50,
-       .cm_memif_emif_h2_clkctrl = 0x4a008b58,
-       .cm_memif_dll_h_clkctrl = 0x4a008b60,
-       .cm_c2c_clkstctrl = 0x4a008c00,
-       .cm_c2c_staticdep = 0x4a008c04,
-       .cm_c2c_dynamicdep = 0x4a008c08,
-       .cm_c2c_sad2d_clkctrl = 0x4a008c20,
-       .cm_c2c_modem_icr_clkctrl = 0x4a008c28,
-       .cm_c2c_sad2d_fw_clkctrl = 0x4a008c30,
-       .cm_l4cfg_clkstctrl = 0x4a008d00,
-       .cm_l4cfg_dynamicdep = 0x4a008d08,
-       .cm_l4cfg_l4_cfg_clkctrl = 0x4a008d20,
-       .cm_l4cfg_hw_sem_clkctrl = 0x4a008d28,
-       .cm_l4cfg_mailbox_clkctrl = 0x4a008d30,
-       .cm_l4cfg_sar_rom_clkctrl = 0x4a008d38,
-       .cm_l3instr_clkstctrl = 0x4a008e00,
-       .cm_l3instr_l3_3_clkctrl = 0x4a008e20,
-       .cm_l3instr_l3_instr_clkctrl = 0x4a008e28,
-       .cm_l3instr_intrconn_wp1_clkct = 0x4a008e40,
-       .cm_ivahd_clkstctrl = 0x4a008f00,
-
-       /* cm2.ivahd */
-       .cm_ivahd_ivahd_clkctrl = 0x4a008f20,
-       .cm_ivahd_sl2_clkctrl = 0x4a008f28,
-
-       /* cm2.cam */
-       .cm_cam_clkstctrl = 0x4a009000,
-       .cm_cam_iss_clkctrl = 0x4a009020,
-       .cm_cam_fdif_clkctrl = 0x4a009028,
-
-       /* cm2.dss */
-       .cm_dss_clkstctrl = 0x4a009100,
-       .cm_dss_dss_clkctrl = 0x4a009120,
-
-       /* cm2.sgx */
-       .cm_sgx_clkstctrl = 0x4a009200,
-       .cm_sgx_sgx_clkctrl = 0x4a009220,
-
-       /* cm2.l3init */
-       .cm_l3init_clkstctrl = 0x4a009300,
-       .cm_l3init_hsmmc1_clkctrl = 0x4a009328,
-       .cm_l3init_hsmmc2_clkctrl = 0x4a009330,
-       .cm_l3init_hsi_clkctrl = 0x4a009338,
-       .cm_l3init_hsusbhost_clkctrl = 0x4a009358,
-       .cm_l3init_hsusbotg_clkctrl = 0x4a009360,
-       .cm_l3init_hsusbtll_clkctrl = 0x4a009368,
-       .cm_l3init_p1500_clkctrl = 0x4a009378,
-       .cm_l3init_fsusb_clkctrl = 0x4a0093d0,
-       .cm_l3init_usbphy_clkctrl = 0x4a0093e0,
-
-       /* cm2.l4per */
-       .cm_l4per_clkstctrl = 0x4a009400,
-       .cm_l4per_dynamicdep = 0x4a009408,
-       .cm_l4per_adc_clkctrl = 0x4a009420,
-       .cm_l4per_gptimer10_clkctrl = 0x4a009428,
-       .cm_l4per_gptimer11_clkctrl = 0x4a009430,
-       .cm_l4per_gptimer2_clkctrl = 0x4a009438,
-       .cm_l4per_gptimer3_clkctrl = 0x4a009440,
-       .cm_l4per_gptimer4_clkctrl = 0x4a009448,
-       .cm_l4per_gptimer9_clkctrl = 0x4a009450,
-       .cm_l4per_elm_clkctrl = 0x4a009458,
-       .cm_l4per_gpio2_clkctrl = 0x4a009460,
-       .cm_l4per_gpio3_clkctrl = 0x4a009468,
-       .cm_l4per_gpio4_clkctrl = 0x4a009470,
-       .cm_l4per_gpio5_clkctrl = 0x4a009478,
-       .cm_l4per_gpio6_clkctrl = 0x4a009480,
-       .cm_l4per_hdq1w_clkctrl = 0x4a009488,
-       .cm_l4per_hecc1_clkctrl = 0x4a009490,
-       .cm_l4per_hecc2_clkctrl = 0x4a009498,
-       .cm_l4per_i2c1_clkctrl = 0x4a0094a0,
-       .cm_l4per_i2c2_clkctrl = 0x4a0094a8,
-       .cm_l4per_i2c3_clkctrl = 0x4a0094b0,
-       .cm_l4per_i2c4_clkctrl = 0x4a0094b8,
-       .cm_l4per_l4per_clkctrl = 0x4a0094c0,
-       .cm_l4per_mcasp2_clkctrl = 0x4a0094d0,
-       .cm_l4per_mcasp3_clkctrl = 0x4a0094d8,
-       .cm_l4per_mcbsp4_clkctrl = 0x4a0094e0,
-       .cm_l4per_mgate_clkctrl = 0x4a0094e8,
-       .cm_l4per_mcspi1_clkctrl = 0x4a0094f0,
-       .cm_l4per_mcspi2_clkctrl = 0x4a0094f8,
-       .cm_l4per_mcspi3_clkctrl = 0x4a009500,
-       .cm_l4per_mcspi4_clkctrl = 0x4a009508,
-       .cm_l4per_mmcsd3_clkctrl = 0x4a009520,
-       .cm_l4per_mmcsd4_clkctrl = 0x4a009528,
-       .cm_l4per_msprohg_clkctrl = 0x4a009530,
-       .cm_l4per_slimbus2_clkctrl = 0x4a009538,
-       .cm_l4per_uart1_clkctrl = 0x4a009540,
-       .cm_l4per_uart2_clkctrl = 0x4a009548,
-       .cm_l4per_uart3_clkctrl = 0x4a009550,
-       .cm_l4per_uart4_clkctrl = 0x4a009558,
-       .cm_l4per_mmcsd5_clkctrl = 0x4a009560,
-       .cm_l4per_i2c5_clkctrl = 0x4a009568,
-       .cm_l4sec_clkstctrl = 0x4a009580,
-       .cm_l4sec_staticdep = 0x4a009584,
-       .cm_l4sec_dynamicdep = 0x4a009588,
-       .cm_l4sec_aes1_clkctrl = 0x4a0095a0,
-       .cm_l4sec_aes2_clkctrl = 0x4a0095a8,
-       .cm_l4sec_des3des_clkctrl = 0x4a0095b0,
-       .cm_l4sec_pkaeip29_clkctrl = 0x4a0095b8,
-       .cm_l4sec_rng_clkctrl = 0x4a0095c0,
-       .cm_l4sec_sha2md51_clkctrl = 0x4a0095c8,
-       .cm_l4sec_cryptodma_clkctrl = 0x4a0095d8,
-
-       /* l4 wkup regs */
-       .cm_abe_pll_ref_clksel = 0x4a30610c,
-       .cm_sys_clksel = 0x4a306110,
-       .cm_wkup_clkstctrl = 0x4a307800,
-       .cm_wkup_l4wkup_clkctrl = 0x4a307820,
-       .cm_wkup_wdtimer1_clkctrl = 0x4a307828,
-       .cm_wkup_wdtimer2_clkctrl = 0x4a307830,
-       .cm_wkup_gpio1_clkctrl = 0x4a307838,
-       .cm_wkup_gptimer1_clkctrl = 0x4a307840,
-       .cm_wkup_gptimer12_clkctrl = 0x4a307848,
-       .cm_wkup_synctimer_clkctrl = 0x4a307850,
-       .cm_wkup_usim_clkctrl = 0x4a307858,
-       .cm_wkup_sarram_clkctrl = 0x4a307860,
-       .cm_wkup_keyboard_clkctrl = 0x4a307878,
-       .cm_wkup_rtc_clkctrl = 0x4a307880,
-       .cm_wkup_bandgap_clkctrl = 0x4a307888,
-       .prm_vc_val_bypass = 0x4a307ba0,
-       .prm_vc_cfg_channel = 0x4a307ba4,
-       .prm_vc_cfg_i2c_mode = 0x4a307ba8,
-       .prm_vc_cfg_i2c_clk = 0x4a307bac,
-};
-
-struct omap_sys_ctrl_regs const omap4_ctrl = {
-       .control_status                         = 0x4A0022C4,
-       .control_std_fuse_die_id_0              = 0x4A002200,
-       .control_std_fuse_die_id_1              = 0x4A002208,
-       .control_std_fuse_die_id_2              = 0x4A00220C,
-       .control_std_fuse_die_id_3              = 0x4A002210,
-       .control_std_fuse_opp_bgap              = 0x4a002260,
-       .control_status                         = 0x4a0022c4,
-       .control_ldosram_iva_voltage_ctrl       = 0x4A002320,
-       .control_ldosram_mpu_voltage_ctrl       = 0x4A002324,
-       .control_ldosram_core_voltage_ctrl      = 0x4A002328,
-       .control_usbotghs_ctrl                  = 0x4A00233C,
-       .control_padconf_core_base              = 0x4A100000,
-       .control_pbiaslite                      = 0x4A100600,
-       .control_lpddr2io1_0                    = 0x4A100638,
-       .control_lpddr2io1_1                    = 0x4A10063C,
-       .control_lpddr2io1_2                    = 0x4A100640,
-       .control_lpddr2io1_3                    = 0x4A100644,
-       .control_lpddr2io2_0                    = 0x4A100648,
-       .control_lpddr2io2_1                    = 0x4A10064C,
-       .control_lpddr2io2_2                    = 0x4A100650,
-       .control_lpddr2io2_3                    = 0x4A100654,
-       .control_efuse_1                        = 0x4A100700,
-       .control_efuse_2                        = 0x4A100704,
-       .control_padconf_wkup_base              = 0x4A31E000,
-};
diff --git a/arch/arm/mach-omap2/omap4/sdram_elpida.c b/arch/arm/mach-omap2/omap4/sdram_elpida.c
deleted file mode 100644 (file)
index a29a264..0000000
+++ /dev/null
@@ -1,323 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Timing and Organization details of the Elpida parts used in OMAP4
- * SDPs and Panda
- *
- * (C) Copyright 2010
- * Texas Instruments, <www.ti.com>
- *
- * Aneesh V <aneesh@ti.com>
- */
-
-#include <asm/emif.h>
-#include <asm/arch/sys_proto.h>
-
-/*
- * This file provides details of the LPDDR2 SDRAM parts used on OMAP4430
- * SDP and Panda. Since the parts used and geometry are identical for
- * SDP and Panda for a given OMAP4 revision, this information is kept
- * here instead of being in board directory. However the key functions
- * exported are weakly linked so that they can be over-ridden in the board
- * directory if there is a OMAP4 board in the future that uses a different
- * memory device or geometry.
- *
- * For any new board with different memory devices over-ride one or more
- * of the following functions as per the CONFIG flags you intend to enable:
- * - emif_get_reg_dump()
- * - emif_get_dmm_regs()
- * - emif_get_device_details()
- * - emif_get_device_timings()
- */
-
-#ifdef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
-
-const struct emif_regs emif_regs_elpida_200_mhz_2cs = {
-       .sdram_config_init              = 0x80000eb9,
-       .sdram_config                   = 0x80001ab9,
-       .ref_ctrl                       = 0x0000030c,
-       .sdram_tim1                     = 0x08648311,
-       .sdram_tim2                     = 0x101b06ca,
-       .sdram_tim3                     = 0x0048a19f,
-       .read_idle_ctrl                 = 0x000501ff,
-       .zq_config                      = 0x500b3214,
-       .temp_alert_config              = 0xd8016893,
-       .emif_ddr_phy_ctlr_1_init       = 0x049ffff5,
-       .emif_ddr_phy_ctlr_1            = 0x049ff808
-};
-
-const struct emif_regs emif_regs_elpida_380_mhz_1cs = {
-       .sdram_config_init              = 0x80000eb1,
-       .sdram_config                   = 0x80001ab1,
-       .ref_ctrl                       = 0x000005cd,
-       .sdram_tim1                     = 0x10cb0622,
-       .sdram_tim2                     = 0x20350d52,
-       .sdram_tim3                     = 0x00b1431f,
-       .read_idle_ctrl                 = 0x000501ff,
-       .zq_config                      = 0x500b3214,
-       .temp_alert_config              = 0x58016893,
-       .emif_ddr_phy_ctlr_1_init       = 0x049ffff5,
-       .emif_ddr_phy_ctlr_1            = 0x049ff418
-};
-
-const struct emif_regs emif_regs_elpida_400_mhz_1cs = {
-       .sdram_config_init              = 0x80800eb2,
-       .sdram_config                   = 0x80801ab2,
-       .ref_ctrl                       = 0x00000618,
-       .sdram_tim1                     = 0x10eb0662,
-       .sdram_tim2                     = 0x20370dd2,
-       .sdram_tim3                     = 0x00b1c33f,
-       .read_idle_ctrl                 = 0x000501ff,
-       .zq_config                      = 0x500b3215,
-       .temp_alert_config              = 0x58016893,
-       .emif_ddr_phy_ctlr_1_init       = 0x049ffff5,
-       .emif_ddr_phy_ctlr_1            = 0x049ff418
-};
-
-const struct emif_regs emif_regs_elpida_400_mhz_2cs = {
-       .sdram_config_init              = 0x80000eb9,
-       .sdram_config                   = 0x80001ab9,
-       .ref_ctrl                       = 0x00000618,
-       .sdram_tim1                     = 0x10eb0662,
-       .sdram_tim2                     = 0x20370dd2,
-       .sdram_tim3                     = 0x00b1c33f,
-       .read_idle_ctrl                 = 0x000501ff,
-       .zq_config                      = 0xd00b3214,
-       .temp_alert_config              = 0xd8016893,
-       .emif_ddr_phy_ctlr_1_init       = 0x049ffff5,
-       .emif_ddr_phy_ctlr_1            = 0x049ff418
-};
-
-const struct dmm_lisa_map_regs lisa_map_2G_x_1_x_2 = {
-       .dmm_lisa_map_0 = 0xFF020100,
-       .dmm_lisa_map_1 = 0,
-       .dmm_lisa_map_2 = 0,
-       .dmm_lisa_map_3 = 0x80540300,
-       .is_ma_present  = 0x0
-};
-
-const struct dmm_lisa_map_regs lisa_map_2G_x_2_x_2 = {
-       .dmm_lisa_map_0 = 0xFF020100,
-       .dmm_lisa_map_1 = 0,
-       .dmm_lisa_map_2 = 0,
-       .dmm_lisa_map_3 = 0x80640300,
-       .is_ma_present  = 0x0
-};
-
-const struct dmm_lisa_map_regs ma_lisa_map_2G_x_2_x_2 = {
-       .dmm_lisa_map_0 = 0xFF020100,
-       .dmm_lisa_map_1 = 0,
-       .dmm_lisa_map_2 = 0,
-       .dmm_lisa_map_3 = 0x80640300,
-       .is_ma_present  = 0x1
-};
-
-static void emif_get_reg_dump_sdp(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 < OMAP4470_ES1_0)
-               *regs = &emif_regs_elpida_400_mhz_2cs;
-       else
-               *regs = &emif_regs_elpida_400_mhz_1cs;
-}
-void emif_get_reg_dump(u32 emif_nr, const struct emif_regs **regs)
-       __attribute__((weak, alias("emif_get_reg_dump_sdp")));
-
-static void emif_get_dmm_regs_sdp(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 < 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;
-}
-
-void emif_get_dmm_regs(const struct dmm_lisa_map_regs **dmm_lisa_regs)
-       __attribute__((weak, alias("emif_get_dmm_regs_sdp")));
-
-#else
-
-const struct lpddr2_device_details elpida_2G_S4_details = {
-       .type           = LPDDR2_TYPE_S4,
-       .density        = LPDDR2_DENSITY_2Gb,
-       .io_width       = LPDDR2_IO_WIDTH_32,
-       .manufacturer   = LPDDR2_MANUFACTURER_ELPIDA
-};
-
-const struct lpddr2_device_details elpida_4G_S4_details = {
-       .type           = LPDDR2_TYPE_S4,
-       .density        = LPDDR2_DENSITY_4Gb,
-       .io_width       = LPDDR2_IO_WIDTH_32,
-       .manufacturer   = LPDDR2_MANUFACTURER_ELPIDA
-};
-
-struct lpddr2_device_details *emif_get_device_details_sdp(u32 emif_nr, u8 cs,
-                       struct lpddr2_device_details *lpddr2_dev_details)
-{
-       u32 omap_rev = omap_revision();
-
-       /* EMIF1 & EMIF2 have identical configuration */
-       if (((omap_rev == OMAP4430_ES1_0) || (omap_rev == OMAP4470_ES1_0))
-               && (cs == CS1)) {
-               /* Nothing connected on CS1 for 4430/4470 ES1.0 */
-               return NULL;
-       } else if (omap_rev < OMAP4470_ES1_0) {
-               /* In all other 4430/4460 cases Elpida 2G device */
-               *lpddr2_dev_details = elpida_2G_S4_details;
-       } else {
-               /* 4470: 4G device */
-               *lpddr2_dev_details = elpida_4G_S4_details;
-       }
-       return lpddr2_dev_details;
-}
-
-struct lpddr2_device_details *emif_get_device_details(u32 emif_nr, u8 cs,
-                       struct lpddr2_device_details *lpddr2_dev_details)
-       __attribute__((weak, alias("emif_get_device_details_sdp")));
-
-#endif /* CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS */
-
-#ifndef CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
-static const struct lpddr2_ac_timings timings_elpida_400_mhz = {
-       .max_freq       = 400000000,
-       .RL             = 6,
-       .tRPab          = 21,
-       .tRCD           = 18,
-       .tWR            = 15,
-       .tRASmin        = 42,
-       .tRRD           = 10,
-       .tWTRx2         = 15,
-       .tXSR           = 140,
-       .tXPx2          = 15,
-       .tRFCab         = 130,
-       .tRTPx2         = 15,
-       .tCKE           = 3,
-       .tCKESR         = 15,
-       .tZQCS          = 90,
-       .tZQCL          = 360,
-       .tZQINIT        = 1000,
-       .tDQSCKMAXx2    = 11,
-       .tRASmax        = 70,
-       .tFAW           = 50
-};
-
-static const struct lpddr2_ac_timings timings_elpida_333_mhz = {
-       .max_freq       = 333000000,
-       .RL             = 5,
-       .tRPab          = 21,
-       .tRCD           = 18,
-       .tWR            = 15,
-       .tRASmin        = 42,
-       .tRRD           = 10,
-       .tWTRx2         = 15,
-       .tXSR           = 140,
-       .tXPx2          = 15,
-       .tRFCab         = 130,
-       .tRTPx2         = 15,
-       .tCKE           = 3,
-       .tCKESR         = 15,
-       .tZQCS          = 90,
-       .tZQCL          = 360,
-       .tZQINIT        = 1000,
-       .tDQSCKMAXx2    = 11,
-       .tRASmax        = 70,
-       .tFAW           = 50
-};
-
-static const struct lpddr2_ac_timings timings_elpida_200_mhz = {
-       .max_freq       = 200000000,
-       .RL             = 3,
-       .tRPab          = 21,
-       .tRCD           = 18,
-       .tWR            = 15,
-       .tRASmin        = 42,
-       .tRRD           = 10,
-       .tWTRx2         = 20,
-       .tXSR           = 140,
-       .tXPx2          = 15,
-       .tRFCab         = 130,
-       .tRTPx2         = 15,
-       .tCKE           = 3,
-       .tCKESR         = 15,
-       .tZQCS          = 90,
-       .tZQCL          = 360,
-       .tZQINIT        = 1000,
-       .tDQSCKMAXx2    = 11,
-       .tRASmax        = 70,
-       .tFAW           = 50
-};
-
-static const struct lpddr2_min_tck min_tck_elpida = {
-       .tRL            = 3,
-       .tRP_AB         = 3,
-       .tRCD           = 3,
-       .tWR            = 3,
-       .tRAS_MIN       = 3,
-       .tRRD           = 2,
-       .tWTR           = 2,
-       .tXP            = 2,
-       .tRTP           = 2,
-       .tCKE           = 3,
-       .tCKESR         = 3,
-       .tFAW           = 8
-};
-
-static const struct lpddr2_ac_timings *elpida_ac_timings[MAX_NUM_SPEEDBINS] = {
-               &timings_elpida_200_mhz,
-               &timings_elpida_333_mhz,
-               &timings_elpida_400_mhz
-};
-
-const struct lpddr2_device_timings elpida_2G_S4_timings = {
-       .ac_timings     = elpida_ac_timings,
-       .min_tck        = &min_tck_elpida,
-};
-
-void emif_get_device_timings_sdp(u32 emif_nr,
-               const struct lpddr2_device_timings **cs0_device_timings,
-               const struct lpddr2_device_timings **cs1_device_timings)
-{
-       u32 omap_rev = omap_revision();
-
-       /* Identical devices on EMIF1 & EMIF2 */
-       *cs0_device_timings = &elpida_2G_S4_timings;
-
-       if ((omap_rev == OMAP4430_ES1_0) || (omap_rev == OMAP4470_ES1_0))
-               *cs1_device_timings = NULL;
-       else
-               *cs1_device_timings = &elpida_2G_S4_timings;
-}
-
-void emif_get_device_timings(u32 emif_nr,
-               const struct lpddr2_device_timings **cs0_device_timings,
-               const struct lpddr2_device_timings **cs1_device_timings)
-       __attribute__((weak, alias("emif_get_device_timings_sdp")));
-
-#endif /* CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS */
-
-const struct lpddr2_mr_regs mr_regs = {
-       .mr1    = MR1_BL_8_BT_SEQ_WRAP_EN_NWR_3,
-       .mr2    = 0x4,
-       .mr3    = -1,
-       .mr10   = MR10_ZQ_ZQINIT,
-       .mr16   = MR16_REF_FULL_ARRAY
-};
-
-void get_lpddr2_mr_regs(const struct lpddr2_mr_regs **regs)
-{
-       *regs = &mr_regs;
-}
-
-__weak const struct read_write_regs *get_bug_regs(u32 *iterations)
-{
-       return 0;
-}
index af43b5f5d3c9526c6d8160397205552f7a5c3d68..6f56ca911c1e2c5e21242c1ff618be66cfbed256 100644 (file)
@@ -500,7 +500,7 @@ config SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
                     ARCH_MX6 || ARCH_MX7 || \
                     ARCH_ROCKCHIP || ARCH_MVEBU ||  ARCH_SOCFPGA || \
                     ARCH_AT91 || ARCH_ZYNQ || ARCH_KEYSTONE || OMAP34XX || \
-                    OMAP44XX || OMAP54XX || AM33XX || AM43XX || \
+                    OMAP54XX || AM33XX || AM43XX || \
                     TARGET_SIFIVE_UNLEASHED || TARGET_SIFIVE_UNMATCHED
        select SPL_LOAD_BLOCK if SPL_MMC
        select SPL_SYS_MMCSD_RAW_MODE if SPL_MMC
@@ -517,7 +517,7 @@ config SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR
        default 0x100 if ARCH_UNIPHIER
        default 0x0 if ARCH_MVEBU
        default 0x200 if ARCH_SOCFPGA || ARCH_AT91
-       default 0x300 if ARCH_ZYNQ || ARCH_KEYSTONE || OMAP34XX || OMAP44XX || \
+       default 0x300 if ARCH_ZYNQ || ARCH_KEYSTONE || OMAP34XX || \
                         OMAP54XX || AM33XX || AM43XX || ARCH_K3
        default 0x4000 if ARCH_ROCKCHIP
        default 0x822 if TARGET_SIFIVE_UNLEASHED || TARGET_SIFIVE_UNMATCHED
index 34b02114dc6951ea9929167b51df381aef29a553..cba7f848942ffe2e21bc83e2295512d0c2072a91 100644 (file)
@@ -771,7 +771,7 @@ config SYS_I2C_BUS_MAX
        int "Max I2C busses"
        depends on ARCH_OMAP2PLUS || ARCH_SOCFPGA
        default 3 if OMAP34XX || AM33XX || AM43XX
-       default 4 if ARCH_SOCFPGA || OMAP44XX
+       default 4 if ARCH_SOCFPGA
        default 5 if OMAP54XX
        help
          Define the maximum number of available I2C buses.
index 8b13a0821ee0741e05a4b39cec0ef2d817dce475..982e84dc3bcc29ff93dad2a0d1037d94bfa919ef 100644 (file)
@@ -406,7 +406,7 @@ config MMC_OMAP36XX_PINS
 
 config HSMMC2_8BIT
        bool "Enable 8-bit interface for eMMC (interface #2)"
-       depends on MMC_OMAP_HS && (OMAP44XX || OMAP54XX || DRA7XX || AM33XX || \
+       depends on MMC_OMAP_HS && (OMAP54XX || DRA7XX || AM33XX || \
                AM43XX || ARCH_KEYSTONE)
 
 config SH_MMCIF
index 2b7f9fc9a205f277a07bfd5a45d0b0b761daa160..8e51453d2aee09667c81a36064cb08449f1a538d 100644 (file)
@@ -30,7 +30,7 @@
 #include <mmc.h>
 #include <part.h>
 #include <i2c.h>
-#if defined(CONFIG_OMAP54XX) || defined(CONFIG_OMAP44XX)
+#if defined(CONFIG_OMAP54XX)
 #include <palmas.h>
 #endif
 #include <asm/cache.h>
@@ -270,8 +270,7 @@ static unsigned char mmc_board_init(struct mmc *mmc)
                &prcm_base->iclken1_core);
 #endif
 
-#if (defined(CONFIG_OMAP54XX) || defined(CONFIG_OMAP44XX)) &&\
-       !CONFIG_IS_ENABLED(DM_REGULATOR)
+#if defined(CONFIG_OMAP54XX) && !CONFIG_IS_ENABLED(DM_REGULATOR)
        /* PBIAS config needed for MMC1 only */
        if (mmc_get_blk_desc(mmc)->devnum == 0)
                vmmc_pbias_config(LDO_VOLT_3V3);
@@ -541,8 +540,7 @@ static int omap_hsmmc_set_signal_voltage(struct mmc *mmc)
 
 #if CONFIG_IS_ENABLED(DM_REGULATOR)
        return omap_hsmmc_set_io_regulator(mmc, mv);
-#elif (defined(CONFIG_OMAP54XX) || defined(CONFIG_OMAP44XX)) && \
-       defined(CONFIG_PALMAS_POWER)
+#elif defined(CONFIG_OMAP54XX) && defined(CONFIG_PALMAS_POWER)
        if (mmc_get_blk_desc(mmc)->devnum == 0)
                vmmc_pbias_config(palmas_ldo_volt);
        return 0;
@@ -905,8 +903,7 @@ static void mmc_reset_controller_fsm(struct hsmmc *mmc_base, u32 bit)
         * 3. Wait until the SRC (SRD) bit returns to 0x0
         *    (reset procedure is completed).
         */
-#if defined(CONFIG_OMAP44XX) || defined(CONFIG_OMAP54XX) || \
-       defined(CONFIG_AM33XX) || defined(CONFIG_AM43XX)
+#if defined(CONFIG_OMAP54XX) || defined(CONFIG_AM33XX) || defined(CONFIG_AM43XX)
        if (!(readl(&mmc_base->sysctl) & bit)) {
                start = get_timer(0);
                while (!(readl(&mmc_base->sysctl) & bit)) {
@@ -1556,7 +1553,7 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio,
 #ifdef OMAP_HSMMC2_BASE
        case 1:
                priv->base_addr = (struct hsmmc *)OMAP_HSMMC2_BASE;
-#if (defined(CONFIG_OMAP44XX) || defined(CONFIG_OMAP54XX) || \
+#if (defined(CONFIG_OMAP54XX) || \
        defined(CONFIG_DRA7XX) || defined(CONFIG_AM33XX) || \
        defined(CONFIG_AM43XX) || defined(CONFIG_ARCH_KEYSTONE)) && \
                defined(CONFIG_HSMMC2_8BIT)
index 5556a22cf6961f200975a6c5b33ee1e3022305f8..4b81aeb7497dff8d11e123c00fc00c8acc67130e 100644 (file)
@@ -443,10 +443,6 @@ config TWL4030_POWER
        The TWL4030 in a combination audio CODEC/power management with
        GPIO and it is commonly used with the OMAP3 family of processors
 
-config TWL6030_POWER
-       depends on OMAP44XX
-       bool "Enable driver for TI TWL6030 power management chip"
-
 config POWER_MT6323
        bool "Poweroff driver for mediatek mt6323"
        select CMD_POWEROFF
index 9f94df8d64143c4ed26ff5e23ab0c68337f0603b..6f7e6fb0a6bdd60d3c8330b49e24af0b1bae64ba 100644 (file)
@@ -22,7 +22,6 @@ obj-$(CONFIG_EXYNOS_TMU)      += exynos-tmu.o
 obj-$(CONFIG_SY8106A_POWER)    += sy8106a.o
 obj-$(CONFIG_TPS6586X_POWER)   += tps6586x.o
 obj-$(CONFIG_TWL4030_POWER)    += twl4030.o
-obj-$(CONFIG_TWL6030_POWER)    += twl6030.o
 obj-$(CONFIG_PALMAS_POWER)     += palmas.o
 obj-$(CONFIG_$(SPL_TPL_)POWER_LEGACY) += power_core.o
 obj-$(CONFIG_DIALOG_POWER) += power_dialog.o
diff --git a/drivers/power/twl6030.c b/drivers/power/twl6030.c
deleted file mode 100644 (file)
index 0cf2e50..0000000
+++ /dev/null
@@ -1,310 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2010
- * Texas Instruments, <www.ti.com>
- */
-#include <config.h>
-#include <linux/delay.h>
-#include <linux/printk.h>
-
-#include <twl6030.h>
-
-static struct twl6030_data *twl;
-
-static struct twl6030_data twl6030_info = {
-       .chip_type      = chip_TWL6030,
-       .adc_rbase      = GPCH0_LSB,
-       .adc_ctrl       = CTRL_P2,
-       .adc_enable     = CTRL_P2_SP2,
-       .vbat_mult      = TWL6030_VBAT_MULT,
-       .vbat_shift     = TWL6030_VBAT_SHIFT,
-};
-
-static struct twl6030_data twl6032_info = {
-       .chip_type      = chip_TWL6032,
-       .adc_rbase      = TWL6032_GPCH0_LSB,
-       .adc_ctrl       = TWL6032_CTRL_P1,
-       .adc_enable     = CTRL_P1_SP1,
-       .vbat_mult      = TWL6032_VBAT_MULT,
-       .vbat_shift     = TWL6032_VBAT_SHIFT,
-};
-
-static int twl6030_gpadc_read_channel(u8 channel_no)
-{
-       u8 lsb = 0;
-       u8 msb = 0;
-       int ret = 0;
-
-       ret = twl6030_i2c_read_u8(TWL6030_CHIP_ADC,
-                                 twl->adc_rbase + channel_no * 2, &lsb);
-       if (ret)
-               return ret;
-
-       ret = twl6030_i2c_read_u8(TWL6030_CHIP_ADC,
-                                 twl->adc_rbase + 1 + channel_no * 2, &msb);
-       if (ret)
-               return ret;
-
-       return (msb << 8) | lsb;
-}
-
-static int twl6030_gpadc_sw2_trigger(void)
-{
-       u8 val;
-       int ret = 0;
-
-       ret = twl6030_i2c_write_u8(TWL6030_CHIP_ADC,
-                                  twl->adc_ctrl, twl->adc_enable);
-       if (ret)
-               return ret;
-
-       /* Waiting until the SW1 conversion ends*/
-       val =  CTRL_P2_BUSY;
-
-       while (!((val & CTRL_P2_EOCP2) && (!(val & CTRL_P2_BUSY)))) {
-               ret = twl6030_i2c_read_u8(TWL6030_CHIP_ADC,
-                                         twl->adc_ctrl, &val);
-               if (ret)
-                       return ret;
-               udelay(1000);
-       }
-
-       return 0;
-}
-
-void twl6030_power_off(void)
-{
-       twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_PHOENIX_DEV_ON,
-               TWL6030_PHOENIX_APP_DEVOFF | TWL6030_PHOENIX_CON_DEVOFF |
-               TWL6030_PHOENIX_MOD_DEVOFF);
-}
-
-void twl6030_stop_usb_charging(void)
-{
-       twl6030_i2c_write_u8(TWL6030_CHIP_CHARGER, CONTROLLER_CTRL1, 0);
-
-       return;
-}
-
-void twl6030_start_usb_charging(void)
-{
-       twl6030_i2c_write_u8(TWL6030_CHIP_CHARGER,
-                            CHARGERUSB_VICHRG, CHARGERUSB_VICHRG_1500);
-       twl6030_i2c_write_u8(TWL6030_CHIP_CHARGER,
-                            CHARGERUSB_CINLIMIT, CHARGERUSB_CIN_LIMIT_NONE);
-       twl6030_i2c_write_u8(TWL6030_CHIP_CHARGER,
-                            CONTROLLER_INT_MASK, MBAT_TEMP);
-       twl6030_i2c_write_u8(TWL6030_CHIP_CHARGER,
-                            CHARGERUSB_INT_MASK, MASK_MCHARGERUSB_THMREG);
-       twl6030_i2c_write_u8(TWL6030_CHIP_CHARGER,
-                            CHARGERUSB_VOREG, CHARGERUSB_VOREG_4P0);
-       twl6030_i2c_write_u8(TWL6030_CHIP_CHARGER,
-                            CHARGERUSB_CTRL2, CHARGERUSB_CTRL2_VITERM_400);
-       twl6030_i2c_write_u8(TWL6030_CHIP_CHARGER, CHARGERUSB_CTRL1, TERM);
-       /* Enable USB charging */
-       twl6030_i2c_write_u8(TWL6030_CHIP_CHARGER,
-                            CONTROLLER_CTRL1, CONTROLLER_CTRL1_EN_CHARGER);
-       return;
-}
-
-int twl6030_get_battery_current(void)
-{
-       int battery_current = 0;
-       u8 msb = 0;
-       u8 lsb = 0;
-
-       twl6030_i2c_read_u8(TWL6030_CHIP_CHARGER, FG_REG_11, &msb);
-       twl6030_i2c_read_u8(TWL6030_CHIP_CHARGER, FG_REG_10, &lsb);
-       battery_current = ((msb << 8) | lsb);
-
-       /* convert 10 bit signed number to 16 bit signed number */
-       if (battery_current >= 0x2000)
-               battery_current = (battery_current - 0x4000);
-
-       battery_current = battery_current * 3000 / 4096;
-       printf("Battery Current: %d mA\n", battery_current);
-
-       return battery_current;
-}
-
-int twl6030_get_battery_voltage(void)
-{
-       int battery_volt = 0;
-       int ret = 0;
-       u8 vbatch;
-
-       if (twl->chip_type == chip_TWL6030) {
-               vbatch = TWL6030_GPADC_VBAT_CHNL;
-       } else {
-               ret = twl6030_i2c_write_u8(TWL6030_CHIP_ADC,
-                                          TWL6032_GPSELECT_ISB,
-                                          TWL6032_GPADC_VBAT_CHNL);
-               if (ret)
-                       return ret;
-               vbatch = 0;
-       }
-
-       /* Start GPADC SW conversion */
-       ret = twl6030_gpadc_sw2_trigger();
-       if (ret) {
-               printf("Failed to convert battery voltage\n");
-               return ret;
-       }
-
-       /* measure Vbat voltage */
-       battery_volt = twl6030_gpadc_read_channel(vbatch);
-       if (battery_volt < 0) {
-               printf("Failed to read battery voltage\n");
-               return ret;
-       }
-       battery_volt = (battery_volt * twl->vbat_mult) >> twl->vbat_shift;
-       printf("Battery Voltage: %d mV\n", battery_volt);
-
-       return battery_volt;
-}
-
-void twl6030_init_battery_charging(void)
-{
-       u8 val = 0;
-       int battery_volt = 0;
-       int ret = 0;
-
-       ret = twl6030_i2c_read_u8(TWL6030_CHIP_USB, USB_PRODUCT_ID_LSB, &val);
-       if (ret) {
-               puts("twl6030_init_battery_charging(): could not determine chip!\n");
-               return;
-       }
-       if (val == 0x30) {
-               twl = &twl6030_info;
-       } else if (val == 0x32) {
-               twl = &twl6032_info;
-       } else {
-               puts("twl6030_init_battery_charging(): unsupported chip type\n");
-               return;
-       }
-
-       /* Enable VBAT measurement */
-       if (twl->chip_type == chip_TWL6030) {
-               twl6030_i2c_write_u8(TWL6030_CHIP_PM, MISC1, VBAT_MEAS);
-               twl6030_i2c_write_u8(TWL6030_CHIP_ADC,
-                                    TWL6030_GPADC_CTRL,
-                                    GPADC_CTRL_SCALER_DIV4);
-       } else {
-               twl6030_i2c_write_u8(TWL6030_CHIP_ADC,
-                                    TWL6032_GPADC_CTRL2,
-                                    GPADC_CTRL2_CH18_SCALER_EN);
-       }
-
-       /* Enable GPADC module */
-       ret = twl6030_i2c_write_u8(TWL6030_CHIP_CHARGER, TOGGLE1, FGS | GPADCS);
-       if (ret) {
-               printf("Failed to enable GPADC\n");
-               return;
-       }
-
-       battery_volt = twl6030_get_battery_voltage();
-       if (battery_volt < 0)
-               return;
-
-       if (battery_volt < 3000)
-               printf("Main battery voltage too low!\n");
-
-       /* Check for the presence of USB charger */
-       twl6030_i2c_read_u8(TWL6030_CHIP_CHARGER, CONTROLLER_STAT1, &val);
-
-       /* check for battery presence indirectly via Fuel gauge */
-       if ((val & VBUS_DET) && (battery_volt < 3300))
-               twl6030_start_usb_charging();
-
-       return;
-}
-
-void twl6030_power_mmc_init(int dev_index)
-{
-       u8 value = 0;
-
-       if (dev_index == 0) {
-               /* 3.0V voltage output for VMMC */
-               twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VMMC_CFG_VOLTAGE,
-                       TWL6030_CFG_VOLTAGE_30);
-
-               /* Enable P1 output for VMMC */
-               twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VMMC_CFG_STATE,
-                       TWL6030_CFG_STATE_P1 | TWL6030_CFG_STATE_ON);
-       } else if (dev_index == 1) {
-               twl6030_i2c_read_u8(TWL6030_CHIP_PM, TWL6030_PH_STS_BOOT,
-                                   &value);
-               /* BOOT2 indicates 1.8V/2.8V VAUX1 for eMMC */
-               if (value & TWL6030_PH_STS_BOOT2) {
-                       /* 1.8V voltage output for VAUX1 */
-                       twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VAUX1_CFG_VOLTAGE,
-                               TWL6030_CFG_VOLTAGE_18);
-               } else {
-                       /* 2.8V voltage output for VAUX1 */
-                       twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VAUX1_CFG_VOLTAGE,
-                               TWL6030_CFG_VOLTAGE_28);
-               }
-
-               /* Enable P1 output for VAUX */
-               twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VAUX1_CFG_STATE,
-                       TWL6030_CFG_STATE_P1 | TWL6030_CFG_STATE_ON);
-       }
-}
-
-void twl6030_usb_device_settings()
-{
-       u8 value = 0;
-
-       /* 3.3V voltage output for VUSB */
-       twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VUSB_CFG_VOLTAGE,
-               TWL6030_CFG_VOLTAGE_33);
-
-       /* Enable P1 output for VUSB */
-       twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VUSB_CFG_STATE,
-               TWL6030_CFG_STATE_P1 | TWL6030_CFG_STATE_ON);
-
-       /* Select the input supply for VUSB regulator */
-       twl6030_i2c_read_u8(TWL6030_CHIP_PM, TWL6030_MISC2, &value);
-       value |= TWL6030_MISC2_VUSB_IN_VSYS;
-       value &= ~TWL6030_MISC2_VUSB_IN_PMID;
-       twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_MISC2, value);
-}
-
-#if CONFIG_IS_ENABLED(DM_I2C)
-int twl6030_i2c_write_u8(u8 chip_no, u8 reg, u8 val)
-{
-       struct udevice *dev;
-       int ret;
-
-       ret = i2c_get_chip_for_busnum(0, chip_no, 1, &dev);
-       if (ret) {
-               pr_err("unable to get I2C bus. ret %d\n", ret);
-               return ret;
-       }
-       ret = dm_i2c_reg_write(dev, reg, val);
-       if (ret) {
-               pr_err("writing to twl6030 failed. ret %d\n", ret);
-               return ret;
-       }
-       return 0;
-}
-
-int twl6030_i2c_read_u8(u8 chip_no, u8 reg, u8 *valp)
-{
-       struct udevice *dev;
-       int ret;
-
-       ret = i2c_get_chip_for_busnum(0, chip_no, 1, &dev);
-       if (ret) {
-               pr_err("unable to get I2C bus. ret %d\n", ret);
-               return ret;
-       }
-       ret = dm_i2c_reg_read(dev, reg);
-       if (ret < 0) {
-               pr_err("reading from twl6030 failed. ret %d\n", ret);
-               return ret;
-       }
-       *valp = (u8)ret;
-       return 0;
-}
-#endif
index 42b69719dd719d321612452a91a30efda7c081b4..6fcb5b523acbf8e924b951625d1479d0454c266b 100644 (file)
@@ -227,8 +227,7 @@ static void ns16550_setbrg(struct ns16550 *com_port, int baud_divisor)
 
 void ns16550_init(struct ns16550 *com_port, int baud_divisor)
 {
-#if (defined(CONFIG_SPL_BUILD) && \
-               (defined(CONFIG_OMAP34XX) || defined(CONFIG_OMAP44XX)))
+#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_OMAP34XX)
        /*
         * On some OMAP3/OMAP4 devices when UART3 is configured for boot mode
         * before SPL starts only THRE bit is set. We have to empty the
index 8829567bfb6811fa06e15dbd30e411d7f77408f5..40e238f86a8422254dd6b5d4364c065ba14c7f18 100644 (file)
@@ -19,8 +19,4 @@
 #define CFG_SOC_OMAP3430
 #endif
 
-#ifdef CONFIG_OMAP44XX
-#define CFG_ARCH_OMAP4
-#endif
-
 #endif /* __LINUX_COMPAT_H__ */
index cb01a8a3b383c2583addc922f15501c3cdb88032..6375be741aeb7f2b4f9608c38d5cec59ea34e7ce 100644 (file)
@@ -1520,7 +1520,7 @@ static int __devinit musb_core_init(u16 musb_type, struct musb *musb)
 /*-------------------------------------------------------------------------*/
 
 #if defined(CONFIG_SOC_OMAP2430) || defined(CFG_SOC_OMAP3430) || \
-       defined(CFG_ARCH_OMAP4) || defined(CONFIG_ARCH_U8500)
+       defined(CONFIG_ARCH_U8500)
 
 static irqreturn_t generic_interrupt(int irq, void *__hci)
 {
index 0e9ec96c0e8bf42294bd2d0acc7135c83a3a3631..00e9181556d459fa956204b748678829de0ae573 100644 (file)
@@ -150,7 +150,7 @@ enum musb_g_ep0_state {
  */
 
 #if defined(CONFIG_ARCH_DAVINCI) || defined(CONFIG_SOC_OMAP2430) \
-               || defined(CFG_SOC_OMAP3430) || defined(CFG_ARCH_OMAP4)
+               || defined(CFG_SOC_OMAP3430)
 /* REVISIT indexed access seemed to
  * misbehave (on DaVinci) for at least peripheral IN ...
  */
index 96771c28cefd7609e06ed5e061346fc74e12ee05..ba600d0110239164ca7c287ba6347e20d9ae2931 100644 (file)
@@ -21,7 +21,6 @@
 #include <asm/omap_common.h>
 #include <asm/omap_musb.h>
 #include <twl4030.h>
-#include <twl6030.h>
 #include "linux-compat.h"
 #include "musb_core.h"
 #include "omap2430.h"
@@ -104,17 +103,6 @@ static int omap2430_musb_enable(struct musb *musb)
                                __PRETTY_FUNCTION__);
        }
 #endif
-
-#ifdef CONFIG_TWL6030_POWER
-       twl6030_usb_device_settings();
-#endif
-
-#ifdef CONFIG_OMAP44XX
-       u32 *usbotghs_control = (u32 *)((*ctrl)->control_usbotghs_ctrl);
-       *usbotghs_control = USBOTGHS_CONTROL_AVALID |
-               USBOTGHS_CONTROL_VBUSVALID | USBOTGHS_CONTROL_IDDIG;
-#endif
-
        return 0;
 }
 
index f9747d69bf6eac365f1f73fcd72489f83a8fec96..e5238bc02f891794186ce659e1ca977a2589b70b 100644 (file)
@@ -19,7 +19,6 @@
 #include <serial.h>
 #include <asm/omap_common.h>
 #include <twl4030.h>
-#include <twl6030.h>
 #include "omap3.h"
 
 static int platform_needs_initialization = 1;
@@ -54,12 +53,7 @@ static struct omap3_otg_regs *otg;
 
 #define OMAP3_OTG_SYSSTATUS_RESETDONE                  0x0001
 
-/* OMAP4430 has an internal PHY, use it */
-#ifdef CONFIG_OMAP44XX
-#define OMAP3_OTG_INTERFSEL_OMAP                       0x0000
-#else
 #define OMAP3_OTG_INTERFSEL_OMAP                       0x0001
-#endif
 
 #define OMAP3_OTG_FORCESTDBY_STANDBY                   0x0001
 
@@ -99,10 +93,6 @@ int musb_platform_init(void)
                }
 #endif
 
-#ifdef CONFIG_TWL6030_POWER
-               twl6030_usb_device_settings();
-#endif
-
                otg = (struct omap3_otg_regs *)OMAP3_OTG_BASE;
 
                /* Set OTG to always be on */
@@ -121,11 +111,6 @@ int musb_platform_init(void)
                musb_cfg.extvbus = omap3_evm_need_extvbus();
 #endif
 
-#ifdef CONFIG_OMAP44XX
-               u32 *usbotghs_control =
-                       (u32 *)((*ctrl)->control_usbotghs_ctrl);
-               *usbotghs_control = 0x15;
-#endif
                platform_needs_initialization = 0;
        }
 
diff --git a/include/twl6030.h b/include/twl6030.h
deleted file mode 100644 (file)
index e3a1058..0000000
+++ /dev/null
@@ -1,224 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2010
- * Texas Instruments, <www.ti.com>
- */
-
-#ifndef TWL6030_H
-#define TWL6030_H
-
-#include <i2c.h>
-
-/* I2C chip addresses */
-#define TWL6030_CHIP_PM                0x48
-
-#define TWL6030_CHIP_USB       0x49
-#define TWL6030_CHIP_ADC       0x49
-#define TWL6030_CHIP_CHARGER   0x49
-#define TWL6030_CHIP_PWM       0x49
-
-/* Slave Address 0x48 */
-#define TWL6030_STS_HW_CONDITIONS      0x21
-
-#define TWL6030_STS_HW_CONDITIONS_PWRON        (1 << 0)
-
-#define TWL6030_PHOENIX_DEV_ON         0x25
-
-#define TWL6030_PHOENIX_APP_DEVOFF     (1 << 0)
-#define TWL6030_PHOENIX_CON_DEVOFF     (1 << 1)
-#define TWL6030_PHOENIX_MOD_DEVOFF     (1 << 2)
-
-#define TWL6030_PH_STS_BOOT            0x29
-
-#define TWL6030_PH_STS_BOOT0           (1 << 0)
-#define TWL6030_PH_STS_BOOT1           (1 << 1)
-#define TWL6030_PH_STS_BOOT2           (1 << 2)
-#define TWL6030_PH_STS_BOOT3           (1 << 3)
-
-#define TWL6030_VAUX1_CFG_STATE                0x86
-#define TWL6030_VAUX1_CFG_VOLTAGE      0x87
-#define TWL6030_VMMC_CFG_STATE         0x9A
-#define TWL6030_VMMC_CFG_VOLTAGE       0x9B
-#define TWL6030_VUSB_CFG_STATE         0xA2
-#define TWL6030_VUSB_CFG_VOLTAGE       0xA3
-
-#define TWL6030_CFG_GRP_P1             (1 << 0)
-#define TWL6030_CFG_STATE_ON           (1 << 0)
-#define TWL6030_CFG_STATE_P1           (TWL6030_CFG_GRP_P1 << 5)
-#define TWL6030_CFG_VOLTAGE_18         0x09
-#define TWL6030_CFG_VOLTAGE_28         0x13
-#define TWL6030_CFG_VOLTAGE_30         0x15
-#define TWL6030_CFG_VOLTAGE_33         0x18
-
-#define MISC1                  0xE4
-#define VAC_MEAS               (1 << 2)
-#define VBAT_MEAS              (1 << 1)
-#define BB_MEAS                        (1 << 0)
-
-#define TWL6030_MISC2                  0xE5
-#define TWL6030_MISC2_VUSB_IN_PMID     (1 << 3)
-#define TWL6030_MISC2_VUSB_IN_VSYS     (1 << 4)
-
-/* Slave Address 0x49 */
-
-#define TWL6030_CONTROLLER_STAT1               0xE3
-
-#define TWL6030_CONTROLLER_STAT1_VAC_DET       (1 << 3)
-#define TWL6030_CONTROLLER_STAT1_VBUS_DET      (1 << 2)
-
-/* Battery CHARGER REGISTERS */
-#define CONTROLLER_INT_MASK    0xE0
-#define CONTROLLER_CTRL1       0xE1
-#define CONTROLLER_WDG         0xE2
-#define CONTROLLER_STAT1       0xE3
-#define CHARGERUSB_INT_STATUS  0xE4
-#define CHARGERUSB_INT_MASK    0xE5
-#define CHARGERUSB_STATUS_INT1 0xE6
-#define CHARGERUSB_STATUS_INT2 0xE7
-#define CHARGERUSB_CTRL1       0xE8
-#define CHARGERUSB_CTRL2       0xE9
-#define CHARGERUSB_CTRL3       0xEA
-#define CHARGERUSB_STAT1       0xEB
-#define CHARGERUSB_VOREG       0xEC
-#define CHARGERUSB_VICHRG      0xED
-#define CHARGERUSB_CINLIMIT    0xEE
-#define CHARGERUSB_CTRLLIMIT1  0xEF
-
-/* CHARGERUSB_VICHRG */
-#define CHARGERUSB_VICHRG_500          0x4
-#define CHARGERUSB_VICHRG_1500         0xE
-/* CHARGERUSB_CINLIMIT */
-#define CHARGERUSB_CIN_LIMIT_100       0x1
-#define CHARGERUSB_CIN_LIMIT_300       0x5
-#define CHARGERUSB_CIN_LIMIT_500       0x9
-#define CHARGERUSB_CIN_LIMIT_NONE      0xF
-/* CONTROLLER_INT_MASK */
-#define MVAC_FAULT             (1 << 6)
-#define MAC_EOC                        (1 << 5)
-#define MBAT_REMOVED           (1 << 4)
-#define MFAULT_WDG             (1 << 3)
-#define MBAT_TEMP              (1 << 2)
-#define MVBUS_DET              (1 << 1)
-#define MVAC_DET               (1 << 0)
-/* CHARGERUSB_INT_MASK */
-#define MASK_MCURRENT_TERM             (1 << 3)
-#define MASK_MCHARGERUSB_STAT          (1 << 2)
-#define MASK_MCHARGERUSB_THMREG                (1 << 1)
-#define MASK_MCHARGERUSB_FAULT         (1 << 0)
-/* CHARGERUSB_VOREG */
-#define CHARGERUSB_VOREG_3P52          0x01
-#define CHARGERUSB_VOREG_4P0           0x19
-#define CHARGERUSB_VOREG_4P2           0x23
-#define CHARGERUSB_VOREG_4P76          0x3F
-/* CHARGERUSB_CTRL1 */
-#define SUSPEND_BOOT           (1 << 7)
-#define OPA_MODE               (1 << 6)
-#define HZ_MODE                        (1 << 5)
-#define TERM                   (1 << 4)
-/* CHARGERUSB_CTRL2 */
-#define CHARGERUSB_CTRL2_VITERM_50     (0 << 5)
-#define CHARGERUSB_CTRL2_VITERM_100    (1 << 5)
-#define CHARGERUSB_CTRL2_VITERM_150    (2 << 5)
-#define CHARGERUSB_CTRL2_VITERM_400    (7 << 5)
-/* CONTROLLER_CTRL1 */
-#define CONTROLLER_CTRL1_EN_CHARGER    (1 << 4)
-#define CONTROLLER_CTRL1_SEL_CHARGER   (1 << 3)
-/* CONTROLLER_STAT1 */
-#define CHRG_EXTCHRG_STATZ     (1 << 7)
-#define CHRG_DET_N             (1 << 5)
-#define VAC_DET                        (1 << 3)
-#define VBUS_DET               (1 << 2)
-
-#define FG_REG_10      0xCA
-#define FG_REG_11      0xCB
-
-#define TOGGLE1                0x90
-#define FGS            (1 << 5)
-#define FGR            (1 << 4)
-#define GPADCS         (1 << 1)
-#define GPADCR         (1 << 0)
-
-#define CTRL_P2                0x34
-#define CTRL_P2_SP2    (1 << 2)
-#define CTRL_P2_EOCP2  (1 << 1)
-#define CTRL_P2_BUSY   (1 << 0)
-
-#define TWL6032_CTRL_P1        0x36
-#define CTRL_P1_SP1    (1 << 3)
-
-#define GPCH0_LSB      0x57
-#define GPCH0_MSB      0x58
-
-#define TWL6032_GPCH0_LSB      0x3b
-
-#define TWL6032_GPSELECT_ISB   0x35
-
-#define USB_PRODUCT_ID_LSB     0x02
-
-#define TWL6030_GPADC_VBAT_CHNL        0x07
-#define TWL6032_GPADC_VBAT_CHNL        0x12
-
-#define TWL6030_GPADC_CTRL     0x2e
-#define TWL6032_GPADC_CTRL2    0x2f
-#define GPADC_CTRL2_CH18_SCALER_EN     (1 << 2)
-#define GPADC_CTRL_SCALER_DIV4         (1 << 3)
-
-#define TWL6030_VBAT_MULT      40 * 1000
-#define TWL6032_VBAT_MULT      25 * 1000
-
-#define TWL6030_VBAT_SHIFT     (10 + 3)
-#define TWL6032_VBAT_SHIFT     (12 + 2)
-
-enum twl603x_chip_type{
-       chip_TWL6030,
-       chip_TWL6032,
-       chip_TWL603X_cnt
-};
-
-struct twl6030_data{
-       u8 chip_type;
-       u8 adc_rbase;
-       u8 adc_ctrl;
-       u8 adc_enable;
-       int vbat_mult;
-       int vbat_shift;
-};
-
-/* Functions to read and write from TWL6030 */
-#if !CONFIG_IS_ENABLED(DM_I2C)
-static inline int twl6030_i2c_write_u8(u8 chip_no, u8 reg, u8 val)
-{
-       return i2c_write(chip_no, reg, 1, &val, 1);
-}
-
-static inline int twl6030_i2c_read_u8(u8 chip_no, u8 reg, u8 *val)
-{
-       return i2c_read(chip_no, reg, 1, val, 1);
-}
-#else
-int twl6030_i2c_write_u8(u8 chip_no, u8 reg, u8 val);
-int twl6030_i2c_read_u8(u8 chip_no, u8 reg, u8 *val);
-#endif
-
-/*
- * Power
- */
-
-void twl6030_power_off(void);
-void twl6030_init_battery_charging(void);
-void twl6030_usb_device_settings(void);
-void twl6030_start_usb_charging(void);
-void twl6030_stop_usb_charging(void);
-int twl6030_get_battery_voltage(void);
-int twl6030_get_battery_current(void);
-void twl6030_power_mmc_init(int dev_index);
-
-/*
- * Input
- */
-
-int twl6030_input_power_button(void);
-int twl6030_input_charger(void);
-int twl6030_input_usb(void);
-
-#endif /* TWL6030_H */