diff --git a/drivers/interconnect/qcom/icc-common.c b/drivers/interconnect/qcom/icc-common.c index 0822ce207b5d..f27f4fdc4531 100644 --- a/drivers/interconnect/qcom/icc-common.c +++ b/drivers/interconnect/qcom/icc-common.c @@ -5,6 +5,7 @@ #include #include +#include #include "icc-common.h" @@ -32,3 +33,5 @@ struct icc_node_data *qcom_icc_xlate_extended(struct of_phandle_args *spec, void return ndata; } EXPORT_SYMBOL_GPL(qcom_icc_xlate_extended); + +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/qcom/eud.c b/drivers/soc/qcom/eud.c index 9f92cacce836..cc7c2a2d94ec 100644 --- a/drivers/soc/qcom/eud.c +++ b/drivers/soc/qcom/eud.c @@ -394,7 +394,7 @@ static void eud_set_termios(struct uart_port *port, struct ktermios *new, static void eud_stop_tx(struct uart_port *port) { /* Disable Tx interrupt */ - writel_relaxed(~EUD_INT_TX, port->membase + EUD_REG_INT_STATUS_1); + writel_relaxed((__force u32)~EUD_INT_TX, port->membase + EUD_REG_INT_STATUS_1); /* Ensure Register Writes Complete */ wmb(); } @@ -410,7 +410,7 @@ static void eud_start_tx(struct uart_port *port) static void eud_stop_rx(struct uart_port *port) { /* Disable Rx interrupt */ - writel_relaxed(~EUD_INT_RX, port->membase + EUD_REG_INT_STATUS_1); + writel_relaxed((__force u32)~EUD_INT_RX, port->membase + EUD_REG_INT_STATUS_1); /* Ensure Register Writes Complete */ wmb(); } @@ -427,7 +427,7 @@ static int eud_startup(struct uart_port *port) static void eud_shutdown(struct uart_port *port) { /* Disable both Tx & Rx interrupts */ - writel_relaxed(~EUD_INT_TX | ~EUD_INT_RX, + writel_relaxed((__force u32)(~EUD_INT_TX | ~EUD_INT_RX), port->membase + EUD_REG_INT_STATUS_1); /* Ensure Register Writes Complete */ wmb(); @@ -453,7 +453,7 @@ static void eud_config_port(struct uart_port *port, int flags) { /* set port type, clear Tx and Rx interrupts */ port->type = PORT_EUD_UART; - writel_relaxed(~EUD_INT_TX | ~EUD_INT_RX, + writel_relaxed((__force u32)(~EUD_INT_TX | ~EUD_INT_RX), port->membase + EUD_REG_INT_STATUS_1); /* Ensure Register Writes Complete */ wmb(); diff --git a/modules.list.msm.kalama b/modules.list.msm.kalama index 082dc061d805..8b2a89db4361 100644 --- a/modules.list.msm.kalama +++ b/modules.list.msm.kalama @@ -12,6 +12,7 @@ proxy-consumer.ko rpmh-regulator.ko qcom_dma_heaps.ko qcom_hwspinlock.ko +interconnect_qcom.ko clk-dummy.ko clk-qcom.ko cmd-db.ko diff --git a/modules.list.msm.pineapple b/modules.list.msm.pineapple index 98951a5d1b78..bbc9c6e71f48 100644 --- a/modules.list.msm.pineapple +++ b/modules.list.msm.pineapple @@ -41,6 +41,7 @@ debug-regulator.ko phy-qcom-ufs.ko phy-qcom-ufs-qrbtc-sdm845.ko ufs_qcom.ko +interconnect_qcom.ko icc-bcm-voter.ko icc-rpmh.ko qnoc-qos.ko