diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-04-14 18:51:33 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-04-14 18:51:33 +0300 |
| commit | 85a3685852d9ac7d92be9d824533c915a4597fa4 (patch) | |
| tree | b7c542e2061cf96c9f7ad500fa12567f9ff0b39f /include/media/smiapp.h | |
| parent | 92bac83dd79e60e65c475222e41a992a70434beb (diff) | |
| parent | 8b8a518ef16be2de27207991e32fc32b0475c767 (diff) | |
| download | linux-85a3685852d9ac7d92be9d824533c915a4597fa4.tar.xz | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.1 merge window.
Diffstat (limited to 'include/media/smiapp.h')
| -rw-r--r-- | include/media/smiapp.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/media/smiapp.h b/include/media/smiapp.h index 0b8f124a630c..268a3cdbf6cb 100644 --- a/include/media/smiapp.h +++ b/include/media/smiapp.h @@ -65,19 +65,19 @@ struct smiapp_platform_data { unsigned short i2c_addr_dfl; /* Default i2c addr */ unsigned short i2c_addr_alt; /* Alternate i2c addr */ - unsigned int nvm_size; /* bytes */ - unsigned int ext_clk; /* sensor external clk */ + uint32_t nvm_size; /* bytes */ + uint32_t ext_clk; /* sensor external clk */ unsigned int lanes; /* Number of CSI-2 lanes */ - u8 csi_signalling_mode; /* SMIAPP_CSI_SIGNALLING_MODE_* */ - const s64 *op_sys_clock; + uint32_t csi_signalling_mode; /* SMIAPP_CSI_SIGNALLING_MODE_* */ + uint64_t *op_sys_clock; enum smiapp_module_board_orient module_board_orient; struct smiapp_flash_strobe_parms *strobe_setup; int (*set_xclk)(struct v4l2_subdev *sd, int hz); - int xshutdown; /* gpio or SMIAPP_NO_XSHUTDOWN */ + int32_t xshutdown; /* gpio or SMIAPP_NO_XSHUTDOWN */ }; #endif /* __SMIAPP_H_ */ |