{
        struct v4l2_ctrl_handler *ctrl_hdlr = &imx335->ctrl_handler;
        const struct imx335_mode *mode = imx335->cur_mode;
+       struct v4l2_fwnode_device_properties props;
        u32 lpfr;
        int ret;
 
-       ret = v4l2_ctrl_handler_init(ctrl_hdlr, 7);
+       ret = v4l2_fwnode_device_parse(imx335->dev, &props);
+       if (ret)
+               return ret;
+
+       /* v4l2_fwnode_device_properties can add two more controls */
+       ret = v4l2_ctrl_handler_init(ctrl_hdlr, 9);
        if (ret)
                return ret;
 
        if (imx335->hblank_ctrl)
                imx335->hblank_ctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY;
 
+       v4l2_ctrl_new_fwnode_properties(ctrl_hdlr, &imx335_ctrl_ops, &props);
+
        if (ctrl_hdlr->error) {
                dev_err(imx335->dev, "control init failed: %d\n",
                        ctrl_hdlr->error);