mirror of https://github.com/xemu-project/xemu.git
hw: Remove omap2 specific defines and enums
Remove some defines and enums that are OMAP2 specific and no longer used anywhere. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-id: 20240903160751.4100218-54-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell
parent
54196ade09
commit
be025ce676
include/hw/arm
|
|
@ -26,7 +26,6 @@
|
|||
#include "qom/object.h"
|
||||
|
||||
# define OMAP_EMIFS_BASE 0x00000000
|
||||
# define OMAP2_Q0_BASE 0x00000000
|
||||
# define OMAP_CS0_BASE 0x00000000
|
||||
# define OMAP_CS1_BASE 0x04000000
|
||||
# define OMAP_CS2_BASE 0x08000000
|
||||
|
|
@ -34,20 +33,12 @@
|
|||
# define OMAP_EMIFF_BASE 0x10000000
|
||||
# define OMAP_IMIF_BASE 0x20000000
|
||||
# define OMAP_LOCALBUS_BASE 0x30000000
|
||||
# define OMAP2_Q1_BASE 0x40000000
|
||||
# define OMAP2_L4_BASE 0x48000000
|
||||
# define OMAP2_SRAM_BASE 0x40200000
|
||||
# define OMAP2_L3_BASE 0x68000000
|
||||
# define OMAP2_Q2_BASE 0x80000000
|
||||
# define OMAP2_Q3_BASE 0xc0000000
|
||||
# define OMAP_MPUI_BASE 0xe1000000
|
||||
|
||||
# define OMAP730_SRAM_SIZE 0x00032000
|
||||
# define OMAP15XX_SRAM_SIZE 0x00030000
|
||||
# define OMAP16XX_SRAM_SIZE 0x00004000
|
||||
# define OMAP1611_SRAM_SIZE 0x0003e800
|
||||
# define OMAP242X_SRAM_SIZE 0x000a0000
|
||||
# define OMAP243X_SRAM_SIZE 0x00010000
|
||||
# define OMAP_CS0_SIZE 0x04000000
|
||||
# define OMAP_CS1_SIZE 0x04000000
|
||||
# define OMAP_CS2_SIZE 0x04000000
|
||||
|
|
@ -335,87 +326,6 @@ void omap_gpio_set_clk(Omap1GpioState *gpio, omap_clk clk);
|
|||
# define OMAP_INT_730_DMA_CH15 62
|
||||
# define OMAP_INT_730_NAND 63
|
||||
|
||||
/*
|
||||
* OMAP-24xx common IRQ numbers
|
||||
*/
|
||||
# define OMAP_INT_24XX_STI 4
|
||||
# define OMAP_INT_24XX_SYS_NIRQ 7
|
||||
# define OMAP_INT_24XX_L3_IRQ 10
|
||||
# define OMAP_INT_24XX_PRCM_MPU_IRQ 11
|
||||
# define OMAP_INT_24XX_SDMA_IRQ0 12
|
||||
# define OMAP_INT_24XX_SDMA_IRQ1 13
|
||||
# define OMAP_INT_24XX_SDMA_IRQ2 14
|
||||
# define OMAP_INT_24XX_SDMA_IRQ3 15
|
||||
# define OMAP_INT_243X_MCBSP2_IRQ 16
|
||||
# define OMAP_INT_243X_MCBSP3_IRQ 17
|
||||
# define OMAP_INT_243X_MCBSP4_IRQ 18
|
||||
# define OMAP_INT_243X_MCBSP5_IRQ 19
|
||||
# define OMAP_INT_24XX_GPMC_IRQ 20
|
||||
# define OMAP_INT_24XX_GUFFAW_IRQ 21
|
||||
# define OMAP_INT_24XX_IVA_IRQ 22
|
||||
# define OMAP_INT_24XX_EAC_IRQ 23
|
||||
# define OMAP_INT_24XX_CAM_IRQ 24
|
||||
# define OMAP_INT_24XX_DSS_IRQ 25
|
||||
# define OMAP_INT_24XX_MAIL_U0_MPU 26
|
||||
# define OMAP_INT_24XX_DSP_UMA 27
|
||||
# define OMAP_INT_24XX_DSP_MMU 28
|
||||
# define OMAP_INT_24XX_GPIO_BANK1 29
|
||||
# define OMAP_INT_24XX_GPIO_BANK2 30
|
||||
# define OMAP_INT_24XX_GPIO_BANK3 31
|
||||
# define OMAP_INT_24XX_GPIO_BANK4 32
|
||||
# define OMAP_INT_243X_GPIO_BANK5 33
|
||||
# define OMAP_INT_24XX_MAIL_U3_MPU 34
|
||||
# define OMAP_INT_24XX_WDT3 35
|
||||
# define OMAP_INT_24XX_WDT4 36
|
||||
# define OMAP_INT_24XX_GPTIMER1 37
|
||||
# define OMAP_INT_24XX_GPTIMER2 38
|
||||
# define OMAP_INT_24XX_GPTIMER3 39
|
||||
# define OMAP_INT_24XX_GPTIMER4 40
|
||||
# define OMAP_INT_24XX_GPTIMER5 41
|
||||
# define OMAP_INT_24XX_GPTIMER6 42
|
||||
# define OMAP_INT_24XX_GPTIMER7 43
|
||||
# define OMAP_INT_24XX_GPTIMER8 44
|
||||
# define OMAP_INT_24XX_GPTIMER9 45
|
||||
# define OMAP_INT_24XX_GPTIMER10 46
|
||||
# define OMAP_INT_24XX_GPTIMER11 47
|
||||
# define OMAP_INT_24XX_GPTIMER12 48
|
||||
# define OMAP_INT_24XX_PKA_IRQ 50
|
||||
# define OMAP_INT_24XX_SHA1MD5_IRQ 51
|
||||
# define OMAP_INT_24XX_RNG_IRQ 52
|
||||
# define OMAP_INT_24XX_MG_IRQ 53
|
||||
# define OMAP_INT_24XX_I2C1_IRQ 56
|
||||
# define OMAP_INT_24XX_I2C2_IRQ 57
|
||||
# define OMAP_INT_24XX_MCBSP1_IRQ_TX 59
|
||||
# define OMAP_INT_24XX_MCBSP1_IRQ_RX 60
|
||||
# define OMAP_INT_24XX_MCBSP2_IRQ_TX 62
|
||||
# define OMAP_INT_24XX_MCBSP2_IRQ_RX 63
|
||||
# define OMAP_INT_243X_MCBSP1_IRQ 64
|
||||
# define OMAP_INT_24XX_MCSPI1_IRQ 65
|
||||
# define OMAP_INT_24XX_MCSPI2_IRQ 66
|
||||
# define OMAP_INT_24XX_SSI1_IRQ0 67
|
||||
# define OMAP_INT_24XX_SSI1_IRQ1 68
|
||||
# define OMAP_INT_24XX_SSI2_IRQ0 69
|
||||
# define OMAP_INT_24XX_SSI2_IRQ1 70
|
||||
# define OMAP_INT_24XX_SSI_GDD_IRQ 71
|
||||
# define OMAP_INT_24XX_UART1_IRQ 72
|
||||
# define OMAP_INT_24XX_UART2_IRQ 73
|
||||
# define OMAP_INT_24XX_UART3_IRQ 74
|
||||
# define OMAP_INT_24XX_USB_IRQ_GEN 75
|
||||
# define OMAP_INT_24XX_USB_IRQ_NISO 76
|
||||
# define OMAP_INT_24XX_USB_IRQ_ISO 77
|
||||
# define OMAP_INT_24XX_USB_IRQ_HGEN 78
|
||||
# define OMAP_INT_24XX_USB_IRQ_HSOF 79
|
||||
# define OMAP_INT_24XX_USB_IRQ_OTG 80
|
||||
# define OMAP_INT_24XX_VLYNQ_IRQ 81
|
||||
# define OMAP_INT_24XX_MMC_IRQ 83
|
||||
# define OMAP_INT_24XX_MS_IRQ 84
|
||||
# define OMAP_INT_24XX_FAC_IRQ 85
|
||||
# define OMAP_INT_24XX_MCSPI3_IRQ 91
|
||||
# define OMAP_INT_243X_HS_USB_MC 92
|
||||
# define OMAP_INT_243X_HS_USB_DMA 93
|
||||
# define OMAP_INT_243X_CARKIT 94
|
||||
# define OMAP_INT_34XX_GPTIMER12 95
|
||||
|
||||
/* omap_dma.c */
|
||||
enum omap_dma_model {
|
||||
omap_dma_3_0,
|
||||
|
|
@ -568,74 +478,6 @@ struct omap_dma_lcd_channel_s {
|
|||
# define OMAP_DMA_MMC2_RX 55
|
||||
# define OMAP_DMA_CRYPTO_DES_OUT 56
|
||||
|
||||
/*
|
||||
* DMA request numbers for the OMAP2
|
||||
*/
|
||||
# define OMAP24XX_DMA_NO_DEVICE 0
|
||||
# define OMAP24XX_DMA_XTI_DMA 1 /* Not in OMAP2420 */
|
||||
# define OMAP24XX_DMA_EXT_DMAREQ0 2
|
||||
# define OMAP24XX_DMA_EXT_DMAREQ1 3
|
||||
# define OMAP24XX_DMA_GPMC 4
|
||||
# define OMAP24XX_DMA_GFX 5 /* Not in OMAP2420 */
|
||||
# define OMAP24XX_DMA_DSS 6
|
||||
# define OMAP24XX_DMA_VLYNQ_TX 7 /* Not in OMAP2420 */
|
||||
# define OMAP24XX_DMA_CWT 8 /* Not in OMAP2420 */
|
||||
# define OMAP24XX_DMA_AES_TX 9 /* Not in OMAP2420 */
|
||||
# define OMAP24XX_DMA_AES_RX 10 /* Not in OMAP2420 */
|
||||
# define OMAP24XX_DMA_DES_TX 11 /* Not in OMAP2420 */
|
||||
# define OMAP24XX_DMA_DES_RX 12 /* Not in OMAP2420 */
|
||||
# define OMAP24XX_DMA_SHA1MD5_RX 13 /* Not in OMAP2420 */
|
||||
# define OMAP24XX_DMA_EXT_DMAREQ2 14
|
||||
# define OMAP24XX_DMA_EXT_DMAREQ3 15
|
||||
# define OMAP24XX_DMA_EXT_DMAREQ4 16
|
||||
# define OMAP24XX_DMA_EAC_AC_RD 17
|
||||
# define OMAP24XX_DMA_EAC_AC_WR 18
|
||||
# define OMAP24XX_DMA_EAC_MD_UL_RD 19
|
||||
# define OMAP24XX_DMA_EAC_MD_UL_WR 20
|
||||
# define OMAP24XX_DMA_EAC_MD_DL_RD 21
|
||||
# define OMAP24XX_DMA_EAC_MD_DL_WR 22
|
||||
# define OMAP24XX_DMA_EAC_BT_UL_RD 23
|
||||
# define OMAP24XX_DMA_EAC_BT_UL_WR 24
|
||||
# define OMAP24XX_DMA_EAC_BT_DL_RD 25
|
||||
# define OMAP24XX_DMA_EAC_BT_DL_WR 26
|
||||
# define OMAP24XX_DMA_I2C1_TX 27
|
||||
# define OMAP24XX_DMA_I2C1_RX 28
|
||||
# define OMAP24XX_DMA_I2C2_TX 29
|
||||
# define OMAP24XX_DMA_I2C2_RX 30
|
||||
# define OMAP24XX_DMA_MCBSP1_TX 31
|
||||
# define OMAP24XX_DMA_MCBSP1_RX 32
|
||||
# define OMAP24XX_DMA_MCBSP2_TX 33
|
||||
# define OMAP24XX_DMA_MCBSP2_RX 34
|
||||
# define OMAP24XX_DMA_SPI1_TX0 35
|
||||
# define OMAP24XX_DMA_SPI1_RX0 36
|
||||
# define OMAP24XX_DMA_SPI1_TX1 37
|
||||
# define OMAP24XX_DMA_SPI1_RX1 38
|
||||
# define OMAP24XX_DMA_SPI1_TX2 39
|
||||
# define OMAP24XX_DMA_SPI1_RX2 40
|
||||
# define OMAP24XX_DMA_SPI1_TX3 41
|
||||
# define OMAP24XX_DMA_SPI1_RX3 42
|
||||
# define OMAP24XX_DMA_SPI2_TX0 43
|
||||
# define OMAP24XX_DMA_SPI2_RX0 44
|
||||
# define OMAP24XX_DMA_SPI2_TX1 45
|
||||
# define OMAP24XX_DMA_SPI2_RX1 46
|
||||
|
||||
# define OMAP24XX_DMA_UART1_TX 49
|
||||
# define OMAP24XX_DMA_UART1_RX 50
|
||||
# define OMAP24XX_DMA_UART2_TX 51
|
||||
# define OMAP24XX_DMA_UART2_RX 52
|
||||
# define OMAP24XX_DMA_UART3_TX 53
|
||||
# define OMAP24XX_DMA_UART3_RX 54
|
||||
# define OMAP24XX_DMA_USB_W2FC_TX0 55
|
||||
# define OMAP24XX_DMA_USB_W2FC_RX0 56
|
||||
# define OMAP24XX_DMA_USB_W2FC_TX1 57
|
||||
# define OMAP24XX_DMA_USB_W2FC_RX1 58
|
||||
# define OMAP24XX_DMA_USB_W2FC_TX2 59
|
||||
# define OMAP24XX_DMA_USB_W2FC_RX2 60
|
||||
# define OMAP24XX_DMA_MMC1_TX 61
|
||||
# define OMAP24XX_DMA_MMC1_RX 62
|
||||
# define OMAP24XX_DMA_MS 63 /* Not in OMAP2420 */
|
||||
# define OMAP24XX_DMA_EXT_DMAREQ5 64
|
||||
|
||||
struct omap_uart_s;
|
||||
struct omap_uart_s *omap_uart_init(hwaddr base,
|
||||
qemu_irq irq, omap_clk fclk, omap_clk iclk,
|
||||
|
|
@ -709,24 +551,11 @@ I2CBus *omap_i2c_bus(DeviceState *omap_i2c);
|
|||
# define cpu_is_omap1510(cpu) (cpu->mpu_model == omap1510)
|
||||
# define cpu_is_omap1610(cpu) (cpu->mpu_model == omap1610)
|
||||
# define cpu_is_omap1710(cpu) (cpu->mpu_model == omap1710)
|
||||
# define cpu_is_omap2410(cpu) (cpu->mpu_model == omap2410)
|
||||
# define cpu_is_omap2420(cpu) (cpu->mpu_model == omap2420)
|
||||
# define cpu_is_omap2430(cpu) (cpu->mpu_model == omap2430)
|
||||
# define cpu_is_omap3430(cpu) (cpu->mpu_model == omap3430)
|
||||
# define cpu_is_omap3630(cpu) (cpu->mpu_model == omap3630)
|
||||
|
||||
# define cpu_is_omap15xx(cpu) \
|
||||
(cpu_is_omap310(cpu) || cpu_is_omap1510(cpu))
|
||||
# define cpu_is_omap16xx(cpu) \
|
||||
(cpu_is_omap1610(cpu) || cpu_is_omap1710(cpu))
|
||||
# define cpu_is_omap24xx(cpu) \
|
||||
(cpu_is_omap2410(cpu) || cpu_is_omap2420(cpu) || cpu_is_omap2430(cpu))
|
||||
|
||||
# define cpu_class_omap1(cpu) \
|
||||
(cpu_is_omap15xx(cpu) || cpu_is_omap16xx(cpu))
|
||||
# define cpu_class_omap2(cpu) cpu_is_omap24xx(cpu)
|
||||
# define cpu_class_omap3(cpu) \
|
||||
(cpu_is_omap3430(cpu) || cpu_is_omap3630(cpu))
|
||||
|
||||
struct omap_mpu_state_s {
|
||||
enum omap_mpu_model {
|
||||
|
|
@ -734,13 +563,6 @@ struct omap_mpu_state_s {
|
|||
omap1510,
|
||||
omap1610,
|
||||
omap1710,
|
||||
omap2410,
|
||||
omap2420,
|
||||
omap2422,
|
||||
omap2423,
|
||||
omap2430,
|
||||
omap3430,
|
||||
omap3630,
|
||||
} mpu_model;
|
||||
|
||||
ARMCPU *cpu;
|
||||
|
|
@ -876,35 +698,6 @@ void omap_mpu_wakeup(void *opaque, int irq, int req);
|
|||
HWADDR_PRIx "\n", \
|
||||
__func__, paddr)
|
||||
|
||||
/* OMAP-specific Linux bootloader tags for the ATAG_BOARD area
|
||||
* (Board-specific tags are not here)
|
||||
*/
|
||||
#define OMAP_TAG_CLOCK 0x4f01
|
||||
#define OMAP_TAG_MMC 0x4f02
|
||||
#define OMAP_TAG_SERIAL_CONSOLE 0x4f03
|
||||
#define OMAP_TAG_USB 0x4f04
|
||||
#define OMAP_TAG_LCD 0x4f05
|
||||
#define OMAP_TAG_GPIO_SWITCH 0x4f06
|
||||
#define OMAP_TAG_UART 0x4f07
|
||||
#define OMAP_TAG_FBMEM 0x4f08
|
||||
#define OMAP_TAG_STI_CONSOLE 0x4f09
|
||||
#define OMAP_TAG_CAMERA_SENSOR 0x4f0a
|
||||
#define OMAP_TAG_PARTITION 0x4f0b
|
||||
#define OMAP_TAG_TEA5761 0x4f10
|
||||
#define OMAP_TAG_TMP105 0x4f11
|
||||
#define OMAP_TAG_BOOT_REASON 0x4f80
|
||||
#define OMAP_TAG_FLASH_PART_STR 0x4f81
|
||||
#define OMAP_TAG_VERSION_STR 0x4f82
|
||||
|
||||
enum {
|
||||
OMAP_GPIOSW_TYPE_COVER = 0 << 4,
|
||||
OMAP_GPIOSW_TYPE_CONNECTION = 1 << 4,
|
||||
OMAP_GPIOSW_TYPE_ACTIVITY = 2 << 4,
|
||||
};
|
||||
|
||||
#define OMAP_GPIOSW_INVERTED 0x0001
|
||||
#define OMAP_GPIOSW_OUTPUT 0x0002
|
||||
|
||||
# define OMAP_MPUI_REG_MASK 0x000007ff
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue