Merge branch 'mr-origin-129' into HEAD

parents e256d3a1 f05d8a29
......@@ -393,6 +393,8 @@ buck4_reg: BUCK4 {
regulator-min-microvolt = <700000>;
regulator-max-microvolt = <1300000>;
rohm,dvs-run-voltage = <1000000>;
regulator-boot-on;
regulator-always-on;
};
buck5_reg: BUCK5 {
......
......@@ -522,7 +522,10 @@ CONFIG_REGULATOR_TPS65132=y
CONFIG_RC_CORE=m
CONFIG_MEDIA_SUPPORT=m
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CONTROLLER=y
CONFIG_MEDIA_CONTROLLER_REQUEST_API=y
CONFIG_MEDIA_PLATFORM_SUPPORT=y
CONFIG_VIDEO_V4L2_SUBDEV_API=y
CONFIG_MEDIA_USB_SUPPORT=y
CONFIG_USB_VIDEO_CLASS=m
CONFIG_V4L_PLATFORM_DRIVERS=y
......@@ -853,6 +856,8 @@ CONFIG_STAGING=y
CONFIG_STAGING_MEDIA=y
CONFIG_VIDEO_IMX7_MEDIA=m
CONFIG_ASHMEM=y
CONFIG_VIDEO_HANTRO=m
CONFIG_COMMON_CLK_VERSATILE=y
CONFIG_COMMON_CLK_BD718XX=m
CONFIG_COMMON_CLK_FIXED_MMIO=y
CONFIG_CLK_IMX8MQ=y
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment