Skip to contentSkip to conversation

arm: Remove omap4_panda board

PATCH In review Tom Rini 3 participants 8 messages Jul 15, 2024 – Jul 17, 2024

Subsystems (9)
lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/5 arm: Remove omap4_panda board

This board has not been converted to CONFIG_DM_I2C by the deadline. Remove it.

---
 arch/arm/dts/Makefile                |   4 -
 arch/arm/dts/omap4-panda-common.dtsi | 573 ---------------------------
 arch/arm/dts/omap4-panda-es.dts      |  82 ----
 arch/arm/dts/omap4-panda.dts         |  13 -
 arch/arm/mach-omap2/omap4/Kconfig    |   4 -
 board/ti/panda/Kconfig               |  14 -
 board/ti/panda/MAINTAINERS           |   6 -
 board/ti/panda/Makefile              |   6 -
 board/ti/panda/panda.c               | 322 ---------------
 board/ti/panda/panda_mux_data.h      |  86 ----
 configs/omap4_panda_defconfig        |  54 ---
 include/configs/omap4_panda.h        |  16 -
 12 files changed, 1180 deletions(-)
 delete mode 100644 arch/arm/dts/omap4-panda-common.dtsi
 delete mode 100644 arch/arm/dts/omap4-panda-es.dts
 delete mode 100644 arch/arm/dts/omap4-panda.dts
 delete mode 100644 board/ti/panda/Kconfig
 delete mode 100644 board/ti/panda/MAINTAINERS
 delete mode 100644 board/ti/panda/Makefile
 delete mode 100644 board/ti/panda/panda.c
 delete mode 100644 board/ti/panda/panda_mux_data.h
 delete mode 100644 configs/omap4_panda_defconfig
 delete mode 100644 include/configs/omap4_panda.h
arch/arm/dts/Makefile +0 -4
index 4a4d5be2bd63..67b978470f4c 100644
@@ -1017,10 +1017,6 @@ dtb-$(CONFIG_TARGET_OMAP3_BEAGLE) += \
 
 dtb-$(CONFIG_TARGET_DEVKIT8000) += omap3-devkit8000.dtb
 
-dtb-$(CONFIG_TARGET_OMAP4_PANDA) += \
-	omap4-panda.dtb \
-	omap4-panda-es.dtb
-
 dtb-$(CONFIG_TARGET_OMAP4_SDP4430) += \
 	omap4-sdp.dtb \
 	omap4-sdp-es23plus.dtb
arch/arm/dts/omap4-panda-common.dtsi deleted +0 -573

573 lines not on this page · raw message

arch/arm/dts/omap4-panda-es.dts deleted +0 -82

82 lines not on this page · raw message

arch/arm/dts/omap4-panda.dts deleted +0 -13
deleted file mode 100644
index 529d5bcceaaf..000000000000
@@ -1,13 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (C) 2011 Texas Instruments Incorporated - https://www.ti.com/
- */
-/dts-v1/;
-
-#include "omap443x.dtsi"
-#include "omap4-panda-common.dtsi"
-
-/ {
-	model = "TI OMAP4 PandaBoard";
-	compatible = "ti,omap4-panda", "ti,omap4430", "ti,omap4";
-};
arch/arm/mach-omap2/omap4/Kconfig +0 -4
index cdac11c6b62b..5c5ac4ff33dd 100644
@@ -4,9 +4,6 @@ choice
 	prompt "OMAP4 board select"
 	optional
 
-config TARGET_OMAP4_PANDA
-	bool "TI OMAP4 PandaBoard"
-
 config TARGET_OMAP4_SDP4430
 	bool "TI OMAP4 SDP4430"
 
@@ -15,7 +12,6 @@ endchoice
 config SYS_SOC
 	default "omap4"
 
-source "board/ti/panda/Kconfig"
 source "board/ti/sdp4430/Kconfig"
 
 endif
board/ti/panda/Kconfig deleted +0 -14
deleted file mode 100644
index 5912f69babe2..000000000000
@@ -1,14 +0,0 @@
-if TARGET_OMAP4_PANDA
-
-config SYS_BOARD
-	default "panda"
-
-config SYS_VENDOR
-	default "ti"
-
-config SYS_CONFIG_NAME
-	default "omap4_panda"
-
-source "board/ti/common/Kconfig"
-
-endif
board/ti/panda/MAINTAINERS deleted +0 -6
deleted file mode 100644
index 8b8cf7daf6d3..000000000000
@@ -1,6 +0,0 @@
-PANDA BOARD
-M:	Tom Rini <[email protected]>
-S:	Maintained
-F:	board/ti/panda/
-F:	include/configs/omap4_panda.h
-F:	configs/omap4_panda_defconfig
board/ti/panda/Makefile deleted +0 -6
deleted file mode 100644
index dd2ff33afaa4..000000000000
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000, 2001, 2002
-# Wolfgang Denk, DENX Software Engineering, [email protected].
-
-obj-y	:= panda.o
board/ti/panda/panda.c deleted +0 -322

