diff --git a/arch/arm/mach-omap2/board-rx51-camera.c b/arch/arm/mach-omap2/board-rx51-camera.c
index 9b692d3..366dd3d 100644
--- a/arch/arm/mach-omap2/board-rx51-camera.c
+++ b/arch/arm/mach-omap2/board-rx51-camera.c
@@ -279,6 +279,22 @@ static struct adp1653_platform_data rx51_adp1653_platform_data = {

 #define ACMELITE_XCLK      ISP_XCLK_A

+static int rx51_acmelite_set_xshutdown(struct v4l2_subdev *subdev, int set)
+{
+   int ret;
+
+   ret = rx51_camera_set_xshutdown(RX51_CAMERA_ACMELITE, set);
+   if (ret == 0 && set) {
+       /* CONTROL_CSIRXFE
+        * Data/clock, enable transceiver, disable reset
+        */
+       omap_ctrl_writel(OMAP343X_CSIB_RESET | OMAP343X_CSIB_PWRDNZ,
+               OMAP343X_CONTROL_CSIRXFE);
+   }
+
+   return ret;
+}
+
 static int rx51_acmelite_set_xclk(struct v4l2_subdev *subdev, int hz)
 {
    struct isp_device *isp = v4l2_dev_to_isp_device(subdev->v4l2_dev);
@@ -286,8 +302,14 @@ static int rx51_acmelite_set_xclk(struct v4l2_subdev *subdev, int hz)
    if (!isp)
        return 1;

+   if (hz == 0)
+       rx51_acmelite_set_xshutdown(subdev, 0);
+
    isp->platform_cb.set_xclk(isp, hz, ACMELITE_XCLK);

+   if (hz != 0)
+       rx51_acmelite_set_xshutdown(subdev, 1);
+
    return 0;
 }

@@ -298,7 +320,7 @@ static struct smiapp_platform_data rx51_smiapp_sensor_platform_data = {
    .op_sys_clock       = (s64 []){ 12000000 * 10 / 2, 0 },
    .csi_signalling_mode    = SMIAPP_CSI_SIGNALLING_MODE_CCP2_DATA_CLOCK,
    .set_xclk       = rx51_acmelite_set_xclk,
-   .xshutdown      = ACMELITE_RESET_GPIO,
+   .xshutdown      = SMIAPP_NO_XSHUTDOWN,
 };

 /*