.. | .. |
---|
6 | 6 | |
---|
7 | 7 | #include "bridge.h" |
---|
8 | 8 | |
---|
9 | | -#define RKISP_MAX_BUS_CLK 8 |
---|
| 9 | +#define RKISP_MAX_BUS_CLK 10 |
---|
10 | 10 | #define RKISP_MAX_RETRY_CNT 5 |
---|
11 | 11 | |
---|
12 | 12 | struct isp_clk_info { |
---|
.. | .. |
---|
22 | 22 | int num_clk_rate_tbl; |
---|
23 | 23 | struct isp_irqs_data *irqs; |
---|
24 | 24 | int num_irqs; |
---|
| 25 | + bool unite; |
---|
25 | 26 | }; |
---|
26 | 27 | |
---|
27 | 28 | struct rkisp_monitor { |
---|
28 | 29 | struct rkisp_hw_dev *dev; |
---|
29 | 30 | struct work_struct work; |
---|
30 | 31 | struct completion cmpl; |
---|
31 | | - int (*reset_handle)(struct rkisp_device *dev); |
---|
32 | 32 | u32 state; |
---|
33 | 33 | u8 retry; |
---|
34 | 34 | bool is_en; |
---|
| 35 | +}; |
---|
| 36 | + |
---|
| 37 | +struct rkisp_sram { |
---|
| 38 | + dma_addr_t dma_addr; |
---|
| 39 | + u32 size; |
---|
| 40 | +}; |
---|
| 41 | + |
---|
| 42 | +struct rkisp_size_info { |
---|
| 43 | + u32 w; |
---|
| 44 | + u32 h; |
---|
| 45 | + u32 size; |
---|
| 46 | + u32 fps; |
---|
| 47 | + bool is_on; |
---|
35 | 48 | }; |
---|
36 | 49 | |
---|
37 | 50 | struct rkisp_hw_dev { |
---|
.. | .. |
---|
39 | 52 | struct platform_device *pdev; |
---|
40 | 53 | struct device *dev; |
---|
41 | 54 | struct regmap *grf; |
---|
| 55 | + void *sw_reg; |
---|
42 | 56 | void __iomem *base_addr; |
---|
| 57 | + void __iomem *base_next_addr; |
---|
43 | 58 | struct clk *clks[RKISP_MAX_BUS_CLK]; |
---|
44 | 59 | int num_clks; |
---|
45 | 60 | const struct isp_clk_info *clk_rate_tbl; |
---|
.. | .. |
---|
48 | 63 | int mipi_irq; |
---|
49 | 64 | enum rkisp_isp_ver isp_ver; |
---|
50 | 65 | struct rkisp_device *isp[DEV_MAX]; |
---|
| 66 | + struct rkisp_size_info isp_size[DEV_MAX]; |
---|
51 | 67 | int dev_num; |
---|
| 68 | + int dev_link_num; |
---|
52 | 69 | int cur_dev_id; |
---|
| 70 | + int pre_dev_id; |
---|
53 | 71 | int mipi_dev_id; |
---|
54 | 72 | struct max_input max_in; |
---|
55 | 73 | /* lock for multi dev */ |
---|
56 | 74 | struct mutex dev_lock; |
---|
57 | 75 | spinlock_t rdbk_lock; |
---|
58 | 76 | atomic_t refcnt; |
---|
| 77 | + |
---|
| 78 | + struct rkisp_sram sram; |
---|
59 | 79 | |
---|
60 | 80 | /* share buf for multi dev */ |
---|
61 | 81 | spinlock_t buf_lock; |
---|
.. | .. |
---|
69 | 89 | struct rkisp_monitor monitor; |
---|
70 | 90 | u64 iq_feature; |
---|
71 | 91 | int buf_init_cnt; |
---|
| 92 | + u32 unite; |
---|
72 | 93 | bool is_feature_on; |
---|
73 | 94 | bool is_dma_contig; |
---|
74 | 95 | bool is_dma_sg_ops; |
---|
.. | .. |
---|
79 | 100 | bool is_thunderboot; |
---|
80 | 101 | bool is_buf_init; |
---|
81 | 102 | bool is_shutdown; |
---|
82 | | - atomic_t tb_ref; |
---|
| 103 | + bool is_multi_overflow; |
---|
| 104 | + bool is_runing; |
---|
| 105 | + bool is_frm_buf; |
---|
| 106 | + bool is_dvfs; |
---|
| 107 | + bool is_assigned_clk; |
---|
83 | 108 | }; |
---|
84 | 109 | |
---|
85 | 110 | int rkisp_register_irq(struct rkisp_hw_dev *dev); |
---|
86 | 111 | void rkisp_soft_reset(struct rkisp_hw_dev *dev, bool is_secure); |
---|
| 112 | +void rkisp_hw_enum_isp_size(struct rkisp_hw_dev *hw_dev); |
---|
| 113 | +void rkisp_hw_reg_save(struct rkisp_hw_dev *dev); |
---|
| 114 | +void rkisp_hw_reg_restore(struct rkisp_hw_dev *dev); |
---|
87 | 115 | #endif |
---|