322 lines not on this page · raw message

board/ti/panda/panda_mux_data.h deleted +0 -86

86 lines not on this page · raw message

configs/omap4_panda_defconfig deleted +0 -54

54 lines not on this page · raw message

include/configs/omap4_panda.h deleted +0 -16
deleted file mode 100644
index 69749ab63022..000000000000
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2010
- * Texas Instruments Incorporated.
- * Steve Sakoman  <[email protected]>
- *
- * Configuration settings for the TI OMAP4 Panda board.
- * See ti_omap4_common.h for OMAP4 common part
- */
-
-#ifndef __CONFIG_PANDA_H
-#define __CONFIG_PANDA_H
-
-#include <configs/ti_omap4_common.h>
-
-#endif /* __CONFIG_PANDA_H */
Signature · 1 line
2.34.1
author
#1 lore raw

PATCH 2/5 arm: Remove omap4_sdp4430 board

This board has not been converted to CONFIG_DM_I2C by the deadline. Remove it.

---
 arch/arm/dts/Makefile                |    4 -
 arch/arm/dts/elpida_ecb240abacn.dtsi |   68 -
 arch/arm/dts/omap4-l4-abe.dtsi       |  488 -----
 arch/arm/dts/omap4-l4.dtsi           | 2473 --------------------------
 arch/arm/dts/omap4-mcpdm.dtsi        |   44 -
 arch/arm/dts/omap4-sdp-es23plus.dts  |   14 -
 arch/arm/dts/omap4-sdp.dts           |  717 --------
 arch/arm/dts/omap4-u-boot.dtsi       |   47 -
 arch/arm/dts/omap4.dtsi              |  663 -------
 arch/arm/dts/omap443x-clocks.dtsi    |   16 -
 arch/arm/dts/omap443x.dtsi           |   73 -
 arch/arm/dts/omap4460.dtsi           |  128 --
 arch/arm/dts/omap446x-clocks.dtsi    |   24 -
 arch/arm/dts/omap44xx-clocks.dtsi    | 1324 --------------
 arch/arm/dts/twl6030.dtsi            |  105 --
 arch/arm/dts/twl6030_omap4.dtsi      |   35 -
 arch/arm/mach-omap2/omap4/Kconfig    |   10 -
 board/ti/sdp4430/Kconfig             |   17 -
 board/ti/sdp4430/MAINTAINERS         |    6 -
 board/ti/sdp4430/Makefile            |   10 -
 board/ti/sdp4430/cmd_bat.c           |   40 -
 board/ti/sdp4430/sdp.c               |  114 --
 board/ti/sdp4430/sdp4430_mux_data.h  |   67 -
 configs/omap4_sdp4430_defconfig      |   51 -
 include/configs/omap4_sdp4430.h      |   23 -
 25 files changed, 6561 deletions(-)
 delete mode 100644 arch/arm/dts/elpida_ecb240abacn.dtsi
 delete mode 100644 arch/arm/dts/omap4-l4-abe.dtsi
 delete mode 100644 arch/arm/dts/omap4-l4.dtsi
 delete mode 100644 arch/arm/dts/omap4-mcpdm.dtsi
 delete mode 100644 arch/arm/dts/omap4-sdp-es23plus.dts
 delete mode 100644 arch/arm/dts/omap4-sdp.dts
 delete mode 100644 arch/arm/dts/omap4-u-boot.dtsi
 delete mode 100644 arch/arm/dts/omap4.dtsi
 delete mode 100644 arch/arm/dts/omap443x-clocks.dtsi
 delete mode 100644 arch/arm/dts/omap443x.dtsi
 delete mode 100644 arch/arm/dts/omap4460.dtsi
 delete mode 100644 arch/arm/dts/omap446x-clocks.dtsi
 delete mode 100644 arch/arm/dts/omap44xx-clocks.dtsi
 delete mode 100644 arch/arm/dts/twl6030.dtsi
 delete mode 100644 arch/arm/dts/twl6030_omap4.dtsi
 delete mode 100644 board/ti/sdp4430/Kconfig
 delete mode 100644 board/ti/sdp4430/MAINTAINERS
 delete mode 100644 board/ti/sdp4430/Makefile
 delete mode 100644 board/ti/sdp4430/cmd_bat.c
 delete mode 100644 board/ti/sdp4430/sdp.c
 delete mode 100644 board/ti/sdp4430/sdp4430_mux_data.h
 delete mode 100644 configs/omap4_sdp4430_defconfig
 delete mode 100644 include/configs/omap4_sdp4430.h
arch/arm/dts/Makefile +0 -4
index 67b978470f4c..24a65c45a933 100644
@@ -1017,10 +1017,6 @@ dtb-$(CONFIG_TARGET_OMAP3_BEAGLE) += \
 
 dtb-$(CONFIG_TARGET_DEVKIT8000) += omap3-devkit8000.dtb
 
