Skip to content
Commit 209e2a32 authored by Abhijit Trivedi's avatar Abhijit Trivedi
Browse files

UPSTREAM: Merge remote-tracking branch 'quic/dev/msm-4.9-camx' into msm-4.9



* quic/dev/msm-4.9-camx:
  ARM: dts: msm: Add camera jpeg device for sdm845
  msm: camera: jpeg: add jpeg driver implementation
  msm: camera: update common logging macros
  msm: camera: Initialize the structure with default values
  msm: camera: Return the correct  pointer
  msm: camera: Initialize power down settings size
  msm: camera: Add UAPI header for camera jpeg
  msm: camera: Reduce CDM reset timeout to 300msec

Change-Id: I8fe20e5d30f51d0a304690def622c177c820afe3
Signed-off-by: default avatarAbhijit Trivedi <abhijitt@codeaurora.org>
parents 5f300da0 35c5cf9d
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment