Revert "merge jb_mr1_rb1.68 from caf"

This reverts commit 699e5fa3eef8e25866285f24f9add1d044ff59b0.

Conflicts:
	arch/arm/boot/dts/msm8974-clock.dtsi
	arch/arm/mach-msm/Makefile
	arch/arm/mach-msm/Makefile.boot
	arch/arm/mach-msm/include/mach/gpiomux.h
	arch/arm/mach-msm/lpm_levels.c
	drivers/input/touchscreen/Makefile
	drivers/media/platform/msm/camera_v2/Kconfig
	drivers/media/platform/msm/camera_v2/sensor/Makefile
	drivers/media/platform/msm/camera_v2/sensor/ov5648.c
	drivers/power/qpnp-charger.c
	drivers/video/msm/mdss/Kconfig
	drivers/video/msm/mdss/Makefile
	drivers/video/msm/mdss/mdss_dsi.c
	drivers/video/msm/mdss/mdss_dsi_host.c
	drivers/video/msm/mdss/mdss_dsi_panel.c
	drivers/video/msm/mdss/mdss_hdmi_edid.c
	drivers/video/msm/mdss/mdss_mdp_ctl.c
	sound/soc/codecs/wcd9xxx-mbhc.c
	sound/soc/msm/qdsp6v2/msm-dolby-dap-config.c
	sound/soc/msm/qdsp6v2/msm-dolby-dap-config.h
nx503a : mdss: update kernel to support autogenerated dtsi files
nx503a : display: Move reset sequence from dsi controller to panel dtsi
nx503a : mdss: disable qcom reset sequence ---- test
nx503a : mdss: primary panel config from boot param  --part

    Add ability to read kernel's boot parameters to
    check for primary panel interface and panel
    configuration. The parameter passes three
    fields of information which are parsed by the MDP
    driver as a part of the device probe.

    Format for cmdline param expected is:
    "mdss_mdp.panel=<lk_cfg>:<pan_intf>:<dt_node_name_panel>"
    where <lk_cfg> is "1" - lk/gcdb config or "0" non-lk/non-gcdb
    config;
    <pan_intf> is one of "dsi:<ctrl_id>", "hdmi", "edp";
    and <dt_node_name_panel> is the string identical to panel's
    device node name from the DT.

    Change-Id: Ib9e7e4b69c62537f551aaf9ccaf0dd69eddd6889
    Signed-off-by: Manoj Rao <manojraj@codeaurora.org>
    Signed-off-by: Jayant Shekhar <jshekhar@codeaurora.org>
nx503a :  dts: msm: enable edp device node
nx503a :  dts: msm: add phandles for dsi panels
nx503a :  dts: msm: primary disp pref for msm8974
nx503a : msm: Support touch with 1080p display on 8974
nx503a : msm8974: Add touchscreen firmware file name
nx503a : dts: msm: Define UART aliases for 8974 --- test
nx503a : merge msm8974.dtsi from caf
nx503a : merge msm8974-mtp.dtsi from caf
nx503a : merge msm8974-regulator.dtsi from caf
nx503a : merge msm-pm8941.dtsi from caf --- test
nx503a : merge msm8974-leds.dtsi from caf --- test
nx503a : msm8974-mdss.dtsi from caf
nx503a : merge msm8974-v2.2.dtsi from caf
nx503a : merge msm8974-v2.dtsi from caf
nx503a : merge msm8974-camera-sensor-mtp.dtsi from caf