ralink: refresh kernel patches
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 41353
This commit is contained in:
parent
fbf8b288e1
commit
22c4f2475b
5 changed files with 11 additions and 13 deletions
|
@ -14,7 +14,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||||
|
|
||||||
--- a/drivers/mtd/devices/m25p80.c
|
--- a/drivers/mtd/devices/m25p80.c
|
||||||
+++ b/drivers/mtd/devices/m25p80.c
|
+++ b/drivers/mtd/devices/m25p80.c
|
||||||
@@ -926,10 +926,13 @@ static int m25p_probe(struct spi_device
|
@@ -927,10 +927,13 @@ static int m25p_probe(struct spi_device
|
||||||
unsigned i;
|
unsigned i;
|
||||||
struct mtd_part_parser_data ppdata;
|
struct mtd_part_parser_data ppdata;
|
||||||
struct device_node __maybe_unused *np = spi->dev.of_node;
|
struct device_node __maybe_unused *np = spi->dev.of_node;
|
||||||
|
@ -28,7 +28,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Platform data helps sort out which chip type we have, as
|
/* Platform data helps sort out which chip type we have, as
|
||||||
@@ -1005,6 +1008,8 @@ static int m25p_probe(struct spi_device
|
@@ -1006,6 +1009,8 @@ static int m25p_probe(struct spi_device
|
||||||
|
|
||||||
if (data && data->name)
|
if (data && data->name)
|
||||||
flash->mtd.name = data->name;
|
flash->mtd.name = data->name;
|
||||||
|
|
|
@ -45,7 +45,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||||
+};
|
+};
|
||||||
--- a/drivers/i2c/busses/Kconfig
|
--- a/drivers/i2c/busses/Kconfig
|
||||||
+++ b/drivers/i2c/busses/Kconfig
|
+++ b/drivers/i2c/busses/Kconfig
|
||||||
@@ -630,6 +630,10 @@ config I2C_PXA_SLAVE
|
@@ -632,6 +632,10 @@ config I2C_PXA_SLAVE
|
||||||
is necessary for systems where the PXA may be a target on the
|
is necessary for systems where the PXA may be a target on the
|
||||||
I2C bus.
|
I2C bus.
|
||||||
|
|
||||||
|
|
|
@ -146,7 +146,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||||
static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
|
static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
|
||||||
size_t *retlen, const u_char *buf)
|
size_t *retlen, const u_char *buf)
|
||||||
{
|
{
|
||||||
@@ -1058,6 +1180,12 @@ static int m25p_probe(struct spi_device
|
@@ -1059,6 +1181,12 @@ static int m25p_probe(struct spi_device
|
||||||
flash->fast_read = true;
|
flash->fast_read = true;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/drivers/mtd/mtdpart.c 2014-04-27 10:09:21.566294160 +0300
|
--- a/drivers/mtd/mtdpart.c
|
||||||
+++ b/drivers/mtd/mtdpart.c 2014-06-09 11:27:48.952211672 +0300
|
+++ b/drivers/mtd/mtdpart.c
|
||||||
@@ -793,8 +793,11 @@
|
@@ -793,8 +793,11 @@ static void split_uimage(struct mtd_info
|
||||||
{
|
{
|
||||||
struct {
|
struct {
|
||||||
__be32 magic;
|
__be32 magic;
|
||||||
|
@ -13,7 +13,7 @@
|
||||||
} hdr;
|
} hdr;
|
||||||
size_t len;
|
size_t len;
|
||||||
|
|
||||||
@@ -804,7 +807,11 @@
|
@@ -804,7 +807,11 @@ static void split_uimage(struct mtd_info
|
||||||
if (len != sizeof(hdr) || hdr.magic != cpu_to_be32(UBOOT_MAGIC))
|
if (len != sizeof(hdr) || hdr.magic != cpu_to_be32(UBOOT_MAGIC))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
Index: linux-3.10.34/arch/mips/ralink/rt288x.c
|
--- a/arch/mips/ralink/rt288x.c
|
||||||
===================================================================
|
+++ b/arch/mips/ralink/rt288x.c
|
||||||
--- linux-3.10.34.orig/arch/mips/ralink/rt288x.c
|
|
||||||
+++ linux-3.10.34/arch/mips/ralink/rt288x.c
|
|
||||||
@@ -52,7 +52,7 @@ static void rt288x_wdt_reset(void)
|
@@ -52,7 +52,7 @@ static void rt288x_wdt_reset(void)
|
||||||
|
|
||||||
void __init ralink_clk_init(void)
|
void __init ralink_clk_init(void)
|
||||||
|
@ -11,7 +9,7 @@ Index: linux-3.10.34/arch/mips/ralink/rt288x.c
|
||||||
u32 t = rt_sysc_r32(SYSC_REG_SYSTEM_CONFIG);
|
u32 t = rt_sysc_r32(SYSC_REG_SYSTEM_CONFIG);
|
||||||
t = ((t >> SYSTEM_CONFIG_CPUCLK_SHIFT) & SYSTEM_CONFIG_CPUCLK_MASK);
|
t = ((t >> SYSTEM_CONFIG_CPUCLK_SHIFT) & SYSTEM_CONFIG_CPUCLK_MASK);
|
||||||
|
|
||||||
@@ -78,6 +78,7 @@ void __init ralink_clk_init(void)
|
@@ -77,6 +77,7 @@ void __init ralink_clk_init(void)
|
||||||
ralink_clk_add("300500.uart", cpu_rate / 2);
|
ralink_clk_add("300500.uart", cpu_rate / 2);
|
||||||
ralink_clk_add("300c00.uartlite", cpu_rate / 2);
|
ralink_clk_add("300c00.uartlite", cpu_rate / 2);
|
||||||
ralink_clk_add("400000.ethernet", cpu_rate / 2);
|
ralink_clk_add("400000.ethernet", cpu_rate / 2);
|
||||||
|
|
Loading…
Reference in a new issue