进行中 #53 » aaa.patch
kernel/drivers/media/i2c/xs9922/xs9922.c | ||
---|---|---|
};
|
||
static const struct xs9922_mode supported_modes[] = {
|
||
#ifndef RP_AHD_1080P
|
||
//#ifndef RP_AHD_1080P
|
||
{
|
||
.bus_fmt = MEDIA_BUS_FMT_UYVY8_2X8,//MEDIA_BUS_FMT_UYVY8_2X8,
|
||
.width = 1280,
|
||
... | ... | |
.vc[PAD2] = V4L2_MBUS_CSI2_CHANNEL_2,
|
||
.vc[PAD3] = V4L2_MBUS_CSI2_CHANNEL_3,
|
||
},
|
||
#endif
|
||
//<<<<<<< Updated upstream
|
||
/*#endif
|
||
{
|
||
=======
|
||
{
|
||
>>>>>>> Stashed changes
|
||
.bus_fmt = MEDIA_BUS_FMT_UYVY8_2X8,//MEDIA_BUS_FMT_UYVY8_2X8,
|
||
.width = 1920,
|
||
.height = 1080,
|
||
... | ... | |
.vc[PAD1] = V4L2_MBUS_CSI2_CHANNEL_1,
|
||
.vc[PAD2] = V4L2_MBUS_CSI2_CHANNEL_2,
|
||
.vc[PAD3] = V4L2_MBUS_CSI2_CHANNEL_3,
|
||
}
|
||
}*/
|
||
};
|
||
- « Previous
- 1
- …
- 7
- 8
- 9
- Next »