-dtb-$(CONFIG_TARGET_OMAP4_SDP4430) += \
-	omap4-sdp.dtb \
-	omap4-sdp-es23plus.dtb
-
 dtb-$(CONFIG_TARGET_SAMA7G5EK) += \
 	at91-sama7g5ek.dtb
 
arch/arm/dts/elpida_ecb240abacn.dtsi deleted +0 -68

68 lines not on this page · raw message

arch/arm/dts/omap4-l4-abe.dtsi deleted +0 -488

488 lines not on this page · raw message

arch/arm/dts/omap4-l4.dtsi deleted +0 -2473

2,434 lines not on this page · raw message

arch/arm/dts/omap4-mcpdm.dtsi deleted +0 -44

44 lines not on this page · raw message

arch/arm/dts/omap4-sdp-es23plus.dts deleted +0 -14
deleted file mode 100644
index 869f6279b5be..000000000000

Lines of this file are not shown. View the raw message.

arch/arm/dts/omap4-sdp.dts deleted +0 -717

717 lines not on this page · raw message

arch/arm/dts/omap4-u-boot.dtsi deleted +0 -47

47 lines not on this page · raw message

arch/arm/dts/omap4.dtsi deleted +0 -663

663 lines not on this page · raw message

arch/arm/dts/omap443x-clocks.dtsi deleted +0 -16
deleted file mode 100644
index 581e088231b5..000000000000

Lines of this file are not shown. View the raw message.

arch/arm/dts/omap443x.dtsi deleted +0 -73

73 lines not on this page · raw message

arch/arm/dts/omap4460.dtsi deleted +0 -128

128 lines not on this page · raw message

arch/arm/dts/omap446x-clocks.dtsi deleted +0 -24
deleted file mode 100644
index 0f41714cffbb..000000000000

Lines of this file are not shown. View the raw message.

arch/arm/dts/omap44xx-clocks.dtsi deleted +0 -1324

1,324 lines not on this page · raw message

arch/arm/dts/twl6030.dtsi deleted +0 -105

105 lines not on this page · raw message

arch/arm/dts/twl6030_omap4.dtsi deleted +0 -35
deleted file mode 100644
index 5730e46b0067..000000000000

Lines of this file are not shown. View the raw message.

arch/arm/mach-omap2/omap4/Kconfig +0 -10
index 5c5ac4ff33dd..3f91c4c29760 100644

Lines of this file are not shown. View the raw message.

board/ti/sdp4430/Kconfig deleted +0 -17
deleted file mode 100644
index 65e9107bc1b0..000000000000

Lines of this file are not shown. View the raw message.

board/ti/sdp4430/MAINTAINERS deleted +0 -6
deleted file mode 100644
index d8b8fe600ed7..000000000000

Lines of this file are not shown. View the raw message.

board/ti/sdp4430/Makefile deleted +0 -10
deleted file mode 100644
index ae06945612a3..000000000000

Lines of this file are not shown. View the raw message.

board/ti/sdp4430/cmd_bat.c deleted +0 -40
deleted file mode 100644
index 6bf44d926550..000000000000

Lines of this file are not shown. View the raw message.

board/ti/sdp4430/sdp.c deleted +0 -114

114 lines not on this page · raw message

board/ti/sdp4430/sdp4430_mux_data.h deleted +0 -67

67 lines not on this page · raw message

configs/omap4_sdp4430_defconfig deleted +0 -51

51 lines not on this page · raw message

include/configs/omap4_sdp4430.h deleted +0 -23
deleted file mode 100644
index fb210ce69b3c..000000000000

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.34.1

Part of the diff is not shown here. View the raw message.

author
#2 lore raw

PATCH 3/5 arm: ti: Remove omap4 platform support

In reply to Tom Rini

There are no longer any OMAP4 platforms in U-Boot, remove the related functionality.

