* [PATCH V3 01/10] MIPS: ralink: adds include files
2013-01-31 11:59 [PATCH V3 00/10] MIPS: ralink: adds support for ralink platform John Crispin
@ 2013-01-31 11:59 ` John Crispin
2013-01-31 13:35 ` Gabor Juhos
2013-01-31 11:59 ` [PATCH V3 02/10] MIPS: ralink: adds irq code John Crispin
` (9 subsequent siblings)
10 siblings, 1 reply; 29+ messages in thread
From: John Crispin @ 2013-01-31 11:59 UTC (permalink / raw)
To: Ralf Baechle; +Cc: linux-mips, John Crispin
Before we start adding the platform code we add the common include files.
Signed-off-by: John Crispin <blogic@openwrt.org>
---
arch/mips/include/asm/mach-ralink/ralink_regs.h | 39 ++++++++++++++++++++
arch/mips/include/asm/mach-ralink/war.h | 25 +++++++++++++
arch/mips/ralink/common.h | 44 +++++++++++++++++++++++
3 files changed, 108 insertions(+)
create mode 100644 arch/mips/include/asm/mach-ralink/ralink_regs.h
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 @@
+/*
+ * Ralink SoC register definitions
+ *
+ * Copyright (C) 2013 John Crispin <blogic@openwrt.org>
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#ifndef _RALINK_REGS_H_
+#define _RALINK_REGS_H_
+
+extern __iomem void *rt_sysc_membase;
+extern __iomem void *rt_memc_membase;
+
+static inline void rt_sysc_w32(u32 val, unsigned reg)
+{
+ __raw_writel(val, rt_sysc_membase + reg);
+}
+
+static inline u32 rt_sysc_r32(unsigned reg)
+{
+ return __raw_readl(rt_sysc_membase + reg);
+}
+
+static inline void rt_memc_w32(u32 val, unsigned reg)
+{
+ __raw_writel(val, rt_memc_membase + reg);
+}
+
+static inline u32 rt_memc_r32(unsigned reg)
+{
+ return __raw_readl(rt_memc_membase + reg);
+}
+
+#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 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
+ */
+#ifndef __ASM_MACH_RALINK_WAR_H
+#define __ASM_MACH_RALINK_WAR_H
+
+#define R4600_V1_INDEX_ICACHEOP_WAR 0
+#define R4600_V1_HIT_CACHEOP_WAR 0
+#define R4600_V2_HIT_CACHEOP_WAR 0
+#define R5432_CP0_INTERRUPT_WAR 0
+#define BCM1250_M3_WAR 0
+#define SIBYTE_1956_WAR 0
+#define MIPS4K_ICACHE_REFILL_WAR 0
+#define MIPS_CACHE_SYNC_WAR 0
+#define TX49XX_ICACHE_INDEX_INV_WAR 0
+#define RM9000_CDEX_SMP_WAR 0
+#define ICACHE_REFILLS_WORKAROUND_WAR 0
+#define R10000_LLSC_WAR 0
+#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 @@
+/*
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ * Copyright (C) 2013 John Crispin <blogic@openwrt.org>
+ */
+
+#ifndef _RALINK_COMMON_H__
+#define _RALINK_COMMON_H__
+
+#define RAMIPS_SYS_TYPE_LEN 32
+
+struct ralink_pinmux_grp {
+ const char *name;
+ u32 mask;
+ int gpio_first;
+ int gpio_last;
+};
+
+struct ralink_pinmux {
+ struct ralink_pinmux_grp *mode;
+ struct ralink_pinmux_grp *uart;
+ int uart_shift;
+ void (*wdt_reset)(void);
+};
+extern struct ralink_pinmux gpio_pinmux;
+
+struct ralink_soc_info {
+ unsigned char sys_type[RAMIPS_SYS_TYPE_LEN];
+ unsigned char *compatible;
+};
+extern struct ralink_soc_info soc_info;
+
+extern void ralink_of_remap(void);
+
+extern void ralink_clk_init(void);
+extern void ralink_clk_add(const char *dev, unsigned long rate);
+
+extern void prom_soc_init(struct ralink_soc_info *soc_info);
+
+__iomem void *plat_of_remap_node(const char *node);
+
+#endif /* _RALINK_COMMON_H__ */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH V3 02/10] MIPS: ralink: adds irq code
2013-01-31 11:59 [PATCH V3 00/10] MIPS: ralink: adds support for ralink platform John Crispin
2013-01-31 11:59 ` [PATCH V3 01/10] MIPS: ralink: adds include files John Crispin
@ 2013-01-31 11:59 ` John Crispin
2013-01-31 13:36 ` Gabor Juhos
2013-01-31 11:59 ` [PATCH V3 03/10] MIPS: ralink: adds reset code John Crispin
` (8 subsequent siblings)
10 siblings, 1 reply; 29+ messages in thread
From: John Crispin @ 2013-01-31 11:59 UTC (permalink / raw)
To: Ralf Baechle; +Cc: linux-mips, John Crispin
All of the Ralink Wifi SoC currently supported by this series share the same
interrupt controller (INTC).
Signed-off-by: John Crispin <blogic@openwrt.org>
---
arch/mips/ralink/irq.c | 176 ++++++++++++++++++++++++++++++++++++++++++++++++
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 @@
+/*
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ * Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2013 John Crispin <blogic@openwrt.org>
+ */
+
+#include <linux/io.h>
+#include <linux/bitops.h>
+#include <linux/of_platform.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <linux/irqdomain.h>
+#include <linux/interrupt.h>
+
+#include <asm/irq_cpu.h>
+#include <asm/mipsregs.h>
+
+#include "common.h"
+
+/* INTC register offsets */
+#define INTC_REG_STATUS0 0x00
+#define INTC_REG_STATUS1 0x04
+#define INTC_REG_TYPE 0x20
+#define INTC_REG_RAW_STATUS 0x30
+#define INTC_REG_ENABLE 0x34
+#define INTC_REG_DISABLE 0x38
+
+#define INTC_INT_GLOBAL BIT(31)
+
+#define RALINK_CPU_IRQ_INTC (MIPS_CPU_IRQ_BASE + 2)
+#define RALINK_CPU_IRQ_FE (MIPS_CPU_IRQ_BASE + 5)
+#define RALINK_CPU_IRQ_WIFI (MIPS_CPU_IRQ_BASE + 6)
+#define RALINK_CPU_IRQ_COUNTER (MIPS_CPU_IRQ_BASE + 7)
+
+/* we have a cascade of 8 irqs */
+#define RALINK_INTC_IRQ_BASE 8
+
+/* we have 32 SoC irqs */
+#define RALINK_INTC_IRQ_COUNT 32
+
+#define RALINK_INTC_IRQ_PERFC (RALINK_INTC_IRQ_BASE + 9)
+
+static void __iomem *rt_intc_membase;
+
+static inline void rt_intc_w32(u32 val, unsigned reg)
+{
+ __raw_writel(val, rt_intc_membase + reg);
+}
+
+static inline u32 rt_intc_r32(unsigned reg)
+{
+ return __raw_readl(rt_intc_membase + reg);
+}
+
+static void ralink_intc_irq_unmask(struct irq_data *d)
+{
+ rt_intc_w32(BIT(d->hwirq), INTC_REG_ENABLE);
+}
+
+static void ralink_intc_irq_mask(struct irq_data *d)
+{
+ rt_intc_w32(BIT(d->hwirq), INTC_REG_DISABLE);
+}
+
+static struct irq_chip ralink_intc_irq_chip = {
+ .name = "INTC",
+ .irq_unmask = ralink_intc_irq_unmask,
+ .irq_mask = ralink_intc_irq_mask,
+ .irq_mask_ack = ralink_intc_irq_mask,
+};
+
+unsigned int __cpuinit get_c0_compare_int(void)
+{
+ return CP0_LEGACY_COMPARE_IRQ;
+}
+
+static void ralink_intc_irq_handler(unsigned int irq, struct irq_desc *desc)
+{
+ u32 pending = rt_intc_r32(INTC_REG_STATUS0);
+
+ if (pending) {
+ struct irq_domain *domain = irq_get_handler_data(irq);
+ generic_handle_irq(irq_find_mapping(domain, __ffs(pending)));
+ } else {
+ spurious_interrupt();
+ }
+}
+
+asmlinkage void plat_irq_dispatch(void)
+{
+ unsigned long pending;
+
+ pending = read_c0_status() & read_c0_cause() & ST0_IM;
+
+ if (pending & STATUSF_IP7)
+ do_IRQ(RALINK_CPU_IRQ_COUNTER);
+
+ else if (pending & STATUSF_IP5)
+ do_IRQ(RALINK_CPU_IRQ_FE);
+
+ else if (pending & STATUSF_IP6)
+ do_IRQ(RALINK_CPU_IRQ_WIFI);
+
+ else if (pending & STATUSF_IP2)
+ do_IRQ(RALINK_CPU_IRQ_INTC);
+
+ else
+ spurious_interrupt();
+}
+
+static int intc_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw)
+{
+ irq_set_chip_and_handler(irq, &ralink_intc_irq_chip, handle_level_irq);
+
+ return 0;
+}
+
+static const struct irq_domain_ops irq_domain_ops = {
+ .xlate = irq_domain_xlate_onecell,
+ .map = intc_map,
+};
+
+static int __init intc_of_init(struct device_node *node,
+ struct device_node *parent)
+{
+ struct resource res;
+ struct irq_domain *domain;
+
+ mips_cpu_irq_init();
+
+ if (of_address_to_resource(node, 0, &res))
+ panic("Failed to get intc memory range");
+
+ if (request_mem_region(res.start, resource_size(&res),
+ res.name) < 0)
+ pr_err("Failed to request intc memory");
+
+ rt_intc_membase = ioremap_nocache(res.start,
+ resource_size(&res));
+ if (!rt_intc_membase)
+ panic("Failed to remap intc memory");
+
+ /* disable all interrupts */
+ rt_intc_w32(~0, INTC_REG_DISABLE);
+
+ /* route all INTC interrupts to MIPS HW0 interrupt */
+ rt_intc_w32(0, INTC_REG_TYPE);
+
+ domain = irq_domain_add_legacy(node, RALINK_INTC_IRQ_COUNT,
+ RALINK_INTC_IRQ_BASE, 0, &irq_domain_ops, NULL);
+ if (!domain)
+ panic("Failed to add irqdomain");
+
+ rt_intc_w32(INTC_INT_GLOBAL, INTC_REG_ENABLE);
+
+ irq_set_chained_handler(RALINK_CPU_IRQ_INTC, ralink_intc_irq_handler);
+ irq_set_handler_data(RALINK_CPU_IRQ_INTC, domain);
+
+ cp0_perfcount_irq = irq_create_mapping(domain, 9);
+
+ return 0;
+}
+
+static struct of_device_id __initdata of_irq_ids[] = {
+ { .compatible = "ralink,rt2880-intc", .data = intc_of_init },
+ {},
+};
+
+void __init arch_init_irq(void)
+{
+ of_irq_init(of_irq_ids);
+}
+
--
1.7.10.4
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH V3 03/10] MIPS: ralink: adds reset code
2013-01-31 11:59 [PATCH V3 00/10] MIPS: ralink: adds support for ralink platform John Crispin
2013-01-31 11:59 ` [PATCH V3 01/10] MIPS: ralink: adds include files John Crispin
2013-01-31 11:59 ` [PATCH V3 02/10] MIPS: ralink: adds irq code John Crispin
@ 2013-01-31 11:59 ` John Crispin
2013-01-31 13:36 ` Gabor Juhos
2013-01-31 11:59 ` [PATCH V3 04/10] MIPS: ralink: adds prom and cmdline code John Crispin
` (7 subsequent siblings)
10 siblings, 1 reply; 29+ messages in thread
From: John Crispin @ 2013-01-31 11:59 UTC (permalink / raw)
To: Ralf Baechle; +Cc: linux-mips, John Crispin
Resetting these SoCs requires no real magic. The code is straight forward.
Signed-off-by: John Crispin <blogic@openwrt.org>
---
arch/mips/ralink/reset.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
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 @@
+/*
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ * Copyright (C) 2013 John Crispin <blogic@openwrt.org>
+ */
+
+#include <linux/pm.h>
+#include <linux/io.h>
+
+#include <asm/reboot.h>
+
+#include <asm/mach-ralink/ralink_regs.h>
+
+/* Reset Control */
+#define SYSC_REG_RESET_CTRL 0x034
+#define RSTCTL_RESET_SYSTEM BIT(0)
+
+static void ralink_restart(char *command)
+{
+ local_irq_disable();
+ rt_sysc_w32(RSTCTL_RESET_SYSTEM, SYSC_REG_RESET_CTRL);
+ unreachable();
+}
+
+static void ralink_halt(void)
+{
+ local_irq_disable();
+ unreachable();
+}
+
+static int __init mips_reboot_setup(void)
+{
+ _machine_restart = ralink_restart;
+ _machine_halt = ralink_halt;
+ pm_power_off = ralink_halt;
+
+ return 0;
+}
+
+arch_initcall(mips_reboot_setup);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH V3 04/10] MIPS: ralink: adds prom and cmdline code
2013-01-31 11:59 [PATCH V3 00/10] MIPS: ralink: adds support for ralink platform John Crispin
` (2 preceding siblings ...)
2013-01-31 11:59 ` [PATCH V3 03/10] MIPS: ralink: adds reset code John Crispin
@ 2013-01-31 11:59 ` John Crispin
2013-01-31 13:36 ` Gabor Juhos
2013-01-31 11:59 ` [PATCH V3 05/10] MIPS: ralink: adds clkdev code John Crispin
` (6 subsequent siblings)
10 siblings, 1 reply; 29+ messages in thread
From: John Crispin @ 2013-01-31 11:59 UTC (permalink / raw)
To: Ralf Baechle; +Cc: linux-mips, John Crispin
Add minimal code to handle commandlines.
Signed-off-by: John Crispin <blogic@openwrt.org>
---
arch/mips/ralink/prom.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++
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 @@
+/*
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ * Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2010 Joonas Lahtinen <joonas.lahtinen@gmail.com>
+ * Copyright (C) 2013 John Crispin <blogic@openwrt.org>
+ */
+
+#include <linux/string.h>
+#include <linux/of_fdt.h>
+#include <linux/of_platform.h>
+
+#include <asm/bootinfo.h>
+#include <asm/addrspace.h>
+
+#include "common.h"
+
+struct ralink_soc_info soc_info;
+
+const char *get_system_type(void)
+{
+ return soc_info.sys_type;
+}
+
+static __init void prom_init_cmdline(int argc, char **argv)
+{
+ int i;
+
+ pr_debug("prom: fw_arg0=%08x fw_arg1=%08x fw_arg2=%08x fw_arg3=%08x\n",
+ (unsigned int)fw_arg0, (unsigned int)fw_arg1,
+ (unsigned int)fw_arg2, (unsigned int)fw_arg3);
+
+ argc = fw_arg0;
+ argv = (char **) KSEG1ADDR(fw_arg1);
+
+ if (!argv) {
+ pr_debug("argv=%p is invalid, skipping\n",
+ argv);
+ return;
+ }
+
+ for (i = 0; i < argc; i++) {
+ char *p = (char *) KSEG1ADDR(argv[i]);
+
+ if (CPHYSADDR(p) && *p) {
+ pr_debug("argv[%d]: %s\n", i, p);
+ strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
+ strlcat(arcs_cmdline, p, sizeof(arcs_cmdline));
+ }
+ }
+}
+
+void __init prom_init(void)
+{
+ int argc;
+ char **argv;
+
+ prom_soc_init(&soc_info);
+
+ pr_info("SoC Type: %s\n", get_system_type());
+
+ prom_init_cmdline(argc, argv);
+}
+
+void __init prom_free_prom_memory(void)
+{
+}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH V3 05/10] MIPS: ralink: adds clkdev code
2013-01-31 11:59 [PATCH V3 00/10] MIPS: ralink: adds support for ralink platform John Crispin
` (3 preceding siblings ...)
2013-01-31 11:59 ` [PATCH V3 04/10] MIPS: ralink: adds prom and cmdline code John Crispin
@ 2013-01-31 11:59 ` John Crispin
2013-01-31 13:37 ` Gabor Juhos
2013-01-31 11:59 ` [PATCH V3 06/10] MIPS: ralink: adds OF code John Crispin
` (5 subsequent siblings)
10 siblings, 1 reply; 29+ messages in thread
From: John Crispin @ 2013-01-31 11:59 UTC (permalink / raw)
To: Ralf Baechle; +Cc: linux-mips, John Crispin
These SoCs have a limited number of fixed rate clocks. Add support for the
clk and clkdev api.
Signed-off-by: John Crispin <blogic@openwrt.org>
---
arch/mips/ralink/clk.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++
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 @@
+/*
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ * Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2013 John Crispin <blogic@openwrt.org>
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/clkdev.h>
+#include <linux/clk.h>
+
+#include <asm/time.h>
+
+#include "common.h"
+
+struct clk {
+ struct clk_lookup cl;
+ unsigned long rate;
+};
+
+void ralink_clk_add(const char *dev, unsigned long rate)
+{
+ struct clk *clk = kzalloc(sizeof(struct clk), GFP_KERNEL);
+
+ if (!clk)
+ panic("failed to add clock\n");
+
+ clk->cl.dev_id = dev;
+ clk->cl.clk = clk;
+
+ clk->rate = rate;
+
+ clkdev_add(&clk->cl);
+}
+
+/*
+ * Linux clock API
+ */
+int clk_enable(struct clk *clk)
+{
+ return 0;
+}
+EXPORT_SYMBOL_GPL(clk_enable);
+
+void clk_disable(struct clk *clk)
+{
+}
+EXPORT_SYMBOL_GPL(clk_disable);
+
+unsigned long clk_get_rate(struct clk *clk)
+{
+ return clk->rate;
+}
+EXPORT_SYMBOL_GPL(clk_get_rate);
+
+void __init plat_time_init(void)
+{
+ struct clk *clk;
+
+ ralink_of_remap();
+
+ ralink_clk_init();
+ clk = clk_get_sys("cpu", NULL);
+ if (IS_ERR(clk))
+ panic("unable to get CPU clock, err=%ld", PTR_ERR(clk));
+ pr_info("CPU Clock: %ldMHz\n", clk_get_rate(clk) / 1000000);
+ mips_hpt_frequency = clk_get_rate(clk) / 2;
+ clk_put(clk);
+}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH V3 06/10] MIPS: ralink: adds OF code
2013-01-31 11:59 [PATCH V3 00/10] MIPS: ralink: adds support for ralink platform John Crispin
` (4 preceding siblings ...)
2013-01-31 11:59 ` [PATCH V3 05/10] MIPS: ralink: adds clkdev code John Crispin
@ 2013-01-31 11:59 ` John Crispin
2013-01-31 13:37 ` Gabor Juhos
2013-01-31 11:59 ` [PATCH V3 07/10] MIPS: ralink: adds early_printk support John Crispin
` (4 subsequent siblings)
10 siblings, 1 reply; 29+ messages in thread
From: John Crispin @ 2013-01-31 11:59 UTC (permalink / raw)
To: Ralf Baechle; +Cc: linux-mips, John Crispin
Until there is a generic MIPS way of handing the DTB over from bootloader to
kernel we rely on a built in devicetrees. The OF code also remaps those register
ranges that we use global in our drivers.
Signed-off-by: John Crispin <blogic@openwrt.org>
---
arch/mips/ralink/of.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++++
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 @@
+/*
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2013 John Crispin <blogic@openwrt.org>
+ */
+
+#include <linux/io.h>
+#include <linux/clk.h>
+#include <linux/init.h>
+#include <linux/of_fdt.h>
+#include <linux/kernel.h>
+#include <linux/bootmem.h>
+#include <linux/of_platform.h>
+#include <linux/of_address.h>
+
+#include <asm/reboot.h>
+#include <asm/bootinfo.h>
+#include <asm/addrspace.h>
+
+#include "common.h"
+
+__iomem void *rt_sysc_membase;
+__iomem void *rt_memc_membase;
+
+extern struct boot_param_header __dtb_start;
+
+__iomem void *plat_of_remap_node(const char *node)
+{
+ struct resource res;
+ struct device_node *np;
+
+ np = of_find_compatible_node(NULL, NULL, node);
+ if (!np)
+ panic("Failed to find %s node", node);
+
+ if (of_address_to_resource(np, 0, &res))
+ panic("Failed to get resource for %s", node);
+
+ if ((request_mem_region(res.start,
+ resource_size(&res),
+ res.name) < 0))
+ panic("Failed to request resources for %s", node);
+
+ return ioremap_nocache(res.start, resource_size(&res));
+}
+
+void __init device_tree_init(void)
+{
+ unsigned long base, size;
+ void *fdt_copy;
+
+ if (!initial_boot_params)
+ return;
+
+ base = virt_to_phys((void *)initial_boot_params);
+ size = be32_to_cpu(initial_boot_params->totalsize);
+
+ /* Before we do anything, lets reserve the dt blob */
+ reserve_bootmem(base, size, BOOTMEM_DEFAULT);
+
+ /* The strings in the flattened tree are referenced directly by the
+ * device tree, so copy the flattened device tree from init memory
+ * to regular memory.
+ */
+ fdt_copy = alloc_bootmem(size);
+ memcpy(fdt_copy, initial_boot_params, size);
+ initial_boot_params = fdt_copy;
+
+ unflatten_device_tree();
+
+ /* free the space reserved for the dt blob */
+ free_bootmem(base, size);
+}
+
+void __init plat_mem_setup(void)
+{
+ set_io_port_base(KSEG1);
+
+ /*
+ * Load the builtin devicetree. This causes the chosen node to be
+ * parsed resulting in our memory appearing
+ */
+ __dt_setup_arch(&__dtb_start);
+}
+
+static int __init plat_of_setup(void)
+{
+ static struct of_device_id of_ids[3];
+ int len = sizeof(of_ids[0].compatible);
+
+ if (!of_have_populated_dt())
+ panic("device tree not present");
+
+ strncpy(of_ids[0].compatible, soc_info.compatible, len);
+ strncpy(of_ids[1].compatible, "palmbus", len);
+
+ if (of_platform_populate(NULL, of_ids, NULL, NULL))
+ panic("failed to populate DT\n");
+
+ return 0;
+}
+
+arch_initcall(plat_of_setup);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH V3 07/10] MIPS: ralink: adds early_printk support
2013-01-31 11:59 [PATCH V3 00/10] MIPS: ralink: adds support for ralink platform John Crispin
` (5 preceding siblings ...)
2013-01-31 11:59 ` [PATCH V3 06/10] MIPS: ralink: adds OF code John Crispin
@ 2013-01-31 11:59 ` John Crispin
2013-01-31 13:37 ` Gabor Juhos
2013-01-31 11:59 ` [PATCH V3 08/10] MIPS: ralink: adds support for RT305x SoC family John Crispin
` (3 subsequent siblings)
10 siblings, 1 reply; 29+ messages in thread
From: John Crispin @ 2013-01-31 11:59 UTC (permalink / raw)
To: Ralf Baechle; +Cc: linux-mips, John Crispin
Add the code needed to make early printk work.
Signed-off-by: John Crispin <blogic@openwrt.org>
---
arch/mips/ralink/early_printk.c | 44 +++++++++++++++++++++++++++++++++++++++
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 @@
+/*
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ * Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
+ */
+
+#include <linux/io.h>
+#include <linux/serial_reg.h>
+
+#include <asm/addrspace.h>
+
+#define EARLY_UART_BASE 0x10000c00
+
+#define UART_REG_RX 0x00
+#define UART_REG_TX 0x04
+#define UART_REG_IER 0x08
+#define UART_REG_IIR 0x0c
+#define UART_REG_FCR 0x10
+#define UART_REG_LCR 0x14
+#define UART_REG_MCR 0x18
+#define UART_REG_LSR 0x1c
+
+static __iomem void *uart_membase = (__iomem void *) KSEG1ADDR(EARLY_UART_BASE);
+
+static inline void uart_w32(u32 val, unsigned reg)
+{
+ __raw_writel(val, uart_membase + reg);
+}
+
+static inline u32 uart_r32(unsigned reg)
+{
+ return __raw_readl(uart_membase + reg);
+}
+
+void prom_putchar(unsigned char ch)
+{
+ while ((uart_r32(UART_REG_LSR) & UART_LSR_THRE) == 0)
+ ;
+ uart_w32(ch, UART_REG_TX);
+ while ((uart_r32(UART_REG_LSR) & UART_LSR_THRE) == 0)
+ ;
+}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH V3 08/10] MIPS: ralink: adds support for RT305x SoC family
2013-01-31 11:59 [PATCH V3 00/10] MIPS: ralink: adds support for ralink platform John Crispin
` (6 preceding siblings ...)
2013-01-31 11:59 ` [PATCH V3 07/10] MIPS: ralink: adds early_printk support John Crispin
@ 2013-01-31 11:59 ` John Crispin
2013-01-31 13:06 ` Florian Fainelli
2013-01-31 13:38 ` Gabor Juhos
2013-01-31 11:59 ` [PATCH V3 09/10] MIPS: ralink: adds rt305x devicetree John Crispin
` (2 subsequent siblings)
10 siblings, 2 replies; 29+ messages in thread
From: John Crispin @ 2013-01-31 11:59 UTC (permalink / raw)
To: Ralf Baechle; +Cc: linux-mips, John Crispin
Add support code for rt3050, rt3052, rt3350, rt3352 and rt5350 SOC.
The code detects the SoC and registers the clk / pinmux settings.
Signed-off-by: John Crispin <blogic@openwrt.org>
---
arch/mips/include/asm/mach-ralink/rt305x.h | 139 ++++++++++++++++
arch/mips/ralink/rt305x.c | 242 ++++++++++++++++++++++++++++
2 files changed, 381 insertions(+)
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 @@
+/*
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ * Parts of this file are based on Ralink's 2.6.21 BSP
+ *
+ * Copyright (C) 2008-2011 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ * Copyright (C) 2013 John Crispin <blogic@openwrt.org>
+ */
+
+#ifndef _RT305X_REGS_H_
+#define _RT305X_REGS_H_
+
+enum rt305x_soc_type {
+ RT305X_SOC_UNKNOWN = 0,
+ RT305X_SOC_RT3050,
+ RT305X_SOC_RT3052,
+ RT305X_SOC_RT3350,
+ RT305X_SOC_RT3352,
+ RT305X_SOC_RT5350,
+};
+
+extern enum rt305x_soc_type rt305x_soc;
+
+static inline int soc_is_rt3050(void)
+{
+ return rt305x_soc == RT305X_SOC_RT3050;
+}
+
+static inline int soc_is_rt3052(void)
+{
+ return rt305x_soc == RT305X_SOC_RT3052;
+}
+
+static inline int soc_is_rt305x(void)
+{
+ return soc_is_rt3050() || soc_is_rt3052();
+}
+
+static inline int soc_is_rt3350(void)
+{
+ return rt305x_soc == RT305X_SOC_RT3350;
+}
+
+static inline int soc_is_rt3352(void)
+{
+ return rt305x_soc == RT305X_SOC_RT3352;
+}
+
+static inline int soc_is_rt5350(void)
+{
+ return rt305x_soc == RT305X_SOC_RT5350;
+}
+
+#define RT305X_SYSC_BASE 0x10000000
+
+#define SYSC_REG_CHIP_NAME0 0x00
+#define SYSC_REG_CHIP_NAME1 0x04
+#define SYSC_REG_CHIP_ID 0x0c
+#define SYSC_REG_SYSTEM_CONFIG 0x10
+
+#define RT3052_CHIP_NAME0 0x30335452
+#define RT3052_CHIP_NAME1 0x20203235
+
+#define RT3350_CHIP_NAME0 0x33335452
+#define RT3350_CHIP_NAME1 0x20203035
+
+#define RT3352_CHIP_NAME0 0x33335452
+#define RT3352_CHIP_NAME1 0x20203235
+
+#define RT5350_CHIP_NAME0 0x33355452
+#define RT5350_CHIP_NAME1 0x20203035
+
+#define CHIP_ID_ID_MASK 0xff
+#define CHIP_ID_ID_SHIFT 8
+#define CHIP_ID_REV_MASK 0xff
+
+#define RT305X_SYSCFG_CPUCLK_SHIFT 18
+#define RT305X_SYSCFG_CPUCLK_MASK 0x1
+#define RT305X_SYSCFG_CPUCLK_LOW 0x0
+#define RT305X_SYSCFG_CPUCLK_HIGH 0x1
+
+#define RT305X_SYSCFG_SRAM_CS0_MODE_SHIFT 2
+#define RT305X_SYSCFG_CPUCLK_MASK 0x1
+#define RT305X_SYSCFG_SRAM_CS0_MODE_WDT 0x1
+
+#define RT3352_SYSCFG0_CPUCLK_SHIFT 8
+#define RT3352_SYSCFG0_CPUCLK_MASK 0x1
+#define RT3352_SYSCFG0_CPUCLK_LOW 0x0
+#define RT3352_SYSCFG0_CPUCLK_HIGH 0x1
+
+#define RT5350_SYSCFG0_CPUCLK_SHIFT 8
+#define RT5350_SYSCFG0_CPUCLK_MASK 0x3
+#define RT5350_SYSCFG0_CPUCLK_360 0x0
+#define RT5350_SYSCFG0_CPUCLK_320 0x2
+#define RT5350_SYSCFG0_CPUCLK_300 0x3
+
+/* multi function gpio pins */
+#define RT305X_GPIO_I2C_SD 1
+#define RT305X_GPIO_I2C_SCLK 2
+#define RT305X_GPIO_SPI_EN 3
+#define RT305X_GPIO_SPI_CLK 4
+/* GPIO 7-14 is shared between UART0, PCM and I2S interfaces */
+#define RT305X_GPIO_7 7
+#define RT305X_GPIO_10 10
+#define RT305X_GPIO_14 14
+#define RT305X_GPIO_UART1_TXD 15
+#define RT305X_GPIO_UART1_RXD 16
+#define RT305X_GPIO_JTAG_TDO 17
+#define RT305X_GPIO_JTAG_TDI 18
+#define RT305X_GPIO_MDIO_MDC 22
+#define RT305X_GPIO_MDIO_MDIO 23
+#define RT305X_GPIO_SDRAM_MD16 24
+#define RT305X_GPIO_SDRAM_MD31 39
+#define RT305X_GPIO_GE0_TXD0 40
+#define RT305X_GPIO_GE0_RXCLK 51
+
+#define RT305X_GPIO_MODE_I2C BIT(0)
+#define RT305X_GPIO_MODE_SPI BIT(1)
+#define RT305X_GPIO_MODE_UART0_SHIFT 2
+#define RT305X_GPIO_MODE_UART0_MASK 0x7
+#define RT305X_GPIO_MODE_UART0(x) ((x) << RT305X_GPIO_MODE_UART0_SHIFT)
+#define RT305X_GPIO_MODE_UARTF 0x0
+#define RT305X_GPIO_MODE_PCM_UARTF 0x1
+#define RT305X_GPIO_MODE_PCM_I2S 0x2
+#define RT305X_GPIO_MODE_I2S_UARTF 0x3
+#define RT305X_GPIO_MODE_PCM_GPIO 0x4
+#define RT305X_GPIO_MODE_GPIO_UARTF 0x5
+#define RT305X_GPIO_MODE_GPIO_I2S 0x6
+#define RT305X_GPIO_MODE_GPIO 0x7
+#define RT305X_GPIO_MODE_UART1 BIT(5)
+#define RT305X_GPIO_MODE_JTAG BIT(6)
+#define RT305X_GPIO_MODE_MDIO BIT(7)
+#define RT305X_GPIO_MODE_SDRAM BIT(8)
+#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..1e24439
--- /dev/null
+++ b/arch/mips/ralink/rt305x.c
@@ -0,0 +1,242 @@
+/*
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ * Parts of this file are based on Ralink's 2.6.21 BSP
+ *
+ * Copyright (C) 2008-2011 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ * Copyright (C) 2013 John Crispin <blogic@openwrt.org>
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+
+#include <asm/mipsregs.h>
+#include <asm/mach-ralink/ralink_regs.h>
+#include <asm/mach-ralink/rt305x.h>
+
+#include "common.h"
+
+enum rt305x_soc_type rt305x_soc;
+
+struct ralink_pinmux_grp mode_mux[] = {
+ {
+ .name = "i2c",
+ .mask = RT305X_GPIO_MODE_I2C,
+ .gpio_first = RT305X_GPIO_I2C_SD,
+ .gpio_last = RT305X_GPIO_I2C_SCLK,
+ }, {
+ .name = "spi",
+ .mask = RT305X_GPIO_MODE_SPI,
+ .gpio_first = RT305X_GPIO_SPI_EN,
+ .gpio_last = RT305X_GPIO_SPI_CLK,
+ }, {
+ .name = "uartlite",
+ .mask = RT305X_GPIO_MODE_UART1,
+ .gpio_first = RT305X_GPIO_UART1_TXD,
+ .gpio_last = RT305X_GPIO_UART1_RXD,
+ }, {
+ .name = "jtag",
+ .mask = RT305X_GPIO_MODE_JTAG,
+ .gpio_first = RT305X_GPIO_JTAG_TDO,
+ .gpio_last = RT305X_GPIO_JTAG_TDI,
+ }, {
+ .name = "mdio",
+ .mask = RT305X_GPIO_MODE_MDIO,
+ .gpio_first = RT305X_GPIO_MDIO_MDC,
+ .gpio_last = RT305X_GPIO_MDIO_MDIO,
+ }, {
+ .name = "sdram",
+ .mask = RT305X_GPIO_MODE_SDRAM,
+ .gpio_first = RT305X_GPIO_SDRAM_MD16,
+ .gpio_last = RT305X_GPIO_SDRAM_MD31,
+ }, {
+ .name = "rgmii",
+ .mask = RT305X_GPIO_MODE_RGMII,
+ .gpio_first = RT305X_GPIO_GE0_TXD0,
+ .gpio_last = RT305X_GPIO_GE0_RXCLK,
+ }, {0}
+};
+
+struct ralink_pinmux_grp uart_mux[] = {
+ {
+ .name = "uartf",
+ .mask = RT305X_GPIO_MODE_UARTF,
+ .gpio_first = RT305X_GPIO_7,
+ .gpio_last = RT305X_GPIO_14,
+ }, {
+ .name = "pcm uartf",
+ .mask = RT305X_GPIO_MODE_PCM_UARTF,
+ .gpio_first = RT305X_GPIO_7,
+ .gpio_last = RT305X_GPIO_14,
+ }, {
+ .name = "pcm i2s",
+ .mask = RT305X_GPIO_MODE_PCM_I2S,
+ .gpio_first = RT305X_GPIO_7,
+ .gpio_last = RT305X_GPIO_14,
+ }, {
+ .name = "i2s uartf",
+ .mask = RT305X_GPIO_MODE_I2S_UARTF,
+ .gpio_first = RT305X_GPIO_7,
+ .gpio_last = RT305X_GPIO_14,
+ }, {
+ .name = "pcm gpio",
+ .mask = RT305X_GPIO_MODE_PCM_GPIO,
+ .gpio_first = RT305X_GPIO_10,
+ .gpio_last = RT305X_GPIO_14,
+ }, {
+ .name = "gpio uartf",
+ .mask = RT305X_GPIO_MODE_GPIO_UARTF,
+ .gpio_first = RT305X_GPIO_7,
+ .gpio_last = RT305X_GPIO_14,
+ }, {
+ .name = "gpio i2s",
+ .mask = RT305X_GPIO_MODE_GPIO_I2S,
+ .gpio_first = RT305X_GPIO_7,
+ .gpio_last = RT305X_GPIO_14,
+ }, {
+ .name = "gpio",
+ .mask = RT305X_GPIO_MODE_GPIO,
+ }, {0}
+};
+
+void rt305x_wdt_reset(void)
+{
+ u32 t;
+
+ /* enable WDT reset output on pin SRAM_CS_N */
+ t = rt_sysc_r32(SYSC_REG_SYSTEM_CONFIG);
+ t |= RT305X_SYSCFG_SRAM_CS0_MODE_WDT <<
+ RT305X_SYSCFG_SRAM_CS0_MODE_SHIFT;
+ rt_sysc_w32(t, SYSC_REG_SYSTEM_CONFIG);
+}
+
+struct ralink_pinmux gpio_pinmux = {
+ .mode = mode_mux,
+ .uart = uart_mux,
+ .uart_shift = RT305X_GPIO_MODE_UART0_SHIFT,
+ .wdt_reset = rt305x_wdt_reset,
+};
+
+void __init ralink_clk_init(void)
+{
+ unsigned long cpu_rate, sys_rate, wdt_rate, uart_rate;
+ u32 t = rt_sysc_r32(SYSC_REG_SYSTEM_CONFIG);
+
+ if (soc_is_rt305x() || soc_is_rt3350()) {
+ t = (t >> RT305X_SYSCFG_CPUCLK_SHIFT) &
+ RT305X_SYSCFG_CPUCLK_MASK;
+ switch (t) {
+ case RT305X_SYSCFG_CPUCLK_LOW:
+ cpu_rate = 320000000;
+ break;
+ case RT305X_SYSCFG_CPUCLK_HIGH:
+ cpu_rate = 384000000;
+ break;
+ }
+ sys_rate = uart_rate = wdt_rate = cpu_rate / 3;
+ } else if (soc_is_rt3352()) {
+ t = (t >> RT3352_SYSCFG0_CPUCLK_SHIFT) &
+ RT3352_SYSCFG0_CPUCLK_MASK;
+ switch (t) {
+ case RT3352_SYSCFG0_CPUCLK_LOW:
+ cpu_rate = 384000000;
+ break;
+ case RT3352_SYSCFG0_CPUCLK_HIGH:
+ cpu_rate = 400000000;
+ break;
+ }
+ sys_rate = wdt_rate = cpu_rate / 3;
+ uart_rate = 40000000;
+ } else if (soc_is_rt5350()) {
+ t = (t >> RT5350_SYSCFG0_CPUCLK_SHIFT) &
+ RT5350_SYSCFG0_CPUCLK_MASK;
+ switch (t) {
+ case RT5350_SYSCFG0_CPUCLK_360:
+ cpu_rate = 360000000;
+ sys_rate = cpu_rate / 3;
+ break;
+ case RT5350_SYSCFG0_CPUCLK_320:
+ cpu_rate = 320000000;
+ sys_rate = cpu_rate / 4;
+ break;
+ case RT5350_SYSCFG0_CPUCLK_300:
+ cpu_rate = 300000000;
+ sys_rate = cpu_rate / 3;
+ break;
+ default:
+ BUG();
+ }
+ uart_rate = 40000000;
+ wdt_rate = sys_rate;
+ } else {
+ BUG();
+ }
+
+ ralink_clk_add("cpu", cpu_rate);
+ ralink_clk_add("10000b00.spi", sys_rate);
+ ralink_clk_add("10000100.timer", wdt_rate);
+ ralink_clk_add("10000500.uart", uart_rate);
+ ralink_clk_add("10000c00.uartlite", uart_rate);
+}
+
+void __init ralink_of_remap(void)
+{
+ rt_sysc_membase = plat_of_remap_node("ralink,rt305x-sysc");
+ rt_memc_membase = plat_of_remap_node("ralink,rt305x-memc");
+
+ if (!rt_sysc_membase || !rt_memc_membase)
+ panic("Failed to remap core resources");
+}
+
+void prom_soc_init(struct ralink_soc_info *soc_info)
+{
+ void __iomem *sysc = (void __iomem *) KSEG1ADDR(RT305X_SYSC_BASE);
+ unsigned char *name;
+ u32 n0;
+ u32 n1;
+ u32 id;
+
+ n0 = __raw_readl(sysc + SYSC_REG_CHIP_NAME0);
+ n1 = __raw_readl(sysc + SYSC_REG_CHIP_NAME1);
+
+ if (n0 == RT3052_CHIP_NAME0 && n1 == RT3052_CHIP_NAME1) {
+ unsigned long icache_sets;
+
+ icache_sets = (read_c0_config1() >> 22) & 7;
+ if (icache_sets == 1) {
+ rt305x_soc = RT305X_SOC_RT3050;
+ name = "RT3050";
+ soc_info->compatible = "ralink,rt3050";
+ } else {
+ rt305x_soc = RT305X_SOC_RT3052;
+ name = "RT3052";
+ soc_info->compatible = "ralink,rt3052";
+ }
+ } else if (n0 == RT3350_CHIP_NAME0 && n1 == RT3350_CHIP_NAME1) {
+ rt305x_soc = RT305X_SOC_RT3350;
+ name = "RT3350";
+ soc_info->compatible = "ralink,rt3350";
+ } else if (n0 == RT3352_CHIP_NAME0 && n1 == RT3352_CHIP_NAME1) {
+ rt305x_soc = RT305X_SOC_RT3352;
+ name = "RT3352";
+ soc_info->compatible = "ralink,rt3352";
+ } else if (n0 == RT5350_CHIP_NAME0 && n1 == RT5350_CHIP_NAME1) {
+ rt305x_soc = RT305X_SOC_RT5350;
+ name = "RT5350";
+ soc_info->compatible = "ralink,rt5350";
+ } else {
+ panic("rt305x: unknown SoC, n0:%08x n1:%08x\n", n0, n1);
+ }
+
+ id = __raw_readl(sysc + SYSC_REG_CHIP_ID);
+
+ snprintf(soc_info->sys_type, RAMIPS_SYS_TYPE_LEN,
+ "Ralink %s id:%u rev:%u",
+ name,
+ (id >> CHIP_ID_ID_SHIFT) & CHIP_ID_ID_MASK,
+ (id & CHIP_ID_REV_MASK));
+}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH V3 08/10] MIPS: ralink: adds support for RT305x SoC family
2013-01-31 11:59 ` [PATCH V3 08/10] MIPS: ralink: adds support for RT305x SoC family John Crispin
@ 2013-01-31 13:06 ` Florian Fainelli
2013-01-31 13:08 ` John Crispin
2013-01-31 13:38 ` Gabor Juhos
1 sibling, 1 reply; 29+ messages in thread
From: Florian Fainelli @ 2013-01-31 13:06 UTC (permalink / raw)
To: John Crispin; +Cc: Ralf Baechle, linux-mips
Hello John,
On 01/31/2013 12:59 PM, John Crispin wrote:
[snip]
> +
> +struct ralink_pinmux gpio_pinmux = {
> + .mode = mode_mux,
> + .uart = uart_mux,
> + .uart_shift = RT305X_GPIO_MODE_UART0_SHIFT,
> + .wdt_reset = rt305x_wdt_reset,
> +};
It seems to me like the new convention for pinctrl/pinmux etc .. is to
actually create drivers/pinctrl/pinctrl-ralink.c and
drivers/pinctrl/pinctrl-rt305x.c, I guess this can be done later when
you come up with support for the other Ralink SoCs.
--
Florian
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PATCH V3 08/10] MIPS: ralink: adds support for RT305x SoC family
2013-01-31 13:06 ` Florian Fainelli
@ 2013-01-31 13:08 ` John Crispin
0 siblings, 0 replies; 29+ messages in thread
From: John Crispin @ 2013-01-31 13:08 UTC (permalink / raw)
To: linux-mips
On 31/01/13 14:06, Florian Fainelli wrote:
> Hello John,
>
> On 01/31/2013 12:59 PM, John Crispin wrote:
> [snip]
>
>> +
>> +struct ralink_pinmux gpio_pinmux = {
>> + .mode = mode_mux,
>> + .uart = uart_mux,
>> + .uart_shift = RT305X_GPIO_MODE_UART0_SHIFT,
>> + .wdt_reset = rt305x_wdt_reset,
>> +};
>
> It seems to me like the new convention for pinctrl/pinmux etc .. is to
> actually create drivers/pinctrl/pinctrl-ralink.c and
> drivers/pinctrl/pinctrl-rt305x.c, I guess this can be done later when
> you come up with support for the other Ralink SoCs.
> --
> Florian
>
>
Hi,
pinctrl is bloat in this context. the pinmux breaks down to a single 32
bit register. i did not send the patch yet as i am wanting to make sure
it works on the new MTK7620 aswell.
John
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH V3 08/10] MIPS: ralink: adds support for RT305x SoC family
2013-01-31 11:59 ` [PATCH V3 08/10] MIPS: ralink: adds support for RT305x SoC family John Crispin
2013-01-31 13:06 ` Florian Fainelli
@ 2013-01-31 13:38 ` Gabor Juhos
1 sibling, 0 replies; 29+ messages in thread
From: Gabor Juhos @ 2013-01-31 13:38 UTC (permalink / raw)
To: John Crispin; +Cc: Ralf Baechle, linux-mips
2013.01.31. 12:59 keltezéssel, John Crispin írta:
> Add support code for rt3050, rt3052, rt3350, rt3352 and rt5350 SOC.
>
> The code detects the SoC and registers the clk / pinmux settings.
>
> Signed-off-by: John Crispin <blogic@openwrt.org>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH V3 09/10] MIPS: ralink: adds rt305x devicetree
2013-01-31 11:59 [PATCH V3 00/10] MIPS: ralink: adds support for ralink platform John Crispin
` (7 preceding siblings ...)
2013-01-31 11:59 ` [PATCH V3 08/10] MIPS: ralink: adds support for RT305x SoC family John Crispin
@ 2013-01-31 11:59 ` John Crispin
2013-01-31 12:59 ` Florian Fainelli
2013-01-31 14:11 ` Gabor Juhos
2013-01-31 11:59 ` [PATCH V3 10/10] MIPS: ralink: adds Kbuild files John Crispin
2013-02-01 11:40 ` [PATCH V3 00/10] MIPS: ralink: adds support for ralink platform Florian Fainelli
10 siblings, 2 replies; 29+ messages in thread
From: John Crispin @ 2013-01-31 11:59 UTC (permalink / raw)
To: Ralf Baechle; +Cc: linux-mips, John Crispin
This adds the devicetree file that describes the rt305x evaluation kit.
Signed-off-by: John Crispin <blogic@openwrt.org>
---
arch/mips/ralink/dts/rt305x.dts | 151 +++++++++++++++++++++++++++++++++++++++
arch/mips/ralink/rt305x.c | 4 +-
2 files changed, 153 insertions(+), 2 deletions(-)
create mode 100644 arch/mips/ralink/dts/rt305x.dts
diff --git a/arch/mips/ralink/dts/rt305x.dts b/arch/mips/ralink/dts/rt305x.dts
new file mode 100644
index 0000000..c7298f3
--- /dev/null
+++ b/arch/mips/ralink/dts/rt305x.dts
@@ -0,0 +1,151 @@
+/dts-v1/;
+
+/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "ralink,rt305x";
+
+ cpus {
+ cpu@0 {
+ compatible = "mips,mips24KEc";
+ };
+ };
+
+ memory@0 {
+ reg = <0x0 0x2000000>;
+ };
+
+ chosen {
+ bootargs = "console=ttyS0,57600 init=/init";
+ };
+
+ palmbus@10000000 {
+ compatible = "palmbus";
+ reg = <0x10000000 0x200000>;
+ ranges = <0x0 0x10000000 0x1FFFFF>;
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ sysc@0 {
+ compatible = "ralink,rt3052-sysc";
+ reg = <0x0 0x100>;
+
+ ralink,pinmmux = "uartlite", "spi";
+ ralink,uartmux = "gpio";
+ ralink,wdtmux = <0>;
+ };
+
+ timer@100 {
+ compatible = "ralink,rt2880-wdt";
+ reg = <0x100 0x100>;
+ };
+
+ intc: intc@200 {
+ compatible = "ralink,rt2880-intc";
+ reg = <0x200 0x100>;
+
+ interrupt-controller;
+ #interrupt-cells = <1>;
+ };
+
+ memc@300 {
+ compatible = "ralink,rt3052-memc";
+ reg = <0x300 0x100>;
+ };
+
+ gpio0: gpio@600 {
+ compatible = "ralink,rt2880-gpio";
+ reg = <0x600 0x34>;
+
+ gpio-controller;
+ #gpio-cells = <2>;
+
+ ralink,ngpio = <24>;
+ ralink,regs = [ 00 04 08 0c
+ 20 24 28 2c
+ 30 34 ];
+ };
+
+ gpio1: gpio@638 {
+ compatible = "ralink,rt2880-gpio";
+ reg = <0x638 0x24>;
+
+ gpio-controller;
+ #gpio-cells = <2>;
+
+ ralink,ngpio = <16>;
+ ralink,regs = [ 00 04 08 0c
+ 10 14 18 1c
+ 20 24 ];
+ };
+
+ gpio2: gpio@660 {
+ compatible = "ralink,rt2880-gpio";
+ reg = <0x660 0x24>;
+
+ gpio-controller;
+ #gpio-cells = <2>;
+
+ ralink,ngpio = <12>;
+ ralink,regs = [ 00 04 08 0c
+ 10 14 18 1c
+ 20 24 ];
+ };
+
+ spi@b00 {
+ compatible = "ralink,rt2880-spi";
+ reg = <0xb00 0x100>;
+ };
+
+ uartlite@c00 {
+ compatible = "ns16550a";
+ reg = <0xc00 0x100>;
+
+ interrupt-parent = <&intc>;
+ interrupts = <12>;
+
+ reg-shift = <2>;
+ };
+
+ fe@100000 {
+ compatible = "ralink,rt3052-fe";
+ reg = <0x100000 0x10000>;
+ };
+
+ esw@110000 {
+ compatible = "ralink,rt3052-esw";
+ reg = <0x110000 0x8000>;
+ };
+ };
+
+ cfi@1f000000 {
+ compatible = "cfi-flash";
+ reg = <0x1f000000 0x800000>;
+
+ bank-width = <2>;
+ device-width = <2>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition@0 {
+ label = "uboot";
+ reg = <0x0 0x30000>;
+ read-only;
+ };
+ partition@30000 {
+ label = "uboot-env";
+ reg = <0x30000 0x10000>;
+ read-only;
+ };
+ partition@40000 {
+ label = "calibration";
+ reg = <0x40000 0x10000>;
+ read-only;
+ };
+ partition@50000 {
+ label = "linux";
+ reg = <0x50000 0x7b0000>;
+ };
+ };
+};
diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c
index 1e24439..f4b2e4d 100644
--- a/arch/mips/ralink/rt305x.c
+++ b/arch/mips/ralink/rt305x.c
@@ -185,8 +185,8 @@ void __init ralink_clk_init(void)
void __init ralink_of_remap(void)
{
- rt_sysc_membase = plat_of_remap_node("ralink,rt305x-sysc");
- rt_memc_membase = plat_of_remap_node("ralink,rt305x-memc");
+ rt_sysc_membase = plat_of_remap_node("ralink,rt3052-sysc");
+ rt_memc_membase = plat_of_remap_node("ralink,rt3052-memc");
if (!rt_sysc_membase || !rt_memc_membase)
panic("Failed to remap core resources");
--
1.7.10.4
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH V3 09/10] MIPS: ralink: adds rt305x devicetree
2013-01-31 11:59 ` [PATCH V3 09/10] MIPS: ralink: adds rt305x devicetree John Crispin
@ 2013-01-31 12:59 ` Florian Fainelli
2013-01-31 13:13 ` John Crispin
2013-01-31 14:11 ` Gabor Juhos
1 sibling, 1 reply; 29+ messages in thread
From: Florian Fainelli @ 2013-01-31 12:59 UTC (permalink / raw)
To: John Crispin; +Cc: Ralf Baechle, linux-mips
Hey John,
On 01/31/2013 12:59 PM, John Crispin wrote:
> This adds the devicetree file that describes the rt305x evaluation kit.
>
> Signed-off-by: John Crispin <blogic@openwrt.org>
> ---
> arch/mips/ralink/dts/rt305x.dts | 151 +++++++++++++++++++++++++++++++++++++++
> arch/mips/ralink/rt305x.c | 4 +-
> 2 files changed, 153 insertions(+), 2 deletions(-)
> create mode 100644 arch/mips/ralink/dts/rt305x.dts
>
> diff --git a/arch/mips/ralink/dts/rt305x.dts b/arch/mips/ralink/dts/rt305x.dts
> new file mode 100644
> index 0000000..c7298f3
> --- /dev/null
> +++ b/arch/mips/ralink/dts/rt305x.dts
> @@ -0,0 +1,151 @@
> +/dts-v1/;
> +
> +/ {
> + #address-cells = <1>;
> + #size-cells = <1>;
> + compatible = "ralink,rt305x";
Should not this file actually be a rt305x.dtsi? And you should then
create a rt305x-eval.dts file including that one and adding a proper
model and compatible property?
Most devices should be marked with status = "disabled" by default in
dtsi files.
> +
> + cpus {
> + cpu@0 {
> + compatible = "mips,mips24KEc";
> + };
> + };
> +
> + memory@0 {
> + reg = <0x0 0x2000000>;
> + };
> +
> + chosen {
> + bootargs = "console=ttyS0,57600 init=/init";
> + };
> +
> + palmbus@10000000 {
> + compatible = "palmbus";
> + reg = <0x10000000 0x200000>;
> + ranges = <0x0 0x10000000 0x1FFFFF>;
> +
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> + sysc@0 {
> + compatible = "ralink,rt3052-sysc";
> + reg = <0x0 0x100>;
> +
> + ralink,pinmmux = "uartlite", "spi";
> + ralink,uartmux = "gpio";
> + ralink,wdtmux = <0>;
> + };
> +
> + timer@100 {
> + compatible = "ralink,rt2880-wdt";
> + reg = <0x100 0x100>;
> + };
> +
> + intc: intc@200 {
> + compatible = "ralink,rt2880-intc";
> + reg = <0x200 0x100>;
> +
> + interrupt-controller;
> + #interrupt-cells = <1>;
> + };
> +
> + memc@300 {
> + compatible = "ralink,rt3052-memc";
> + reg = <0x300 0x100>;
> + };
> +
> + gpio0: gpio@600 {
> + compatible = "ralink,rt2880-gpio";
> + reg = <0x600 0x34>;
> +
> + gpio-controller;
> + #gpio-cells = <2>;
> +
> + ralink,ngpio = <24>;
> + ralink,regs = [ 00 04 08 0c
> + 20 24 28 2c
> + 30 34 ];
> + };
> +
> + gpio1: gpio@638 {
> + compatible = "ralink,rt2880-gpio";
> + reg = <0x638 0x24>;
> +
> + gpio-controller;
> + #gpio-cells = <2>;
> +
> + ralink,ngpio = <16>;
> + ralink,regs = [ 00 04 08 0c
> + 10 14 18 1c
> + 20 24 ];
> + };
> +
> + gpio2: gpio@660 {
> + compatible = "ralink,rt2880-gpio";
> + reg = <0x660 0x24>;
> +
> + gpio-controller;
> + #gpio-cells = <2>;
> +
> + ralink,ngpio = <12>;
> + ralink,regs = [ 00 04 08 0c
> + 10 14 18 1c
> + 20 24 ];
> + };
> +
> + spi@b00 {
> + compatible = "ralink,rt2880-spi";
> + reg = <0xb00 0x100>;
> + };
> +
> + uartlite@c00 {
> + compatible = "ns16550a";
> + reg = <0xc00 0x100>;
> +
> + interrupt-parent = <&intc>;
> + interrupts = <12>;
> +
> + reg-shift = <2>;
> + };
> +
> + fe@100000 {
> + compatible = "ralink,rt3052-fe";
> + reg = <0x100000 0x10000>;
> + };
> +
> + esw@110000 {
> + compatible = "ralink,rt3052-esw";
> + reg = <0x110000 0x8000>;
> + };
> + };
> +
> + cfi@1f000000 {
> + compatible = "cfi-flash";
> + reg = <0x1f000000 0x800000>;
> +
> + bank-width = <2>;
> + device-width = <2>;
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> + partition@0 {
> + label = "uboot";
> + reg = <0x0 0x30000>;
> + read-only;
> + };
> + partition@30000 {
> + label = "uboot-env";
> + reg = <0x30000 0x10000>;
> + read-only;
> + };
> + partition@40000 {
> + label = "calibration";
> + reg = <0x40000 0x10000>;
> + read-only;
> + };
> + partition@50000 {
> + label = "linux";
> + reg = <0x50000 0x7b0000>;
> + };
> + };
The specific partition mapping definitively belongs to a rt305x-eval.dts
file and not a dtsi you would create.
> +};
> diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c
> index 1e24439..f4b2e4d 100644
> --- a/arch/mips/ralink/rt305x.c
> +++ b/arch/mips/ralink/rt305x.c
> @@ -185,8 +185,8 @@ void __init ralink_clk_init(void)
>
> void __init ralink_of_remap(void)
> {
> - rt_sysc_membase = plat_of_remap_node("ralink,rt305x-sysc");
> - rt_memc_membase = plat_of_remap_node("ralink,rt305x-memc");
> + rt_sysc_membase = plat_of_remap_node("ralink,rt3052-sysc");
> + rt_memc_membase = plat_of_remap_node("ralink,rt3052-memc");
Why are you doing this? If you specify multiple compatible properties,
such as:
compatible = "ralink,rt3052-sysc", "ralink,rt305x-sysc" you should be
good in any case no?
--
Florian
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PATCH V3 09/10] MIPS: ralink: adds rt305x devicetree
2013-01-31 12:59 ` Florian Fainelli
@ 2013-01-31 13:13 ` John Crispin
0 siblings, 0 replies; 29+ messages in thread
From: John Crispin @ 2013-01-31 13:13 UTC (permalink / raw)
To: linux-mips
> The specific partition mapping definitively belongs to a rt305x-eval.dts
> file and not a dtsi you would create.
I’ll split this into 2 files
>
>> +};
>> diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c
>> index 1e24439..f4b2e4d 100644
>> --- a/arch/mips/ralink/rt305x.c
>> +++ b/arch/mips/ralink/rt305x.c
>> @@ -185,8 +185,8 @@ void __init ralink_clk_init(void)
>>
>> void __init ralink_of_remap(void)
>> {
>> - rt_sysc_membase = plat_of_remap_node("ralink,rt305x-sysc");
>> - rt_memc_membase = plat_of_remap_node("ralink,rt305x-memc");
>> + rt_sysc_membase = plat_of_remap_node("ralink,rt3052-sysc");
>> + rt_memc_membase = plat_of_remap_node("ralink,rt3052-memc");
>
> Why are you doing this? If you specify multiple compatible properties,
> such as:
> compatible = "ralink,rt3052-sysc", "ralink,rt305x-sysc" you should be
> good in any case no?
I folded that fix into the wrong patch :-)
using wild cards is discouraged for compatible strings rt3052 was the
first silicon with this sysc version.
John
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH V3 09/10] MIPS: ralink: adds rt305x devicetree
2013-01-31 11:59 ` [PATCH V3 09/10] MIPS: ralink: adds rt305x devicetree John Crispin
2013-01-31 12:59 ` Florian Fainelli
@ 2013-01-31 14:11 ` Gabor Juhos
1 sibling, 0 replies; 29+ messages in thread
From: Gabor Juhos @ 2013-01-31 14:11 UTC (permalink / raw)
To: John Crispin; +Cc: Ralf Baechle, linux-mips
2013.01.31. 12:59 keltezéssel, John Crispin írta:
> This adds the devicetree file that describes the rt305x evaluation kit.
>
> Signed-off-by: John Crispin <blogic@openwrt.org>
I hate to say this again, but the compatible strings should be extended.
> ---
> arch/mips/ralink/dts/rt305x.dts | 151 +++++++++++++++++++++++++++++++++++++++
> arch/mips/ralink/rt305x.c | 4 +-
> 2 files changed, 153 insertions(+), 2 deletions(-)
> create mode 100644 arch/mips/ralink/dts/rt305x.dts
>
> diff --git a/arch/mips/ralink/dts/rt305x.dts b/arch/mips/ralink/dts/rt305x.dts
> new file mode 100644
> index 0000000..c7298f3
> --- /dev/null
> +++ b/arch/mips/ralink/dts/rt305x.dts
> @@ -0,0 +1,151 @@
> +/dts-v1/;
> +
> +/ {
> + #address-cells = <1>;
> + #size-cells = <1>;
> + compatible = "ralink,rt305x";
compatible = "ralink,rt3052-eval-board", "ralink,rt3052-soc";
Although if you have a unique model number for your evaluation board, it would
be better to use that in the first compatible string.
Also it would be good to include a model property into each machine's dts file.
I mean something similar to this:
model = "Ralink RT3052 evaluation board";
> +
> + cpus {
> + cpu@0 {
> + compatible = "mips,mips24KEc";
> + };
> + };
> +
> + memory@0 {
> + reg = <0x0 0x2000000>;
> + };
> +
> + chosen {
> + bootargs = "console=ttyS0,57600 init=/init";
> + };
> +
> + palmbus@10000000 {
> + compatible = "palmbus";
> + reg = <0x10000000 0x200000>;
> + ranges = <0x0 0x10000000 0x1FFFFF>;
> +
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> + sysc@0 {
> + compatible = "ralink,rt3052-sysc";
compatible = "ralink,rt3052-sysc", "ralink,rt3050-sysc";
> + reg = <0x0 0x100>;
> +
> + ralink,pinmmux = "uartlite", "spi";
> + ralink,uartmux = "gpio";
> + ralink,wdtmux = <0>;
> + };
> +
> + timer@100 {
> + compatible = "ralink,rt2880-wdt";
compatible = "ralink,rt3052-wdt", "ralink,rt2880-wdt";
> + reg = <0x100 0x100>;
> + };
> +
> + intc: intc@200 {
> + compatible = "ralink,rt2880-intc";
compatible = "ralink,rt3052-intc", "ralink,rt2880-intc";
> + reg = <0x200 0x100>;
> +
> + interrupt-controller;
> + #interrupt-cells = <1>;
> + };
> +
> + memc@300 {
> + compatible = "ralink,rt3052-memc";
compatible = "ralink,rt3052-memc", "ralink,rt3050-memc";
> + reg = <0x300 0x100>;
> + };
> +
> + gpio0: gpio@600 {
> + compatible = "ralink,rt2880-gpio";
compatible = "ralink,rt3052-gpio", "ralink,rt2880-gpio";
> + reg = <0x600 0x34>;
> +
> + gpio-controller;
> + #gpio-cells = <2>;
> +
> + ralink,ngpio = <24>;
> + ralink,regs = [ 00 04 08 0c
> + 20 24 28 2c
> + 30 34 ];
> + };
> +
> + gpio1: gpio@638 {
> + compatible = "ralink,rt2880-gpio";
compatible = "ralink,rt3052-gpio", "ralink,rt2880-gpio";
> + reg = <0x638 0x24>;
> +
> + gpio-controller;
> + #gpio-cells = <2>;
> +
> + ralink,ngpio = <16>;
> + ralink,regs = [ 00 04 08 0c
> + 10 14 18 1c
> + 20 24 ];
> + };
> +
> + gpio2: gpio@660 {
> + compatible = "ralink,rt2880-gpio";
compatible = "ralink,rt3052-gpio", "ralink,rt2880-gpio";
> + reg = <0x660 0x24>;
> +
> + gpio-controller;
> + #gpio-cells = <2>;
> +
> + ralink,ngpio = <12>;
> + ralink,regs = [ 00 04 08 0c
> + 10 14 18 1c
> + 20 24 ];
> + };
> +
> + spi@b00 {
> + compatible = "ralink,rt2880-spi";
compatible = "ralink,rt3052-spi", "ralink,rt2880-spi";
> + reg = <0xb00 0x100>;
> + };
> +
> + uartlite@c00 {
> + compatible = "ns16550a";
compatible = "ralink,rt3052-uart", "ralink,rt2880-uart", "ns16550a";
> + reg = <0xc00 0x100>;
> +
> + interrupt-parent = <&intc>;
> + interrupts = <12>;
> +
> + reg-shift = <2>;
> + };
> +
> + fe@100000 {
> + compatible = "ralink,rt3052-fe";
compatible = "ralink,rt3052-esw", "ralink,rt3050-fe";
> + reg = <0x100000 0x10000>;
> + };
> +
> + esw@110000 {
> + compatible = "ralink,rt3052-esw";
compatible = "ralink,rt3052-esw", "ralink,rt3050-esw";
> + reg = <0x110000 0x8000>;
> + };
> + };
-Gabor
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH V3 10/10] MIPS: ralink: adds Kbuild files
2013-01-31 11:59 [PATCH V3 00/10] MIPS: ralink: adds support for ralink platform John Crispin
` (8 preceding siblings ...)
2013-01-31 11:59 ` [PATCH V3 09/10] MIPS: ralink: adds rt305x devicetree John Crispin
@ 2013-01-31 11:59 ` John Crispin
2013-01-31 12:56 ` Florian Fainelli
2013-01-31 13:39 ` Gabor Juhos
2013-02-01 11:40 ` [PATCH V3 00/10] MIPS: ralink: adds support for ralink platform Florian Fainelli
10 siblings, 2 replies; 29+ messages in thread
From: John Crispin @ 2013-01-31 11:59 UTC (permalink / raw)
To: Ralf Baechle; +Cc: linux-mips, John Crispin
Add the Kbuild symbols and Makefiles needed to actually build the ralink code
from this series
Signed-off-by: John Crispin <blogic@openwrt.org>
---
arch/mips/Kbuild.platforms | 1 +
arch/mips/Kconfig | 19 ++++++++++++++++++-
arch/mips/ralink/Kconfig | 32 ++++++++++++++++++++++++++++++++
arch/mips/ralink/Makefile | 15 +++++++++++++++
arch/mips/ralink/Platform | 10 ++++++++++
arch/mips/ralink/dts/Makefile | 1 +
6 files changed, 77 insertions(+), 1 deletion(-)
create mode 100644 arch/mips/ralink/Kconfig
create mode 100644 arch/mips/ralink/Makefile
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 += pnx833x
platforms += pnx8550
platforms += powertv
+platforms += ralink
platforms += rb532
platforms += sgi-ip22
platforms += sgi-ip27
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index daeafe2..e52ae2b 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -436,6 +436,22 @@ config POWERTV
help
This enables support for the Cisco PowerTV Platform.
+config RALINK
+ bool "Ralink based machines"
+ select CEVT_R4K
+ select CSRC_R4K
+ select BOOT_RAW
+ select DMA_NONCOHERENT
+ select IRQ_CPU
+ select USE_OF
+ select SYS_HAS_CPU_MIPS32_R1
+ select SYS_HAS_CPU_MIPS32_R2
+ select SYS_SUPPORTS_32BIT_KERNEL
+ select SYS_SUPPORTS_LITTLE_ENDIAN
+ select SYS_HAS_EARLY_PRINTK
+ select HAVE_MACH_CLKDEV
+ select CLKDEV_LOOKUP
+
config SGI_IP22
bool "SGI IP22 (Indy/Indigo2)"
select FW_ARC
@@ -848,6 +864,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/ralink/Kconfig"
source "arch/mips/sgi-ip27/Kconfig"
source "arch/mips/sibyte/Kconfig"
source "arch/mips/txx9/Kconfig"
@@ -1162,7 +1179,7 @@ config BOOT_ELF32
config MIPS_L1_CACHE_SHIFT
int
- default "4" if MACH_DECSTATION || MIKROTIK_RB532 || PMC_MSP4200_EVAL
+ default "4" if MACH_DECSTATION || MIKROTIK_RB532 || PMC_MSP4200_EVAL || RALINK_RT288X
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/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 @@
+if RALINK
+
+choice
+ prompt "Ralink SoC selection"
+ default SOC_RT305X
+ help
+ Select Ralink MIPS SoC type.
+
+ config SOC_RT305X
+ bool "RT305x"
+ select USB_ARCH_HAS_HCD
+ select USB_ARCH_HAS_OHCI
+ select USB_ARCH_HAS_EHCI
+
+endchoice
+
+choice
+ prompt "Devicetree selection"
+ default DTB_RT_NONE
+ help
+ Select the devicetree.
+
+ config DTB_RT_NONE
+ bool "None"
+
+ config DTB_RT305X_EVAL
+ bool "RT305x eval kit"
+ depends on SOC_RT305X
+
+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 @@
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published
+# by the Free Software Foundation.#
+# Makefile for the Ralink common stuff
+#
+# Copyright (C) 2009-2011 Gabor Juhos <juhosg@openwrt.org>
+# Copyright (C) 2013 John Crispin <blogic@openwrt.org>
+
+obj-y := prom.o of.o reset.o clk.o irq.o
+
+obj-$(CONFIG_SOC_RT305X) += rt305x.o
+
+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 SoC common stuff
+#
+core-$(CONFIG_RALINK) += arch/mips/ralink/
+cflags-$(CONFIG_RALINK) += -I$(srctree)/arch/mips/include/asm/mach-ralink
+
+#
+# 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..e2ce7b4
--- /dev/null
+++ b/arch/mips/ralink/dts/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_DTB_RT305X_EVAL) := rt305x.dtb.o
--
1.7.10.4
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH V3 10/10] MIPS: ralink: adds Kbuild files
2013-01-31 11:59 ` [PATCH V3 10/10] MIPS: ralink: adds Kbuild files John Crispin
@ 2013-01-31 12:56 ` Florian Fainelli
2013-01-31 12:57 ` John Crispin
2013-01-31 13:39 ` Gabor Juhos
1 sibling, 1 reply; 29+ messages in thread
From: Florian Fainelli @ 2013-01-31 12:56 UTC (permalink / raw)
To: John Crispin; +Cc: Ralf Baechle, linux-mips
Hello John,
On 01/31/2013 12:59 PM, John Crispin wrote:
[snip]
>
> config MIPS_L1_CACHE_SHIFT
> int
> - default "4" if MACH_DECSTATION || MIKROTIK_RB532 || PMC_MSP4200_EVAL
> + default "4" if MACH_DECSTATION || MIKROTIK_RB532 || PMC_MSP4200_EVAL || RALINK_RT288X
I got slightly confused here because this is actually ok, RALINK_RT288X
should have MIPS_L1_CACHE_SHIFT=4, but rt305x and rt3883 have
MIPS_L1_CACHE_SHIFT=5. So I would drop this hunk until you add support
for rt288x.
--
Florian
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH V3 10/10] MIPS: ralink: adds Kbuild files
2013-01-31 12:56 ` Florian Fainelli
@ 2013-01-31 12:57 ` John Crispin
0 siblings, 0 replies; 29+ messages in thread
From: John Crispin @ 2013-01-31 12:57 UTC (permalink / raw)
To: Florian Fainelli; +Cc: Ralf Baechle, linux-mips
On 31/01/13 13:56, Florian Fainelli wrote:
> Hello John,
>
> On 01/31/2013 12:59 PM, John Crispin wrote:
> [snip]
>>
>> config MIPS_L1_CACHE_SHIFT
>> int
>> - default "4" if MACH_DECSTATION || MIKROTIK_RB532 ||
>> PMC_MSP4200_EVAL
>> + default "4" if MACH_DECSTATION || MIKROTIK_RB532 ||
>> PMC_MSP4200_EVAL || RALINK_RT288X
>
> I got slightly confused here because this is actually ok,
> RALINK_RT288X should have MIPS_L1_CACHE_SHIFT=4, but rt305x and rt3883
> have MIPS_L1_CACHE_SHIFT=5. So I would drop this hunk until you add
> support for rt288x.
> --
> Florian
>
yes i forgot that bit
John
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH V3 10/10] MIPS: ralink: adds Kbuild files
2013-01-31 11:59 ` [PATCH V3 10/10] MIPS: ralink: adds Kbuild files John Crispin
2013-01-31 12:56 ` Florian Fainelli
@ 2013-01-31 13:39 ` Gabor Juhos
1 sibling, 0 replies; 29+ messages in thread
From: Gabor Juhos @ 2013-01-31 13:39 UTC (permalink / raw)
To: John Crispin; +Cc: Ralf Baechle, linux-mips
2013.01.31. 12:59 keltezéssel, John Crispin írta:
> Add the Kbuild symbols and Makefiles needed to actually build the ralink code
> from this series
>
> Signed-off-by: John Crispin <blogic@openwrt.org>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH V3 00/10] MIPS: ralink: adds support for ralink platform
2013-01-31 11:59 [PATCH V3 00/10] MIPS: ralink: adds support for ralink platform John Crispin
` (9 preceding siblings ...)
2013-01-31 11:59 ` [PATCH V3 10/10] MIPS: ralink: adds Kbuild files John Crispin
@ 2013-02-01 11:40 ` Florian Fainelli
2013-02-01 11:47 ` John Crispin
10 siblings, 1 reply; 29+ messages in thread
From: Florian Fainelli @ 2013-02-01 11:40 UTC (permalink / raw)
To: John Crispin; +Cc: Ralf Baechle, linux-mips
Hey John,
On 01/31/2013 12:59 PM, John Crispin wrote:
> This series adds support for the ralink SoC family. Currently RT305X type
> SoC is supported. RT2880/3883 are in my local queue already but require
> further testing.
One last thing, I think Ralf wants a defconfig for this new platform as
well. Thanks!
--
Florian
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PATCH V3 00/10] MIPS: ralink: adds support for ralink platform
2013-02-01 11:40 ` [PATCH V3 00/10] MIPS: ralink: adds support for ralink platform Florian Fainelli
@ 2013-02-01 11:47 ` John Crispin
0 siblings, 0 replies; 29+ messages in thread
From: John Crispin @ 2013-02-01 11:47 UTC (permalink / raw)
To: Florian Fainelli; +Cc: Ralf Baechle, linux-mips
On 01/02/13 12:40, Florian Fainelli wrote:
> Hey John,
>
> On 01/31/2013 12:59 PM, John Crispin wrote:
>> This series adds support for the ralink SoC family. Currently RT305X
>> type
>> SoC is supported. RT2880/3883 are in my local queue already but require
>> further testing.
>
> One last thing, I think Ralf wants a defconfig for this new platform
> as well. Thanks!
> --
> Florian
>
Hi,
well noticed, i will add it to the pull tree
John
^ permalink raw reply [flat|nested] 29+ messages in thread