3 files changed, 28 insertions, 0 deletions

diff --git a/include/linux/omap-iommu.h b/include/linux/omap-iommu.h
index c1aede46718b..ce1b7c6283ee 100644
--- a/include/linux/omap-iommu.h
+++ b/include/linux/omap-iommu.h
@@ -13,7 +13,12 @@
 #ifndef _OMAP_IOMMU_H_
 #define _OMAP_IOMMU_H_
 
+#ifdef CONFIG_OMAP_IOMMU
 extern void omap_iommu_save_ctx(struct device *dev);
 extern void omap_iommu_restore_ctx(struct device *dev);
+#else
+static inline void omap_iommu_save_ctx(struct device *dev) {}
+static inline void omap_iommu_restore_ctx(struct device *dev) {}
+#endif
 
 #endif
diff --git a/include/linux/platform_data/media/mmp-camera.h b/include/linux/platform_data/media/mmp-camera.h
index 83804028115c..d2d3a443eedf 100644
--- a/include/linux/platform_data/media/mmp-camera.h
+++ b/include/linux/platform_data/media/mmp-camera.h
@@ -3,8 +3,27 @@
  * Information for the Marvell Armada MMP camera
  */
 
+#include <media/v4l2-mediabus.h>
+
+enum dphy3_algo {
+        DPHY3_ALGO_DEFAULT = 0,
+        DPHY3_ALGO_PXA910,
+        DPHY3_ALGO_PXA2128
+};
+
 struct mmp_camera_platform_data {
         struct platform_device *i2c_device;
         int sensor_power_gpio;
         int sensor_reset_gpio;
+        enum v4l2_mbus_type bus_type;
+        int mclk_min;   /* The minimal value of MCLK */
+        int mclk_src;   /* which clock source the MCLK derives from */
+        int mclk_div;   /* Clock Divider Value for MCLK */
+        /*
+         * MIPI support
+         */
+        int dphy[3];            /* DPHY: CSI2_DPHY3, CSI2_DPHY5, CSI2_DPHY6 */
+        enum dphy3_algo dphy3_algo;     /* algos for calculate CSI2_DPHY3 */
+        int lane;               /* ccic used lane number; 0 means DVP mode */
+        int lane_clk;
 };
diff --git a/include/linux/sony-laptop.h b/include/linux/sony-laptop.h
index 1a4b77317fa1..374d0fdb0743 100644
--- a/include/linux/sony-laptop.h
+++ b/include/linux/sony-laptop.h
@@ -28,7 +28,11 @@
 #define SONY_PIC_COMMAND_GETCAMERAROMVERSION    18      /* obsolete */
 #define SONY_PIC_COMMAND_GETCAMERAREVISION      19      /* obsolete */
 
+#if IS_ENABLED(CONFIG_SONY_LAPTOP)
 int sony_pic_camera_command(int command, u8 value);
+#else
+static inline int sony_pic_camera_command(int command, u8 value) { return 0; };
+#endif
 
 #endif  /* __KERNEL__ */