---
 arch/arm/include/asm/arch-omap4/clock.h       | 250 ----------
 arch/arm/include/asm/arch-omap4/cpu.h         | 109 -----
 arch/arm/include/asm/arch-omap4/ehci.h        |  38 --
 arch/arm/include/asm/arch-omap4/gpio.h        |  34 --
 arch/arm/include/asm/arch-omap4/hardware.h    |  25 -
 arch/arm/include/asm/arch-omap4/i2c.h         |  11 -
 arch/arm/include/asm/arch-omap4/mem.h         |  61 ---
 .../arm/include/asm/arch-omap4/mmc_host_def.h |  38 --
 arch/arm/include/asm/arch-omap4/mux_omap4.h   | 328 -------------
 arch/arm/include/asm/arch-omap4/omap.h        | 143 ------
 arch/arm/include/asm/arch-omap4/spl.h         |  22 -
 arch/arm/include/asm/arch-omap4/sys_proto.h   |  71 ---
 arch/arm/include/asm/omap_common.h            |  16 +-
 arch/arm/mach-omap2/Kconfig                   |  27 +-
 arch/arm/mach-omap2/Makefile                  |   3 +-
 arch/arm/mach-omap2/emif-common.c             |   4 -
 arch/arm/mach-omap2/omap4/Kconfig             |   7 -
 arch/arm/mach-omap2/omap4/Makefile            |  11 -
 arch/arm/mach-omap2/omap4/boot.c              | 103 ----
 arch/arm/mach-omap2/omap4/emif.c              | 109 -----
 arch/arm/mach-omap2/omap4/hw_data.c           | 460 ------------------
 arch/arm/mach-omap2/omap4/hwinit.c            | 186 -------
 arch/arm/mach-omap2/omap4/prcm-regs.c         | 306 ------------
 arch/arm/mach-omap2/omap4/sdram_elpida.c      | 323 ------------
 common/spl/Kconfig                            |   4 +-
 drivers/i2c/Kconfig                           |   2 +-
 drivers/mmc/Kconfig                           |   2 +-
 drivers/mmc/omap_hsmmc.c                      |  13 +-
 drivers/power/Kconfig                         |   4 -
 drivers/power/Makefile                        |   1 -
 drivers/power/twl6030.c                       | 311 ------------
 drivers/serial/ns16550.c                      |   3 +-
 drivers/usb/musb-new/linux-compat.h           |   4 -
 drivers/usb/musb-new/musb_core.c              |   2 +-
 drivers/usb/musb-new/musb_core.h              |   2 +-
 drivers/usb/musb-new/omap2430.c               |  12 -
 drivers/usb/musb/omap3.c                      |  15 -
 include/twl6030.h                             | 224 ---------
 38 files changed, 22 insertions(+), 3262 deletions(-)
 delete mode 100644 arch/arm/include/asm/arch-omap4/clock.h
 delete mode 100644 arch/arm/include/asm/arch-omap4/cpu.h
 delete mode 100644 arch/arm/include/asm/arch-omap4/ehci.h
 delete mode 100644 arch/arm/include/asm/arch-omap4/gpio.h
 delete mode 100644 arch/arm/include/asm/arch-omap4/hardware.h
 delete mode 100644 arch/arm/include/asm/arch-omap4/i2c.h
 delete mode 100644 arch/arm/include/asm/arch-omap4/mem.h
 delete mode 100644 arch/arm/include/asm/arch-omap4/mmc_host_def.h
 delete mode 100644 arch/arm/include/asm/arch-omap4/mux_omap4.h
 delete mode 100644 arch/arm/include/asm/arch-omap4/omap.h
 delete mode 100644 arch/arm/include/asm/arch-omap4/spl.h
 delete mode 100644 arch/arm/include/asm/arch-omap4/sys_proto.h
 delete mode 100644 arch/arm/mach-omap2/omap4/Kconfig
 delete mode 100644 arch/arm/mach-omap2/omap4/Makefile
 delete mode 100644 arch/arm/mach-omap2/omap4/boot.c
 delete mode 100644 arch/arm/mach-omap2/omap4/emif.c
 delete mode 100644 arch/arm/mach-omap2/omap4/hw_data.c
 delete mode 100644 arch/arm/mach-omap2/omap4/hwinit.c
 delete mode 100644 arch/arm/mach-omap2/omap4/prcm-regs.c
 delete mode 100644 arch/arm/mach-omap2/omap4/sdram_elpida.c
 delete mode 100644 drivers/power/twl6030.c
 delete mode 100644 include/twl6030.h
arch/arm/include/asm/arch-omap4/clock.h deleted +0 -250
deleted file mode 100644
index 4054dd8edcbc..000000000000
@@ -1,250 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2010
- * Texas Instruments, <www.ti.com>
- *
- * Aneesh V <[email protected]>
- */
-#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_ */
arch/arm/include/asm/arch-omap4/cpu.h deleted +0 -109

109 lines not on this page · raw message

arch/arm/include/asm/arch-omap4/ehci.h deleted +0 -38
deleted file mode 100644
index e8fe88f2afc4..000000000000
@@ -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 <[email protected]>
- */
-
-#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_ */
arch/arm/include/asm/arch-omap4/gpio.h deleted +0 -34
deleted file mode 100644
index aceb3e227c9e..000000000000
@@ -1,34 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Copyright (c) 2009 Wind River Systems, Inc.
- * Tom Rix <[email protected]>
- *
- * 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ä <[email protected]>
- */
-#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 */
arch/arm/include/asm/arch-omap4/hardware.h deleted +0 -25
deleted file mode 100644
index 67e3dae7bcea..000000000000
@@ -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
arch/arm/include/asm/arch-omap4/i2c.h deleted +0 -11
deleted file mode 100644
index c8f2f9716f12..000000000000
@@ -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_ */
arch/arm/include/asm/arch-omap4/mem.h deleted +0 -61

