update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/platform/rockchip/isp/regs.h
..
..
@@ -1753,7 +1753,7 @@
1753
1753
 static inline void mi_frame_end_int_enable(struct rkisp_stream *stream)
1754
1754
 {
1755
1755
 	struct rkisp_hw_dev *hw = stream->ispdev->hw_dev;
1756
-	void __iomem *base = !hw->is_unite ?
1756
+	void __iomem *base = hw->unite != ISP_UNITE_TWO ?
1757
1757
 		hw->base_addr : hw->base_next_addr;
1758
1758
 	void __iomem *addr = base + CIF_MI_IMSC;
1759
1759
 
..
..
@@ -1763,7 +1763,7 @@
1763
1763
 static inline void mi_frame_end_int_disable(struct rkisp_stream *stream)
1764
1764
 {
1765
1765
 	struct rkisp_hw_dev *hw = stream->ispdev->hw_dev;
1766
-	void __iomem *base = !hw->is_unite ?
1766
+	void __iomem *base = hw->unite != ISP_UNITE_TWO ?
1767
1767
 		hw->base_addr : hw->base_next_addr;
1768
1768
 	void __iomem *addr = base + CIF_MI_IMSC;
1769
1769
 
..
..
@@ -1773,7 +1773,7 @@
1773
1773
 static inline void mi_frame_end_int_clear(struct rkisp_stream *stream)
1774
1774
 {
1775
1775
 	struct rkisp_hw_dev *hw = stream->ispdev->hw_dev;
1776
-	void __iomem *base = !hw->is_unite ?
1776
+	void __iomem *base = hw->unite != ISP_UNITE_TWO ?
1777
1777
 		hw->base_addr : hw->base_next_addr;
1778
1778
 	void __iomem *addr = base + CIF_MI_ICR;
1779
1779
 
..
..
@@ -1783,7 +1783,6 @@
1783
1783
 static inline void stream_data_path(struct rkisp_stream *stream)
1784
1784
 {
1785
1785
 	struct rkisp_device *dev = stream->ispdev;
1786
-	bool is_unite = dev->hw_dev->is_unite;
1787
1786
 	u32 dpcl = 0;
1788
1787
 
1789
1788
 	if (stream->id == RKISP_STREAM_MP)
..
..
@@ -1792,7 +1791,7 @@
1792
1791
 		dpcl |= CIF_VI_DPCL_CHAN_MODE_SP;
1793
1792
 
1794
1793
 	if (dpcl)
1795
-		rkisp_unite_set_bits(dev, CIF_VI_DPCL, 0, dpcl, true, is_unite);
1794
+		rkisp_unite_set_bits(dev, CIF_VI_DPCL, 0, dpcl, true);
1796
1795
 }
1797
1796
 
1798
1797
 static inline void mp_set_uv_swap(void __iomem *base)
..
..
@@ -1914,16 +1913,15 @@
1914
1913
 static inline void force_cfg_update(struct rkisp_device *dev)
1915
1914
 {
1916
1915
 	u32 val = CIF_MI_CTRL_INIT_OFFSET_EN | CIF_MI_CTRL_INIT_BASE_EN;
1917
-	bool is_unite = dev->hw_dev->is_unite;
1918
1916
 
1919
1917
 	if (dev->isp_ver == ISP_V21) {
1920
1918
 		val |= rkisp_read_reg_cache(dev, CIF_MI_CTRL);
1921
1919
 		rkisp_write(dev, CIF_MI_CTRL, val, true);
1922
1920
 	}
1923
1921
 	dev->hw_dev->is_mi_update = true;
1924
-	rkisp_unite_set_bits(dev, CIF_MI_CTRL, 0, val, false, is_unite);
1922
+	rkisp_unite_set_bits(dev, CIF_MI_CTRL, 0, val, false);
1925
1923
 	val = CIF_MI_INIT_SOFT_UPD;
1926
-	rkisp_unite_write(dev, CIF_MI_INIT, val, true, is_unite);
1924
+	rkisp_unite_write(dev, CIF_MI_INIT, val, true);
1927
1925
 }
1928
1926
 
1929
1927
 static inline void dmatx0_ctrl(void __iomem *base, u32 val)