From 0fc4f9f9319555f3bac12228d49cf5751ad8011b Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 15 Jan 2016 00:29:56 +0000 Subject: [PATCH] core/linux-odroid-xu3 to 3.10.92-4 --- .../0001-remove-thermal-messages.patch | 35 -------- .../0002-remove-rtc-messages.patch | 85 ------------------- core/linux-odroid-xu3/PKGBUILD | 17 ++-- core/linux-odroid-xu3/config | 18 ++-- 4 files changed, 15 insertions(+), 140 deletions(-) delete mode 100644 core/linux-odroid-xu3/0001-remove-thermal-messages.patch delete mode 100644 core/linux-odroid-xu3/0002-remove-rtc-messages.patch diff --git a/core/linux-odroid-xu3/0001-remove-thermal-messages.patch b/core/linux-odroid-xu3/0001-remove-thermal-messages.patch deleted file mode 100644 index 6223cf820..000000000 --- a/core/linux-odroid-xu3/0001-remove-thermal-messages.patch +++ /dev/null @@ -1,35 +0,0 @@ -From dec0de6bdf0acee4ebaa6dd570d50561f88d02db Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich -Date: Thu, 4 Dec 2014 20:59:39 -0700 -Subject: [PATCH 1/2] remove thermal messages - ---- - drivers/thermal/exynos_thermal.c | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/drivers/thermal/exynos_thermal.c b/drivers/thermal/exynos_thermal.c -index 287708d..772334e 100644 ---- a/drivers/thermal/exynos_thermal.c -+++ b/drivers/thermal/exynos_thermal.c -@@ -512,10 +512,6 @@ void exynos_tmu_call_notifier(enum tmu_noti_state_t cur_state, int temp) - blocking_notifier_call_chain(&exynos_tmu_notifier, TMU_COLD, &cur_state); - else - blocking_notifier_call_chain(&exynos_tmu_notifier, cur_state, &tmu_old_state); -- if (cur_state == TMU_COLD) -- pr_debug("tmu temperature state %d to %d\n", tmu_old_state, cur_state); -- else -- pr_debug("tmu temperature state %d to %d, cur_temp : %d\n", tmu_old_state, cur_state, temp); - tmu_old_state = cur_state; - } - } -@@ -531,7 +527,6 @@ void exynos_gpu_call_notifier(enum gpu_noti_state_t cur_state) - cur_state = GPU_COLD; - - if (cur_state != gpu_old_state) { -- pr_debug("gpu temperature state %d to %d\n", gpu_old_state, cur_state); - blocking_notifier_call_chain(&exynos_gpu_notifier, cur_state, &cur_state); - gpu_old_state = cur_state; - } --- -2.6.1 - diff --git a/core/linux-odroid-xu3/0002-remove-rtc-messages.patch b/core/linux-odroid-xu3/0002-remove-rtc-messages.patch deleted file mode 100644 index c8b46a92a..000000000 --- a/core/linux-odroid-xu3/0002-remove-rtc-messages.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 0dde28681b13295cd70b69c35b97035573159418 Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich -Date: Thu, 4 Dec 2014 21:02:34 -0700 -Subject: [PATCH 2/2] remove rtc messages - ---- - drivers/rtc/rtc-sec.c | 27 --------------------------- - 1 file changed, 27 deletions(-) - -diff --git a/drivers/rtc/rtc-sec.c b/drivers/rtc/rtc-sec.c -index 95d13bd..743678c 100644 ---- a/drivers/rtc/rtc-sec.c -+++ b/drivers/rtc/rtc-sec.c -@@ -150,10 +150,6 @@ static int s2m_rtc_read_time(struct device *dev, struct rtc_time *tm) - - s2m_data_to_tm(data, tm, info->rtc_24hr_mode); - -- printk(KERN_INFO "%s: %d/%d/%d %d:%d:%d(%d)\n", __func__, -- 1900 + tm->tm_year, 1 + tm->tm_mon, tm->tm_mday, -- tm->tm_hour, tm->tm_min, tm->tm_sec, tm->tm_wday); -- - return rtc_valid_tm(tm); - } - -@@ -171,10 +167,6 @@ static int s2m_rtc_set_time(struct device *dev, struct rtc_time *tm) - - ret = s2m_rtc_set_time_reg(info, 0); - -- printk(KERN_INFO "%s: %d/%d/%d %d:%d:%d(%d)\n", __func__, -- 1900 + tm->tm_year, 1 + tm->tm_mon, tm->tm_mday, -- tm->tm_hour, tm->tm_min, tm->tm_sec, tm->tm_wday); -- - return ret; - } - -@@ -191,12 +183,6 @@ static int s2m_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) - - s2m_data_to_tm(data, &alrm->time, info->rtc_24hr_mode); - -- printk(KERN_INFO "%s: %d/%d/%d %d:%d:%d(%d)\n", __func__, -- 1900 + alrm->time.tm_year, 1 + alrm->time.tm_mon, -- alrm->time.tm_mday, alrm->time.tm_hour, -- alrm->time.tm_min, alrm->time.tm_sec, -- alrm->time.tm_wday); -- - alrm->enabled = 0; - - for (i = 0; i < 7; i++) { -@@ -275,10 +261,6 @@ static int s2m_rtc_stop_alarm(struct s2m_rtc_info *info) - - s2m_data_to_tm(data, &tm, info->rtc_24hr_mode); - -- printk(KERN_INFO "%s: %d/%d/%d %d:%d:%d(%d)\n", __func__, -- 1900 + tm.tm_year, 1 + tm.tm_mon, tm.tm_mday, -- tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_wday); -- - for (i = 0; i < 7; i++) - data[i] &= ~ALARM_ENABLE_MASK; - -@@ -302,10 +284,6 @@ static int s2m_rtc_start_alarm(struct s2m_rtc_info *info) - - s2m_data_to_tm(data, &tm, info->rtc_24hr_mode); - -- printk(KERN_INFO "%s: %d/%d/%d %d:%d:%d(%d)\n", __func__, -- 1900 + tm.tm_year, 1 + tm.tm_mon, tm.tm_mday, -- tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_wday); -- - data[RTC_SEC] |= ALARM_ENABLE_MASK; - data[RTC_MIN] |= ALARM_ENABLE_MASK; - data[RTC_HOUR] |= ALARM_ENABLE_MASK; -@@ -334,11 +312,6 @@ static int s2m_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) - - s2m_tm_to_data(&alrm->time, data); - -- printk(KERN_INFO "%s: %d/%d/%d %d:%d:%d(%d)\n", __func__, -- 1900 + alrm->time.tm_year, 1 + alrm->time.tm_mon, -- alrm->time.tm_mday, alrm->time.tm_hour, alrm->time.tm_min, -- alrm->time.tm_sec, alrm->time.tm_wday); -- - ret = s2m_rtc_stop_alarm(info); - if (ret < 0) - return ret; --- -2.6.1 - diff --git a/core/linux-odroid-xu3/PKGBUILD b/core/linux-odroid-xu3/PKGBUILD index 7d8853726..f566396c7 100644 --- a/core/linux-odroid-xu3/PKGBUILD +++ b/core/linux-odroid-xu3/PKGBUILD @@ -4,25 +4,21 @@ buildarch=4 pkgbase=linux-odroid-xu3 -_commit=8475a30f84c3cb15192aa19dc3b21fe5e124c51c +_commit=e7233384979e0f954dcfb5276feab5baab533eae _srcname=linux-${_commit} _kernelname=${pkgbase#linux} _desc="ODROID-XU3" pkgver=3.10.92 -pkgrel=3 +pkgrel=4 arch=('armv7h') url="https://github.com/hardkernel/linux" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git') options=('!strip') source=("https://github.com/hardkernel/linux/archive/${_commit}.tar.gz" - 'config' - '0001-remove-thermal-messages.patch' - '0002-remove-rtc-messages.patch') -md5sums=('22e378c80613eccc7df49304b4e0d6a7' - '1a1a0c9748fdb7c4428522f6f2d402d7' - 'f6309dcd8c7c932ab79c1e0a5476c996' - 'f7a8357aae3a173905d2a6b3729227e2') + 'config') +md5sums=('30c36a14f8be4fd73f072e5d4f2e13ad' + 'e7c4efba98b936c656f91205626f0346') prepare() { cd "${srcdir}/${_srcname}" @@ -34,9 +30,6 @@ prepare() { # don't run depmod on 'make install'. We'll do this ourselves in packaging sed -i '2iexit 0' scripts/depmod.sh - - git apply ../0001-remove-thermal-messages.patch - git apply ../0002-remove-rtc-messages.patch } build() { diff --git a/core/linux-odroid-xu3/config b/core/linux-odroid-xu3/config index 7914744ca..19010ae78 100644 --- a/core/linux-odroid-xu3/config +++ b/core/linux-odroid-xu3/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.10.92-2 Kernel Configuration +# Linux/arm 3.10.92-4 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -640,9 +640,9 @@ CONFIG_NET=y # Networking options # CONFIG_PACKET=y -# CONFIG_PACKET_DIAG is not set +CONFIG_PACKET_DIAG=m CONFIG_UNIX=y -# CONFIG_UNIX_DIAG is not set +CONFIG_UNIX_DIAG=m CONFIG_XFRM=y CONFIG_XFRM_ALGO=y CONFIG_XFRM_USER=y @@ -2069,7 +2069,7 @@ CONFIG_WATCHDOG_CORE=y # CONFIG_SOFT_WATCHDOG is not set # CONFIG_ARM_SP805_WATCHDOG is not set CONFIG_HAVE_S3C2410_WATCHDOG=y -CONFIG_S3C2410_WATCHDOG=m +CONFIG_S3C2410_WATCHDOG=y # CONFIG_DW_WATCHDOG is not set # CONFIG_MAX63XX_WATCHDOG is not set @@ -2682,6 +2682,7 @@ CONFIG_DRM_EXYNOS_HDMI=y # CONFIG_DRM_EXYNOS_VIDI is not set # CONFIG_DRM_EXYNOS_G2D is not set # CONFIG_DRM_EXYNOS_IPP is not set +CONFIG_DRM_EXYNOS_EXPERIMENTAL_VSYNC=y CONFIG_DRM_UDL=m # CONFIG_DRM_ARMADA is not set # CONFIG_DRM_TILCDC is not set @@ -2690,15 +2691,16 @@ CONFIG_DRM_UDL=m # ARM GPU Configuration # CONFIG_MALI_MIDGARD=y +CONFIG_MALI_TIMELINE_DISABLED=y # CONFIG_MALI_GATOR_SUPPORT is not set +# CONFIG_MALI_MIPE_ENABLED is not set CONFIG_MALI_MIDGARD_DVFS=y -CONFIG_MALI_MIDGARD_RT_PM=y # CONFIG_MALI_MIDGARD_ENABLE_TRACE is not set -CONFIG_MALI_MIDGARD_DEBUG_SYS=y -CONFIG_MALI_EXPERT=y # CONFIG_MALI_DEVFREQ is not set +CONFIG_MALI_EXPERT=y # CONFIG_MALI_DEBUG_SHADER_SPLIT_FS is not set CONFIG_MALI_PLATFORM_FAKE=y +# CONFIG_MALI_PLATFORM_DEVICETREE is not set CONFIG_MALI_PLATFORM_THIRDPARTY=y CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="5422" # CONFIG_MALI_DEBUG is not set @@ -4600,6 +4602,6 @@ CONFIG_BACKPORT_USB_NET_RNDIS_HOST=m # # CONFIG_BACKPORT_USB_WDM is not set CONFIG_RTL8192CU=m -CONFIG_RTL8821AU=m +CONFIG_RTL8812AU=m CONFIG_RTL8188EU=m CONFIG_RTL8192DU=m