mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/i2c/busses/i2c-qup.c
..
..
@@ -136,13 +136,8 @@
136
136
  */
137
137
 #define TOUT_MIN			2
138
138
 
139
-/* I2C Frequency Modes */
140
-#define I2C_STANDARD_FREQ		100000
141
-#define I2C_FAST_MODE_FREQ		400000
142
-#define I2C_FAST_MODE_PLUS_FREQ		1000000
143
-
144
139
 /* Default values. Use these if FW query fails */
145
-#define DEFAULT_CLK_FREQ I2C_STANDARD_FREQ
140
+#define DEFAULT_CLK_FREQ I2C_MAX_STANDARD_MODE_FREQ
146
141
 #define DEFAULT_SRC_CLK 20000000
147
142
 
148
143
 /*
..
..
@@ -628,7 +623,7 @@
628
623
 	int err;
629
624
 
630
625
 	if (!qup->btx.dma) {
631
-		qup->btx.dma = dma_request_slave_channel_reason(qup->dev, "tx");
626
+		qup->btx.dma = dma_request_chan(qup->dev, "tx");
632
627
 		if (IS_ERR(qup->btx.dma)) {
633
628
 			err = PTR_ERR(qup->btx.dma);
634
629
 			qup->btx.dma = NULL;
..
..
@@ -638,7 +633,7 @@
638
633
 	}
639
634
 
640
635
 	if (!qup->brx.dma) {
641
-		qup->brx.dma = dma_request_slave_channel_reason(qup->dev, "rx");
636
+		qup->brx.dma = dma_request_chan(qup->dev, "rx");
642
637
 		if (IS_ERR(qup->brx.dma)) {
643
638
 			dev_err(qup->dev, "\n rx channel not available");
644
639
 			err = PTR_ERR(qup->brx.dma);
..
..
@@ -962,10 +957,8 @@
962
957
 	u32 qup_config = I2C_MINI_CORE | I2C_N_VAL;
963
958
 	u32 io_mode = QUP_REPACK_EN;
964
959
 
965
-	blk->is_tx_blk_mode =
966
-		blk->total_tx_len > qup->out_fifo_sz ? true : false;
967
-	blk->is_rx_blk_mode =
968
-		blk->total_rx_len > qup->in_fifo_sz ? true : false;
960
+	blk->is_tx_blk_mode = blk->total_tx_len > qup->out_fifo_sz;
961
+	blk->is_rx_blk_mode = blk->total_rx_len > qup->in_fifo_sz;
969
962
 
970
963
 	if (blk->is_tx_blk_mode) {
971
964
 		io_mode |= QUP_OUTPUT_BLK_MODE;
..
..
@@ -1534,9 +1527,9 @@
1534
1527
 		qup->use_dma = true;
1535
1528
 	} else {
1536
1529
 		qup->blk.is_tx_blk_mode = max_tx_len > qup->out_fifo_sz -
1537
-			QUP_MAX_TAGS_LEN ? true : false;
1530
+			QUP_MAX_TAGS_LEN;
1538
1531
 		qup->blk.is_rx_blk_mode = max_rx_len > qup->in_fifo_sz -
1539
-			READ_RX_TAGS_LEN ? true : false;
1532
+			READ_RX_TAGS_LEN;
1540
1533
 	}
1541
1534
 
1542
1535
 	return 0;
..
..
@@ -1666,7 +1659,6 @@
1666
1659
 	static const int blk_sizes[] = {4, 16, 32};
1667
1660
 	struct qup_i2c_dev *qup;
1668
1661
 	unsigned long one_bit_t;
1669
-	struct resource *res;
1670
1662
 	u32 io_mode, hw_ver, size;
1671
1663
 	int ret, fs_div, hs_div;
1672
1664
 	u32 src_clk_freq = DEFAULT_SRC_CLK;
..
..
@@ -1757,22 +1749,19 @@
1757
1749
 
1758
1750
 nodma:
1759
1751
 	/* We support frequencies up to FAST Mode Plus (1MHz) */
1760
-	if (!clk_freq || clk_freq > I2C_FAST_MODE_PLUS_FREQ) {
1752
+	if (!clk_freq || clk_freq > I2C_MAX_FAST_MODE_PLUS_FREQ) {
1761
1753
 		dev_err(qup->dev, "clock frequency not supported %d\n",
1762
1754
 			clk_freq);
1763
1755
 		return -EINVAL;
1764
1756
 	}
1765
1757
 
1766
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
1767
-	qup->base = devm_ioremap_resource(qup->dev, res);
1758
+	qup->base = devm_platform_ioremap_resource(pdev, 0);
1768
1759
 	if (IS_ERR(qup->base))
1769
1760
 		return PTR_ERR(qup->base);
1770
1761
 
1771
1762
 	qup->irq = platform_get_irq(pdev, 0);
1772
-	if (qup->irq < 0) {
1773
-		dev_err(qup->dev, "No IRQ defined\n");
1763
+	if (qup->irq < 0)
1774
1764
 		return qup->irq;
1775
-	}
1776
1765
 
1777
1766
 	if (has_acpi_companion(qup->dev)) {
1778
1767
 		ret = device_property_read_u32(qup->dev,
..
..
@@ -1862,7 +1851,7 @@
1862
1851
 	qup->in_fifo_sz = qup->in_blk_sz * (2 << size);
1863
1852
 
1864
1853
 	hs_div = 3;
1865
-	if (clk_freq <= I2C_STANDARD_FREQ) {
1854
+	if (clk_freq <= I2C_MAX_STANDARD_MODE_FREQ) {
1866
1855
 		fs_div = ((src_clk_freq / clk_freq) / 2) - 3;
1867
1856
 		qup->clk_ctl = (hs_div << 8) | (fs_div & 0xff);
1868
1857
 	} else {