Merge branch 'akpm' (patches from Andrew)

[cascardo/linux.git] / drivers / media / i2c / smiapp / smiapp.h

diff --git a/drivers/media/i2c/smiapp/smiapp.h b/drivers/media/i2c/smiapp/smiapp.h
index 2174f89..aae72bc 100644 (file)
--- a/drivers/media/i2c/smiapp/smiapp.h
+++ b/drivers/media/i2c/smiapp/smiapp.h
@@ -151,7 +151,7 @@ struct smiapp_csi_data_format {
 #define SMIAPP_PADS                    2
 
 #define SMIAPP_COMPRESSED_BASE         8
-#define SMIAPP_COMPRESSED_MAX          12
+#define SMIAPP_COMPRESSED_MAX          16
 #define SMIAPP_NR_OF_COMPRESSED                (SMIAPP_COMPRESSED_MAX - \
                                         SMIAPP_COMPRESSED_BASE + 1)
 
@@ -197,9 +197,10 @@ struct smiapp_sensor {
        struct smiapp_subdev *binner;
        struct smiapp_subdev *scaler;
        struct smiapp_subdev *pixel_array;
-       struct smiapp_platform_data *platform_data;
+       struct smiapp_hwconfig *hwcfg;
        struct regulator *vana;
        struct clk *ext_clk;
+       struct gpio_desc *xshutdown;
        u32 limits[SMIAPP_LIMIT_LAST];
        u8 nbinning_subtypes;
        struct smiapp_binning_subtype binning_subtypes[SMIAPP_BINNING_SUBTYPES];