61 lines not on this page · raw message

arch/arm/include/asm/arch-omap4/mmc_host_def.h deleted +0 -38
deleted file mode 100644
index d06779956f6e..000000000000
@@ -1,38 +0,0 @@
-/*
- * (C) Copyright 2010
- * Texas Instruments, <www.ti.com>
- * Syed Mohammed Khasim <[email protected]>
- *
- * 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 */
arch/arm/include/asm/arch-omap4/mux_omap4.h deleted +0 -328

328 lines not on this page · raw message

arch/arm/include/asm/arch-omap4/omap.h deleted +0 -143

143 lines not on this page · raw message

arch/arm/include/asm/arch-omap4/spl.h deleted +0 -22
deleted file mode 100644
index d24944af0ae8..000000000000
@@ -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
arch/arm/include/asm/arch-omap4/sys_proto.h deleted +0 -71

71 lines not on this page · raw message

arch/arm/include/asm/omap_common.h +8 -8
index 17fdfbcffb7a..dc00f4707267 100644
@@ -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);
arch/arm/mach-omap2/Kconfig +1 -26
index 8465b5426d81..c07dd68e6cee 100644
@@ -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"
arch/arm/mach-omap2/Makefile +1 -2
index 8c10c694dffb..d683c64566a1 100644
@@ -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
arch/arm/mach-omap2/emif-common.c +0 -4
index 4d431e20779d..a60eb990f0b4 100644
@@ -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) ==
arch/arm/mach-omap2/omap4/Kconfig deleted +0 -7
deleted file mode 100644
index 3f91c4c29760..000000000000
@@ -1,7 +0,0 @@
-if OMAP44XX
-
-config SYS_SOC
-	default "omap4"
-
-
-endif
arch/arm/mach-omap2/omap4/Makefile deleted +0 -11
deleted file mode 100644
index 0ed3fc768daa..000000000000
@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000-2010
-# Wolfgang Denk, DENX Software Engineering, [email protected].
-
-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
arch/arm/mach-omap2/omap4/boot.c deleted +0 -103

103 lines not on this page · raw message

arch/arm/mach-omap2/omap4/emif.c deleted +0 -109

109 lines not on this page · raw message

arch/arm/mach-omap2/omap4/hw_data.c deleted +0 -460

460 lines not on this page · raw message

arch/arm/mach-omap2/omap4/hwinit.c deleted +0 -186

186 lines not on this page · raw message

arch/arm/mach-omap2/omap4/prcm-regs.c deleted +0 -306

306 lines not on this page · raw message

arch/arm/mach-omap2/omap4/sdram_elpida.c deleted +0 -323

323 lines not on this page · raw message

common/spl/Kconfig +2 -2
index af43b5f5d3c9..6f56ca911c1e 100644
@@ -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
drivers/i2c/Kconfig +1 -1
index 34b02114dc69..cba7f848942f 100644
@@ -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.
drivers/mmc/Kconfig +1 -1
index 8b13a0821ee0..982e84dc3bcc 100644
@@ -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
drivers/mmc/omap_hsmmc.c +5 -8
index 2b7f9fc9a205..8e51453d2aee 100644
@@ -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)
drivers/power/Kconfig +0 -4
index 33b8bc1214d2..cc1c12455baf 100644
@@ -434,10 +434,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
drivers/power/Makefile +0 -1
index c7ee4595fc8f..61363ca699e1 100644
@@ -19,7 +19,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
drivers/power/twl6030.c deleted +0 -311

130 lines not on this page · raw message

drivers/serial/ns16550.c +1 -2
index 42b69719dd71..6fcb5b523acb 100644

Lines of this file are not shown. View the raw message.

drivers/usb/musb-new/linux-compat.h +0 -4
index 8829567bfb68..40e238f86a84 100644

Lines of this file are not shown. View the raw message.

drivers/usb/musb-new/musb_core.c +1 -1
index 257e7685cfa3..72caf0e7bd30 100644

Lines of this file are not shown. View the raw message.

drivers/usb/musb-new/musb_core.h +1 -1
index adfd81b85448..96ee13982648 100644

Lines of this file are not shown. View the raw message.

drivers/usb/musb-new/omap2430.c +0 -12
index 96771c28cefd..ba600d011023 100644

Lines of this file are not shown. View the raw message.

drivers/usb/musb/omap3.c +0 -15
index 080bd78523c9..60e245dee462 100644

Lines of this file are not shown. View the raw message.

include/twl6030.h deleted +0 -224

224 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.34.1

Part of the diff is not shown here. View the raw message.

author
#3 lore raw

PATCH 4/5 arm: Remove devkit3250 board

In reply to Tom Rini

This board has not been converted to CONFIG_DM_I2C by the deadline. Remove it.

---
Cc: Vladimir Zapolskiy <[email protected]>

