Merge pull request #4095 from stefansaraev/wetekplayfix

wetekplay "fixes"

packages/linux-drivers/wetekdvb/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="wetekdvb"
-PKG_VERSION="20150305"
+PKG_VERSION="20150307"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="nonfree"

projects/WeTek_Play/linux/linux.arm.conf

@@ -936,7 +936,7 @@ CONFIG_I2C_AML=y
 # CONFIG_I2C_SW_AML is not set
 # CONFIG_BCM2079X_I2C is not set
 CONFIG_AM_INPUT=y
-CONFIG_SARADC_AM=y
+# CONFIG_SARADC_AM is not set
 CONFIG_MESON_INPUT_REMOTE=y
 CONFIG_AM_REMOTE=y
 # CONFIG_AM_IR_RECEIVER is not set
@@ -945,13 +945,11 @@ CONFIG_MESON_NEW_INPUT_REMOTE=y
 # CONFIG_NEW_AM_REMOTE is not set
 # CONFIG_NEW_AM_IR_TX is not set
 CONFIG_MESON_INPUT_KEYBOARD=y
-# CONFIG_ADC_KEYPADS_AM is not set
 CONFIG_KEY_INPUT_CUSTOM_AM=y
 # CONFIG_TOUCH_KEY_PAD_IT7230 is not set
 # CONFIG_TOUCH_KEY_PAD_SO340010 is not set
 # CONFIG_TOUCH_KEY_PAD_HA2605 is not set
 # CONFIG_MESON_INPUT_TOUCHSCREEN is not set
-# CONFIG_SIMCARD_DETECT_AM is not set
 # CONFIG_AML_HOLD_KEY is not set
 # CONFIG_AML_CALL_KEY is not set
 # CONFIG_SENSOR_DEVICES is not set

projects/WeTek_Play/patches/kodi/0004-Add-support-for-retrieval-of-CPU-temperature-on-Amlo.patch

@@ -1,50 +0,0 @@
-From 41fa8f5e4ad5498417a8de12031003dc1c13ea19 Mon Sep 17 00:00:00 2001
-From: Alex Deryskyba <alex@codesnake.com>
-Date: Tue, 22 Jul 2014 12:18:29 +0300
-Subject: [PATCH 04/17] Add support for retrieval of CPU temperature on Amlogic
-
----
- xbmc/utils/CPUInfo.cpp | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/xbmc/utils/CPUInfo.cpp b/xbmc/utils/CPUInfo.cpp
-index 5f5bf80..c840ab6 100644
---- a/xbmc/utils/CPUInfo.cpp
-+++ b/xbmc/utils/CPUInfo.cpp
-@@ -97,6 +97,10 @@
- #include "settings/AdvancedSettings.h"
- #include "utils/StringUtils.h"
- 
-+#ifdef HAS_LIBAMCODEC
-+#include "utils/AMLUtils.h"
-+#endif
-+
- using namespace std;
- 
- // In milliseconds
-@@ -267,6 +271,10 @@ CCPUInfo::CCPUInfo(void)
-     m_fProcTemperature = fopen("/sys/class/hwmon/hwmon0/temp1_input", "r");
-   if (m_fProcTemperature == NULL)   
-     m_fProcTemperature = fopen("/sys/class/thermal/thermal_zone0/temp", "r");  // On Raspberry PIs
-+#ifdef HAS_LIBAMCODEC
-+  if (m_fProcTemperature == NULL)
-+    m_fProcTemperature = fopen("/sys/class/saradc/temperature", "r");
-+#endif
- 
-   m_fCPUFreq = fopen ("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq", "r");
-   if (!m_fCPUFreq)
-@@ -609,7 +617,10 @@ bool CCPUInfo::getTemperature(CTemperature& temperature)
-     if (!ret)
-     {
-       ret = fscanf(m_fProcTemperature, "%d", &value);
--      value = value / 1000;
-+#ifndef HAS_LIBAMCODEC
-+      if (!aml_present())
-+        value = value / 1000;
-+#endif
-       scale = 'c';
-       ret++;
-     }
--- 
-2.1.4
-