projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'sound-asoc/for-next'
[deliverable/linux.git]
/
include
/
media
/
i2c
/
smiapp.h
diff --git
a/include/media/i2c/smiapp.h
b/include/media/i2c/smiapp.h
index 029142ddb95c6b39fcfd8f6608cef103f09224ee..635007e7441a9f5695771683351e85a59b794e5c 100644
(file)
--- a/
include/media/i2c/smiapp.h
+++ b/
include/media/i2c/smiapp.h
@@
-36,8
+36,6
@@
#define SMIAPP_CSI_SIGNALLING_MODE_CCP2_DATA_STROBE 1
#define SMIAPP_CSI_SIGNALLING_MODE_CSI2 2
#define SMIAPP_CSI_SIGNALLING_MODE_CCP2_DATA_STROBE 1
#define SMIAPP_CSI_SIGNALLING_MODE_CSI2 2
-#define SMIAPP_NO_XSHUTDOWN -1
-
/*
* Sometimes due to board layout considerations the camera module can be
* mounted rotated. The typical rotation used is 180 degrees which can be
/*
* Sometimes due to board layout considerations the camera module can be
* mounted rotated. The typical rotation used is 180 degrees which can be
@@
-57,7
+55,7
@@
struct smiapp_flash_strobe_parms {
u8 trigger;
};
u8 trigger;
};
-struct smiapp_
platform_data
{
+struct smiapp_
hwconfig
{
/*
* Change the cci address if i2c_addr_alt is set.
* Both default and alternate cci addr need to be present
/*
* Change the cci address if i2c_addr_alt is set.
* Both default and alternate cci addr need to be present
@@
-75,9
+73,6
@@
struct smiapp_platform_data {
enum smiapp_module_board_orient module_board_orient;
struct smiapp_flash_strobe_parms *strobe_setup;
enum smiapp_module_board_orient module_board_orient;
struct smiapp_flash_strobe_parms *strobe_setup;
-
- int (*set_xclk)(struct v4l2_subdev *sd, int hz);
- int32_t xshutdown; /* gpio or SMIAPP_NO_XSHUTDOWN */
};
#endif /* __SMIAPP_H_ */
};
#endif /* __SMIAPP_H_ */
This page took
0.034244 seconds
and
5
git commands to generate.