---
 arch/arm/mach-lpc32xx/Kconfig           |  4 --
 board/timll/devkit3250/Kconfig          | 12 ----
 board/timll/devkit3250/MAINTAINERS      |  6 --
 board/timll/devkit3250/Makefile         |  7 --
 board/timll/devkit3250/devkit3250.c     | 83 ----------------------
 board/timll/devkit3250/devkit3250_spl.c | 66 -----------------
 configs/devkit3250_defconfig            | 93 ------------------------
 include/configs/devkit3250.h            | 94 -------------------------
 8 files changed, 365 deletions(-)
 delete mode 100644 board/timll/devkit3250/Kconfig
 delete mode 100644 board/timll/devkit3250/MAINTAINERS
 delete mode 100644 board/timll/devkit3250/Makefile
 delete mode 100644 board/timll/devkit3250/devkit3250.c
 delete mode 100644 board/timll/devkit3250/devkit3250_spl.c
 delete mode 100644 configs/devkit3250_defconfig
 delete mode 100644 include/configs/devkit3250.h
arch/arm/mach-lpc32xx/Kconfig +0 -4
index 185bda41c224..f34c6728f420 100644
@@ -6,9 +6,6 @@ config SYS_SOC
 choice
 	prompt "NXP LPC32xx board select"
 
-config TARGET_DEVKIT3250
-	bool "Timll DevKit3250"
-
 config TARGET_WORK_92105
 	bool "Work Microwave Work_92105"
 
@@ -17,7 +14,6 @@ config TARGET_EA_LPC3250DEVKITV2
 
 endchoice
 
-source "board/timll/devkit3250/Kconfig"
 source "board/work-microwave/work_92105/Kconfig"
 source "board/ea/ea-lpc3250devkitv2/Kconfig"
 
board/timll/devkit3250/Kconfig deleted +0 -12
deleted file mode 100644
index 5129c2dcae54..000000000000
@@ -1,12 +0,0 @@
-if TARGET_DEVKIT3250
-
-config SYS_BOARD
-	default "devkit3250"
-
-config SYS_VENDOR
-	default "timll"
-
-config SYS_CONFIG_NAME
-	default "devkit3250"
-
-endif
board/timll/devkit3250/MAINTAINERS deleted +0 -6
deleted file mode 100644
index cb93563feda5..000000000000
@@ -1,6 +0,0 @@
-DEVKIT3250 BOARD
-M:	Vladimir Zapolskiy <[email protected]>
-S:	Maintained
-F:	board/timll/devkit3250/
-F:	include/configs/devkit3250.h
-F:	configs/devkit3250_defconfig
board/timll/devkit3250/Makefile deleted +0 -7
deleted file mode 100644
index 056813995eb8..000000000000
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright (C) 2011 by Vladimir Zapolskiy <[email protected]>
-# Copyright (C) 2008, Guennadi Liakhovetski <[email protected]>
-
-obj-y	:= devkit3250.o
-obj-$(CONFIG_SPL_BUILD) += devkit3250_spl.o
board/timll/devkit3250/devkit3250.c deleted +0 -83

83 lines not on this page · raw message

board/timll/devkit3250/devkit3250_spl.c deleted +0 -66

66 lines not on this page · raw message

configs/devkit3250_defconfig deleted +0 -93

93 lines not on this page · raw message

include/configs/devkit3250.h deleted +0 -94

94 lines not on this page · raw message

Signature · 1 line
2.34.1
author
#4 lore raw

PATCH 5/5 arm: Remove omap3_beagle board

In reply to Tom Rini

This board has not been converted to CONFIG_DM_I2C by the deadline. Remove it.

---
Cc: Robert Nelson <[email protected]>

---
 arch/arm/dts/Makefile                       |   5 -
 arch/arm/dts/omap3-beagle-u-boot.dtsi       |  14 -
 arch/arm/dts/omap3-beagle-xm-ab-u-boot.dtsi |  14 -
 arch/arm/dts/omap3-beagle-xm-ab.dts         |  13 -
 arch/arm/dts/omap3-beagle-xm-u-boot.dtsi    |  14 -
 arch/arm/dts/omap3-beagle-xm.dts            | 406 ---------------
 arch/arm/dts/omap3-beagle.dts               | 433 ----------------
 arch/arm/mach-omap2/omap3/Kconfig           |  10 -
 board/beagle/beagle/Kconfig                 |  12 -
 board/beagle/beagle/MAINTAINERS             |   6 -
 board/beagle/beagle/Makefile                |   7 -
 board/beagle/beagle/beagle.c                | 503 ------------------
 board/beagle/beagle/beagle.h                | 545 --------------------
 board/beagle/beagle/led.c                   |  70 ---
 configs/omap3_beagle_defconfig              | 115 -----
 include/configs/omap3_beagle.h              | 200 -------
 16 files changed, 2367 deletions(-)
 delete mode 100644 arch/arm/dts/omap3-beagle-u-boot.dtsi
 delete mode 100644 arch/arm/dts/omap3-beagle-xm-ab-u-boot.dtsi
 delete mode 100644 arch/arm/dts/omap3-beagle-xm-ab.dts
 delete mode 100644 arch/arm/dts/omap3-beagle-xm-u-boot.dtsi
 delete mode 100644 arch/arm/dts/omap3-beagle-xm.dts
 delete mode 100644 arch/arm/dts/omap3-beagle.dts
 delete mode 100644 board/beagle/beagle/Kconfig
 delete mode 100644 board/beagle/beagle/MAINTAINERS
 delete mode 100644 board/beagle/beagle/Makefile
 delete mode 100644 board/beagle/beagle/beagle.c
 delete mode 100644 board/beagle/beagle/beagle.h
 delete mode 100644 board/beagle/beagle/led.c
 delete mode 100644 configs/omap3_beagle_defconfig
 delete mode 100644 include/configs/omap3_beagle.h
