mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 05:36:47 +00:00
linux: update to linux-3.12.4
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
b73d898360
commit
ce268cdd07
@ -21,7 +21,7 @@
|
|||||||
PKG_NAME="linux"
|
PKG_NAME="linux"
|
||||||
case "$LINUX" in
|
case "$LINUX" in
|
||||||
*)
|
*)
|
||||||
PKG_VERSION="3.12.3"
|
PKG_VERSION="3.12.4"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz"
|
PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||||
|
@ -1,72 +0,0 @@
|
|||||||
commit 073af93346306a0e079c161e3ed8dd263fef0b20
|
|
||||||
Author: Stefan Saraev <stefan@saraev.ca>
|
|
||||||
Date: Sat Jul 13 19:31:03 2013 +0300
|
|
||||||
|
|
||||||
Support for cheap Ralink 3070 WiFi plug
|
|
||||||
|
|
||||||
source: http://www.geekamole.com/2013/rt2800usb-fix-for-ralinkmediatek-3070-gentoo-linux/
|
|
||||||
|
|
||||||
diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h
|
|
||||||
index a7630d5..9504d45 100644
|
|
||||||
--- a/drivers/net/wireless/rt2x00/rt2800.h
|
|
||||||
+++ b/drivers/net/wireless/rt2x00/rt2800.h
|
|
||||||
@@ -69,6 +69,7 @@
|
|
||||||
#define RF3320 0x000b
|
|
||||||
#define RF3322 0x000c
|
|
||||||
#define RF3053 0x000d
|
|
||||||
+#define RF3070 0x3070
|
|
||||||
#define RF5592 0x000f
|
|
||||||
#define RF3290 0x3290
|
|
||||||
#define RF5360 0x5360
|
|
||||||
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
|
|
||||||
index 72f32e5..3e18df4 100644
|
|
||||||
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
|
|
||||||
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
|
|
||||||
@@ -2599,6 +2599,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
|
|
||||||
break;
|
|
||||||
case RF5360:
|
|
||||||
case RF5370:
|
|
||||||
+ case RF3070:
|
|
||||||
case RF5372:
|
|
||||||
case RF5390:
|
|
||||||
case RF5392:
|
|
||||||
@@ -2615,6 +2616,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
|
|
||||||
rt2x00_rf(rt2x00dev, RF3322) ||
|
|
||||||
rt2x00_rf(rt2x00dev, RF5360) ||
|
|
||||||
rt2x00_rf(rt2x00dev, RF5370) ||
|
|
||||||
+ rt2x00_rf(rt2x00dev, RF3070) ||
|
|
||||||
rt2x00_rf(rt2x00dev, RF5372) ||
|
|
||||||
rt2x00_rf(rt2x00dev, RF5390) ||
|
|
||||||
rt2x00_rf(rt2x00dev, RF5392)) {
|
|
||||||
@@ -3199,6 +3201,7 @@ void rt2800_vco_calibration(struct rt2x00_dev *rt2x00dev)
|
|
||||||
case RF3290:
|
|
||||||
case RF5360:
|
|
||||||
case RF5370:
|
|
||||||
+ case RF3070:
|
|
||||||
case RF5372:
|
|
||||||
case RF5390:
|
|
||||||
case RF5392:
|
|
||||||
@@ -5515,6 +5518,7 @@ static int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)
|
|
||||||
case RF3322:
|
|
||||||
case RF5360:
|
|
||||||
case RF5370:
|
|
||||||
+ case RF3070:
|
|
||||||
case RF5372:
|
|
||||||
case RF5390:
|
|
||||||
case RF5392:
|
|
||||||
@@ -5969,6 +5973,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
|
|
||||||
rt2x00_rf(rt2x00dev, RF3322) ||
|
|
||||||
rt2x00_rf(rt2x00dev, RF5360) ||
|
|
||||||
rt2x00_rf(rt2x00dev, RF5370) ||
|
|
||||||
+ rt2x00_rf(rt2x00dev, RF3070) ||
|
|
||||||
rt2x00_rf(rt2x00dev, RF5372) ||
|
|
||||||
rt2x00_rf(rt2x00dev, RF5390) ||
|
|
||||||
rt2x00_rf(rt2x00dev, RF5392)) {
|
|
||||||
@@ -6071,6 +6076,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
|
|
||||||
case RF3290:
|
|
||||||
case RF5360:
|
|
||||||
case RF5370:
|
|
||||||
+ case RF3070:
|
|
||||||
case RF5372:
|
|
||||||
case RF5390:
|
|
||||||
case RF5392:
|
|
@ -1,124 +0,0 @@
|
|||||||
From 7c6feef46f4fa9085ad63bd8c80604222bbd4be3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: fritsch <peter.fruehberger@gmail.com>
|
|
||||||
Date: Fri, 1 Nov 2013 15:28:53 +0100
|
|
||||||
Subject: [PATCH 4/5] Fix clock calculations by Pierre Ossman
|
|
||||||
|
|
||||||
---
|
|
||||||
drivers/gpu/drm/radeon/r600_hdmi.c | 74 +++++++++++++++++++++++++-------------
|
|
||||||
1 file changed, 49 insertions(+), 25 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c
|
|
||||||
index 06022e3..7fa8a93 100644
|
|
||||||
--- a/drivers/gpu/drm/radeon/r600_hdmi.c
|
|
||||||
+++ b/drivers/gpu/drm/radeon/r600_hdmi.c
|
|
||||||
@@ -24,6 +24,7 @@
|
|
||||||
* Authors: Christian König
|
|
||||||
*/
|
|
||||||
#include <linux/hdmi.h>
|
|
||||||
+#include <linux/gcd.h>
|
|
||||||
#include <drm/drmP.h>
|
|
||||||
#include <drm/radeon_drm.h>
|
|
||||||
#include "radeon.h"
|
|
||||||
@@ -57,35 +58,56 @@ enum r600_hdmi_iec_status_bits {
|
|
||||||
static const struct radeon_hdmi_acr r600_hdmi_predefined_acr[] = {
|
|
||||||
/* 32kHz 44.1kHz 48kHz */
|
|
||||||
/* Clock N CTS N CTS N CTS */
|
|
||||||
- { 25175, 4576, 28125, 7007, 31250, 6864, 28125 }, /* 25,20/1.001 MHz */
|
|
||||||
+ { 25175, 4096, 25175, 28224, 125875, 6144, 25175 }, /* 25,20/1.001 MHz */
|
|
||||||
{ 25200, 4096, 25200, 6272, 28000, 6144, 25200 }, /* 25.20 MHz */
|
|
||||||
{ 27000, 4096, 27000, 6272, 30000, 6144, 27000 }, /* 27.00 MHz */
|
|
||||||
{ 27027, 4096, 27027, 6272, 30030, 6144, 27027 }, /* 27.00*1.001 MHz */
|
|
||||||
{ 54000, 4096, 54000, 6272, 60000, 6144, 54000 }, /* 54.00 MHz */
|
|
||||||
{ 54054, 4096, 54054, 6272, 60060, 6144, 54054 }, /* 54.00*1.001 MHz */
|
|
||||||
- { 74176, 11648, 210937, 17836, 234375, 11648, 140625 }, /* 74.25/1.001 MHz */
|
|
||||||
+ { 74176, 4096, 74176, 5733, 75335, 6144, 74176 }, /* 74.25/1.001 MHz */
|
|
||||||
{ 74250, 4096, 74250, 6272, 82500, 6144, 74250 }, /* 74.25 MHz */
|
|
||||||
- { 148352, 11648, 421875, 8918, 234375, 5824, 140625 }, /* 148.50/1.001 MHz */
|
|
||||||
+ { 148352, 4096, 148352, 5733, 150670, 6144, 148352 }, /* 148.50/1.001 MHz */
|
|
||||||
{ 148500, 4096, 148500, 6272, 165000, 6144, 148500 }, /* 148.50 MHz */
|
|
||||||
- { 0, 4096, 0, 6272, 0, 6144, 0 } /* Other */
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
- * calculate CTS value if it's not found in the table
|
|
||||||
+ * calculate CTS and N values if they are not found in the table
|
|
||||||
*/
|
|
||||||
-static void r600_hdmi_calc_cts(uint32_t clock, int *CTS, int N, int freq)
|
|
||||||
+static void r600_hdmi_calc_cts(uint32_t clock, int *CTS, int *N, int freq)
|
|
||||||
{
|
|
||||||
- u64 n;
|
|
||||||
- u32 d;
|
|
||||||
-
|
|
||||||
- if (*CTS == 0) {
|
|
||||||
- n = (u64)clock * (u64)N * 1000ULL;
|
|
||||||
- d = 128 * freq;
|
|
||||||
- do_div(n, d);
|
|
||||||
- *CTS = n;
|
|
||||||
- }
|
|
||||||
- DRM_DEBUG("Using ACR timing N=%d CTS=%d for frequency %d\n",
|
|
||||||
- N, *CTS, freq);
|
|
||||||
+ int n, cts;
|
|
||||||
+ unsigned long div, mul;
|
|
||||||
+
|
|
||||||
+ /* Safe, but overly large values */
|
|
||||||
+ n = 128 * freq;
|
|
||||||
+ cts = clock * 1000;
|
|
||||||
+
|
|
||||||
+ /* Smallest valid fraction */
|
|
||||||
+ div = gcd(n, cts);
|
|
||||||
+
|
|
||||||
+ n /= div;
|
|
||||||
+ cts /= div;
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * The optimal N is 128*freq/1000. Calculate the closest larger
|
|
||||||
+ * value that doesn't truncate any bits.
|
|
||||||
+ */
|
|
||||||
+ mul = ((128*freq/1000) + (n-1))/n;
|
|
||||||
+
|
|
||||||
+ n *= mul;
|
|
||||||
+ cts *= mul;
|
|
||||||
+
|
|
||||||
+ /* Check that we are in spec (not always possible) */
|
|
||||||
+ if (n < (128*freq/1500))
|
|
||||||
+ printk(KERN_WARNING "Calculated ACR N value is too small. You may experience audio problems.\n");
|
|
||||||
+ if (n > (128*freq/300))
|
|
||||||
+ printk(KERN_WARNING "Calculated ACR N value is too large. You may experience audio problems.\n");
|
|
||||||
+
|
|
||||||
+ *N = n;
|
|
||||||
+ *CTS = cts;
|
|
||||||
+
|
|
||||||
+ DRM_DEBUG("Calculated ACR timing N=%d CTS=%d for frequency %d\n",
|
|
||||||
+ *N, *CTS, freq);
|
|
||||||
}
|
|
||||||
|
|
||||||
struct radeon_hdmi_acr r600_hdmi_acr(uint32_t clock)
|
|
||||||
@@ -93,15 +115,17 @@ struct radeon_hdmi_acr r600_hdmi_acr(uint32_t clock)
|
|
||||||
struct radeon_hdmi_acr res;
|
|
||||||
u8 i;
|
|
||||||
|
|
||||||
- for (i = 0; r600_hdmi_predefined_acr[i].clock != clock &&
|
|
||||||
- r600_hdmi_predefined_acr[i].clock != 0; i++)
|
|
||||||
- ;
|
|
||||||
- res = r600_hdmi_predefined_acr[i];
|
|
||||||
+ /* Precalculated values for common clocks */
|
|
||||||
+ for (i = 0; i < ARRAY_SIZE(r600_hdmi_predefined_acr); i++) {
|
|
||||||
+ if (r600_hdmi_predefined_acr[i].clock == clock) {
|
|
||||||
+ return r600_hdmi_predefined_acr[i];
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
|
|
||||||
- /* In case some CTS are missing */
|
|
||||||
- r600_hdmi_calc_cts(clock, &res.cts_32khz, res.n_32khz, 32000);
|
|
||||||
- r600_hdmi_calc_cts(clock, &res.cts_44_1khz, res.n_44_1khz, 44100);
|
|
||||||
- r600_hdmi_calc_cts(clock, &res.cts_48khz, res.n_48khz, 48000);
|
|
||||||
+ /* And odd clocks get manually calculated */
|
|
||||||
+ r600_hdmi_calc_cts(clock, &res.cts_32khz, &res.n_32khz, 32000);
|
|
||||||
+ r600_hdmi_calc_cts(clock, &res.cts_44_1khz, &res.n_44_1khz, 44100);
|
|
||||||
+ r600_hdmi_calc_cts(clock, &res.cts_48khz, &res.n_48khz, 48000);
|
|
||||||
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
--
|
|
||||||
1.8.3.2
|
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user