diff --git a/arch/xtensa/soc/intel_s1000/dts.fixup b/arch/xtensa/soc/intel_s1000/dts.fixup index 0f5cd4db0ec..c1a0a196caf 100644 --- a/arch/xtensa/soc/intel_s1000/dts.fixup +++ b/arch/xtensa/soc/intel_s1000/dts.fixup @@ -3,9 +3,12 @@ #define CONFIG_UART_NS16550_PORT_0_BASE_ADDR NS16550_80800_BASE_ADDRESS #define CONFIG_UART_NS16550_PORT_0_BAUD_RATE NS16550_80800_CURRENT_SPEED #define CONFIG_UART_NS16550_PORT_0_NAME NS16550_80800_LABEL -#define CONFIG_UART_NS16550_PORT_0_IRQ NS16550_80800_IRQ_0 +#define CONFIG_UART_NS16550_PORT_0_IRQ (NS16550_80800_IRQ_0 << 16) | \ + (SNPS_DESIGNWARE_INTC_81800_IRQ_0 << 8) | \ + (INTEL_CAVS_INTC_78800_IRQ_0 << 0) + #define CONFIG_UART_NS16550_PORT_0_IRQ_PRI NS16550_80800_IRQ_0_PRIORITY -#define CONFIG_UART_NS16550_PORT_0_CLK_FREQ NS16550_808000_CLOCK_FREQUENCY +#define CONFIG_UART_NS16550_PORT_0_CLK_FREQ NS16550_80800_CLOCK_FREQUENCY #define L2_SRAM_BASE CONFIG_SRAM_BASE_ADDRESS diff --git a/arch/xtensa/soc/intel_s1000/soc.h b/arch/xtensa/soc/intel_s1000/soc.h index 1866813dbb8..730d57cad08 100644 --- a/arch/xtensa/soc/intel_s1000/soc.h +++ b/arch/xtensa/soc/intel_s1000/soc.h @@ -61,7 +61,7 @@ /* UART - UART0 */ #define CONFIG_UART_NS16550_P0_IRQ_ICTL_OFFSET INTR_CNTL_IRQ_NUM(\ - UART_NS16550_PORT_0_IRQ) + NS16550_80800_IRQ_0) #define CONFIG_UART_NS16550_PORT_0_IRQ_FLAGS 0 /* I2C - I2C0 */ diff --git a/drivers/serial/uart_ns16550.c b/drivers/serial/uart_ns16550.c index 5998b8905a4..56b423c901c 100644 --- a/drivers/serial/uart_ns16550.c +++ b/drivers/serial/uart_ns16550.c @@ -20,12 +20,12 @@ * UART_REG_ADDR_INTERVAL */ -#include -#include +#include #include #include #include +#include #include #include diff --git a/dts/xtensa/intel_s1000.dtsi b/dts/xtensa/intel_s1000.dtsi index 332b6cd0a9d..7f20bde96b5 100644 --- a/dts/xtensa/intel_s1000.dtsi +++ b/dts/xtensa/intel_s1000.dtsi @@ -85,6 +85,10 @@ compatible = "ns16550"; reg = <0x80800 0x400>; label = "UART_0"; + clock-frequency = <38400000>; + interrupts = <3 0>; + interrupt-parent = <&dw_intc>; + status = "disabled"; };