Revert "drivers:thermal:fixed merging conlicts"

This reverts commit ff078d3cac4e9a129f81dbabe53f100c77c0b798.
Revert "drivers:thermal:export CPU temp to the userspace (credits to francisco)"

This reverts commit ad89f2e6db71e3d4d97351b5849160798fdec3fb.