Commit d864b7da authored by Dennis Rassmann's avatar Dennis Rassmann
Browse files

Merge remote-tracking branch 'cm/cm-11.0'

parents 89ead00c 8e6d9609
......@@ -18,6 +18,13 @@
aliases {
serial0 = &blsp1_uart1;
};
oem_data_mem: oem_data_region@5900000 {
linux,reserve-contiguous-region;
linux,reserve-region;
linux,remove-completely;
reg = <0x5900000 0x100000>;
};
};
&soc {
......@@ -25,6 +32,12 @@
status = "ok";
};
oem_data_sharedmem {
compatible = "qcom,sharedmem-uio";
reg = <0x5900000 0x100000>;
reg-names = "oem_data";
};
qcom,mdss_mdp@fd900000 {
qcom,mdss-pref-prim-intf = "dsi";
batfet-supply = <&pm8941_chg_batif>;
......
......@@ -480,7 +480,7 @@ CONFIG_MSM_BUS_SCALING=y
CONFIG_MSM_WATCHDOG_V2=y
CONFIG_MSM_MEMORY_DUMP=y
CONFIG_MSM_DLOAD_MODE=y
CONFIG_MSM_JTAG=y
# CONFIG_MSM_JTAG is not set
# CONFIG_MSM_JTAG_MM is not set
# CONFIG_MSM_SLEEP_STATS_DEVICE is not set
CONFIG_MSM_RUN_QUEUE_STATS=y
......
......@@ -644,7 +644,8 @@ set_rcvbuf:
case SO_KEEPALIVE:
#ifdef CONFIG_INET
if (sk->sk_protocol == IPPROTO_TCP)
if (sk->sk_protocol == IPPROTO_TCP &&
sk->sk_type == SOCK_STREAM)
tcp_set_keepalive(sk, valbool);
#endif
sock_valbool_flag(sk, SOCK_KEEPOPEN, valbool);
......
......@@ -250,7 +250,6 @@ static struct snd_soc_dai_driver msm_fe_dais[] = {
.rate_max = 48000,
},
.ops = &msm_fe_Multimedia_dai_ops,
.compress_dai = 1,
.name = "MultiMedia6",
},
{
......@@ -295,7 +294,6 @@ static struct snd_soc_dai_driver msm_fe_dais[] = {
.rate_max = 48000,
},
.ops = &msm_fe_Multimedia_dai_ops,
.compress_dai = 1,
.name = "MultiMedia8",
},
/* FE DAIs created for hostless operation purpose */
......
......@@ -2341,7 +2341,7 @@ static struct snd_soc_dai_link msm8974_common_dai_links[] = {
.name = "MSM8974 Compress8",
.stream_name = "Compress8",
.cpu_dai_name = "MultiMedia8",
.platform_name = "msm-compress-dsp",
.platform_name = "msm-compr-dsp",
.dynamic = 1,
.async_ops = ASYNC_DPCM_SND_SOC_PREPARE
| ASYNC_DPCM_SND_SOC_HW_PARAMS,
......
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