[Android Q&A, Help & Troubleshooting] celoxocis:
Thank you! :) Well the good thing is i made no changes except those mentioned above outside of the device tree. I tracked changes in the R7 Plus device tree and forked the device tree for the R7S.

And of course removed the bits which were not needed such as fingerprint support. While tracking Uberlaggydarwins F1f device tree i knew what i had to remove.

Thank you! I have seen the R5 commit and already made a diff check last night between 15011 and 15018 to see which files are common files and which are different, this way i can "base" my 15022 DTS files off.

The common files are probably refreshed (newer) files from CM than those from Oppo's github.

As far as i have noted:

meaning:
"+" = Identical(common) between 15011 and 15022
"<----" = means 15022 differs here:
+msm8939-bus.dtsi
+msm8939-camera.dtsi
+msm8939-coresight.dtsi
+msm8939-cpu.dtsi
+msm8939-gpu.dtsi<----
+msm8939-iommu.dtsi
+msm8939-iommu-domains.dtsi
+msm8939-ion.dtsi
+msm8939-ipcrouter.dtsi+
+msm8939-mdss.dtsi<----
+msm8939-mdss-pll.dtsi+
+msm8939-pm.dtsi<----
+msm8939-regulator.dtsi<----
+msm8939-smem.dtsi
+msm8939-smp2p.dtsi
+msm-gdsc-8916.dtsi
+msm-iommu-v2.dtsi
+msm-pm8916.dtsi<----
+msm-pm8916-rpm-regulato.dtsi
+skeleton64.dtsi

Not identical / different naming (diff 15011 / 15018):
(not compared with 15022 yet)
msm8939-audio-internal_codec.dtsi
msm8939-camera-sensor-mtp.dtsi
msm8939-common.dtsi
msm8939-mtp.dtsi
msm8939-pinctrl.dtsi
msm8939-v3.0-gpu.dtsi
msm8939-v3.0-pm.dtsi
msm8939-v3.0.dtsi

I can do the DTS files changes and can also do the changes in:

arch/arm/boot/dts/qcom/Makefile
drivers/input/touchscreen/synaptics_oppo/synaptics_oppo_driver_3508.c

but to be honest the changes below scare me off. I'm not an developer/coder. Im an Windows/Linux/Unix Systems Integrator my skills for coding are limited to simple scripts :-/

drivers/usb/phy/phy-msm-usb.c
sound/soc/codecs/wcd9xxx-mbhc.c
sound/soc/msm/msm8939-slimbus.c

I have not enable insecure adb for adb logging during boot. But I think it is using the DTS file for 15018. Devcheck shows the panel (display driver) as 15018.

I finished compiling CM13.0-20160520

and in this version i don't know why both but Cameras stopped working. Previously they worked but Videocamera did not. I guess this will fix once i include and compile the 15022 DTS files.

Orientation / Rotate is actually inverted. When i rotate the phone 90° Left the Display will rotate 90° right and vice versa. So it is inverted. Same with 180° degree. It will be upside/down.

Not sure what happened here, it worked in an older version. Maybe the "timestamp" fix from a few weeks ago worked for the R7S?

Display driver is 15018 but I'm working on that :)

Everything else works perfectly fine!

Previously to fix the audio and microphone i used the audio_platform_info.xml and mixer_paths_mtp.xml from the R7Plus.

I did compare mixer_paths_mtp.xml of the R7Plus and R7S from ColorOS stock and they only differed in one single line. It worked.

Only thing left are the TFA9890 profiles for the R7S https://github.com/oppo-dev/proprietary_vendor_oppo/commit/c66367fa3970afe98e1398a532c8553fc61d2f53

So it is not much to fix before everything works as most of the work has been done for the R7Plus by you guys :)