diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-06-03 11:46:14 -0600 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2016-06-03 11:46:14 -0600 |
| commit | c7cdc5071fdb0dd9dbcfce744fdf2c22d59dcf43 (patch) | |
| tree | 7dc4f6be176e3151fc16f54ee935827d98894f11 /include | |
| parent | 739d6d7a4ce26bbd5eeb3115d8ceb88dbb28f17b (diff) | |
| parent | d4c48266b2bb34be0a09cea38a551872c64d7790 (diff) | |
Promotion of kernel.lnx.4.4-160602.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1014726 Ia6d4755408646ac4a75724f3c6f2177651875da3 ASoC: compress: fix unsigned integer overflow check
999619 Ia31c3f10c24380d9670cd0ca83834844435e593d msm: camera: isp: For vfe version 4.8 do not reset vbif
1021009 Id0687402d56f24ca851916f92f86a145136bb866 msm: camera: Configure some of the csiphy registers
1023180 I9601efd300c7f428c4576e6ecf6d31791d0b47bd arm64: dma-mapping: Attach IOMMUs as groups
1021593 Ide3309d4dc713892703e2eb5ee33c9db7f990156 clk: msm: osm: increase main PLL minimum L_VAL to 825.6
987041 I2eb33c63168ab26818dfdb3e11315f2ce8f24fa5 net: core: neighbour: Change the print format for addres
1003213 I9f9845fea425fc4463dae72e8f8ab6e8bda23121 clk: msm: clock-gcc-cobalt: Add the cnoc_periph RPM reso
1008023 If43428f0eb53370ca725480b3cd13e7b53e643c3 ARM: dts: msm: Advertise SG support by rmnet_ipa on msmc
1023412 I812f0f6b38e7e9973cc9a0c8bfd6fb5078f719ff ARM: dts: msm: rename the flash/WLED devices in pmicobal
1021593 1022853 I1fdde432e267c1161ac5d28bdee4af57c23137ec ARM: dts: msm: Add full Silver cluster frequency plan fo
890916 If4503b0e25ac151039d1743a007ba1624a2e90f4 ARM: dts: msm: Add Round robin ADC channels for pmicobal
1022663 I60185482ae9b5364e297370593d95cce056b314e clk: msm: clock-mmss-8996: Add graphics clocks support o
1023187 Icb5c5f219a197a158e00f600e68111ff699062b7 clk: msm: osm: increase unstall timer for PC/RET FSM to
890916 I88b5922ab4dc817257042fdaa385768e6f14be57 defconfig: arm64: msmcortex: Enable IIO and RRADC driver
1007397 Iab4f544532e57682eb5dbfe7865850b8e978f1b4 ARM: dts: msm: add WCN3990 BT/FM support for msmcobalt d
1015446 I78f1d3a1ac9ed09d2f4f266f61a1c14d44b41f53 ARM: dts: msm: Enable the GPU clock driver on MSMCOBALT
1019576 Ibd0041cea2ac47180110a1cfe96516d347d9816a ARM: dts: msm: disable IPA and rmnet-ipa nodes on APQ809
1017800 I93aa6df8c7ec1916ba23d21d92e477510db949da qcom-charger: use mutex instead of spinlock when calling
1008023 Idf626cb5a22d2ed5152ab76dcc5fe56696a631a6 msm: rmnet_ipa3: add RMNET_IOCTL_GET_SG_SUPPORT support
Change-Id: I4e27425902c8c7fc8baad951575616e92b28b2fc
CRs-Fixed: 1014726, 1023180, 1023412, 1021593, 1023187, 1003213, 1017800, 890916, 1008023, 1022853, 1007397, 1022663, 987041, 1015446, 1019576, 1021009, 999619
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/clock/msm-clocks-cobalt.h | 10 | ||||
| -rw-r--r-- | include/dt-bindings/clock/msm-clocks-hwio-cobalt.h | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/include/dt-bindings/clock/msm-clocks-cobalt.h b/include/dt-bindings/clock/msm-clocks-cobalt.h index 607bcfb9b506..bb2c7b64809a 100644 --- a/include/dt-bindings/clock/msm-clocks-cobalt.h +++ b/include/dt-bindings/clock/msm-clocks-cobalt.h @@ -19,14 +19,15 @@ #define clk_ce1_clk 0x42229c55 #define clk_ce1_a_clk 0x44a833fe #define clk_cxo_clk_src 0x79e95308 -#define clk_pnoc_clk 0x4325d220 -#define clk_pnoc_a_clk 0x2808c12b #define clk_bimc_clk 0x4b80bf00 #define clk_bimc_a_clk 0x4b25668a #define clk_cnoc_clk 0xd5ccb7f4 #define clk_cnoc_a_clk 0xd8fe2ccc #define clk_snoc_clk 0x2c341aa0 #define clk_snoc_a_clk 0x8fcef2af +#define clk_cnoc_periph_clk 0xb11e9cf9 +#define clk_cnoc_periph_a_clk 0x1d7faa2e +#define clk_cnoc_periph_keepalive_a_clk 0x7287aef2 #define clk_ln_bb_clk1 0xb867b147 #define clk_ln_bb_clk1_ao 0x7f63a93a #define clk_ln_bb_clk1_pin 0x6fc5653c @@ -61,11 +62,6 @@ #define clk_mcd_ce1_clk 0xbb615d26 #define clk_mmssnoc_axi_clk 0xdb4b31e6 #define clk_mmssnoc_axi_a_clk 0xd4970614 -#define clk_pnoc_keepalive_a_clk 0xf8f91f0b -#define clk_pnoc_msmbus_clk 0x38b95c77 -#define clk_pnoc_msmbus_a_clk 0x8c9b4e93 -#define clk_pnoc_pm_clk 0xd6f7dfb9 -#define clk_pnoc_sps_clk 0xd482ecc7 #define clk_qcedev_ce1_clk 0x293f97b0 #define clk_qcrypto_ce1_clk 0xa6ac14df #define clk_qdss_clk 0x1492202a diff --git a/include/dt-bindings/clock/msm-clocks-hwio-cobalt.h b/include/dt-bindings/clock/msm-clocks-hwio-cobalt.h index a39433fa150f..52a28b5cbaf5 100644 --- a/include/dt-bindings/clock/msm-clocks-hwio-cobalt.h +++ b/include/dt-bindings/clock/msm-clocks-hwio-cobalt.h @@ -30,9 +30,9 @@ #define CXO_CLK_SRC_ID 0x0 #define QDSS_CLK_ID 0x1 -#define PNOC_CLK_ID 0x0 #define SNOC_CLK_ID 0x1 #define CNOC_CLK_ID 0x2 +#define CNOC_PERIPH_CLK_ID 0x0 #define BIMC_CLK_ID 0x0 #define IPA_CLK_ID 0x0 #define CE1_CLK_ID 0x0 |