From 81670a3954f88dd317160040a05593e6c665cfb8 Mon Sep 17 00:00:00 2001 From: Shubhraprakash Das Date: Tue, 5 Jul 2016 17:42:45 -0700 Subject: media: videobuf2: Increase max buffers Increase the maximum video buffers to 64 as with camera 64 buffers are allocated and used. CRs-Fixed: 1039456 Change-Id: I37d91c4f7e5d98333cf6be3c75168e134ae78060 Signed-off-by: Shubhraprakash Das --- include/media/videobuf2-core.h | 2 +- include/uapi/linux/videodev2.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h index 647ebfe5174f..4984d372b04b 100644 --- a/include/media/videobuf2-core.h +++ b/include/media/videobuf2-core.h @@ -17,7 +17,7 @@ #include #include -#define VB2_MAX_FRAME (32) +#define VB2_MAX_FRAME (64) #define VB2_MAX_PLANES (8) enum vb2_memory { diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index c7bb78a0d57b..46b0402a730f 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -70,7 +70,7 @@ * Common stuff for both V4L1 and V4L2 * Moved from videodev.h */ -#define VIDEO_MAX_FRAME 32 +#define VIDEO_MAX_FRAME 64 #define VIDEO_MAX_PLANES 8 /* -- cgit v1.2.3 From 9eb8b67fe9eef65412d630e0ab3d90300a601450 Mon Sep 17 00:00:00 2001 From: Chun Zhang Date: Wed, 16 Mar 2016 17:24:17 -0700 Subject: leds: qpnp-flash-v2: add support for strobe configuration Flash LED module supports various kinds of strobe support. Strobe type can be hardware or software, active high or low, and level or edge trigger. Add support for configuring strobe type through device tree properties. CRs-Fixed: 1024187 Change-Id: Ief6a610c82b7f645966c596f543a1d30f7a40dcc Signed-off-by: Chun Zhang Signed-off-by: Devesh Jhunjhunwala --- include/linux/leds-qpnp-flash-v2.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include') diff --git a/include/linux/leds-qpnp-flash-v2.h b/include/linux/leds-qpnp-flash-v2.h index ae36a163ed21..c1e841689b55 100644 --- a/include/linux/leds-qpnp-flash-v2.h +++ b/include/linux/leds-qpnp-flash-v2.h @@ -25,6 +25,9 @@ struct flash_node_data { struct pinctrl *pinctrl; struct pinctrl_state *gpio_state_active; struct pinctrl_state *gpio_state_suspend; + struct pinctrl_state *hw_strobe_state_active; + struct pinctrl_state *hw_strobe_state_suspend; + int hw_strobe_gpio; int ires_ua; int max_current; int current_ma; @@ -34,6 +37,7 @@ struct flash_node_data { u8 ires; u8 hdrm_val; u8 current_reg_val; + u8 trigger; bool led_on; }; -- cgit v1.2.3 From 01d202d756900e3f0f88bf9b184dbcad6874b41b Mon Sep 17 00:00:00 2001 From: Chun Zhang Date: Tue, 5 Apr 2016 23:36:54 -0700 Subject: leds: qpnp-flash-v2: add callback for max current query Flash LED is a high energy aggregator from system as it is capable to provide current up to 3750mA for illumination. Therefore, it should be used with caution especially when battery state of charge is low. Therefore, add a function which can be used by clients like camera to query the flash current limit before using flash LED. This protects the system from a possible UVLO condition. CRs-Fixed: 964855 Change-Id: I17fa4f28cc151e3a3ad89d284995a3fa770bec68 Signed-off-by: Chun Zhang Signed-off-by: Devesh Jhunjhunwala --- include/linux/leds-qpnp-flash-v2.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include') diff --git a/include/linux/leds-qpnp-flash-v2.h b/include/linux/leds-qpnp-flash-v2.h index c1e841689b55..38d3c9887354 100644 --- a/include/linux/leds-qpnp-flash-v2.h +++ b/include/linux/leds-qpnp-flash-v2.h @@ -16,6 +16,9 @@ #include #include "leds.h" +#define ENABLE_REGULATOR BIT(0) +#define QUERY_MAX_CURRENT BIT(1) + /* * Configurations for each individual LED */ @@ -46,4 +49,6 @@ struct flash_switch_data { struct led_classdev cdev; }; +int qpnp_flash_led_prepare(struct led_classdev *led_cdev, int options); + #endif -- cgit v1.2.3 From 94d2a9fd5dc8a51a4b43e82bd2271d209bd132c2 Mon Sep 17 00:00:00 2001 From: Devesh Jhunjhunwala Date: Thu, 2 Jun 2016 11:59:58 -0700 Subject: leds: qpnp-flash-v2: add regulator support Add support to control regulators required for flash-led. The pmicobalt_bob regulator is one such regulator required by the flash-led device. CRs-Fixed: 1024187 Change-Id: I1515fba2fb04c0b4d21828af3cea6d322262ab14 Signed-off-by: Devesh Jhunjhunwala --- include/linux/leds-qpnp-flash-v2.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'include') diff --git a/include/linux/leds-qpnp-flash-v2.h b/include/linux/leds-qpnp-flash-v2.h index 38d3c9887354..1ff8781d3837 100644 --- a/include/linux/leds-qpnp-flash-v2.h +++ b/include/linux/leds-qpnp-flash-v2.h @@ -19,6 +19,12 @@ #define ENABLE_REGULATOR BIT(0) #define QUERY_MAX_CURRENT BIT(1) +struct flash_regulator_data { + struct regulator *vreg; + const char *reg_name; + u32 max_volt_uv; +}; + /* * Configurations for each individual LED */ @@ -47,6 +53,9 @@ struct flash_node_data { struct flash_switch_data { struct platform_device *pdev; struct led_classdev cdev; + struct flash_regulator_data *reg_data; + u8 num_regulators; + bool regulator_on; }; int qpnp_flash_led_prepare(struct led_classdev *led_cdev, int options); -- cgit v1.2.3 From 533b2558a1e63874d832201d655a02e3186929bd Mon Sep 17 00:00:00 2001 From: Deepak Katragadda Date: Mon, 29 Feb 2016 14:33:20 -0800 Subject: clk: msm: clock-mmss-cobalt: Add display port clock support Add support for the DP link and crypto clocks on MSMCOBALT. CRs-Fixed: 1028725 Change-Id: I6cdb366499f9589dff9a42491c7ff357e98d65c5 Signed-off-by: Deepak Katragadda --- include/dt-bindings/clock/msm-clocks-cobalt.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'include') diff --git a/include/dt-bindings/clock/msm-clocks-cobalt.h b/include/dt-bindings/clock/msm-clocks-cobalt.h index d3cfc622b323..5cdeb01a173b 100644 --- a/include/dt-bindings/clock/msm-clocks-cobalt.h +++ b/include/dt-bindings/clock/msm-clocks-cobalt.h @@ -306,6 +306,11 @@ #define clk_csi2_clk_src 0x4113589f #define clk_csi3_clk_src 0xfd934012 #define clk_fd_core_clk_src 0xe4799ab7 +#define clk_ext_dp_phy_pll_vco 0x441b576b +#define clk_ext_dp_phy_pll_link 0xea12644c +#define clk_dp_link_clk_src 0x370d0626 +#define clk_dp_crypto_clk_src 0xf8faa811 +#define clk_dp_pixel_clk_src 0xf5dfbabf #define clk_ext_extpclk_clk_src 0xe5b273af #define clk_ext_pclk0_clk_src 0x087c1612 #define clk_ext_pclk1_clk_src 0x8067c5a3 @@ -405,6 +410,10 @@ #define clk_mmss_mdss_byte1_intf_clk 0xcf654d8e #define clk_mmss_mdss_byte1_intf_div_clk 0xcdf334c5 #define clk_mmss_mdss_dp_aux_clk 0x23125eb6 +#define clk_mmss_mdss_dp_crypto_clk 0x9a072d4e +#define clk_mmss_mdss_dp_link_clk 0x8dd302d1 +#define clk_mmss_mdss_dp_link_intf_clk 0x70e386e6 +#define clk_mmss_mdss_dp_pixel_clk 0xb707b765 #define clk_mmss_mdss_dp_gtc_clk 0xb59c151a #define clk_mmss_mdss_esc0_clk 0x5721ff83 #define clk_mmss_mdss_esc1_clk 0xc3d0376b -- cgit v1.2.3 From 9f7a8de9ee315043fb3cc3aefff8cc307e441f40 Mon Sep 17 00:00:00 2001 From: Benjamin Chan Date: Wed, 22 Jun 2016 14:54:08 -0400 Subject: msm: sde: Updating linear format definition for v4l2 rotator Providing additonal linear format support for v4l2 rotator in mdss 3.x hardware. CRs-Fixed: 1032294 Change-Id: Ie8a19341831d4ffaea36898a80c71ab25f5daf3c Signed-off-by: Benjamin Chan --- include/uapi/media/msm_sde_rotator.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'include') diff --git a/include/uapi/media/msm_sde_rotator.h b/include/uapi/media/msm_sde_rotator.h index d771959f2e03..461a171a42c1 100644 --- a/include/uapi/media/msm_sde_rotator.h +++ b/include/uapi/media/msm_sde_rotator.h @@ -13,9 +13,23 @@ #define SDE_PIX_FMT_BGRA_8888 V4L2_PIX_FMT_ARGB32 #define SDE_PIX_FMT_RGBX_8888 v4l2_fourcc('X', 'B', '2', '4') #define SDE_PIX_FMT_BGRX_8888 V4L2_PIX_FMT_XRGB32 +#define SDE_PIX_FMT_XBGR_8888 v4l2_fourcc('R', 'X', '2', '4') #define SDE_PIX_FMT_RGBA_5551 v4l2_fourcc('R', 'A', '1', '5') +#define SDE_PIX_FMT_ARGB_1555 V4L2_PIX_FMT_ARGB555 +#define SDE_PIX_FMT_ABGR_1555 v4l2_fourcc('A', 'B', '1', '5') +#define SDE_PIX_FMT_BGRA_5551 v4l2_fourcc('B', 'A', '1', '5') +#define SDE_PIX_FMT_BGRX_5551 v4l2_fourcc('B', 'X', '1', '5') +#define SDE_PIX_FMT_RGBX_5551 v4l2_fourcc('R', 'X', '1', '5') +#define SDE_PIX_FMT_XBGR_1555 v4l2_fourcc('X', 'B', '1', '5') +#define SDE_PIX_FMT_XRGB_1555 V4L2_PIX_FMT_XRGB555 #define SDE_PIX_FMT_ARGB_4444 V4L2_PIX_FMT_ARGB444 #define SDE_PIX_FMT_RGBA_4444 v4l2_fourcc('R', 'A', '1', '2') +#define SDE_PIX_FMT_BGRA_4444 v4l2_fourcc('B', 'A', '1', '2') +#define SDE_PIX_FMT_ABGR_4444 v4l2_fourcc('A', 'B', '1', '2') +#define SDE_PIX_FMT_RGBX_4444 v4l2_fourcc('R', 'X', '1', '2') +#define SDE_PIX_FMT_XRGB_4444 V4L2_PIX_FMT_XRGB444 +#define SDE_PIX_FMT_BGRX_4444 v4l2_fourcc('B', 'X', '1', '2') +#define SDE_PIX_FMT_XBGR_4444 v4l2_fourcc('X', 'B', '1', '2') #define SDE_PIX_FMT_RGB_888 V4L2_PIX_FMT_RGB24 #define SDE_PIX_FMT_BGR_888 V4L2_PIX_FMT_BGR24 #define SDE_PIX_FMT_RGB_565 V4L2_PIX_FMT_RGB565 -- cgit v1.2.3