ifeq ($(LINUX_VERSION),3.7.10)
LINUX_KERNEL_MD5SUM:=09624c3702107076efcac5e1cd8a18ec
endif
-ifeq ($(LINUX_VERSION),3.8.3)
- LINUX_KERNEL_MD5SUM:=eb59b1fc7343db96e20c85a9cf2baa9f
+ifeq ($(LINUX_VERSION),3.8.6)
+ LINUX_KERNEL_MD5SUM:=80aa1c706e1bc69cc7a1b2c07db90cf9
endif
# disable the md5sum check for unknown kernel versions
BOARD:=adm5120
BOARDNAME:=Infineon/ADMtek ADM5120
-LINUX_VERSION:=3.8.3
+LINUX_VERSION:=3.8.6
SUBTARGETS:=router_le router_be rb1xx
INITRAMFS_EXTRA_FILES:=
CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves -mno-branch-likely
SUBTARGETS:=generic nand
-LINUX_VERSION:=3.8.3
+LINUX_VERSION:=3.8.6
include $(INCLUDE_DIR)/target.mk
/*
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
-@@ -3871,13 +3871,14 @@ static bool tcp_parse_aligned_timestamp(
+@@ -3868,13 +3868,14 @@ static bool tcp_parse_aligned_timestamp(
{
const __be32 *ptr = (const __be32 *)(th + 1);
#include <asm/uaccess.h>
#include <linux/proc_fs.h>
-@@ -756,10 +757,10 @@ static void tcp_v6_send_response(struct
+@@ -763,10 +764,10 @@ static void tcp_v6_send_response(struct
topt = (__be32 *)(t1 + 1);
if (ts) {
BOARDNAME:=Atheros AR231x/AR5312
FEATURES:=squashfs jffs2
-LINUX_VERSION:=3.8.3
+LINUX_VERSION:=3.8.6
include $(INCLUDE_DIR)/target.mk
FEATURES:=squashfs
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.8.3
+LINUX_VERSION:=3.8.6
include $(INCLUDE_DIR)/target.mk
u32 val = tr32(0x7d00);
val &= ~((1 << 16) | (1 << 4) | (1 << 2) | (1 << 1) | 1);
-@@ -4431,6 +4461,15 @@ relink:
+@@ -4439,6 +4469,15 @@ relink:
if (current_link_up == 0 || (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER)) {
tg3_phy_copper_begin(tp);
tg3_readphy(tp, MII_BMSR, &bmsr);
if ((!tg3_readphy(tp, MII_BMSR, &bmsr) && (bmsr & BMSR_LSTATUS)) ||
(tp->mac_mode & MAC_MODE_PORT_INT_LPBACK))
-@@ -4449,6 +4488,26 @@ relink:
+@@ -4457,6 +4496,26 @@ relink:
else
tp->mac_mode |= MAC_MODE_PORT_MODE_GMII;
tp->mac_mode &= ~MAC_MODE_HALF_DUPLEX;
if (tp->link_config.active_duplex == DUPLEX_HALF)
tp->mac_mode |= MAC_MODE_HALF_DUPLEX;
-@@ -8427,6 +8486,16 @@ static int tg3_chip_reset(struct tg3 *tp
+@@ -8435,6 +8494,16 @@ static int tg3_chip_reset(struct tg3 *tp
tw32(0x5000, 0x400);
}
tw32(GRC_MODE, tp->grc_mode);
if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A0) {
-@@ -10060,6 +10129,11 @@ static void tg3_timer(unsigned long __op
+@@ -10068,6 +10137,11 @@ static void tg3_timer(unsigned long __op
tg3_flag(tp, 57765_CLASS))
tg3_chk_missed_msi(tp);
if (!tg3_flag(tp, TAGGED_STATUS)) {
/* All of this garbage is because when using non-tagged
* IRQ status the mailbox/status_block protocol the chip
-@@ -12933,7 +13007,8 @@ static int tg3_ioctl(struct net_device *
+@@ -12941,7 +13015,8 @@ static int tg3_ioctl(struct net_device *
return -EAGAIN;
spin_lock_bh(&tp->lock);
spin_unlock_bh(&tp->lock);
data->val_out = mii_regval;
-@@ -12949,7 +13024,8 @@ static int tg3_ioctl(struct net_device *
+@@ -12957,7 +13032,8 @@ static int tg3_ioctl(struct net_device *
return -EAGAIN;
spin_lock_bh(&tp->lock);
spin_unlock_bh(&tp->lock);
return err;
-@@ -13802,6 +13878,14 @@ static void tg3_get_5720_nvram_info(stru
+@@ -13810,6 +13886,14 @@ static void tg3_get_5720_nvram_info(stru
/* Chips other than 5700/5701 use the NVRAM for fetching info. */
static void tg3_nvram_init(struct tg3 *tp)
{
tw32_f(GRC_EEPROM_ADDR,
(EEPROM_ADDR_FSM_RESET |
(EEPROM_DEFAULT_CLOCK_PERIOD <<
-@@ -14294,10 +14378,19 @@ static int tg3_phy_probe(struct tg3 *tp)
+@@ -14302,10 +14386,19 @@ static int tg3_phy_probe(struct tg3 *tp)
* subsys device table.
*/
p = tg3_lookup_by_subsys(tp);
if (!tp->phy_id ||
tp->phy_id == TG3_PHY_ID_BCM8002)
tp->phy_flags |= TG3_PHYFLG_PHY_SERDES;
-@@ -15342,6 +15435,11 @@ static int tg3_get_invariants(struct tg3
+@@ -15353,6 +15446,11 @@ static int tg3_get_invariants(struct tg3
}
}
/* Get eeprom hw config before calling tg3_set_power_state().
* In particular, the TG3_FLAG_IS_NIC flag must be
* determined before calling tg3_set_power_state() so that
-@@ -15675,12 +15773,19 @@ static int tg3_get_device_address(struct
+@@ -15686,12 +15784,19 @@ static int tg3_get_device_address(struct
struct net_device *dev = tp->dev;
u32 hi, lo, mac_offset;
int addr_ok = 0;
mac_offset = 0x7c;
if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704 ||
tg3_flag(tp, 5780_CLASS)) {
-@@ -16041,6 +16146,8 @@ static int tg3_test_dma(struct tg3 *tp)
+@@ -16052,6 +16157,8 @@ static int tg3_test_dma(struct tg3 *tp)
tp->dma_rwctrl |= 0x001b000f;
}
}
if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703 ||
GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704)
-@@ -16385,6 +16492,18 @@ static int tg3_init_one(struct pci_dev *
+@@ -16396,6 +16503,18 @@ static int tg3_init_one(struct pci_dev *
else
tp->msg_enable = TG3_DEF_MSG_ENABLE;
FEATURES:=squashfs
CFLAGS:=-Os -pipe -march=armv4 -mtune=fa526 -fno-caller-saves
-LINUX_VERSION:=3.8.3
+LINUX_VERSION:=3.8.6
include $(INCLUDE_DIR)/target.mk
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
-@@ -1342,6 +1342,11 @@ MODULE_LICENSE ("GPL");
+@@ -1341,6 +1341,11 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER ehci_hcd_sead3_driver
#endif
CFLAGS:=-Os -pipe -march=armv6k -mtune=mpcore -mfloat-abi=softfp -mfpu=vfp -fno-caller-saves
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.8.3
+LINUX_VERSION:=3.8.6
include $(INCLUDE_DIR)/target.mk
---- a/arch/arm/mach-cns3xxx/core.c
-+++ b/arch/arm/mach-cns3xxx/core.c
-@@ -24,17 +24,7 @@ static struct map_desc cns3xxx_io_desc[]
- {
- .virtual = CNS3XXX_TC11MP_TWD_BASE_VIRT,
- .pfn = __phys_to_pfn(CNS3XXX_TC11MP_TWD_BASE),
-- .length = SZ_4K,
-- .type = MT_DEVICE,
-- }, {
-- .virtual = CNS3XXX_TC11MP_GIC_CPU_BASE_VIRT,
-- .pfn = __phys_to_pfn(CNS3XXX_TC11MP_GIC_CPU_BASE),
-- .length = SZ_4K,
-- .type = MT_DEVICE,
-- }, {
-- .virtual = CNS3XXX_TC11MP_GIC_DIST_BASE_VIRT,
-- .pfn = __phys_to_pfn(CNS3XXX_TC11MP_GIC_DIST_BASE),
-- .length = SZ_4K,
-+ .length = SZ_8K,
- .type = MT_DEVICE,
- }, {
- .virtual = CNS3XXX_TIMER1_2_3_BASE_VIRT,
--- a/arch/arm/mach-cns3xxx/include/mach/cns3xxx.h
+++ b/arch/arm/mach-cns3xxx/include/mach/cns3xxx.h
@@ -20,22 +20,22 @@
#define RTC_INTR_STS_OFFSET 0x34
#define CNS3XXX_MISC_BASE 0x76000000 /* Misc Control */
--#define CNS3XXX_MISC_BASE_VIRT 0xFFF07000 /* Misc Control */
+-#define CNS3XXX_MISC_BASE_VIRT 0xFB000000 /* Misc Control */
+#define CNS3XXX_MISC_BASE_VIRT 0xFEF07000 /* Misc Control */
#define CNS3XXX_PM_BASE 0x77000000 /* Power Management Control */
--#define CNS3XXX_PM_BASE_VIRT 0xFFF08000
+-#define CNS3XXX_PM_BASE_VIRT 0xFB001000
+#define CNS3XXX_PM_BASE_VIRT 0xFEF08000
#define PM_CLK_GATE_OFFSET 0x00
#define PM_PLL_HM_PD_OFFSET 0x1C
#define CNS3XXX_UART0_BASE 0x78000000 /* UART 0 */
--#define CNS3XXX_UART0_BASE_VIRT 0xFFF09000
+-#define CNS3XXX_UART0_BASE_VIRT 0xFB002000
+#define CNS3XXX_UART0_BASE_VIRT 0xFEF09000
#define CNS3XXX_UART1_BASE 0x78400000 /* UART 1 */
+#define CNS3XXX_I2S_BASE_VIRT 0xFEF10000
#define CNS3XXX_TIMER1_2_3_BASE 0x7C800000 /* Timer */
--#define CNS3XXX_TIMER1_2_3_BASE_VIRT 0xFFF10800
+-#define CNS3XXX_TIMER1_2_3_BASE_VIRT 0xFB003000
+#define CNS3XXX_TIMER1_2_3_BASE_VIRT 0xFEF10800
#define TIMER1_COUNTER_OFFSET 0x00
#define CNS3XXX_PCIE0_MEM_BASE 0xA0000000 /* PCIe Port 0 IO/Memory Space */
#define CNS3XXX_PCIE0_MEM_BASE_VIRT 0xE0000000
-@@ -227,19 +227,19 @@
+@@ -227,7 +227,7 @@
* Testchip peripheral and fpga gic regions
*/
#define CNS3XXX_TC11MP_SCU_BASE 0x90000000 /* IRQ, Test chip */
--#define CNS3XXX_TC11MP_SCU_BASE_VIRT 0xFF000000
+-#define CNS3XXX_TC11MP_SCU_BASE_VIRT 0xFB004000
+#define CNS3XXX_TC11MP_SCU_BASE_VIRT 0xFEE00000
#define CNS3XXX_TC11MP_GIC_CPU_BASE 0x90000100 /* Test chip interrupt controller CPU interface */
--#define CNS3XXX_TC11MP_GIC_CPU_BASE_VIRT 0xFF000100
-+#define CNS3XXX_TC11MP_GIC_CPU_BASE_VIRT 0xFEE00100
-
- #define CNS3XXX_TC11MP_TWD_BASE 0x90000600
--#define CNS3XXX_TC11MP_TWD_BASE_VIRT 0xFF000600
-+#define CNS3XXX_TC11MP_TWD_BASE_VIRT 0xFEE00600
-
- #define CNS3XXX_TC11MP_GIC_DIST_BASE 0x90001000 /* Test chip interrupt controller distributor */
--#define CNS3XXX_TC11MP_GIC_DIST_BASE_VIRT 0xFF001000
-+#define CNS3XXX_TC11MP_GIC_DIST_BASE_VIRT 0xFEE01000
+ #define CNS3XXX_TC11MP_GIC_CPU_BASE_VIRT (CNS3XXX_TC11MP_SCU_BASE_VIRT + 0x100)
+@@ -239,7 +239,7 @@
+ #define CNS3XXX_TC11MP_GIC_DIST_BASE_VIRT (CNS3XXX_TC11MP_SCU_BASE_VIRT + 0x1000)
#define CNS3XXX_TC11MP_L220_BASE 0x92002000 /* L220 registers */
-#define CNS3XXX_TC11MP_L220_BASE_VIRT 0xFF002000
+
static struct map_desc cns3xxx_io_desc[] __initdata = {
{
- .virtual = CNS3XXX_TC11MP_TWD_BASE_VIRT,
+ .virtual = CNS3XXX_TC11MP_SCU_BASE_VIRT,
@@ -277,3 +284,33 @@ void __init cns3xxx_l2x0_init(void)
}
CFLAGS:=-Os -pipe -march=armv4t -fno-caller-saves
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-LINUX_VERSION:=3.8.3
+LINUX_VERSION:=3.8.6
DEVICE_TYPE:=developerboard
{USB_DEVICE(0x0af0, 0xd155)},
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
-@@ -1237,6 +1237,18 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0
+@@ -1244,6 +1244,18 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0
USB_SC_DEVICE, USB_PR_DEVICE, NULL,
0 ),
goto out;
--- a/fs/namespace.c
+++ b/fs/namespace.c
-@@ -1417,6 +1417,24 @@ void drop_collected_mounts(struct vfsmou
+@@ -1421,6 +1421,24 @@ void drop_collected_mounts(struct vfsmou
release_mounts(&umount_list);
}
static inline bool execute_ok(struct inode *inode)
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
-@@ -66,6 +66,9 @@ extern void mnt_pin(struct vfsmount *mnt
+@@ -68,6 +68,9 @@ extern void mnt_pin(struct vfsmount *mnt
extern void mnt_unpin(struct vfsmount *mnt);
extern int __mnt_is_readonly(struct vfsmount *mnt);
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
-@@ -630,7 +630,7 @@ static int ehci_run (struct usb_hcd *hcd
+@@ -631,7 +631,7 @@ static int ehci_run (struct usb_hcd *hcd
"USB %x.%x started, EHCI %x.%02x%s\n",
((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f),
temp >> 8, temp & 0xff,
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
-@@ -647,6 +647,7 @@ struct platform_nand_chip {
+@@ -654,6 +654,7 @@ struct platform_nand_chip {
unsigned int options;
unsigned int bbt_options;
const char **part_probe_types;
int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
unsigned char banned_flags)
-@@ -4947,6 +4946,9 @@ int __init addrconf_init(void)
+@@ -4941,6 +4940,9 @@ int __init addrconf_init(void)
ipv6_addr_label_rtnl_register();
return 0;
errout:
rtnl_af_unregister(&inet6_ops);
-@@ -4965,6 +4967,9 @@ void addrconf_cleanup(void)
+@@ -4959,6 +4961,9 @@ void addrconf_cleanup(void)
struct net_device *dev;
int i;
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -1722,7 +1722,7 @@ static inline int pskb_network_may_pull(
+@@ -1727,7 +1727,7 @@ static inline int pskb_network_may_pull(
* NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
*/
#ifndef NET_SKB_PAD
#define IF_GET_IFACE 0x0001 /* for querying only */
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -1752,6 +1752,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -1757,6 +1757,10 @@ static inline int pskb_trim(struct sk_bu
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
}
/**
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
* @skb: buffer to alter
-@@ -1854,16 +1858,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -1859,16 +1863,6 @@ static inline struct sk_buff *dev_alloc_
}
help
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -2361,9 +2361,19 @@ int dev_hard_start_xmit(struct sk_buff *
+@@ -2360,9 +2360,19 @@ int dev_hard_start_xmit(struct sk_buff *
if (!list_empty(&ptype_all))
dev_queue_xmit_nit(skb, dev);
if (rc == NETDEV_TX_OK)
txq_trans_update(txq);
return rc;
-@@ -2386,9 +2396,19 @@ gso:
+@@ -2385,9 +2395,19 @@ gso:
if (!list_empty(&ptype_all))
dev_queue_xmit_nit(nskb, dev);
goto err;
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -4578,9 +4578,11 @@ static int __net_init dev_proc_net_init(
+@@ -4584,9 +4584,11 @@ static int __net_init dev_proc_net_init(
if (!proc_net_fops_create(net, "dev", S_IRUGO, &dev_seq_fops))
goto out;
goto out_softnet;
if (wext_proc_init(net))
-@@ -4589,9 +4591,11 @@ static int __net_init dev_proc_net_init(
+@@ -4595,9 +4597,11 @@ static int __net_init dev_proc_net_init(
out:
return rc;
out_ptype:
out_dev:
proc_net_remove(net, "dev");
goto out;
-@@ -4601,8 +4605,10 @@ static void __net_exit dev_proc_net_exit
+@@ -4607,8 +4611,10 @@ static void __net_exit dev_proc_net_exit
{
wext_proc_exit(net);
-Index: linux-3.8.3/init/main.c
-===================================================================
---- linux-3.8.3.orig/init/main.c 2013-04-02 21:43:30.000000000 +0200
-+++ linux-3.8.3/init/main.c 2013-04-02 21:44:26.362130897 +0200
-@@ -835,7 +835,8 @@
+--- a/init/main.c
++++ b/init/main.c
+@@ -835,7 +835,8 @@ static int __ref kernel_init(void *unuse
printk(KERN_WARNING "Failed to execute %s. Attempting "
"defaults...\n", execute_command);
}
FEATURES:=squashfs jffs2
SUBTARGETS=xway ase falcon
-LINUX_VERSION:=3.8.3
+LINUX_VERSION:=3.8.6
CFLAGS=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves -mno-branch-likely
arch/mips/kernel/prom.c | 24 ++++++++++++++++++++++++
3 files changed, 32 insertions(+), 1 deletion(-)
-diff --git a/arch/mips/include/asm/prom.h b/arch/mips/include/asm/prom.h
-index 8808bf5..a4ad354 100644
--- a/arch/mips/include/asm/prom.h
+++ b/arch/mips/include/asm/prom.h
-@@ -44,8 +44,11 @@ extern void __dt_setup_arch(struct boot_param_header *bph);
+@@ -44,8 +44,11 @@ extern void __dt_setup_arch(struct boot_
__dt_setup_arch(&__dtb_##sym##_begin); \
})
#endif /* CONFIG_OF */
#endif /* __ASM_PROM_H */
-diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
-index 135c4aa..9ab3d13 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -12,6 +12,7 @@
#include <asm/mips_machine.h>
unsigned int vced_count, vcei_count;
-@@ -34,7 +35,10 @@ static int show_cpuinfo(struct seq_file *m, void *v)
+@@ -34,7 +35,10 @@ static int show_cpuinfo(struct seq_file
*/
if (n == 0) {
seq_printf(m, "system type\t\t: %s\n", get_system_type());
seq_printf(m, "machine\t\t\t: %s\n",
mips_get_machine_name());
}
-diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c
-index 028f6f8..1aa68a2 100644
--- a/arch/mips/kernel/prom.c
+++ b/arch/mips/kernel/prom.c
@@ -23,6 +23,13 @@
int __init early_init_dt_scan_memory_arch(unsigned long node,
const char *uname, int depth,
void *data)
-@@ -50,6 +57,20 @@ void __init early_init_dt_setup_initrd_arch(unsigned long start,
+@@ -50,6 +57,20 @@ void __init early_init_dt_setup_initrd_a
}
#endif
void __init early_init_devtree(void *params)
{
/* Setup flat device-tree pointer */
-@@ -65,6 +86,9 @@ void __init early_init_devtree(void *params)
+@@ -65,6 +86,9 @@ void __init early_init_devtree(void *par
/* Scan memory nodes */
of_scan_flat_dt(early_init_dt_scan_root, NULL);
of_scan_flat_dt(early_init_dt_scan_memory_arch, NULL);
}
void __init __dt_setup_arch(struct boot_param_header *bph)
---
-1.7.10.4
-
INITRAMFS_EXTRA_FILES:=
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-LINUX_VERSION:=3.8.3
+LINUX_VERSION:=3.8.6
DEVICE_TYPE:=developerboard
CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=603e
FEATURES:=targz ext4
-LINUX_VERSION:=3.8.3
+LINUX_VERSION:=3.8.6
include $(INCLUDE_DIR)/target.mk
FEATURES:=squashfs targz
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.8.3
+LINUX_VERSION:=3.8.6
include $(INCLUDE_DIR)/target.mk
FEATURES:=spe_fpu squashfs
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.8.3
+LINUX_VERSION:=3.8.6
include $(INCLUDE_DIR)/target.mk
CFLAGS:=-Os -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-LINUX_VERSION:=3.8.3
+LINUX_VERSION:=3.8.6
include $(INCLUDE_DIR)/target.mk
CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=405
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.8.3
+LINUX_VERSION:=3.8.6
include $(INCLUDE_DIR)/target.mk
CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=440
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.8.3
+LINUX_VERSION:=3.8.6
include $(INCLUDE_DIR)/target.mk
CFLAGS:=-Os -pipe -fno-caller-saves -mno-branch-likely
FEATURES:=squashfs gpio
-LINUX_VERSION:=3.8.3
+LINUX_VERSION:=3.8.6
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES+=\
create mode 100644 arch/mips/include/asm/mach-ralink/war.h
create mode 100644 arch/mips/ralink/common.h
-diff --git a/arch/mips/include/asm/mach-ralink/ralink_regs.h b/arch/mips/include/asm/mach-ralink/ralink_regs.h
-new file mode 100644
-index 0000000..5a508f9
--- /dev/null
+++ b/arch/mips/include/asm/mach-ralink/ralink_regs.h
@@ -0,0 +1,39 @@
+}
+
+#endif /* _RALINK_REGS_H_ */
-diff --git a/arch/mips/include/asm/mach-ralink/war.h b/arch/mips/include/asm/mach-ralink/war.h
-new file mode 100644
-index 0000000..a7b712c
--- /dev/null
+++ b/arch/mips/include/asm/mach-ralink/war.h
@@ -0,0 +1,25 @@
+#define MIPS34K_MISSED_ITLB_WAR 0
+
+#endif /* __ASM_MACH_RALINK_WAR_H */
-diff --git a/arch/mips/ralink/common.h b/arch/mips/ralink/common.h
-new file mode 100644
-index 0000000..3009903
--- /dev/null
+++ b/arch/mips/ralink/common.h
@@ -0,0 +1,44 @@
+__iomem void *plat_of_remap_node(const char *node);
+
+#endif /* _RALINK_COMMON_H__ */
---
-1.7.10.4
-
1 file changed, 176 insertions(+)
create mode 100644 arch/mips/ralink/irq.c
-diff --git a/arch/mips/ralink/irq.c b/arch/mips/ralink/irq.c
-new file mode 100644
-index 0000000..e62c975
--- /dev/null
+++ b/arch/mips/ralink/irq.c
@@ -0,0 +1,176 @@
+ of_irq_init(of_irq_ids);
+}
+
---
-1.7.10.4
-
1 file changed, 44 insertions(+)
create mode 100644 arch/mips/ralink/reset.c
-diff --git a/arch/mips/ralink/reset.c b/arch/mips/ralink/reset.c
-new file mode 100644
-index 0000000..22120e5
--- /dev/null
+++ b/arch/mips/ralink/reset.c
@@ -0,0 +1,44 @@
+}
+
+arch_initcall(mips_reboot_setup);
---
-1.7.10.4
-
1 file changed, 69 insertions(+)
create mode 100644 arch/mips/ralink/prom.c
-diff --git a/arch/mips/ralink/prom.c b/arch/mips/ralink/prom.c
-new file mode 100644
-index 0000000..9c64f02
--- /dev/null
+++ b/arch/mips/ralink/prom.c
@@ -0,0 +1,69 @@
+void __init prom_free_prom_memory(void)
+{
+}
---
-1.7.10.4
-
1 file changed, 72 insertions(+)
create mode 100644 arch/mips/ralink/clk.c
-diff --git a/arch/mips/ralink/clk.c b/arch/mips/ralink/clk.c
-new file mode 100644
-index 0000000..8dfa22f
--- /dev/null
+++ b/arch/mips/ralink/clk.c
@@ -0,0 +1,72 @@
+ mips_hpt_frequency = clk_get_rate(clk) / 2;
+ clk_put(clk);
+}
---
-1.7.10.4
-
1 file changed, 107 insertions(+)
create mode 100644 arch/mips/ralink/of.c
-diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
-new file mode 100644
-index 0000000..4165e70
--- /dev/null
+++ b/arch/mips/ralink/of.c
@@ -0,0 +1,107 @@
+}
+
+arch_initcall(plat_of_setup);
---
-1.7.10.4
-
1 file changed, 44 insertions(+)
create mode 100644 arch/mips/ralink/early_printk.c
-diff --git a/arch/mips/ralink/early_printk.c b/arch/mips/ralink/early_printk.c
-new file mode 100644
-index 0000000..c4ae47e
--- /dev/null
+++ b/arch/mips/ralink/early_printk.c
@@ -0,0 +1,44 @@
+ while ((uart_r32(UART_REG_LSR) & UART_LSR_THRE) == 0)
+ ;
+}
---
-1.7.10.4
-
create mode 100644 arch/mips/include/asm/mach-ralink/rt305x.h
create mode 100644 arch/mips/ralink/rt305x.c
-diff --git a/arch/mips/include/asm/mach-ralink/rt305x.h b/arch/mips/include/asm/mach-ralink/rt305x.h
-new file mode 100644
-index 0000000..7d344f2
--- /dev/null
+++ b/arch/mips/include/asm/mach-ralink/rt305x.h
@@ -0,0 +1,139 @@
+#define RT305X_GPIO_MODE_RGMII BIT(9)
+
+#endif
-diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c
-new file mode 100644
-index 0000000..0a4bbdc
--- /dev/null
+++ b/arch/mips/ralink/rt305x.c
@@ -0,0 +1,242 @@
+ (id >> CHIP_ID_ID_SHIFT) & CHIP_ID_ID_MASK,
+ (id & CHIP_ID_REV_MASK));
+}
---
-1.7.10.4
-
create mode 100644 arch/mips/ralink/dts/rt3050.dtsi
create mode 100644 arch/mips/ralink/dts/rt3052_eval.dts
-diff --git a/arch/mips/ralink/dts/rt3050.dtsi b/arch/mips/ralink/dts/rt3050.dtsi
-new file mode 100644
-index 0000000..fd49daa
--- /dev/null
+++ b/arch/mips/ralink/dts/rt3050.dtsi
@@ -0,0 +1,96 @@
+ };
+ };
+};
-diff --git a/arch/mips/ralink/dts/rt3052_eval.dts b/arch/mips/ralink/dts/rt3052_eval.dts
-new file mode 100644
-index 0000000..148a590
--- /dev/null
+++ b/arch/mips/ralink/dts/rt3052_eval.dts
@@ -0,0 +1,52 @@
+ };
+ };
+};
---
-1.7.10.4
-
create mode 100644 arch/mips/ralink/Platform
create mode 100644 arch/mips/ralink/dts/Makefile
-diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms
-index 91b9d69..9a73ce6 100644
--- a/arch/mips/Kbuild.platforms
+++ b/arch/mips/Kbuild.platforms
@@ -22,6 +22,7 @@ platforms += pmc-sierra
platforms += rb532
platforms += sgi-ip22
platforms += sgi-ip27
-diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
-index 8f8666c..79ad1d0 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -437,6 +437,22 @@ config POWERTV
+@@ -434,6 +434,22 @@ config POWERTV
help
This enables support for the Cisco PowerTV Platform.
config SGI_IP22
bool "SGI IP22 (Indy/Indigo2)"
select FW_ARC
-@@ -849,6 +865,7 @@ source "arch/mips/lantiq/Kconfig"
+@@ -846,6 +862,7 @@ source "arch/mips/lantiq/Kconfig"
source "arch/mips/lasat/Kconfig"
source "arch/mips/pmc-sierra/Kconfig"
source "arch/mips/powertv/Kconfig"
source "arch/mips/sgi-ip27/Kconfig"
source "arch/mips/sibyte/Kconfig"
source "arch/mips/txx9/Kconfig"
-diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
-new file mode 100644
-index 0000000..a0b0197
--- /dev/null
+++ b/arch/mips/ralink/Kconfig
@@ -0,0 +1,32 @@
+endchoice
+
+endif
-diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile
-new file mode 100644
-index 0000000..939757f
--- /dev/null
+++ b/arch/mips/ralink/Makefile
@@ -0,0 +1,15 @@
+obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
+
+obj-y += dts/
-diff --git a/arch/mips/ralink/Platform b/arch/mips/ralink/Platform
-new file mode 100644
-index 0000000..6babd65
--- /dev/null
+++ b/arch/mips/ralink/Platform
@@ -0,0 +1,10 @@
+# Ralink RT305x
+#
+load-$(CONFIG_SOC_RT305X) += 0xffffffff80000000
-diff --git a/arch/mips/ralink/dts/Makefile b/arch/mips/ralink/dts/Makefile
-new file mode 100644
-index 0000000..1a69fb3
--- /dev/null
+++ b/arch/mips/ralink/dts/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_DTB_RT305X_EVAL) := rt3052_eval.dtb.o
---
-1.7.10.4
-
1 file changed, 167 insertions(+)
create mode 100644 arch/mips/configs/rt305x_defconfig
-diff --git a/arch/mips/configs/rt305x_defconfig b/arch/mips/configs/rt305x_defconfig
-new file mode 100644
-index 0000000..d1741bc
--- /dev/null
+++ b/arch/mips/configs/rt305x_defconfig
@@ -0,0 +1,167 @@
+# CONFIG_XZ_DEC_ARMTHUMB is not set
+# CONFIG_XZ_DEC_SPARC is not set
+CONFIG_AVERAGE=y
---
-1.7.10.4
-
1 file changed, 47 insertions(+)
create mode 100644 Documentation/devicetree/bindings/mips/cpu_irq.txt
-diff --git a/Documentation/devicetree/bindings/mips/cpu_irq.txt b/Documentation/devicetree/bindings/mips/cpu_irq.txt
-new file mode 100644
-index 0000000..13aa4b6
--- /dev/null
+++ b/Documentation/devicetree/bindings/mips/cpu_irq.txt
@@ -0,0 +1,47 @@
+{
+ of_irq_init(of_irq_ids);
+}
---
-1.7.10.4
-
arch/mips/kernel/irq_cpu.c | 42 +++++++++++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+)
-diff --git a/arch/mips/include/asm/irq_cpu.h b/arch/mips/include/asm/irq_cpu.h
-index ef6a07c..3f11fdb 100644
--- a/arch/mips/include/asm/irq_cpu.h
+++ b/arch/mips/include/asm/irq_cpu.h
@@ -17,4 +17,10 @@ extern void mips_cpu_irq_init(void);
+#endif
+
#endif /* _ASM_IRQ_CPU_H */
-diff --git a/arch/mips/kernel/irq_cpu.c b/arch/mips/kernel/irq_cpu.c
-index 972263b..49bc9ca 100644
--- a/arch/mips/kernel/irq_cpu.c
+++ b/arch/mips/kernel/irq_cpu.c
@@ -31,6 +31,7 @@
+ return 0;
+}
+#endif /* CONFIG_IRQ_DOMAIN */
---
-1.7.10.4
-
arch/mips/ralink/irq.c | 10 +++++++---
2 files changed, 17 insertions(+), 3 deletions(-)
-diff --git a/arch/mips/ralink/dts/rt3050.dtsi b/arch/mips/ralink/dts/rt3050.dtsi
-index fd49daa..069d066 100644
--- a/arch/mips/ralink/dts/rt3050.dtsi
+++ b/arch/mips/ralink/dts/rt3050.dtsi
@@ -13,6 +13,13 @@
};
memc@300 {
-diff --git a/arch/mips/ralink/irq.c b/arch/mips/ralink/irq.c
-index e62c975..6d054c5 100644
--- a/arch/mips/ralink/irq.c
+++ b/arch/mips/ralink/irq.c
-@@ -128,8 +128,11 @@ static int __init intc_of_init(struct device_node *node,
+@@ -128,8 +128,11 @@ static int __init intc_of_init(struct de
{
struct resource res;
struct irq_domain *domain;
if (of_address_to_resource(node, 0, &res))
panic("Failed to get intc memory range");
-@@ -156,8 +159,8 @@ static int __init intc_of_init(struct device_node *node,
+@@ -156,8 +159,8 @@ static int __init intc_of_init(struct de
rt_intc_w32(INTC_INT_GLOBAL, INTC_REG_ENABLE);
cp0_perfcount_irq = irq_create_mapping(domain, 9);
-@@ -165,6 +168,7 @@ static int __init intc_of_init(struct device_node *node,
+@@ -165,6 +168,7 @@ static int __init intc_of_init(struct de
}
static struct of_device_id __initdata of_irq_ids[] = {
{ .compatible = "ralink,rt2880-intc", .data = intc_of_init },
{},
};
---
-1.7.10.4
-
include/linux/serial_core.h | 2 +-
3 files changed, 12 insertions(+), 4 deletions(-)
-diff --git a/drivers/tty/serial/8250/8250.c b/drivers/tty/serial/8250/8250.c
-index 24939ca..0efc815 100644
--- a/drivers/tty/serial/8250/8250.c
+++ b/drivers/tty/serial/8250/8250.c
-@@ -317,9 +317,9 @@ static void default_serial_dl_write(struct uart_8250_port *up, int value)
+@@ -345,9 +345,9 @@ static void default_serial_dl_write(stru
serial_out(up, UART_DLM, value >> 8 & 0xff);
}
static const u8 au_io_in_map[] = {
[UART_RX] = 0,
[UART_IER] = 2,
-@@ -440,7 +440,7 @@ static void set_io_from_upio(struct uart_port *p)
- p->serial_out = mem32_serial_out;
+@@ -527,7 +527,7 @@ static void set_io_from_upio(struct uart
break;
+ #endif
-#ifdef CONFIG_MIPS_ALCHEMY
+#if defined(CONFIG_MIPS_ALCHEMY) || defined(CONFIG_SERIAL_8250_RT288X)
case UPIO_AU:
p->serial_in = au_serial_in;
p->serial_out = au_serial_out;
-diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig
-index d31f4c6..2ef9537 100644
--- a/drivers/tty/serial/8250/Kconfig
+++ b/drivers/tty/serial/8250/Kconfig
-@@ -276,3 +276,11 @@ config SERIAL_8250_EM
+@@ -277,3 +277,11 @@ config SERIAL_8250_EM
Selecting this option will add support for the integrated serial
port hardware found on the Emma Mobile line of processors.
If unsure, say N.
+ If you have a Ralink RT288x/RT305x SoC based board and want to use the
+ serial port, say Y to this option. The driver can handle up to 2 serial
+ ports. If unsure, say N.
-diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
-index 82aebc8..d971421 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -134,7 +134,7 @@ struct uart_port {
-#define UPIO_AU (4) /* Au1x00 type IO */
+#define UPIO_AU (4) /* Au1x00 and RT288x type IO */
#define UPIO_TSI (5) /* Tsi108/109 type IO */
+ #define UPIO_RM9000 (6) /* RM9000 type IO */
- unsigned int read_status_mask; /* driver specific */
---
-1.7.10.4
-
arch/mips/ralink/rt305x.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
-diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c
-index 0a4bbdc..856ebff 100644
--- a/arch/mips/ralink/rt305x.c
+++ b/arch/mips/ralink/rt305x.c
@@ -125,6 +125,7 @@ void __init ralink_clk_init(void)
}
void __init ralink_of_remap(void)
---
-1.7.10.4
-
arch/mips/ralink/irq.c | 1 +
1 file changed, 1 insertion(+)
-diff --git a/arch/mips/ralink/irq.c b/arch/mips/ralink/irq.c
-index 6d054c5..ed613b0 100644
--- a/arch/mips/ralink/irq.c
+++ b/arch/mips/ralink/irq.c
-@@ -162,6 +162,7 @@ static int __init intc_of_init(struct device_node *node,
+@@ -162,6 +162,7 @@ static int __init intc_of_init(struct de
irq_set_chained_handler(irq, ralink_intc_irq_handler);
irq_set_handler_data(irq, domain);
cp0_perfcount_irq = irq_create_mapping(domain, 9);
return 0;
---
-1.7.10.4
-
arch/mips/include/asm/mach-ralink/rt305x.h | 8 ++++++++
1 file changed, 8 insertions(+)
-diff --git a/arch/mips/include/asm/mach-ralink/rt305x.h b/arch/mips/include/asm/mach-ralink/rt305x.h
-index 7d344f2..4e62cef 100644
--- a/arch/mips/include/asm/mach-ralink/rt305x.h
+++ b/arch/mips/include/asm/mach-ralink/rt305x.h
@@ -97,6 +97,14 @@ static inline int soc_is_rt5350(void)
/* multi function gpio pins */
#define RT305X_GPIO_I2C_SD 1
#define RT305X_GPIO_I2C_SCLK 2
---
-1.7.10.4
-
arch/mips/include/asm/mach-ralink/rt305x.h | 11 +++++++++++
1 file changed, 11 insertions(+)
-Index: linux-3.8.3/arch/mips/include/asm/mach-ralink/rt305x.h
-===================================================================
---- linux-3.8.3.orig/arch/mips/include/asm/mach-ralink/rt305x.h 2013-04-02 13:30:35.601424833 +0200
-+++ linux-3.8.3/arch/mips/include/asm/mach-ralink/rt305x.h 2013-04-02 13:39:37.721437754 +0200
-@@ -144,4 +144,18 @@
+--- a/arch/mips/include/asm/mach-ralink/rt305x.h
++++ b/arch/mips/include/asm/mach-ralink/rt305x.h
+@@ -144,4 +144,18 @@ static inline int soc_is_rt5350(void)
#define RT305X_GPIO_MODE_SDRAM BIT(8)
#define RT305X_GPIO_MODE_RGMII BIT(9)
5 files changed, 85 insertions(+), 6 deletions(-)
create mode 100644 arch/mips/ralink/pinmux.c
-diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile
-index 939757f..39ef249 100644
--- a/arch/mips/ralink/Makefile
+++ b/arch/mips/ralink/Makefile
@@ -6,7 +6,7 @@
obj-$(CONFIG_SOC_RT305X) += rt305x.o
-diff --git a/arch/mips/ralink/common.h b/arch/mips/ralink/common.h
-index 3009903..ed99f23 100644
--- a/arch/mips/ralink/common.h
+++ b/arch/mips/ralink/common.h
@@ -22,9 +22,10 @@ struct ralink_pinmux {
struct ralink_soc_info {
unsigned char sys_type[RAMIPS_SYS_TYPE_LEN];
-@@ -41,4 +42,6 @@ extern void prom_soc_init(struct ralink_soc_info *soc_info);
+@@ -41,4 +42,6 @@ extern void prom_soc_init(struct ralink_
__iomem void *plat_of_remap_node(const char *node);
+void ralink_pinmux(void);
+
#endif /* _RALINK_COMMON_H__ */
-diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
-index 4165e70..ecf1482 100644
--- a/arch/mips/ralink/of.c
+++ b/arch/mips/ralink/of.c
@@ -101,6 +101,8 @@ static int __init plat_of_setup(void)
return 0;
}
-diff --git a/arch/mips/ralink/pinmux.c b/arch/mips/ralink/pinmux.c
-new file mode 100644
-index 0000000..7477deb
--- /dev/null
+++ b/arch/mips/ralink/pinmux.c
@@ -0,0 +1,76 @@
+
+ rt_sysc_w32(mode, SYSC_REG_GPIO_MODE);
+}
-diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c
-index 856ebff..d9ea53d 100644
--- a/arch/mips/ralink/rt305x.c
+++ b/arch/mips/ralink/rt305x.c
@@ -97,9 +97,6 @@ struct ralink_pinmux_grp uart_mux[] = {
.wdt_reset = rt305x_wdt_reset,
};
---
-1.7.10.4
-
arch/mips/ralink/dts/rt3050.dtsi | 96 ++++++++++++++++++++++++++++++++------
1 file changed, 81 insertions(+), 15 deletions(-)
-diff --git a/arch/mips/ralink/dts/rt3050.dtsi b/arch/mips/ralink/dts/rt3050.dtsi
-index 069d066..5aede8d 100644
--- a/arch/mips/ralink/dts/rt3050.dtsi
+++ b/arch/mips/ralink/dts/rt3050.dtsi
@@ -1,7 +1,7 @@
+ status = "disabled";
};
};
---
-1.7.10.4
-
1 file changed, 181 insertions(+)
create mode 100644 arch/mips/ralink/dts/rt5350.dtsi
-diff --git a/arch/mips/ralink/dts/rt5350.dtsi b/arch/mips/ralink/dts/rt5350.dtsi
-new file mode 100644
-index 0000000..9ca95a3
--- /dev/null
+++ b/arch/mips/ralink/dts/rt5350.dtsi
@@ -0,0 +1,181 @@
+ status = "disabled";
+ };
+};
---
-1.7.10.4
-
create mode 100644 arch/mips/include/asm/mach-ralink/rt288x.h
create mode 100644 arch/mips/ralink/rt288x.c
-diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
-index cd2e21f..490d769 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -1152,7 +1152,7 @@ config BOOT_ELF32
+@@ -1189,7 +1189,7 @@ config BOOT_ELF32
config MIPS_L1_CACHE_SHIFT
int
default "6" if MIPS_CPU_SCACHE
default "7" if SGI_IP22 || SGI_IP27 || SGI_IP28 || SNI_RM || CPU_CAVIUM_OCTEON
default "5"
-diff --git a/arch/mips/include/asm/mach-ralink/rt288x.h b/arch/mips/include/asm/mach-ralink/rt288x.h
-new file mode 100644
-index 0000000..ad8b42d
--- /dev/null
+++ b/arch/mips/include/asm/mach-ralink/rt288x.h
@@ -0,0 +1,49 @@
+#define CLKCFG_SRAM_CS_N_WDT BIT(9)
+
+#endif
-diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
-index a0b0197..6723b94 100644
--- a/arch/mips/ralink/Kconfig
+++ b/arch/mips/ralink/Kconfig
@@ -6,6 +6,9 @@ choice
config SOC_RT305X
bool "RT305x"
select USB_ARCH_HAS_HCD
-diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile
-index 39ef249..ce83bfc 100644
--- a/arch/mips/ralink/Makefile
+++ b/arch/mips/ralink/Makefile
@@ -8,6 +8,7 @@
obj-$(CONFIG_SOC_RT305X) += rt305x.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
-diff --git a/arch/mips/ralink/Platform b/arch/mips/ralink/Platform
-index 6babd65..3f49e51 100644
--- a/arch/mips/ralink/Platform
+++ b/arch/mips/ralink/Platform
-@@ -5,6 +5,11 @@ core-$(CONFIG_RALINK) += arch/mips/ralink/
+@@ -5,6 +5,11 @@ core-$(CONFIG_RALINK) += arch/mips/rali
cflags-$(CONFIG_RALINK) += -I$(srctree)/arch/mips/include/asm/mach-ralink
#
# Ralink RT305x
#
load-$(CONFIG_SOC_RT305X) += 0xffffffff80000000
-diff --git a/arch/mips/ralink/rt288x.c b/arch/mips/ralink/rt288x.c
-new file mode 100644
-index 0000000..37faff0
--- /dev/null
+++ b/arch/mips/ralink/rt288x.c
@@ -0,0 +1,141 @@
+ (id >> CHIP_ID_ID_SHIFT) & CHIP_ID_ID_MASK,
+ (id & CHIP_ID_REV_MASK));
+}
---
-1.7.10.4
-
create mode 100644 arch/mips/ralink/dts/rt2880.dtsi
create mode 100644 arch/mips/ralink/dts/rt2880_eval.dts
-diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
-index 6723b94..0d312fc 100644
--- a/arch/mips/ralink/Kconfig
+++ b/arch/mips/ralink/Kconfig
@@ -26,6 +26,10 @@ choice
config DTB_RT305X_EVAL
bool "RT305x eval kit"
depends on SOC_RT305X
-diff --git a/arch/mips/ralink/dts/Makefile b/arch/mips/ralink/dts/Makefile
-index 1a69fb3..f635a01 100644
--- a/arch/mips/ralink/dts/Makefile
+++ b/arch/mips/ralink/dts/Makefile
@@ -1 +1,2 @@
+obj-$(CONFIG_DTB_RT2880_EVAL) := rt2880_eval.dtb.o
obj-$(CONFIG_DTB_RT305X_EVAL) := rt3052_eval.dtb.o
-diff --git a/arch/mips/ralink/dts/rt2880.dtsi b/arch/mips/ralink/dts/rt2880.dtsi
-new file mode 100644
-index 0000000..b51c227
--- /dev/null
+++ b/arch/mips/ralink/dts/rt2880.dtsi
@@ -0,0 +1,116 @@
+ };
+ };
+};
-diff --git a/arch/mips/ralink/dts/rt2880_eval.dts b/arch/mips/ralink/dts/rt2880_eval.dts
-new file mode 100644
-index 0000000..7c74e16
--- /dev/null
+++ b/arch/mips/ralink/dts/rt2880_eval.dts
@@ -0,0 +1,52 @@
+ };
+ };
+};
---
-1.7.10.4
-
create mode 100644 arch/mips/include/asm/mach-ralink/rt3883.h
create mode 100644 arch/mips/ralink/rt3883.c
-diff --git a/arch/mips/include/asm/mach-ralink/rt3883.h b/arch/mips/include/asm/mach-ralink/rt3883.h
-new file mode 100644
-index 0000000..b91c6c1
--- /dev/null
+++ b/arch/mips/include/asm/mach-ralink/rt3883.h
@@ -0,0 +1,247 @@
+#define RT3883_FLASH_CFG_WIDTH_32BIT 0x2
+
+#endif /* _RT3883_REGS_H_ */
-diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
-index 0d312fc..f21cbaa 100644
--- a/arch/mips/ralink/Kconfig
+++ b/arch/mips/ralink/Kconfig
@@ -15,6 +15,11 @@ choice
endchoice
choice
-diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile
-index ce83bfc..87f6ca9 100644
--- a/arch/mips/ralink/Makefile
+++ b/arch/mips/ralink/Makefile
-@@ -10,6 +10,7 @@ obj-y := prom.o of.o reset.o clk.o irq.o pinmux.o
+@@ -10,6 +10,7 @@ obj-y := prom.o of.o reset.o clk.o irq.o
obj-$(CONFIG_SOC_RT288X) += rt288x.o
obj-$(CONFIG_SOC_RT305X) += rt305x.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
-diff --git a/arch/mips/ralink/Platform b/arch/mips/ralink/Platform
-index 3f49e51..f67c08d 100644
--- a/arch/mips/ralink/Platform
+++ b/arch/mips/ralink/Platform
-@@ -13,3 +13,8 @@ load-$(CONFIG_SOC_RT288X) += 0xffffffff88000000
+@@ -13,3 +13,8 @@ load-$(CONFIG_SOC_RT288X) += 0xffffffff8
# Ralink RT305x
#
load-$(CONFIG_SOC_RT305X) += 0xffffffff80000000
+# Ralink RT3883
+#
+load-$(CONFIG_SOC_RT3883) += 0xffffffff80000000
-diff --git a/arch/mips/ralink/rt3883.c b/arch/mips/ralink/rt3883.c
-new file mode 100644
-index 0000000..10a8150
--- /dev/null
+++ b/arch/mips/ralink/rt3883.c
@@ -0,0 +1,207 @@
+ (id >> RT3883_REVID_VER_ID_SHIFT) & RT3883_REVID_VER_ID_MASK,
+ (id & RT3883_REVID_ECO_ID_MASK));
+}
---
-1.7.10.4
-
create mode 100644 arch/mips/ralink/dts/rt3883.dtsi
create mode 100644 arch/mips/ralink/dts/rt3883_eval.dts
-diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
-index f21cbaa..2ef69ee 100644
--- a/arch/mips/ralink/Kconfig
+++ b/arch/mips/ralink/Kconfig
@@ -39,6 +39,10 @@ choice
endchoice
endif
-diff --git a/arch/mips/ralink/dts/Makefile b/arch/mips/ralink/dts/Makefile
-index f635a01..040a986 100644
--- a/arch/mips/ralink/dts/Makefile
+++ b/arch/mips/ralink/dts/Makefile
@@ -1,2 +1,3 @@
obj-$(CONFIG_DTB_RT2880_EVAL) := rt2880_eval.dtb.o
obj-$(CONFIG_DTB_RT305X_EVAL) := rt3052_eval.dtb.o
+obj-$(CONFIG_DTB_RT3883_EVAL) := rt3883_eval.dtb.o
-diff --git a/arch/mips/ralink/dts/rt3883.dtsi b/arch/mips/ralink/dts/rt3883.dtsi
-new file mode 100644
-index 0000000..1e80ad3
--- /dev/null
+++ b/arch/mips/ralink/dts/rt3883.dtsi
@@ -0,0 +1,186 @@
+ status = "disabled";
+ };
+};
-diff --git a/arch/mips/ralink/dts/rt3883_eval.dts b/arch/mips/ralink/dts/rt3883_eval.dts
-new file mode 100644
-index 0000000..d4c06ed
--- /dev/null
+++ b/arch/mips/ralink/dts/rt3883_eval.dts
@@ -0,0 +1,52 @@
+ };
+ };
+};
---
-1.7.10.4
-
create mode 100644 arch/mips/include/asm/mach-ralink/mt7620.h
create mode 100644 arch/mips/ralink/mt7620.c
-diff --git a/arch/mips/include/asm/mach-ralink/mt7620.h b/arch/mips/include/asm/mach-ralink/mt7620.h
-new file mode 100644
-index 0000000..3d51235
--- /dev/null
+++ b/arch/mips/include/asm/mach-ralink/mt7620.h
@@ -0,0 +1,66 @@
+#define MT7620_GPIO_MODE_WDT BIT(22)
+
+#endif
-diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
-index 2ef69ee..493411f 100644
--- a/arch/mips/ralink/Kconfig
+++ b/arch/mips/ralink/Kconfig
@@ -20,6 +20,9 @@ choice
endchoice
choice
-diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile
-index 87f6ca9..341b4de 100644
--- a/arch/mips/ralink/Makefile
+++ b/arch/mips/ralink/Makefile
-@@ -11,6 +11,7 @@ obj-y := prom.o of.o reset.o clk.o irq.o pinmux.o
+@@ -11,6 +11,7 @@ obj-y := prom.o of.o reset.o clk.o irq.o
obj-$(CONFIG_SOC_RT288X) += rt288x.o
obj-$(CONFIG_SOC_RT305X) += rt305x.o
obj-$(CONFIG_SOC_RT3883) += rt3883.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
-diff --git a/arch/mips/ralink/Platform b/arch/mips/ralink/Platform
-index f67c08d..b2cbf16 100644
--- a/arch/mips/ralink/Platform
+++ b/arch/mips/ralink/Platform
-@@ -18,3 +18,8 @@ load-$(CONFIG_SOC_RT305X) += 0xffffffff80000000
+@@ -18,3 +18,8 @@ load-$(CONFIG_SOC_RT305X) += 0xffffffff8
# Ralink RT3883
#
load-$(CONFIG_SOC_RT3883) += 0xffffffff80000000
+# Ralink MT7620
+#
+load-$(CONFIG_SOC_MT7620) += 0xffffffff80000000
-diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c
-new file mode 100644
-index 0000000..9d0dc8b
--- /dev/null
+++ b/arch/mips/ralink/mt7620.c
@@ -0,0 +1,215 @@
+ (rev >> CHIP_REV_VER_SHIFT) & CHIP_REV_VER_MASK,
+ (rev & CHIP_REV_ECO_MASK));
+}
---
-1.7.10.4
-
create mode 100644 arch/mips/ralink/dts/mt7620.dtsi
create mode 100644 arch/mips/ralink/dts/mt7620_eval.dts
-diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
-index 493411f..8254502 100644
--- a/arch/mips/ralink/Kconfig
+++ b/arch/mips/ralink/Kconfig
@@ -46,6 +46,10 @@ choice
endchoice
endif
-diff --git a/arch/mips/ralink/dts/Makefile b/arch/mips/ralink/dts/Makefile
-index 040a986..036603a 100644
--- a/arch/mips/ralink/dts/Makefile
+++ b/arch/mips/ralink/dts/Makefile
@@ -1,3 +1,4 @@
obj-$(CONFIG_DTB_RT305X_EVAL) := rt3052_eval.dtb.o
obj-$(CONFIG_DTB_RT3883_EVAL) := rt3883_eval.dtb.o
+obj-$(CONFIG_DTB_MT7620_EVAL) := mt7620_eval.dtb.o
-diff --git a/arch/mips/ralink/dts/mt7620.dtsi b/arch/mips/ralink/dts/mt7620.dtsi
-new file mode 100644
-index 0000000..59f057f
--- /dev/null
+++ b/arch/mips/ralink/dts/mt7620.dtsi
@@ -0,0 +1,138 @@
+ };
+ };
+};
-diff --git a/arch/mips/ralink/dts/mt7620_eval.dts b/arch/mips/ralink/dts/mt7620_eval.dts
-new file mode 100644
-index 0000000..dda0f4d
--- /dev/null
+++ b/arch/mips/ralink/dts/mt7620_eval.dts
@@ -0,0 +1,22 @@
+ };
+ };
+};
---
-1.7.10.4
-
2 files changed, 193 insertions(+), 1 deletion(-)
create mode 100644 arch/mips/ralink/timer.c
-diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile
-index 341b4de..cae7d88 100644
--- a/arch/mips/ralink/Makefile
+++ b/arch/mips/ralink/Makefile
@@ -6,7 +6,7 @@
obj-$(CONFIG_SOC_RT288X) += rt288x.o
obj-$(CONFIG_SOC_RT305X) += rt305x.o
-diff --git a/arch/mips/ralink/timer.c b/arch/mips/ralink/timer.c
-new file mode 100644
-index 0000000..9a943e8
--- /dev/null
+++ b/arch/mips/ralink/timer.c
@@ -0,0 +1,192 @@
+MODULE_DESCRIPTION("Ralink RT2880 timer");
+MODULE_AUTHOR("John Crispin <blogic@openwrt.org");
+MODULE_LICENSE("GPL");
---
-1.7.10.4
-
create mode 100644 arch/mips/include/asm/mach-ralink/gpio.h
create mode 100644 drivers/gpio/gpio-ralink.c
-diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
-index 490d769..1db6ce9 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -443,6 +443,7 @@ config RALINK
+@@ -449,6 +449,7 @@ config RALINK
select SYS_HAS_EARLY_PRINTK
select HAVE_MACH_CLKDEV
select CLKDEV_LOOKUP
config SGI_IP22
bool "SGI IP22 (Indy/Indigo2)"
-diff --git a/arch/mips/include/asm/mach-ralink/gpio.h b/arch/mips/include/asm/mach-ralink/gpio.h
-new file mode 100644
-index 0000000..f68ee16
--- /dev/null
+++ b/arch/mips/include/asm/mach-ralink/gpio.h
@@ -0,0 +1,24 @@
+#define gpio_to_irq __gpio_to_irq
+
+#endif /* __ASM_MACH_RALINK_GPIO_H */
-diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
-index 93aaadf..29add97 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
-@@ -204,6 +204,12 @@ config GPIO_PXA
+@@ -201,6 +201,12 @@ config GPIO_PXA
help
Say yes here to support the PXA GPIO device
config GPIO_SPEAR_SPICS
bool "ST SPEAr13xx SPI Chip Select as GPIO support"
depends on PLAT_SPEAR
-diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
-index 22e07bc..f7b6603 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
-@@ -55,6 +55,7 @@ obj-$(CONFIG_GPIO_PCF857X) += gpio-pcf857x.o
+@@ -54,6 +54,7 @@ obj-$(CONFIG_GPIO_PCF857X) += gpio-pcf85
obj-$(CONFIG_GPIO_PCH) += gpio-pch.o
obj-$(CONFIG_GPIO_PL061) += gpio-pl061.o
obj-$(CONFIG_GPIO_PXA) += gpio-pxa.o
obj-$(CONFIG_GPIO_RC5T583) += gpio-rc5t583.o
obj-$(CONFIG_GPIO_RDC321X) += gpio-rdc321x.o
obj-$(CONFIG_PLAT_SAMSUNG) += gpio-samsung.o
-diff --git a/drivers/gpio/gpio-ralink.c b/drivers/gpio/gpio-ralink.c
-new file mode 100644
-index 0000000..26e8441
--- /dev/null
+++ b/drivers/gpio/gpio-ralink.c
@@ -0,0 +1,176 @@
+}
+
+subsys_initcall(ralink_gpio_init);
---
-1.7.10.4
-
3 files changed, 479 insertions(+)
create mode 100644 drivers/spi/spi-ralink.c
-diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
-index f80eee7..301dbad 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
-@@ -326,6 +326,12 @@ config SPI_RSPI
+@@ -324,6 +324,12 @@ config SPI_RSPI
help
SPI driver for Renesas RSPI blocks.
+
config SPI_S3C24XX
tristate "Samsung S3C24XX series SPI"
- depends on ARCH_S3C24XX
-diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
-index e53c309..a4b3c5b 100644
+ depends on ARCH_S3C24XX && EXPERIMENTAL
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
-@@ -53,6 +53,7 @@ spi-pxa2xx-platform-$(CONFIG_SPI_PXA2XX_DMA) += spi-pxa2xx-dma.o
- obj-$(CONFIG_SPI_PXA2XX) += spi-pxa2xx-platform.o
+@@ -51,6 +51,7 @@ obj-$(CONFIG_SPI_PPC4xx) += spi-ppc4xx.
+ obj-$(CONFIG_SPI_PXA2XX) += spi-pxa2xx.o
obj-$(CONFIG_SPI_PXA2XX_PCI) += spi-pxa2xx-pci.o
obj-$(CONFIG_SPI_RSPI) += spi-rspi.o
+obj-$(CONFIG_SPI_RALINK) += spi-ralink.o
obj-$(CONFIG_SPI_S3C24XX) += spi-s3c24xx-hw.o
spi-s3c24xx-hw-y := spi-s3c24xx.o
spi-s3c24xx-hw-$(CONFIG_SPI_S3C24XX_FIQ) += spi-s3c24xx-fiq.o
-diff --git a/drivers/spi/spi-ralink.c b/drivers/spi/spi-ralink.c
-new file mode 100644
-index 0000000..8d89cab
--- /dev/null
+++ b/drivers/spi/spi-ralink.c
@@ -0,0 +1,472 @@
+MODULE_AUTHOR("Sergiy <piratfm@gmail.com>");
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL");
---
-1.7.10.4
-
drivers/tty/serial/of_serial.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
-diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c
-index b025d54..42f8550 100644
--- a/drivers/tty/serial/of_serial.c
+++ b/drivers/tty/serial/of_serial.c
-@@ -98,7 +98,10 @@ static int of_platform_serial_setup(struct platform_device *ofdev,
+@@ -97,7 +97,10 @@ static int of_platform_serial_setup(stru
port->regshift = prop;
port->irq = irq_of_parse_and_map(np, 0);
if (of_property_read_u32(np, "reg-io-width", &prop) == 0) {
switch (prop) {
case 1:
---
-1.7.10.4
-
drivers/tty/serial/8250/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig
-index 2ef9537..1038cdb 100644
--- a/drivers/tty/serial/8250/Kconfig
+++ b/drivers/tty/serial/8250/Kconfig
-@@ -279,7 +279,7 @@ config SERIAL_8250_EM
+@@ -280,7 +280,7 @@ config SERIAL_8250_EM
config SERIAL_8250_RT288X
bool "Ralink RT288x/RT305x/RT3662/RT3883 serial port support"
help
If you have a Ralink RT288x/RT305x SoC based board and want to use the
serial port, say Y to this option. The driver can handle up to 2 serial
---
-1.7.10.4
-
3 files changed, 283 insertions(+)
create mode 100644 arch/mips/pci/pci-rt2880.c
-diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
-index 2cb1d31..77974ba 100644
--- a/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile
-@@ -41,6 +41,7 @@ obj-$(CONFIG_SIBYTE_BCM1x80) += pci-bcm1480.o pci-bcm1480ht.o
+@@ -42,6 +42,7 @@ obj-$(CONFIG_SIBYTE_BCM1x80) += pci-bcm1
obj-$(CONFIG_SNI_RM) += fixup-sni.o ops-sni.o
obj-$(CONFIG_LANTIQ) += fixup-lantiq.o
obj-$(CONFIG_PCI_LANTIQ) += pci-lantiq.o ops-lantiq.o
obj-$(CONFIG_TANBAC_TB0219) += fixup-tb0219.o
obj-$(CONFIG_TANBAC_TB0226) += fixup-tb0226.o
obj-$(CONFIG_TANBAC_TB0287) += fixup-tb0287.o
-diff --git a/arch/mips/pci/pci-rt2880.c b/arch/mips/pci/pci-rt2880.c
-new file mode 100644
-index 0000000..e2c4730
--- /dev/null
+++ b/arch/mips/pci/pci-rt2880.c
@@ -0,0 +1,281 @@
+}
+
+arch_initcall(pcibios_init);
-diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
-index 8254502..a3eec2a 100644
--- a/arch/mips/ralink/Kconfig
+++ b/arch/mips/ralink/Kconfig
@@ -8,6 +8,7 @@ choice
config SOC_RT305X
bool "RT305x"
---
-1.7.10.4
-
3 files changed, 489 insertions(+)
create mode 100644 arch/mips/pci/pci-rt3883.c
-diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
-index 77974ba..3cbfd9b 100644
--- a/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile
-@@ -42,6 +42,7 @@ obj-$(CONFIG_SNI_RM) += fixup-sni.o ops-sni.o
+@@ -43,6 +43,7 @@ obj-$(CONFIG_SNI_RM) += fixup-sni.o ops
obj-$(CONFIG_LANTIQ) += fixup-lantiq.o
obj-$(CONFIG_PCI_LANTIQ) += pci-lantiq.o ops-lantiq.o
obj-$(CONFIG_SOC_RT2880) += pci-rt2880.o
obj-$(CONFIG_TANBAC_TB0219) += fixup-tb0219.o
obj-$(CONFIG_TANBAC_TB0226) += fixup-tb0226.o
obj-$(CONFIG_TANBAC_TB0287) += fixup-tb0287.o
-diff --git a/arch/mips/pci/pci-rt3883.c b/arch/mips/pci/pci-rt3883.c
-new file mode 100644
-index 0000000..8a4c8ce
--- /dev/null
+++ b/arch/mips/pci/pci-rt3883.c
@@ -0,0 +1,487 @@
+
+ return 0;
+}
-diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
-index a3eec2a..2b7b70a 100644
--- a/arch/mips/ralink/Kconfig
+++ b/arch/mips/ralink/Kconfig
@@ -20,6 +20,7 @@ choice
config SOC_MT7620
bool "MT7620"
---
-1.7.10.4
-
create mode 100644 drivers/net/ethernet/ramips/ramips_eth.h
create mode 100644 drivers/net/ethernet/ramips/ramips_main.c
-Index: linux-3.8.3/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.8.3/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h 2013-04-02 11:45:25.221274467 +0200
+--- /dev/null
++++ b/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h
@@ -0,0 +1,27 @@
+/*
+ * Ralink RT305x SoC platform device registration
+};
+
+#endif /* _RT305X_ESW_PLATFORM_H */
-Index: linux-3.8.3/arch/mips/ralink/rt305x.c
-===================================================================
---- linux-3.8.3.orig/arch/mips/ralink/rt305x.c 2013-04-02 11:45:25.025274462 +0200
-+++ linux-3.8.3/arch/mips/ralink/rt305x.c 2013-04-02 11:45:25.221274467 +0200
-@@ -182,6 +182,7 @@
+--- a/arch/mips/ralink/rt305x.c
++++ b/arch/mips/ralink/rt305x.c
+@@ -182,6 +182,7 @@ void __init ralink_clk_init(void)
}
ralink_clk_add("cpu", cpu_rate);
ralink_clk_add("10000b00.spi", sys_rate);
ralink_clk_add("10000100.timer", wdt_rate);
ralink_clk_add("10000120.watchdog", wdt_rate);
-Index: linux-3.8.3/drivers/net/ethernet/Kconfig
-===================================================================
---- linux-3.8.3.orig/drivers/net/ethernet/Kconfig 2013-03-14 19:27:14.000000000 +0100
-+++ linux-3.8.3/drivers/net/ethernet/Kconfig 2013-04-02 11:45:25.221274467 +0200
-@@ -136,6 +136,7 @@
+--- a/drivers/net/ethernet/Kconfig
++++ b/drivers/net/ethernet/Kconfig
+@@ -136,6 +136,7 @@ source "drivers/net/ethernet/packetengin
source "drivers/net/ethernet/pasemi/Kconfig"
source "drivers/net/ethernet/qlogic/Kconfig"
source "drivers/net/ethernet/racal/Kconfig"
source "drivers/net/ethernet/realtek/Kconfig"
source "drivers/net/ethernet/renesas/Kconfig"
source "drivers/net/ethernet/rdc/Kconfig"
-Index: linux-3.8.3/drivers/net/ethernet/Makefile
-===================================================================
---- linux-3.8.3.orig/drivers/net/ethernet/Makefile 2013-03-14 19:27:14.000000000 +0100
-+++ linux-3.8.3/drivers/net/ethernet/Makefile 2013-04-02 11:45:25.221274467 +0200
-@@ -54,6 +54,7 @@
+--- a/drivers/net/ethernet/Makefile
++++ b/drivers/net/ethernet/Makefile
+@@ -54,6 +54,7 @@ obj-$(CONFIG_NET_PACKET_ENGINE) += packe
obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/
obj-$(CONFIG_SH_ETH) += renesas/
obj-$(CONFIG_NET_VENDOR_RDC) += rdc/
-Index: linux-3.8.3/drivers/net/ethernet/ramips/Kconfig
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.8.3/drivers/net/ethernet/ramips/Kconfig 2013-04-02 11:45:25.221274467 +0200
+--- /dev/null
++++ b/drivers/net/ethernet/ramips/Kconfig
@@ -0,0 +1,18 @@
+config NET_RAMIPS
+ tristate "Ralink RT288X/RT3X5X/RT3662/RT3883 ethernet driver"
+ depends on DEBUG_FS
+
+endif
-Index: linux-3.8.3/drivers/net/ethernet/ramips/Makefile
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.8.3/drivers/net/ethernet/ramips/Makefile 2013-04-02 11:45:25.221274467 +0200
+--- /dev/null
++++ b/drivers/net/ethernet/ramips/Makefile
@@ -0,0 +1,9 @@
+#
+# Makefile for the Ramips SoCs built-in ethernet macs
+ramips-$(CONFIG_NET_RAMIPS_DEBUG_FS) += ramips_debugfs.o
+
+obj-$(CONFIG_NET_RAMIPS) += ramips.o
-Index: linux-3.8.3/drivers/net/ethernet/ramips/ramips_debugfs.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.8.3/drivers/net/ethernet/ramips/ramips_debugfs.c 2013-04-02 11:45:25.225274468 +0200
+--- /dev/null
++++ b/drivers/net/ethernet/ramips/ramips_debugfs.c
@@ -0,0 +1,127 @@
+/*
+ * Ralink SoC ethernet driver debugfs code
+ debugfs_remove(raeth_debugfs_root);
+ raeth_debugfs_root = NULL;
+}
-Index: linux-3.8.3/drivers/net/ethernet/ramips/ramips_esw.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.8.3/drivers/net/ethernet/ramips/ramips_esw.c 2013-04-02 11:45:25.225274468 +0200
+--- /dev/null
++++ b/drivers/net/ethernet/ramips/ramips_esw.c
@@ -0,0 +1,1220 @@
+#include <linux/ioport.h>
+#include <linux/switch.h>
+{
+ platform_driver_unregister(&rt305x_esw_driver);
+}
-Index: linux-3.8.3/drivers/net/ethernet/ramips/ramips_eth.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.8.3/drivers/net/ethernet/ramips/ramips_eth.h 2013-04-02 11:45:25.225274468 +0200
+--- /dev/null
++++ b/drivers/net/ethernet/ramips/ramips_eth.h
@@ -0,0 +1,375 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+#endif /* CONFIG_NET_RAMIPS_DEBUG_FS */
+
+#endif /* RAMIPS_ETH_H */
-Index: linux-3.8.3/drivers/net/ethernet/ramips/ramips_main.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.8.3/drivers/net/ethernet/ramips/ramips_main.c 2013-04-02 12:07:58.749306720 +0200
+--- /dev/null
++++ b/drivers/net/ethernet/ramips/ramips_main.c
@@ -0,0 +1,1285 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
3 files changed, 359 insertions(+)
create mode 100644 drivers/watchdog/ralink_wdt.c
-diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
-index 9fcc70c..c4b508e 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
-@@ -1104,6 +1104,12 @@ config LANTIQ_WDT
+@@ -1077,6 +1077,12 @@ config LANTIQ_WDT
help
Hardware driver for the Lantiq SoC Watchdog Timer.
# PARISC Architecture
# POWERPC Architecture
-diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
-index a300b94..3a8ad6a 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
-@@ -134,6 +134,7 @@ obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
+@@ -132,6 +132,7 @@ obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
obj-$(CONFIG_OCTEON_WDT) += octeon-wdt.o
octeon-wdt-y := octeon-wdt-main.o octeon-wdt-nmi.o
obj-$(CONFIG_LANTIQ_WDT) += lantiq_wdt.o
# PARISC Architecture
-diff --git a/drivers/watchdog/ralink_wdt.c b/drivers/watchdog/ralink_wdt.c
-new file mode 100644
-index 0000000..8a8dc76
--- /dev/null
+++ b/drivers/watchdog/ralink_wdt.c
@@ -0,0 +1,352 @@
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRIVER_NAME);
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
---
-1.7.10.4
-
arch/mips/kernel/prom.c | 24 ++++++++++++++++++++++++
3 files changed, 32 insertions(+), 1 deletion(-)
-diff --git a/arch/mips/include/asm/prom.h b/arch/mips/include/asm/prom.h
-index 8808bf5..a4ad354 100644
--- a/arch/mips/include/asm/prom.h
+++ b/arch/mips/include/asm/prom.h
-@@ -44,8 +44,11 @@ extern void __dt_setup_arch(struct boot_param_header *bph);
+@@ -44,8 +44,11 @@ extern void __dt_setup_arch(struct boot_
__dt_setup_arch(&__dtb_##sym##_begin); \
})
#endif /* CONFIG_OF */
#endif /* __ASM_PROM_H */
-diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
-index 135c4aa..9ab3d13 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -12,6 +12,7 @@
#include <asm/mips_machine.h>
unsigned int vced_count, vcei_count;
-@@ -34,7 +35,10 @@ static int show_cpuinfo(struct seq_file *m, void *v)
+@@ -34,7 +35,10 @@ static int show_cpuinfo(struct seq_file
*/
if (n == 0) {
seq_printf(m, "system type\t\t: %s\n", get_system_type());
seq_printf(m, "machine\t\t\t: %s\n",
mips_get_machine_name());
}
-diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c
-index 028f6f8..1aa68a2 100644
--- a/arch/mips/kernel/prom.c
+++ b/arch/mips/kernel/prom.c
@@ -23,6 +23,13 @@
int __init early_init_dt_scan_memory_arch(unsigned long node,
const char *uname, int depth,
void *data)
-@@ -50,6 +57,20 @@ void __init early_init_dt_setup_initrd_arch(unsigned long start,
+@@ -50,6 +57,20 @@ void __init early_init_dt_setup_initrd_a
}
#endif
void __init early_init_devtree(void *params)
{
/* Setup flat device-tree pointer */
-@@ -65,6 +86,9 @@ void __init early_init_devtree(void *params)
+@@ -65,6 +86,9 @@ void __init early_init_devtree(void *par
/* Scan memory nodes */
of_scan_flat_dt(early_init_dt_scan_root, NULL);
of_scan_flat_dt(early_init_dt_scan_memory_arch, NULL);
}
void __init __dt_setup_arch(struct boot_param_header *bph)
---
-1.7.10.4
-
include/linux/of_net.h | 1 +
2 files changed, 38 insertions(+)
-diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c
-index ffab033..15f4a71 100644
--- a/drivers/of/of_net.c
+++ b/drivers/of/of_net.c
@@ -10,6 +10,7 @@
/**
* It maps 'enum phy_interface_t' found in include/linux/phy.h
-@@ -92,3 +93,39 @@ const void *of_get_mac_address(struct device_node *np)
+@@ -92,3 +93,39 @@ const void *of_get_mac_address(struct de
return NULL;
}
EXPORT_SYMBOL(of_get_mac_address);
+ return ret;
+}
+EXPORT_SYMBOL_GPL(of_get_mac_address_mtd);
-diff --git a/include/linux/of_net.h b/include/linux/of_net.h
-index f474641..9d3304f 100644
--- a/include/linux/of_net.h
+++ b/include/linux/of_net.h
@@ -11,6 +11,7 @@
#endif
#endif /* __LINUX_OF_NET_H */
---
-1.7.10.4
-
create mode 100644 drivers/usb/dwc_otg/dwc_otg_regs.h
create mode 100644 drivers/usb/dwc_otg/linux/dwc_otg_plat.h
-diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
-index 640ae6c..20a629a 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -126,6 +126,8 @@ source "drivers/usb/core/Kconfig"
source "drivers/usb/mon/Kconfig"
source "drivers/usb/wusbcore/Kconfig"
-diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
-index 8f5ebce..4bcfe6d 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_USB) += core/
obj-$(CONFIG_USB_MON) += mon/
-diff --git a/drivers/usb/dwc_otg/Kconfig b/drivers/usb/dwc_otg/Kconfig
-new file mode 100644
-index 0000000..6dd75f1
--- /dev/null
+++ b/drivers/usb/dwc_otg/Kconfig
@@ -0,0 +1,24 @@
+config DWC_OTG_DEBUG
+ bool "Enable debug mode"
+ depends on DWC_OTG
-diff --git a/drivers/usb/dwc_otg/Makefile b/drivers/usb/dwc_otg/Makefile
-new file mode 100644
-index 0000000..95c5b66
--- /dev/null
+++ b/drivers/usb/dwc_otg/Makefile
@@ -0,0 +1,25 @@
+dwc_otg-objs += dwc_otg_cil.o dwc_otg_cil_intr.o
+dwc_otg-objs += dwc_otg_pcd.o dwc_otg_pcd_intr.o
+dwc_otg-objs += dwc_otg_hcd.o dwc_otg_hcd_intr.o dwc_otg_hcd_queue.o
-diff --git a/drivers/usb/dwc_otg/dummy_audio.c b/drivers/usb/dwc_otg/dummy_audio.c
-new file mode 100644
-index 0000000..225decf
--- /dev/null
+++ b/drivers/usb/dwc_otg/dummy_audio.c
@@ -0,0 +1,1575 @@
+ remove_proc_entry("isoc_test", NULL);
+}
+module_exit (cleanup);
-diff --git a/drivers/usb/dwc_otg/dwc_otg_attr.c b/drivers/usb/dwc_otg/dwc_otg_attr.c
-new file mode 100644
-index 0000000..8543537
--- /dev/null
+++ b/drivers/usb/dwc_otg/dwc_otg_attr.c
@@ -0,0 +1,966 @@
+ device_remove_file(dev, &dev_attr_rd_reg_test);
+ device_remove_file(dev, &dev_attr_wr_reg_test);
+}
-diff --git a/drivers/usb/dwc_otg/dwc_otg_attr.h b/drivers/usb/dwc_otg/dwc_otg_attr.h
-new file mode 100644
-index 0000000..0862b27
--- /dev/null
+++ b/drivers/usb/dwc_otg/dwc_otg_attr.h
@@ -0,0 +1,67 @@
+void dwc_otg_attr_remove (struct device *dev);
+
+#endif
-diff --git a/drivers/usb/dwc_otg/dwc_otg_cil.c b/drivers/usb/dwc_otg/dwc_otg_cil.c
-new file mode 100644
-index 0000000..89aa83e
--- /dev/null
+++ b/drivers/usb/dwc_otg/dwc_otg_cil.c
@@ -0,0 +1,3692 @@
+}
+
+#endif //DWC_EN_ISOC
-diff --git a/drivers/usb/dwc_otg/dwc_otg_cil.h b/drivers/usb/dwc_otg/dwc_otg_cil.h
-new file mode 100644
-index 0000000..9507992
--- /dev/null
+++ b/drivers/usb/dwc_otg/dwc_otg_cil.h
@@ -0,0 +1,1098 @@
+
+#endif
+
-diff --git a/drivers/usb/dwc_otg/dwc_otg_cil_intr.c b/drivers/usb/dwc_otg/dwc_otg_cil_intr.c
-new file mode 100644
-index 0000000..61b17b3
--- /dev/null
+++ b/drivers/usb/dwc_otg/dwc_otg_cil_intr.c
@@ -0,0 +1,750 @@
+
+ return retval;
+}
-diff --git a/drivers/usb/dwc_otg/dwc_otg_driver.c b/drivers/usb/dwc_otg/dwc_otg_driver.c
-new file mode 100644
-index 0000000..63272d0
--- /dev/null
+++ b/drivers/usb/dwc_otg/dwc_otg_driver.c
@@ -0,0 +1,1273 @@
+ </td></tr>
+
+*/
-diff --git a/drivers/usb/dwc_otg/dwc_otg_driver.h b/drivers/usb/dwc_otg/dwc_otg_driver.h
-new file mode 100644
-index 0000000..fd7f0a4
--- /dev/null
+++ b/drivers/usb/dwc_otg/dwc_otg_driver.h
@@ -0,0 +1,83 @@
+} dwc_otg_device_t;
+
+#endif
-diff --git a/drivers/usb/dwc_otg/dwc_otg_hcd.c b/drivers/usb/dwc_otg/dwc_otg_hcd.c
-new file mode 100644
-index 0000000..fe643b6
--- /dev/null
+++ b/drivers/usb/dwc_otg/dwc_otg_hcd.c
@@ -0,0 +1,2852 @@
+#endif
+}
+#endif /* DWC_DEVICE_ONLY */
-diff --git a/drivers/usb/dwc_otg/dwc_otg_hcd.h b/drivers/usb/dwc_otg/dwc_otg_hcd.h
-new file mode 100644
-index 0000000..ee41dc9
--- /dev/null
+++ b/drivers/usb/dwc_otg/dwc_otg_hcd.h
@@ -0,0 +1,668 @@
+#endif
+#endif
+#endif /* DWC_DEVICE_ONLY */
-diff --git a/drivers/usb/dwc_otg/dwc_otg_hcd_intr.c b/drivers/usb/dwc_otg/dwc_otg_hcd_intr.c
-new file mode 100644
-index 0000000..bdf2db9
--- /dev/null
+++ b/drivers/usb/dwc_otg/dwc_otg_hcd_intr.c
@@ -0,0 +1,1873 @@
+}
+
+#endif /* DWC_DEVICE_ONLY */
-diff --git a/drivers/usb/dwc_otg/dwc_otg_hcd_queue.c b/drivers/usb/dwc_otg/dwc_otg_hcd_queue.c
-new file mode 100644
-index 0000000..cfb1f16
--- /dev/null
+++ b/drivers/usb/dwc_otg/dwc_otg_hcd_queue.c
@@ -0,0 +1,684 @@
+}
+
+#endif /* DWC_DEVICE_ONLY */
-diff --git a/drivers/usb/dwc_otg/dwc_otg_pcd.c b/drivers/usb/dwc_otg/dwc_otg_pcd.c
-new file mode 100644
-index 0000000..030a3f2
--- /dev/null
+++ b/drivers/usb/dwc_otg/dwc_otg_pcd.c
@@ -0,0 +1,2523 @@
+EXPORT_SYMBOL(usb_gadget_unregister_driver);
+
+#endif /* DWC_HOST_ONLY */
-diff --git a/drivers/usb/dwc_otg/dwc_otg_pcd.h b/drivers/usb/dwc_otg/dwc_otg_pcd.h
-new file mode 100644
-index 0000000..48de957
--- /dev/null
+++ b/drivers/usb/dwc_otg/dwc_otg_pcd.h
@@ -0,0 +1,248 @@
+
+#endif
+#endif /* DWC_HOST_ONLY */
-diff --git a/drivers/usb/dwc_otg/dwc_otg_pcd_intr.c b/drivers/usb/dwc_otg/dwc_otg_pcd_intr.c
-new file mode 100644
-index 0000000..fd44fd8
--- /dev/null
+++ b/drivers/usb/dwc_otg/dwc_otg_pcd_intr.c
@@ -0,0 +1,3654 @@
+}
+
+#endif /* DWC_HOST_ONLY */
-diff --git a/drivers/usb/dwc_otg/dwc_otg_regs.h b/drivers/usb/dwc_otg/dwc_otg_regs.h
-new file mode 100644
-index 0000000..8265766
--- /dev/null
+++ b/drivers/usb/dwc_otg/dwc_otg_regs.h
@@ -0,0 +1,2075 @@
+
+
+#endif
-diff --git a/drivers/usb/dwc_otg/linux/dwc_otg_plat.h b/drivers/usb/dwc_otg/linux/dwc_otg_plat.h
-new file mode 100644
-index 0000000..618151b
--- /dev/null
+++ b/drivers/usb/dwc_otg/linux/dwc_otg_plat.h
@@ -0,0 +1,260 @@
+
+#endif
+
---
-1.7.10.4
-
drivers/usb/host/ohci-platform.c | 7 +++++++
2 files changed, 14 insertions(+)
-diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
-index ca75063..fdddce1 100644
--- a/drivers/usb/host/ehci-platform.c
+++ b/drivers/usb/host/ehci-platform.c
-@@ -183,6 +183,12 @@ static int ehci_platform_resume(struct device *dev)
+@@ -183,6 +183,12 @@ static int ehci_platform_resume(struct d
#define ehci_platform_resume NULL
#endif /* CONFIG_PM */
static const struct platform_device_id ehci_platform_table[] = {
{ "ehci-platform", 0 },
{ }
-@@ -203,6 +209,7 @@ static struct platform_driver ehci_platform_driver = {
+@@ -203,6 +209,7 @@ static struct platform_driver ehci_platf
.owner = THIS_MODULE,
.name = "ehci-platform",
.pm = &ehci_platform_pm_ops,
}
};
-diff --git a/drivers/usb/host/ohci-platform.c b/drivers/usb/host/ohci-platform.c
-index c3e7287..6d7d30b 100644
--- a/drivers/usb/host/ohci-platform.c
+++ b/drivers/usb/host/ohci-platform.c
-@@ -201,6 +201,12 @@ static int ohci_platform_resume(struct device *dev)
+@@ -200,6 +200,12 @@ static int ohci_platform_resume(struct d
#define ohci_platform_resume NULL
#endif /* CONFIG_PM */
static const struct platform_device_id ohci_platform_table[] = {
{ "ohci-platform", 0 },
{ }
-@@ -221,5 +227,6 @@ static struct platform_driver ohci_platform_driver = {
+@@ -220,5 +226,6 @@ static struct platform_driver ohci_platf
.owner = THIS_MODULE,
.name = "ohci-platform",
.pm = &ohci_platform_pm_ops,
+ .of_match_table = ohci_match_table,
}
};
---
-1.7.10.4
-
create mode 100644 arch/mips/ralink/rt305x-usb.c
create mode 100644 arch/mips/ralink/rt3883-usb.c
-diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile
-index cae7d88..8572538 100644
--- a/arch/mips/ralink/Makefile
+++ b/arch/mips/ralink/Makefile
@@ -9,8 +9,8 @@
obj-$(CONFIG_SOC_MT7620) += mt7620.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
-diff --git a/arch/mips/ralink/common.h b/arch/mips/ralink/common.h
-index ed99f23..14a101c 100644
--- a/arch/mips/ralink/common.h
+++ b/arch/mips/ralink/common.h
-@@ -43,5 +43,6 @@ extern void prom_soc_init(struct ralink_soc_info *soc_info);
+@@ -43,5 +43,6 @@ extern void prom_soc_init(struct ralink_
__iomem void *plat_of_remap_node(const char *node);
void ralink_pinmux(void);
+void ralink_usb_platform(void);
#endif /* _RALINK_COMMON_H__ */
-diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c
-index 9d0dc8b..19b28c5 100644
--- a/arch/mips/ralink/mt7620.c
+++ b/arch/mips/ralink/mt7620.c
@@ -146,6 +146,11 @@ struct ralink_pinmux rt_pinmux = {
void __init ralink_clk_init(void)
{
unsigned long cpu_rate, sys_rate;
-diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
-index ecf1482..f438145 100644
--- a/arch/mips/ralink/of.c
+++ b/arch/mips/ralink/of.c
@@ -102,6 +102,7 @@ static int __init plat_of_setup(void)
return 0;
}
-diff --git a/arch/mips/ralink/rt305x-usb.c b/arch/mips/ralink/rt305x-usb.c
-new file mode 100644
-index 0000000..793fc82
--- /dev/null
+++ b/arch/mips/ralink/rt305x-usb.c
@@ -0,0 +1,120 @@
+ &rt3352_ehci_data, &rt3352_ehci_dmamask);
+ }
+}
-diff --git a/arch/mips/ralink/rt3883-usb.c b/arch/mips/ralink/rt3883-usb.c
-new file mode 100644
-index 0000000..1d948a9
--- /dev/null
+++ b/arch/mips/ralink/rt3883-usb.c
@@ -0,0 +1,118 @@
+ ralink_add_usb("ehci-platform",
+ &rt3883_ehci_data, &rt3883_ehci_dmamask);
+}
---
-1.7.10.4
-
arch/mips/ralink/of.c | 4 +++-
3 files changed, 7 insertions(+), 2 deletions(-)
-diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S
-index c61cdae..b4e55bb 100644
--- a/arch/mips/kernel/head.S
+++ b/arch/mips/kernel/head.S
-@@ -140,6 +140,9 @@ FEXPORT(__kernel_entry)
- j kernel_entry
- #endif
+@@ -146,6 +146,9 @@ EXPORT(__image_cmdline)
+ .fill 0x400
+ #endif /* CONFIG_IMAGE_CMDLINE_HACK */
+ .ascii "OWRTDTB:"
+ EXPORT(__image_dtb)
__REF
NESTED(kernel_entry, 16, sp) # kernel entry point
-diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile
-index 8572538..9e58aa1 100644
--- a/arch/mips/ralink/Makefile
+++ b/arch/mips/ralink/Makefile
@@ -15,4 +15,4 @@ obj-$(CONFIG_SOC_MT7620) += mt7620.o
-obj-y += dts/
+#obj-y += dts/
-diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
-index f438145..ee998b7 100644
--- a/arch/mips/ralink/of.c
+++ b/arch/mips/ralink/of.c
@@ -76,6 +76,8 @@ void __init device_tree_init(void)
}
static int __init plat_of_setup(void)
---
-1.7.10.4
-
arch/mips/ralink/timer.c | 213 ++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 197 insertions(+), 16 deletions(-)
-diff --git a/arch/mips/ralink/timer.c b/arch/mips/ralink/timer.c
-index 9a943e8..33b2a04 100644
--- a/arch/mips/ralink/timer.c
+++ b/arch/mips/ralink/timer.c
@@ -12,6 +12,8 @@
};
static inline void rt_timer_w32(struct rt_timer *rt, u8 reg, u32 val)
-@@ -48,18 +68,46 @@ static inline u32 rt_timer_r32(struct rt_timer *rt, u8 reg)
+@@ -48,18 +68,46 @@ static inline u32 rt_timer_r32(struct rt
static irqreturn_t rt_timer_irq(int irq, void *_rt)
{
struct rt_timer *rt = (struct rt_timer *) _rt;
if (err) {
dev_err(rt->dev, "failed to request irq\n");
} else {
-@@ -81,8 +129,6 @@ static int rt_timer_config(struct rt_timer *rt, unsigned long divisor)
+@@ -81,8 +129,6 @@ static int rt_timer_config(struct rt_tim
else
rt->timer_div = divisor;
return 0;
}
-@@ -108,11 +154,128 @@ static void rt_timer_disable(struct rt_timer *rt)
+@@ -108,11 +154,128 @@ static void rt_timer_disable(struct rt_t
rt_timer_w32(rt, TIMER_REG_TMR0CTL, t);
}
if (!res) {
dev_err(&pdev->dev, "no memory resource found\n");
-@@ -147,12 +310,29 @@ static int rt_timer_probe(struct platform_device *pdev)
+@@ -147,12 +310,29 @@ static int rt_timer_probe(struct platfor
if (!rt->timer_freq)
return -EINVAL;
dev_info(&pdev->dev, "maximum frequncy is %luHz\n", rt->timer_freq);
-@@ -163,6 +343,7 @@ static int rt_timer_remove(struct platform_device *pdev)
+@@ -163,6 +343,7 @@ static int rt_timer_remove(struct platfo
{
struct rt_timer *rt = platform_get_drvdata(pdev);
rt_timer_disable(rt);
rt_timer_free(rt);
-@@ -187,6 +368,6 @@ static struct platform_driver rt_timer_driver = {
+@@ -187,6 +368,6 @@ static struct platform_driver rt_timer_d
module_platform_driver(rt_timer_driver);
+MODULE_DESCRIPTION("Ralink RT2880 timer / pseudo pwm");
MODULE_AUTHOR("John Crispin <blogic@openwrt.org");
MODULE_LICENSE("GPL");
---
-1.7.10.4
-
4 files changed, 126 insertions(+), 1 deletion(-)
create mode 100644 arch/mips/ralink/memory.c
-diff --git a/arch/mips/include/asm/prom.h b/arch/mips/include/asm/prom.h
-index a4ad354..91e83e3 100644
--- a/arch/mips/include/asm/prom.h
+++ b/arch/mips/include/asm/prom.h
@@ -20,6 +20,9 @@
extern void device_tree_init(void);
static inline unsigned long pci_address_to_pio(phys_addr_t address)
-diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c
-index 1aa68a2..feac917 100644
--- a/arch/mips/kernel/prom.c
+++ b/arch/mips/kernel/prom.c
-@@ -88,6 +88,9 @@ void __init early_init_devtree(void *params)
+@@ -88,6 +88,9 @@ void __init early_init_devtree(void *par
of_scan_flat_dt(early_init_dt_scan_memory_arch, NULL);
/* try to load the mips machine name */
of_scan_flat_dt(early_init_dt_scan_model, NULL);
}
-diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile
-index 9e58aa1..800f98b 100644
--- a/arch/mips/ralink/Makefile
+++ b/arch/mips/ralink/Makefile
@@ -6,7 +6,7 @@
obj-$(CONFIG_SOC_RT288X) += rt288x.o
obj-$(CONFIG_SOC_RT305X) += rt305x.o rt305x-usb.o
-diff --git a/arch/mips/ralink/memory.c b/arch/mips/ralink/memory.c
-new file mode 100644
-index 0000000..54da31d
--- /dev/null
+++ b/arch/mips/ralink/memory.c
@@ -0,0 +1,119 @@
+
+ return 0;
+}
---
-1.7.10.4
-
drivers/mtd/mtdpart.c | 173 +++++++++++++++++++-
4 files changed, 184 insertions(+), 1 deletions(-)
-Index: linux-3.9-rc4/drivers/mtd/Kconfig
-===================================================================
---- linux-3.9-rc4.orig/drivers/mtd/Kconfig 2013-03-27 09:26:32.005789709 +0100
-+++ linux-3.9-rc4/drivers/mtd/Kconfig 2013-03-27 09:26:35.669789796 +0100
-@@ -31,6 +31,10 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -31,6 +31,10 @@ config MTD_ROOTFS_SPLIT
bool "Automatically split 'rootfs' partition for squashfs"
default y
config MTD_REDBOOT_PARTS
tristate "RedBoot partition table parsing"
---help---
-Index: linux-3.9-rc4/drivers/mtd/mtdpart.c
-===================================================================
---- linux-3.9-rc4.orig/drivers/mtd/mtdpart.c 2013-03-27 09:26:32.281789715 +0100
-+++ linux-3.9-rc4/drivers/mtd/mtdpart.c 2013-03-27 17:20:12.874466937 +0100
-@@ -844,6 +844,99 @@
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -844,6 +844,99 @@ static int refresh_rootfs_split(struct m
}
#endif /* CONFIG_MTD_ROOTFS_SPLIT */
/*
* This function, given a master MTD object and a partition table, creates
* and registers slave MTD objects which are bound to the master according to
-@@ -860,7 +953,7 @@
+@@ -860,7 +953,7 @@ int add_mtd_partitions(struct mtd_info *
struct mtd_part *slave;
uint64_t cur_offset = 0;
int i;
int ret;
#endif
-@@ -877,6 +970,14 @@
+@@ -877,6 +970,14 @@ int add_mtd_partitions(struct mtd_info *
add_mtd_device(&slave->mtd);
include/linux/gpio.h | 23 ++++++++-
5 files changed, 160 insertions(+), 8 deletions(-)
-Index: linux-3.8.3/Documentation/devicetree/bindings/gpio/gpio.txt
-===================================================================
---- linux-3.8.3.orig/Documentation/devicetree/bindings/gpio/gpio.txt 2013-03-14 19:27:14.000000000 +0100
-+++ linux-3.8.3/Documentation/devicetree/bindings/gpio/gpio.txt 2013-04-01 11:11:42.151167467 +0200
-@@ -112,3 +112,63 @@
+--- a/Documentation/devicetree/bindings/gpio/gpio.txt
++++ b/Documentation/devicetree/bindings/gpio/gpio.txt
+@@ -112,3 +112,63 @@ where,
The pinctrl node must have "#gpio-range-cells" property to show number of
arguments to pass with phandle from gpio controllers node.
+ gpio-export,output = <1>;
+ };
+};
-Index: linux-3.8.3/drivers/gpio/gpiolib-of.c
-===================================================================
---- linux-3.8.3.orig/drivers/gpio/gpiolib-of.c 2013-03-14 19:27:14.000000000 +0100
-+++ linux-3.8.3/drivers/gpio/gpiolib-of.c 2013-04-01 11:11:42.151167467 +0200
+--- a/drivers/gpio/gpiolib-of.c
++++ b/drivers/gpio/gpiolib-of.c
@@ -21,6 +21,8 @@
#include <linux/of_gpio.h>
#include <linux/pinctrl/pinctrl.h>
/* Private data structure for of_gpiochip_find_and_xlate */
struct gg_data {
-@@ -289,3 +291,62 @@
+@@ -289,3 +291,62 @@ void of_gpiochip_remove(struct gpio_chip
if (chip->of_node)
of_node_put(chip->of_node);
}
+ return platform_driver_probe(&gpio_export_driver, of_gpio_export_probe);
+}
+device_initcall(of_gpio_export_init);
-Index: linux-3.8.3/drivers/gpio/gpiolib.c
-===================================================================
---- linux-3.8.3.orig/drivers/gpio/gpiolib.c 2013-03-14 19:27:14.000000000 +0100
-+++ linux-3.8.3/drivers/gpio/gpiolib.c 2013-04-01 11:12:29.263168590 +0200
-@@ -714,9 +714,10 @@
+--- a/drivers/gpio/gpiolib.c
++++ b/drivers/gpio/gpiolib.c
+@@ -714,9 +714,10 @@ static struct class gpio_class = {
/**
* Context: arch_initcall or later
*
* When drivers want to make a GPIO accessible to userspace after they
-@@ -728,7 +729,7 @@
+@@ -728,7 +729,7 @@ static struct class gpio_class = {
*
* Returns zero on success, else an error.
*/
{
unsigned long flags;
struct gpio_desc *desc;
-@@ -762,6 +763,8 @@
+@@ -762,6 +763,8 @@ int gpio_export(unsigned gpio, bool dire
goto fail_unlock;
}
if (!desc->chip->direction_input || !desc->chip->direction_output)
direction_may_change = false;
spin_unlock_irqrestore(&gpio_lock, flags);
-@@ -804,7 +807,7 @@
+@@ -804,7 +807,7 @@ fail_unlock:
pr_debug("%s: gpio%d status %d\n", __func__, gpio, status);
return status;
}
static int match_export(struct device *dev, void *data)
{
-Index: linux-3.8.3/include/asm-generic/gpio.h
-===================================================================
---- linux-3.8.3.orig/include/asm-generic/gpio.h 2013-03-14 19:27:14.000000000 +0100
-+++ linux-3.8.3/include/asm-generic/gpio.h 2013-04-01 11:11:42.155167467 +0200
-@@ -204,7 +204,8 @@
+--- a/include/asm-generic/gpio.h
++++ b/include/asm-generic/gpio.h
+@@ -204,7 +204,8 @@ void devm_gpio_free(struct device *dev,
* A sysfs interface can be exported by individual drivers if they want,
* but more typically is configured entirely from userspace.
*/
extern int gpio_export_link(struct device *dev, const char *name,
unsigned gpio);
extern int gpio_sysfs_set_active_low(unsigned gpio, int value);
-@@ -249,7 +250,8 @@
+@@ -249,7 +250,8 @@ struct device;
/* sysfs support is only available with gpiolib, where it's optional */
{
return -ENOSYS;
}
-Index: linux-3.8.3/include/linux/gpio.h
-===================================================================
---- linux-3.8.3.orig/include/linux/gpio.h 2013-03-14 19:27:14.000000000 +0100
-+++ linux-3.8.3/include/linux/gpio.h 2013-04-01 11:11:42.159167467 +0200
-@@ -189,7 +189,8 @@
+--- a/include/linux/gpio.h
++++ b/include/linux/gpio.h
+@@ -189,7 +189,8 @@ static inline void gpio_set_value_cansle
WARN_ON(1);
}
{
/* GPIO can never have been requested or set as {in,out}put */
WARN_ON(1);
-@@ -248,4 +249,24 @@
+@@ -248,4 +249,24 @@ gpiochip_remove_pin_ranges(struct gpio_c
#endif /* ! CONFIG_GENERIC_GPIO */
BOARDNAME:=Mikrotik RouterBoard 532
FEATURES:=jffs2 pci targz broken
-LINUX_VERSION:=3.8.3
+LINUX_VERSION:=3.8.6
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += wpad-mini kmod-madwifi kmod-input-rb532
CFLAGS:=-Os -pipe -march=armv6k -mtune=mpcore -mfloat-abi=softfp -mfpu=vfp -fno-caller-saves
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-LINUX_VERSION:=3.8.3
+LINUX_VERSION:=3.8.6
DEVICE_TYPE:=developerboard
FEATURES:=ext4 audio
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-LINUX_VERSION:=3.8.3
+LINUX_VERSION:=3.8.6
include $(INCLUDE_DIR)/target.mk
FEATURES:=jffs2 targz ubifs audio broken
SUBTARGETS:=qi_lb60 n516 n526 id800wt
-LINUX_VERSION:=3.8.3
+LINUX_VERSION:=3.8.6
DEVICE_TYPE=other