Merged TI feature platform_base into ti-linux-4.19.y

TI-Feature: platform_base
TI-Branch: platform-ti-linux-4.19.y

* 'platform-ti-linux-4.19.y' of ssh://bitbucket.itg.ti.com/lcpdpublicdom/platform:
  crypto: Kconfig: sa2ul: select SHA512/SHA256 explicitly
  clk: ti: dra7-atl-clock: Remove ti_clk_add_alias call
  dmaengine: ti: k3-navss-udma: Reset flowid range when no extra flows needed
  dmaengine: ti: k3-udma: Make sure that extra flows are disabled for rchan

Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>

drivers/clk/ti/clk-dra7-atl.c

@@ -207,11 +207,6 @@ static void __init of_dra7_atl_clock_setup(struct device_node *node)
 	clk = ti_clk_register(NULL, &clk_hw->hw, node->name);
 
 	if (!IS_ERR(clk)) {
-		ret = ti_clk_add_alias(NULL, clk, node->name);
-		if (ret) {
-			clk_unregister(clk);
-			goto cleanup;
-		}
 		of_clk_add_provider(node, of_clk_src_simple_get, clk);
 		kfree(parent_names);
 		return;

drivers/crypto/Kconfig

@@ -769,9 +769,12 @@ config CRYPTO_DEV_SA2UL
 	select CRYPTO_AES
 	select CRYPTO_AES_ARM64
 	select CRYPTO_SHA1
+	select CRYPTO_SHA512
+	select CRYPTO_SHA256
 	select CRYPTO_MD5
 	select CRYPTO_ALGAPI
 	select CRYPTO_AUTHENC
+	select CRYPTO_HMAC
 	select HW_RANDOM
 	default m if ARCH_K3
 	help

drivers/dma/ti/k3-navss-udma.c

@@ -552,7 +552,9 @@ static int k3_nav_udmax_cfg_rx_chn(struct k3_nav_udmax_rx_channel *rx_chn)
 
 	req.valid_params = TI_SCI_MSG_VALUE_RM_UDMAP_CH_FETCH_SIZE_VALID |
 			TI_SCI_MSG_VALUE_RM_UDMAP_CH_CQ_QNUM_VALID |
-			TI_SCI_MSG_VALUE_RM_UDMAP_CH_CHAN_TYPE_VALID;
+			TI_SCI_MSG_VALUE_RM_UDMAP_CH_CHAN_TYPE_VALID |
+			TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_FLOWID_START_VALID |
+			TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_FLOWID_CNT_VALID;
 
 	req.nav_id = tisci_rm->tisci_dev_id;
 	req.index = rx_chn->udma_rchan_id;
@@ -567,9 +569,6 @@ static int k3_nav_udmax_cfg_rx_chn(struct k3_nav_udmax_rx_channel *rx_chn)
 		/* Default flow + extra ones */
 		req.flowid_start = rx_chn->flow_id_base;
 		req.flowid_cnt = rx_chn->flow_num;
-		req.valid_params |=
-			TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_FLOWID_START_VALID |
-			TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_FLOWID_CNT_VALID;
 	}
 	req.rx_chan_type = TI_SCI_RM_UDMAP_CHAN_TYPE_PKT_PBRR;
 

drivers/dma/ti/k3-udma.c

@@ -1629,7 +1629,9 @@ static int udma_alloc_chan_resources(struct dma_chan *chan)
 			TI_SCI_MSG_VALUE_RM_UDMAP_CH_CQ_QNUM_VALID |
 			TI_SCI_MSG_VALUE_RM_UDMAP_CH_CHAN_TYPE_VALID |
 			TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_IGNORE_SHORT_VALID |
-			TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_IGNORE_LONG_VALID;
+			TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_IGNORE_LONG_VALID |
+			TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_FLOWID_START_VALID |
+			TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_FLOWID_CNT_VALID;
 
 		req_rx.nav_id = tisci_rm->tisci_dev_id;
 		req_rx.index = rchan->id;
@@ -1639,6 +1641,8 @@ static int udma_alloc_chan_resources(struct dma_chan *chan)
 		req_rx.rx_chan_type = TI_SCI_RM_UDMAP_CHAN_TYPE_3RDP_BCOPY_PBRR;
 		req_rx.rx_ignore_short = 0;
 		req_rx.rx_ignore_long = 0;
+		req_rx.flowid_start = 0;
+		req_rx.flowid_cnt = 0;
 
 		ret = tisci_ops->rx_ch_cfg(tisci_rm->tisci, &req_rx);
 		if (ret) {
@@ -1711,7 +1715,9 @@ static int udma_alloc_chan_resources(struct dma_chan *chan)
 			TI_SCI_MSG_VALUE_RM_UDMAP_CH_CQ_QNUM_VALID |
 			TI_SCI_MSG_VALUE_RM_UDMAP_CH_CHAN_TYPE_VALID |
 			TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_IGNORE_SHORT_VALID |
-			TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_IGNORE_LONG_VALID;
+			TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_IGNORE_LONG_VALID |
+			TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_FLOWID_START_VALID |
+			TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_FLOWID_CNT_VALID;
 
 			req_rx.nav_id = tisci_rm->tisci_dev_id;
 			req_rx.index = rchan->id;
@@ -1721,6 +1727,8 @@ static int udma_alloc_chan_resources(struct dma_chan *chan)
 			req_rx.rx_chan_type = mode;
 			req_rx.rx_ignore_short = 0;
 			req_rx.rx_ignore_long = 0;
+			req_rx.flowid_start = 0;
+			req_rx.flowid_cnt = 0;
 
 			ret = tisci_ops->rx_ch_cfg(tisci_rm->tisci, &req_rx);
 			if (ret) {