diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-04-19 19:02:28 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2016-04-19 19:02:29 -0700 |
| commit | 03ce2c9390eea8aa5360ea336b1f50a2383f50e2 (patch) | |
| tree | 58772ceac1596cecddd0043aae3f09ad3b967b04 /include | |
| parent | ff586a964c7d34d12eaeabc7ece026b4b67a05fc (diff) | |
| parent | b001afe7ef51fbc77812fd4da840e0ef44dc1f7b (diff) | |
Promotion of kernel.lnx.4.4-160418.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1002362 I319a93c49022b08e5c33b561d982a751d5223a58 soc: qcom: glink: Fix channel migration logic
1000848 I394bfc1c72492415d6f7fbb0b10df309b86d6faa ARM: dts: msm: Don't set the iommus property on IOMMUs
1000848 Id52d17f034a8d5403448fd09b78003e5ab23639c ARM: dts: msm: Add some more clocks for the GPU SMMU
1003624 I65dd431b7f1f756b33a2a0b25ab841aad5368967 um: define TIF_MM_RELEASED
1000642 999611 I7bbbc9d2318bd5a6bd2ea051fad43898ae979381 ARM: dts: msm: Add gladitor erp v2 device definition on
1002041 Ie49e47f2a0f26144e0107759fedc67c3af80032c usb: gadget: f_diag: Fix list corruption due to diag_con
1001827 I93facd07e46e2e2ce9e302c5a6d48ae2fb2ca9c3 defconfig: msm8996: enable bonding and TC drivers
1003245 I84fd0170a3a0ea41070c1368a5f6efdae5288f2d defconfig: msmcortex: Enable CONFIG_UIO and CONFIG_UIO_M
1000637 999611 I1605e68893a73f364f044c046e65b563e666bcd4 ARM: dts: msm: Add uartblsp node in msmcobalt cdp and mt
1002440 I2eb9f1e11f97cf7eeee4314616bc5d06443c8920 regmap: spmi: Fix regmap_spmi_ext_read in multi-byte cas
1000642 999611 I2c7a36f6a31e2f7caa36aa5632f8ddb4746abcc1 defconfig: msmcobalt: Enable gladiator error reporting v
1000848 I6b0ffa35d73e7d5e4ed506779444ebc2902a7d28 ARM: dts: msm: Add bus vote for MMSS SMMU
996399 I843c9a3e56b567a3e7bada1833bbee66fff60892 defconfig: msm: enable GIC_V3_ACL access control
1001858 I5a320a605622fab85373d02fdbc6c206ddc514aa msm_11ad: enable SMMU S1 bypass
969563 I16b0c2106ae649b8a23b7ebb534c967aebd72774 arm64: errata: Enable #845719 Errataum for Kryo2xx Silve
1003173 I976c2b9e9739b603f6cfb10d11c7b1d64cb577c5 clk: msm: clock: Add support for the mdss byte_intf_div
1000642 999611 I68c5ce09cc77a19eb334a1d8ccce8d577f964316 soc: qcom: Add support for gladiator error reporting v2
1001324 Ice15afd63e006401a469376277b50a129ef177b4 msm: jpeg: DMA V4L2 driver changes
1000724 I696aab348cdb04db4068b2b62bcd049c839cbc33 msm: mdss: make DSI regulator settings an optional dt bi
Change-Id: I4098fa99b254ba648dd9cbd905efd59040f2bd56
CRs-Fixed: 1001827, 1003173, 1000637, 1001324, 1003624, 1002440, 1002362, 1000848, 1000724, 969563, 1000642, 999611, 1002041, 1001858, 1003245, 996399
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/clock/msm-clocks-cobalt.h | 2 | ||||
| -rw-r--r-- | include/dt-bindings/clock/msm-clocks-hwio-cobalt.h | 2 | ||||
| -rw-r--r-- | include/uapi/media/msm_jpeg_dma.h | 8 |
3 files changed, 11 insertions, 1 deletions
diff --git a/include/dt-bindings/clock/msm-clocks-cobalt.h b/include/dt-bindings/clock/msm-clocks-cobalt.h index 8fb7e73441bc..bd0ae1388487 100644 --- a/include/dt-bindings/clock/msm-clocks-cobalt.h +++ b/include/dt-bindings/clock/msm-clocks-cobalt.h @@ -398,8 +398,10 @@ #define clk_mmss_mdss_axi_clk 0xdf04fc1d #define clk_mmss_mdss_byte0_clk 0x38105d25 #define clk_mmss_mdss_byte0_intf_clk 0x38e5aa79 +#define clk_mmss_mdss_byte0_intf_div_clk 0x8604f181 #define clk_mmss_mdss_byte1_clk 0xe0c21354 #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_gtc_clk 0xb59c151a #define clk_mmss_mdss_esc0_clk 0x5721ff83 diff --git a/include/dt-bindings/clock/msm-clocks-hwio-cobalt.h b/include/dt-bindings/clock/msm-clocks-hwio-cobalt.h index 22bafd3ee428..9ba814880632 100644 --- a/include/dt-bindings/clock/msm-clocks-hwio-cobalt.h +++ b/include/dt-bindings/clock/msm-clocks-hwio-cobalt.h @@ -358,8 +358,10 @@ #define MMSS_MDSS_AXI_CBCR 0x02310 #define MMSS_MDSS_BYTE0_CBCR 0x0233C #define MMSS_MDSS_BYTE0_INTF_CBCR 0x02374 +#define MMSS_MDSS_BYTE0_INTF_DIV 0x0237C #define MMSS_MDSS_BYTE1_CBCR 0x02340 #define MMSS_MDSS_BYTE1_INTF_CBCR 0x02378 +#define MMSS_MDSS_BYTE1_INTF_DIV 0x02380 #define MMSS_MDSS_DP_AUX_CBCR 0x02364 #define MMSS_MDSS_DP_CRYPTO_CBCR 0x0235C #define MMSS_MDSS_DP_GTC_CBCR 0x02368 diff --git a/include/uapi/media/msm_jpeg_dma.h b/include/uapi/media/msm_jpeg_dma.h index 44fa4ed8af52..df3c7ee5b7cf 100644 --- a/include/uapi/media/msm_jpeg_dma.h +++ b/include/uapi/media/msm_jpeg_dma.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, The Linux Foundation. All rights reserved. +/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -18,4 +18,10 @@ /* msm jpeg dma control ID's */ #define V4L2_CID_JPEG_DMA_SPEED (V4L2_CID_PRIVATE_BASE) +/* msm_jpeg_dma_buf */ +struct msm_jpeg_dma_buff { + int32_t fd; + uint32_t offset; +}; + #endif /* __UAPI_MSM_JPEG_DMA__ */ |