diff options
author | Madhukar Pappireddy <madhukar.pappireddy@arm.com> | 2021-04-20 15:43:07 +0200 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2021-04-20 15:43:07 +0200 |
commit | 404bcbd70a5bc2b6398a523cf0c6b53263a3c450 (patch) | |
tree | 6f49e1a55855c613135158ae93735e1e87c2acbb | |
parent | a9e14e202f77cce74ff7f0433bf2d593be77ce3c (diff) | |
parent | 7e78300fc1ff7a1ad3474f3407989575140c55a5 (diff) | |
download | trusted-firmware-a-404bcbd70a5bc2b6398a523cf0c6b53263a3c450.tar.gz |
Merge "mediatek: move uart.h to common folder" into integration
-rw-r--r-- | plat/mediatek/common/drivers/uart/uart.h (renamed from plat/mediatek/mt8192/drivers/uart/uart.h) | 0 | ||||
-rw-r--r-- | plat/mediatek/mt8183/drivers/uart/uart.h | 100 | ||||
-rw-r--r-- | plat/mediatek/mt8183/platform.mk | 2 | ||||
-rw-r--r-- | plat/mediatek/mt8192/platform.mk | 4 |
4 files changed, 3 insertions, 103 deletions
diff --git a/plat/mediatek/mt8192/drivers/uart/uart.h b/plat/mediatek/common/drivers/uart/uart.h index ac8b94dd1a..ac8b94dd1a 100644 --- a/plat/mediatek/mt8192/drivers/uart/uart.h +++ b/plat/mediatek/common/drivers/uart/uart.h diff --git a/plat/mediatek/mt8183/drivers/uart/uart.h b/plat/mediatek/mt8183/drivers/uart/uart.h deleted file mode 100644 index 062ce3adc3..0000000000 --- a/plat/mediatek/mt8183/drivers/uart/uart.h +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (c) 2019, ARM Limited and Contributors. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef __UART_H__ -#define __UART_H__ - -#include <platform_def.h> - -/* UART HW information */ -#define HW_SUPPORT_UART_PORTS 2 -#define DRV_SUPPORT_UART_PORTS 2 - -/* console UART clock cg */ -#define UART_CLOCK_GATE_SET (INFRACFG_AO_BASE + 0x80) -#define UART_CLOCK_GATE_CLR (INFRACFG_AO_BASE + 0x84) -#define UART_CLOCK_GATE_STA (INFRACFG_AO_BASE + 0x90) -#define UART0_CLOCK_GATE_BIT (1U<<22) -#define UART1_CLOCK_GATE_BIT (1U<<23) - -/* UART registers */ -#define UART_RBR(_baseaddr) (_baseaddr + 0x0) -#define UART_THR(_baseaddr) (_baseaddr + 0x0) -#define UART_IER(_baseaddr) (_baseaddr + 0x4) -#define UART_IIR(_baseaddr) (_baseaddr + 0x8) -#define UART_FCR(_baseaddr) (_baseaddr + 0x8) -#define UART_LCR(_baseaddr) (_baseaddr + 0xc) -#define UART_MCR(_baseaddr) (_baseaddr + 0x10) -#define UART_LSR(_baseaddr) (_baseaddr + 0x14) -#define UART_MSR(_baseaddr) (_baseaddr + 0x18) -#define UART_SCR(_baseaddr) (_baseaddr + 0x1c) -#define UART_DLL(_baseaddr) (_baseaddr + 0x0) -#define UART_DLH(_baseaddr) (_baseaddr + 0x4) -#define UART_EFR(_baseaddr) (_baseaddr + 0x8) -#define UART_XON1(_baseaddr) (_baseaddr + 0x10) -#define UART_XON2(_baseaddr) (_baseaddr + 0x14) -#define UART_XOFF1(_baseaddr) (_baseaddr + 0x18) -#define UART_XOFF2(_baseaddr) (_baseaddr + 0x1c) -#define UART_AUTOBAUD(_baseaddr) (_baseaddr + 0x20) -#define UART_HIGHSPEED(_baseaddr) (_baseaddr + 0x24) -#define UART_SAMPLE_COUNT(_baseaddr) (_baseaddr + 0x28) -#define UART_SAMPLE_POINT(_baseaddr) (_baseaddr + 0x2c) -#define UART_AUTOBAUD_REG(_baseaddr) (_baseaddr + 0x30) -#define UART_RATE_FIX_REG(_baseaddr) (_baseaddr + 0x34) -#define UART_AUTO_BAUDSAMPLE(_baseaddr) (_baseaddr + 0x38) -#define UART_GUARD(_baseaddr) (_baseaddr + 0x3c) -#define UART_ESCAPE_DAT(_baseaddr) (_baseaddr + 0x40) -#define UART_ESCAPE_EN(_baseaddr) (_baseaddr + 0x44) -#define UART_SLEEP_EN(_baseaddr) (_baseaddr + 0x48) -#define UART_DMA_EN(_baseaddr) (_baseaddr + 0x4c) -#define UART_RXTRI_AD(_baseaddr) (_baseaddr + 0x50) -#define UART_FRACDIV_L(_baseaddr) (_baseaddr + 0x54) -#define UART_FRACDIV_M(_baseaddr) (_baseaddr + 0x58) -#define UART_FCR_RD(_baseaddr) (_baseaddr + 0x5C) -#define UART_USB_RX_SEL(_baseaddr) (_baseaddr + 0xB0) -#define UART_SLEEP_REQ(_baseaddr) (_baseaddr + 0xB4) -#define UART_SLEEP_ACK(_baseaddr) (_baseaddr + 0xB8) -#define UART_SPM_SEL(_baseaddr) (_baseaddr + 0xBC) -#define UART_LCR_DLAB 0x0080 -#define UART_LCR_MODE_B 0x00bf - -enum uart_port_ID { - UART_PORT0 = 0, - UART_PORT1 -}; - -struct mt_uart_register { - unsigned int dll; - unsigned int dlh; - unsigned int ier; - unsigned int lcr; - unsigned int mcr; - unsigned int fcr; - unsigned int lsr; - unsigned int scr; - unsigned int efr; - unsigned int highspeed; - unsigned int sample_count; - unsigned int sample_point; - unsigned int fracdiv_l; - unsigned int fracdiv_m; - unsigned int escape_en; - unsigned int guard; - unsigned int rx_sel; -}; - -struct mt_uart { - unsigned long base; - struct mt_uart_register registers; -}; - -/* external API */ -void mt_uart_save(void); -void mt_uart_restore(void); -void mt_console_uart_cg(int on); -uint32_t mt_console_uart_cg_status(void); - -#endif /* __UART_H__ */ diff --git a/plat/mediatek/mt8183/platform.mk b/plat/mediatek/mt8183/platform.mk index 07da1afac3..1615cf9534 100644 --- a/plat/mediatek/mt8183/platform.mk +++ b/plat/mediatek/mt8183/platform.mk @@ -8,6 +8,7 @@ MTK_PLAT := plat/mediatek MTK_PLAT_SOC := ${MTK_PLAT}/${PLAT} PLAT_INCLUDES := -I${MTK_PLAT}/common/ \ + -I${MTK_PLAT}/common/drivers/uart/ \ -I${MTK_PLAT_SOC}/drivers/ \ -I${MTK_PLAT_SOC}/drivers/emi_mpu/ \ -I${MTK_PLAT_SOC}/drivers/devapc/ \ @@ -19,7 +20,6 @@ PLAT_INCLUDES := -I${MTK_PLAT}/common/ \ -I${MTK_PLAT_SOC}/drivers/spm/ \ -I${MTK_PLAT_SOC}/drivers/sspm/ \ -I${MTK_PLAT_SOC}/drivers/rtc/ \ - -I${MTK_PLAT_SOC}/drivers/uart/ \ -I${MTK_PLAT_SOC}/include/ PLAT_BL_COMMON_SOURCES := lib/xlat_tables/aarch64/xlat_tables.c \ diff --git a/plat/mediatek/mt8192/platform.mk b/plat/mediatek/mt8192/platform.mk index 0b35d06490..e45f649c86 100644 --- a/plat/mediatek/mt8192/platform.mk +++ b/plat/mediatek/mt8192/platform.mk @@ -8,6 +8,7 @@ MTK_PLAT := plat/mediatek MTK_PLAT_SOC := ${MTK_PLAT}/${PLAT} PLAT_INCLUDES := -I${MTK_PLAT}/common/ \ + -I${MTK_PLAT}/common/drivers/uart/ \ -I${MTK_PLAT}/common/lpm/ \ -I${MTK_PLAT_SOC}/include/ \ -I${MTK_PLAT_SOC}/drivers/ \ @@ -19,8 +20,7 @@ PLAT_INCLUDES := -I${MTK_PLAT}/common/ \ -I${MTK_PLAT_SOC}/drivers/ptp3/ \ -I${MTK_PLAT_SOC}/drivers/rtc/ \ -I${MTK_PLAT_SOC}/drivers/spmc/ \ - -I${MTK_PLAT_SOC}/drivers/timer/ \ - -I${MTK_PLAT_SOC}/drivers/uart/ + -I${MTK_PLAT_SOC}/drivers/timer/ GICV3_SUPPORT_GIC600 := 1 include drivers/arm/gic/v3/gicv3.mk |