arch/arm/dts/Makefile +0 -5
index 24a65c45a933..7936188f79e6 100644
@@ -1010,11 +1010,6 @@ dtb-$(CONFIG_TARGET_OMAP3_EVM) += \
 	omap3-evm-37xx.dtb \
 	omap3-evm.dtb
 
-dtb-$(CONFIG_TARGET_OMAP3_BEAGLE) += \
-	omap3-beagle-xm-ab.dtb \
-	omap3-beagle-xm.dtb \
-	omap3-beagle.dtb
-
 dtb-$(CONFIG_TARGET_DEVKIT8000) += omap3-devkit8000.dtb
 
 dtb-$(CONFIG_TARGET_SAMA7G5EK) += \
arch/arm/dts/omap3-beagle-u-boot.dtsi deleted +0 -14
deleted file mode 100644
index 2c03701c896a..000000000000
@@ -1,14 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * U-Boot additions
- *
- * (C) Copyright 2017 Derald D. Woods <[email protected]>
- */
-
-#include "omap3-u-boot.dtsi"
-
-/ {
-	chosen {
-		stdout-path = &uart3;
-	};
-};
arch/arm/dts/omap3-beagle-xm-ab-u-boot.dtsi deleted +0 -14
deleted file mode 100644
index 2c03701c896a..000000000000
@@ -1,14 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * U-Boot additions
- *
- * (C) Copyright 2017 Derald D. Woods <[email protected]>
- */
-
-#include "omap3-u-boot.dtsi"
-
-/ {
-	chosen {
-		stdout-path = &uart3;
-	};
-};
arch/arm/dts/omap3-beagle-xm-ab.dts deleted +0 -13
deleted file mode 100644
index cb6968a8bce8..000000000000
@@ -1,13 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (C) 2011 Texas Instruments Incorporated - https://www.ti.com/
- */
-
-#include "omap3-beagle-xm.dts"
-
-/ {
-	/* HS USB Port 2 Power enable was inverted with the xM C */
-	hsusb2_power: hsusb2_power_reg {
-		enable-active-high;
-	};
-};
arch/arm/dts/omap3-beagle-xm-u-boot.dtsi deleted +0 -14
deleted file mode 100644
index 2c03701c896a..000000000000
@@ -1,14 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * U-Boot additions
- *
- * (C) Copyright 2017 Derald D. Woods <[email protected]>
- */
-
-#include "omap3-u-boot.dtsi"
-
-/ {
-	chosen {
-		stdout-path = &uart3;
-	};
-};
arch/arm/dts/omap3-beagle-xm.dts deleted +0 -406

406 lines not on this page · raw message

arch/arm/dts/omap3-beagle.dts deleted +0 -433

433 lines not on this page · raw message

arch/arm/mach-omap2/omap3/Kconfig +0 -10
index 850ee76746ee..f15f44fe7d4b 100644
@@ -34,15 +34,6 @@ config TARGET_AM3517_EVM
 	select DM_SERIAL
 	imply CMD_DM
 
-config TARGET_OMAP3_BEAGLE
-	bool "TI OMAP3 BeagleBoard"
-	select DM
-	select DM_GPIO
-	select DM_SERIAL
-	select OMAP3_GPIO_5
-	select OMAP3_GPIO_6
-	imply CMD_DM
-
 config TARGET_CM_T35
 	bool "CompuLab CM-T3530 and CM-T3730 boards"
 	select OMAP3_GPIO_2
@@ -153,7 +144,6 @@ config SYS_SOC
 	default "omap3"
 
 source "board/logicpd/am3517evm/Kconfig"
-source "board/beagle/beagle/Kconfig"
 source "board/timll/devkit8000/Kconfig"
 source "board/ti/omap3evm/Kconfig"
 source "board/isee/igep00x0/Kconfig"
board/beagle/beagle/Kconfig deleted +0 -12
deleted file mode 100644
index eade599dc934..000000000000
@@ -1,12 +0,0 @@
-if TARGET_OMAP3_BEAGLE
-
-config SYS_BOARD
-	default "beagle"
-
-config SYS_VENDOR
-	default "beagle"
-
-config SYS_CONFIG_NAME
-	default "omap3_beagle"
-
-endif
board/beagle/beagle/MAINTAINERS deleted +0 -6
deleted file mode 100644
index c7fa87acfcc8..000000000000
@@ -1,6 +0,0 @@
-BEAGLE BOARD
-M:	Tom Rini <[email protected]>
-S:	Maintained
-F:	board/beagle/beagle/
-F:	include/configs/omap3_beagle.h
-F:	configs/omap3_beagle_defconfig
board/beagle/beagle/Makefile deleted +0 -7
deleted file mode 100644
index fc9288cf1863..000000000000
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000, 2001, 2002
-# Wolfgang Denk, DENX Software Engineering, [email protected].
-
-obj-y	:= beagle.o
-obj-$(CONFIG_LED_STATUS) += led.o
board/beagle/beagle/beagle.c deleted +0 -503

503 lines not on this page · raw message

board/beagle/beagle/beagle.h deleted +0 -545

545 lines not on this page · raw message

board/beagle/beagle/led.c deleted +0 -70

70 lines not on this page · raw message

configs/omap3_beagle_defconfig deleted +0 -115

115 lines not on this page · raw message

include/configs/omap3_beagle.h deleted +0 -200

200 lines not on this page · raw message

Signature · 1 line
2.34.1
Acked-by on v1 5/5
#5 lore raw

Re: [PATCH 5/5] arm: Remove omap3_beagle board

Quoted 5 lines · Tom Rini

This board has not been converted to CONFIG_DM_I2C by the deadline. Remove it.

It has to be done, has not been converted, if any active real users want to bring this back, it can be reverted.

Looking at the remaining armhf distros:

Buildroot; not in git tree
Arch Linux; 2016.11-1
Debian; 2024.01

CC'ing Vagrant Debian's u-boot maintainer..

Regards,

Signature · 2 lines
Robert Nelson
https://rcn-ee.com/
Acked-by on v1 1/5
#6 lore raw
In reply to Tom Rini
Quoted 5 lines · Tom Rini

This board has not been converted to CONFIG_DM_I2C by the deadline. Remove it.

It has to be done, has not been converted, if any active real users want to bring this back, it can be reverted.

This was also a fun board, as not every hardware revision had a matching ID change, and ES changed to incompatible memory mid cycle.. Watching from a fair we learned a lot for future Beagle's..

Looking at the remaining armhf distros:

Buildroot; 2021.04
Arch Linux; 2017.07-1
Debian; 2024.01

CC'ing Vagrant Debian's u-boot maintainer..

Regards,

Signature · 2 lines
Robert Nelson
https://rcn-ee.com/
#7 lore raw
In reply to Tom Rini

Hi Tom,

Quoted 21 lines · Tom Rini

This board has not been converted to CONFIG_DM_I2C by the deadline. Remove it.

---
 arch/arm/dts/Makefile                |   4 -
 arch/arm/dts/omap4-panda-common.dtsi | 573 ---------------------------
 arch/arm/dts/omap4-panda-es.dts      |  82 ----
 arch/arm/dts/omap4-panda.dts         |  13 -
 arch/arm/mach-omap2/omap4/Kconfig    |   4 -
 board/ti/panda/Kconfig               |  14 -
 board/ti/panda/MAINTAINERS           |   6 -
 board/ti/panda/Makefile              |   6 -
 board/ti/panda/panda.c               | 322 ---------------
 board/ti/panda/panda_mux_data.h      |  86 ----
 configs/omap4_panda_defconfig        |  54 ---
 include/configs/omap4_panda.h        |  16 -
 12 files changed, 1180 deletions(-)
 delete mode 100644 arch/arm/dts/omap4-panda-common.dtsi
 delete mode 100644 arch/arm/dts/omap4-panda-es.dts
Quoted 8 lines
 delete mode 100644 arch/arm/dts/omap4-panda.dts
 delete mode 100644 board/ti/panda/Kconfig
 delete mode 100644 board/ti/panda/MAINTAINERS
 delete mode 100644 board/ti/panda/Makefile
 delete mode 100644 board/ti/panda/panda.c
 delete mode 100644 board/ti/panda/panda_mux_data.h
 delete mode 100644 configs/omap4_panda_defconfig
 delete mode 100644 include/configs/omap4_panda.h

I'm very pleased to see this.

I happened to be looking at i2c deprecation (yet again!) the other day. I found the generation *before* the legacy SYS_I2C feature.

I will see if I can get it building, then send a series.

For SPL, I am thinking we may need a 'tiny' i2c a bit like the tiny mmc, e.g. supporting a single controller and simple read/write. I have never really looked at it in any detail as there is too much cruft in there.

Regards,
Simon