arm: Add basic support for Mediatek Cortex-A7 SoCs

PATCH Superseded Matthias Brugger 5 participants 17 messages May 30, 2014 – Jun 5, 2014

Subsystems (5)

Device tree bindings Arm (32-bit) Arm sub-architectures Arm MediaTek +1 more subsystems

lore

Share & tools

lore

Matthias Brugger

author maintainer

2014-05-30 16:55 UTC #0 lore raw

v6 cover arm: Add basic support for Mediatek Cortex-A7 SoCs

Sixth round for the Mediatek basic support patches.

I encapsulated the setup of the timer and the interrupt in seperate functions.
Apart I fixed the compatibily string to be consisten throughout the whole system (from mediatek,mtk6577 to mediatek,mt6577) and added the address to the bindings documentation.

---
This patch set adds basic support for the Mediatek Cortex-A7 SoCs. Support is quite basic, as the only component working up to now are the timers.

The patch series is build against torvalds/master tree.

Signed-off-by Matthias Brugger <[email protected]>

Changes for v6:
- fix compatible string of the timer
- encapsulate timer setup in function
- add more information to the timer commit message
- add address in timer DTS bindings documentation

Changes for v5:
1. Clocksource timer
- Change the compatible string to mt6577

2. Timer DT bindings
- Change compatible string to mt6577

Changes for v4:
1. Clocksource timer
- use cpu_possible_mask

2. Timer DT bindings
- Delete comments about the frequency of the clocks
- Add clock-names for the input clocks

3. Basic SoC support
- add clock-names for the timer
- rename the label of the clocks nodes

Changes for v3:
1. Clocksource timer
- Set cpu_mask_all and irq in clock_event_device
- Use device private structure for driver specific values

2. Timer DT bindings
- Define order of the clock phandles
- Fix typos

3. Basic SoC support
- DTS: set gic to a15-gic
- DTS: order by physical address
- Remove call to dt_init function

Changes for v2:
1. Clocksource timer
- Delete unused parts for sched_clock_source
- Use irq_request instead of setup_irq
- Remove unused SMP parts
- Fix some style issues
- use of_address_to resource and request_mem_region
- delete use of named clock
- select CLKSRC_MMIO in driver Kconfig

2. DT bindings
- delete named clock bindings

3. Basic SoC support
- Clean-up Kconfig
- Add documentation of the SoC compatible property
- DTS: rename SoC file to mt6589.dts
- DTS: Delete not present cache controller
- DTS: Add missing GICv2 properties
- DTS: Change clock names
- DTS: Add Aquaris5 board

4. Add earlyprintk
- patch droped until serial driver is available

5. Add support for Aquaris5 mobile phone

Matthias Brugger (6):
clocksource: Add support for the Mediatek SoCs
dt-bindings: add mtk-timer bindings
vendor-prefixes: add prefix for Mediaktek Inc.
arm: add basic support for Mediatek MT6589 boards
dt-bindings: add documentation for Mediatek SoC
arm: mediatek: add dts for Aquaris5 mobile phone

 .../devicetree/bindings/arm/mediatek-mt65xx.txt    |    8 +
 .../bindings/timer/mediatek,mtk-timer.txt          |   18 ++
 .../devicetree/bindings/vendor-prefixes.txt        |    1 +
 arch/arm/Kconfig                                   |    2 +
 arch/arm/Makefile                                  |    1 +
 arch/arm/boot/dts/mt6589-aquaris5.dts              |   25 ++
 arch/arm/boot/dts/mt6589.dtsi                      |   94 ++++++++
 arch/arm/mach-mediatek/Kconfig                     |    6 +
 arch/arm/mach-mediatek/Makefile                    |    1 +
 arch/arm/mach-mediatek/mediatek.c                  |   27 +++
 drivers/clocksource/Kconfig                        |    4 +
 drivers/clocksource/Makefile                       |    1 +
 drivers/clocksource/mtk_timer.c                    |  242 ++++++++++++++++++++
 13 files changed, 430 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/arm/mediatek-mt65xx.txt
 create mode 100644 Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt
 create mode 100644 arch/arm/boot/dts/mt6589-aquaris5.dts
 create mode 100644 arch/arm/boot/dts/mt6589.dtsi
 create mode 100644 arch/arm/mach-mediatek/Kconfig
 create mode 100644 arch/arm/mach-mediatek/Makefile
 create mode 100644 arch/arm/mach-mediatek/mediatek.c
 create mode 100644 drivers/clocksource/mtk_timer.c

Signature · 1 line

1.7.9.5

Matthias Brugger

author maintainer

2014-05-30 16:55 UTC #1 lore raw

PATCH v6 1/6 clocksource: Add support for the Mediatek SoCs

This patch adds a clock source and clock event for the timer found on the Mediatek SoCs.

The Mediatek General Purpose Timer block provides five 32 bit timers and one 64 bit timer.

Two 32 bit timers are used by this driver:
TIMER1: clock events supporting periodic and oneshot events
TIMER2: clock source configured as a free running counter

The General Purpose Timer block can be run with two clocks. A 13 MHz system clock and the RTC clock running at 32 KHz. This implementation uses the system clock with no clock source divider.

The interrupts are shared between the different timers and have to be read back from a register. We just enable one interrupt for the clock event. The clock event timer is used by all cores.

Signed-off-by Matthias Brugger <[email protected]>

---
 drivers/clocksource/Kconfig     |    4 +
 drivers/clocksource/Makefile    |    1 +
 drivers/clocksource/mtk_timer.c |  242 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 247 insertions(+)
 create mode 100644 drivers/clocksource/mtk_timer.c

drivers/clocksource/Kconfig +4 -0

index 96918e1..1f73740 100644
@@ -144,6 +144,10 @@ config VF_PIT_TIMER
 config SYS_SUPPORTS_SH_CMT
         bool
 
+config MTK_TIMER
+	select CLKSRC_MMIO
+	bool
+
 config SYS_SUPPORTS_SH_MTU2
         bool

drivers/clocksource/Makefile +1 -0

index 98cb6c5..619d302 100644
@@ -33,6 +33,7 @@ obj-$(CONFIG_CLKSRC_EXYNOS_MCT)	+= exynos_mct.o
 obj-$(CONFIG_CLKSRC_SAMSUNG_PWM)	+= samsung_pwm_timer.o
 obj-$(CONFIG_VF_PIT_TIMER)	+= vf_pit_timer.o
 obj-$(CONFIG_CLKSRC_QCOM)	+= qcom-timer.o
+obj-$(CONFIG_MTK_TIMER)		+= mtk_timer.o
 
 obj-$(CONFIG_ARM_ARCH_TIMER)		+= arm_arch_timer.o
 obj-$(CONFIG_ARM_GLOBAL_TIMER)		+= arm_global_timer.o

drivers/clocksource/mtk_timer.c new file +242 -0

242 lines not on this page · raw message

Signature · 1 line

1.7.9.5

Rob Herring

2014-06-04 11:18 UTC #2 lore raw

PATCH v6 1/6 clocksource: Add support for the Mediatek SoCs

Quoted 31 lines · Matthias Brugger

This patch adds a clock source and clock event for the timer found on the Mediatek SoCs.
The Mediatek General Purpose Timer block provides five 32 bit timers and one 64 bit timer.
Two 32 bit timers are used by this driver:
TIMER1: clock events supporting periodic and oneshot events
TIMER2: clock source configured as a free running counter
The General Purpose Timer block can be run with two clocks. A 13 MHz system clock and the RTC clock running at 32 KHz. This implementation uses the system clock with no clock source divider.
The interrupts are shared between the different timers and have to be read back from a register. We just enable one interrupt for the clock event. The clock event timer is used by all cores.
Signed-off-by Matthias Brugger <[email protected]>
---
 drivers/clocksource/Kconfig     |    4 +
 drivers/clocksource/Makefile    |    1 +
 drivers/clocksource/mtk_timer.c |  242 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 247 insertions(+)
 create mode 100644 drivers/clocksource/mtk_timer.c
drivers/clocksource/Kconfig +0 -0
index 96918e1..1f73740 100644

drivers/clocksource/Kconfig config VF_PIT_TIMER · line 148

Quoted 5 lines

drivers/clocksource/Kconfig +2 -0

@@ -144,6 +144,10 @@ config VF_PIT_TIMER
 config SYS_SUPPORTS_SH_CMT
         bool
 
+config MTK_TIMER
+       select CLKSRC_MMIO

Also select CLKSRC_OF

Quoted 43 lines

drivers/clocksource/Kconfig +2 -0

+       bool
+
 config SYS_SUPPORTS_SH_MTU2
         bool

drivers/clocksource/Makefile +1 -0

index 98cb6c5..619d302 100644
@@ -33,6 +33,7 @@ obj-$(CONFIG_CLKSRC_EXYNOS_MCT)       += exynos_mct.o
 obj-$(CONFIG_CLKSRC_SAMSUNG_PWM)       += samsung_pwm_timer.o
 obj-$(CONFIG_VF_PIT_TIMER)     += vf_pit_timer.o
 obj-$(CONFIG_CLKSRC_QCOM)      += qcom-timer.o
+obj-$(CONFIG_MTK_TIMER)                += mtk_timer.o
 
 obj-$(CONFIG_ARM_ARCH_TIMER)           += arm_arch_timer.o
 obj-$(CONFIG_ARM_GLOBAL_TIMER)         += arm_global_timer.o

drivers/clocksource/mtk_timer.c new file +20 -0

new file mode 100644
index 0000000..8e8b94a
@@ -0,0 +1,242 @@
+/*
+ * Mediatek SoCs General-Purpose Timer handling.
+ *
+ * Copyright (C) 2014 Matthias Brugger
+ *
+ * Matthias Brugger <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/clk.h>
+#include <linux/clockchips.h>

drivers/clocksource/mtk_timer.c line 30

Quoted 10 lines

drivers/clocksource/mtk_timer.c new file +10 -0

+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/irqreturn.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <linux/slab.h>
+
+#define GPT_IRQ_EN_REG         0x00
+#define GPT_IRQ_ENABLE(val)    BIT(val-1)

val should have parentheses.

drivers/clocksource/mtk_timer.c line 32

Quoted 2 lines

drivers/clocksource/mtk_timer.c new file +2 -0

+#define GPT_IRQ_ACK_REG                0x08
+#define GPT_IRQ_ACK(val)       BIT(val-1)

ditto

Quoted 159 lines

drivers/clocksource/mtk_timer.c new file +159 -0

+
+#define TIMER_CTRL_REG(val)    (0x10 * val)
+#define TIMER_CTRL_OP(val)     (((val) & 0x3) << 4)
+#define TIMER_CTRL_OP_ONESHOT  (0)
+#define TIMER_CTRL_OP_REPEAT   (1)
+#define TIMER_CTRL_OP_FREERUN  (3)
+#define TIMER_CTRL_CLEAR       (2)
+#define TIMER_CTRL_ENABLE      (1)
+#define TIMER_CTRL_DISABLE     (0)
+
+#define TIMER_CLK_REG(val)     (0x04 + (0x10 * val))
+#define TIMER_CLK_SRC(val)     (((val) & 0x1) << 4)
+#define TIMER_CLK_SRC_SYS13M   (0)
+#define TIMER_CLK_SRC_RTC32K   (1)
+#define TIMER_CLK_DIV1         (0x0)
+#define TIMER_CLK_DIV2         (0x1)
+
+#define TIMER_CNT_REG(val)     (0x08 + (0x10 * val))
+#define TIMER_CMP_REG(val)     (0x0C + (0x10 * val))
+
+#define GPT_CLK_EVT    1
+#define GPT_CLK_SRC    2
+
+struct mtk_clock_event_device {
+       void __iomem *gpt_base;
+       u32 ticks_per_jiffy;
+       struct clock_event_device dev;
+};
+
+static inline struct mtk_clock_event_device *to_mtk_clk(
+                               struct clock_event_device *c)
+{
+       return container_of(c, struct mtk_clock_event_device, dev);
+}
+
+static void mtk_clkevt_time_stop(struct mtk_clock_event_device *evt, u8 timer)
+{
+       u32 val = readl(evt->gpt_base + TIMER_CTRL_REG(timer));
+       writel(val & ~TIMER_CTRL_ENABLE, evt->gpt_base +
+                       TIMER_CTRL_REG(timer));
+}
+
+static void mtk_clkevt_time_setup(struct mtk_clock_event_device *evt,
+                               unsigned long delay, u8 timer)
+{
+       writel(delay, evt->gpt_base + TIMER_CMP_REG(timer));
+}
+
+static void mtk_clkevt_time_start(struct mtk_clock_event_device *evt,
+               bool periodic, u8 timer)
+{
+       u32 val;
+
+       /* Acknowledge interrupt */
+       writel(GPT_IRQ_ACK(timer), evt->gpt_base + GPT_IRQ_ACK_REG);
+
+       val = readl(evt->gpt_base + TIMER_CTRL_REG(timer));
+
+       /* Clear 2 bit timer operation mode field */
+       val &= ~TIMER_CTRL_OP(0x3);
+
+       if (periodic)
+               val |= TIMER_CTRL_OP(TIMER_CTRL_OP_REPEAT);
+       else
+               val |= TIMER_CTRL_OP(TIMER_CTRL_OP_ONESHOT);
+
+       writel(val | TIMER_CTRL_ENABLE | TIMER_CTRL_CLEAR,
+              evt->gpt_base + TIMER_CTRL_REG(timer));
+}
+
+static void mtk_clkevt_mode(enum clock_event_mode mode,
+                               struct clock_event_device *clk)
+{
+       struct mtk_clock_event_device *evt = to_mtk_clk(clk);
+
+       mtk_clkevt_time_stop(evt, GPT_CLK_EVT);
+
+       switch (mode) {
+       case CLOCK_EVT_MODE_PERIODIC:
+               mtk_clkevt_time_setup(evt, evt->ticks_per_jiffy, GPT_CLK_EVT);
+               mtk_clkevt_time_start(evt, true, GPT_CLK_EVT);
+               break;
+       case CLOCK_EVT_MODE_ONESHOT:
+               mtk_clkevt_time_start(evt, false, GPT_CLK_EVT);
+               break;
+       case CLOCK_EVT_MODE_UNUSED:
+       case CLOCK_EVT_MODE_SHUTDOWN:
+       default:
+               /* No more interrupts will occur as source is disabled */
+               break;
+       }
+}
+
+static int mtk_clkevt_next_event(unsigned long event,
+                                  struct clock_event_device *clk)
+{
+       struct mtk_clock_event_device *evt = to_mtk_clk(clk);
+
+       mtk_clkevt_time_stop(evt, GPT_CLK_EVT);
+       mtk_clkevt_time_setup(evt, event, GPT_CLK_EVT);
+       mtk_clkevt_time_start(evt, false, GPT_CLK_EVT);
+
+       return 0;
+}
+
+static irqreturn_t mtk_timer_interrupt(int irq, void *dev_id)
+{
+       struct mtk_clock_event_device *evt = dev_id;
+
+       /* Acknowledge timer0 irq */
+       writel(GPT_IRQ_ACK(GPT_CLK_EVT), evt->gpt_base + GPT_IRQ_ACK_REG);
+       evt->dev.event_handler(&evt->dev);
+
+       return IRQ_HANDLED;
+}
+
+static void mtk_timer_global_reset(struct mtk_clock_event_device *evt)
+{
+       /* Disable all interrupts */
+       writel(0x0, evt->gpt_base + GPT_IRQ_EN_REG);
+       /* Acknowledge all interrupts */
+       writel(0x3f, evt->gpt_base + GPT_IRQ_ACK_REG);
+}
+
+static void
+mtk_timer_setup(struct mtk_clock_event_device *evt, u8 timer, u8 option)
+{
+       writel(TIMER_CTRL_CLEAR | TIMER_CTRL_DISABLE,
+               evt->gpt_base + TIMER_CTRL_REG(timer));
+
+       writel(TIMER_CLK_SRC(TIMER_CLK_SRC_SYS13M) | TIMER_CLK_DIV1,
+                       evt->gpt_base + TIMER_CLK_REG(timer));
+
+       writel(0x0, evt->gpt_base + TIMER_CMP_REG(timer));
+
+       writel(TIMER_CTRL_OP(option) | TIMER_CTRL_ENABLE,
+                       evt->gpt_base + TIMER_CTRL_REG(timer));
+}
+
+static void mtk_timer_enable_irq(struct mtk_clock_event_device *evt, u8 timer)
+{
+       u32 val;
+
+       val = readl(evt->gpt_base + GPT_IRQ_EN_REG);
+       writel(val | GPT_IRQ_ENABLE(timer),
+                       evt->gpt_base + GPT_IRQ_EN_REG);
+}
+
+static void __init mtk_timer_init(struct device_node *node)
+{
+       struct mtk_clock_event_device *evt;
+       struct resource res;
+       unsigned long rate = 0;
+       struct clk *clk;
+       int ret;
+
+       evt = kzalloc(sizeof(*evt), GFP_KERNEL);
+       if (!evt)
+               panic("Can't allocate mtk clock event driver struct");

drivers/clocksource/mtk_timer.c line 201

Quoted 10 lines

drivers/clocksource/mtk_timer.c new file +10 -0

+
+       evt->dev.name = "mtk_tick";
+       evt->dev.rating = 300;
+       evt->dev.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT;
+       evt->dev.set_mode = mtk_clkevt_mode;
+       evt->dev.set_next_event = mtk_clkevt_next_event;
+       evt->dev.cpumask = cpu_possible_mask;
+
+       if (of_address_to_resource(node, 0, &res))
+               panic("Failed to parse resource\n");

panics are a bit pointless at this stage since your console is typically not up yet. Warning and continuing on with boot gives you a better shot at actually seeing the message.

drivers/clocksource/mtk_timer.c line 206

Quoted 5 lines

drivers/clocksource/mtk_timer.c new file +5 -0

+
+       if (!request_mem_region(res.start, resource_size(&res), "mtk-timer"))
+               panic("Registers are a busy IO resource");
+
+       evt->gpt_base = ioremap(res.start, resource_size(&res));

of_iomap instead of these 3 calls.

Quoted 39 lines

drivers/clocksource/mtk_timer.c new file +36 -1

+       if (!evt->gpt_base)
+               panic("Can't map registers");
+
+       evt->dev.irq = irq_of_parse_and_map(node, 0);
+       if (evt->dev.irq <= 0)
+               panic("Can't parse IRQ");
+
+       clk = of_clk_get(node, 0);
+       if (IS_ERR(clk))
+               panic("Can't get timer clock");
+
+       clk_prepare_enable(clk);
+       rate = clk_get_rate(clk);
+
+       ret = request_irq(evt->dev.irq, mtk_timer_interrupt,
+                       IRQF_TIMER | IRQF_IRQPOLL, "mtk_timer", evt);
+       if (ret)
+               pr_warn("failed to setup irq %d\n", evt->dev.irq);
+
+       evt->ticks_per_jiffy = DIV_ROUND_UP(rate, HZ);
+
+       mtk_timer_global_reset(evt);
+
+       /* Configure clock source */
+       mtk_timer_setup(evt, GPT_CLK_SRC, TIMER_CTRL_OP_FREERUN);
+       clocksource_mmio_init(evt->gpt_base + TIMER_CNT_REG(GPT_CLK_SRC),
+                       node->name, rate, 300, 32, clocksource_mmio_readl_up);
+
+       /* Configure clock event */
+       mtk_timer_setup(evt, GPT_CLK_EVT, TIMER_CTRL_OP_REPEAT);
+       mtk_timer_enable_irq(evt, GPT_CLK_EVT);
+
+       clockevents_config_and_register(&evt->dev, rate, 0x3,
+                                       0xffffffff);
+}
+CLOCKSOURCE_OF_DECLARE(mtk_mt6577, "mediatek,mt6577-timer", mtk_timer_init);
--

1.7.9.5

Gregory CLEMENT

2014-06-04 11:25 UTC #3 lore raw

PATCH v6 1/6 clocksource: Add support for the Mediatek SoCs

Hi Rob,

On 04/06/2014 13:18, Rob Herring wrote:

[...]

Quoted 8 lines

drivers/clocksource/mtk_timer.c line 201
Quoted 3 lines
drivers/clocksource/mtk_timer.c new file +3 -0
+
+       if (of_address_to_resource(node, 0, &res))
+               panic("Failed to parse resource\n");
panics are a bit pointless at this stage since your console is typically not up yet. Warning and continuing on with boot gives you a better shot at actually seeing the message.

Quoted 7 lines

drivers/clocksource/mtk_timer.c line 206
Quoted 5 lines
drivers/clocksource/mtk_timer.c new file +5 -0
+
+       if (!request_mem_region(res.start, resource_size(&res), "mtk-timer"))
+               panic("Registers are a busy IO resource");
+
+       evt->gpt_base = ioremap(res.start, resource_size(&res));
of_iomap instead of these 3 calls.

Actually of_iomap doesn't request_mem_region, that's why for mvebu we are trying now to replace of_iomap by request_mem_region/ioremap.

Signature · 4 lines

Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

Thomas Gleixner

2014-06-04 13:46 UTC #4 lore raw

PATCH v6 1/6 clocksource: Add support for the Mediatek SoCs

Quoted 22 lines · Gregory CLEMENT

Hi Rob,
On 04/06/2014 13:18, Rob Herring wrote:
[...]
Quoted 8 lines
drivers/clocksource/mtk_timer.c line 201
Quoted 3 lines
drivers/clocksource/mtk_timer.c new file +3 -0
+
+       if (of_address_to_resource(node, 0, &res))
+               panic("Failed to parse resource\n");
panics are a bit pointless at this stage since your console is typically not up yet. Warning and continuing on with boot gives you a better shot at actually seeing the message.
Quoted 7 lines
drivers/clocksource/mtk_timer.c line 206
Quoted 5 lines
drivers/clocksource/mtk_timer.c new file +5 -0
+
+       if (!request_mem_region(res.start, resource_size(&res), "mtk-timer"))
+               panic("Registers are a busy IO resource");
+
+       evt->gpt_base = ioremap(res.start, resource_size(&res));
of_iomap instead of these 3 calls.

Quoted 2 lines

Actually of_iomap doesn't request_mem_region, that's why for mvebu we are trying now to replace of_iomap by request_mem_region/ioremap.

What about creating of_io_request_and_map() instead of open coding it ?

Thanks,

tglx

Rob Herring

2014-06-04 13:52 UTC #5 lore raw

PATCH v6 1/6 clocksource: Add support for the Mediatek SoCs

In reply to Gregory CLEMENT

Quoted 22 lines · Gregory CLEMENT

Hi Rob,
On 04/06/2014 13:18, Rob Herring wrote:
[...]
Quoted 8 lines
drivers/clocksource/mtk_timer.c line 201
Quoted 3 lines
drivers/clocksource/mtk_timer.c new file +3 -0
+
+       if (of_address_to_resource(node, 0, &res))
+               panic("Failed to parse resource\n");
panics are a bit pointless at this stage since your console is typically not up yet. Warning and continuing on with boot gives you a better shot at actually seeing the message.
Quoted 7 lines
drivers/clocksource/mtk_timer.c line 206
Quoted 5 lines
drivers/clocksource/mtk_timer.c new file +5 -0
+
+       if (!request_mem_region(res.start, resource_size(&res), "mtk-timer"))
+               panic("Registers are a busy IO resource");
+
+       evt->gpt_base = ioremap(res.start, resource_size(&res));
of_iomap instead of these 3 calls.

Quoted 2 lines

Actually of_iomap doesn't request_mem_region, that's why for mvebu we are trying now to replace of_iomap by request_mem_region/ioremap.

Then perhaps we should add of_iomap_resource which does both. It could possibly be added into of_iomap, but we'd have to ignore any failures due to overlapping regions.

Rob

Matthias Brugger

author maintainer

2014-05-30 16:56 UTC #6 lore raw

PATCH v6 2/6 dt-bindings: add mtk-timer bindings

In reply to Matthias Brugger

Add binding documentation for the General Porpose Timer driver of the Mediatek SoCs.

Signed-off-by Matthias Brugger <[email protected]>

---
 .../bindings/timer/mediatek,mtk-timer.txt          |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt

Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt new file +18 -0

new file mode 100644
index 0000000..0558ddd0
@@ -0,0 +1,18 @@
+Mediatek MT6577, MT6572 and MT6589 Timers
+---------------------------------------
+
+Required properties:
+- compatible: Should be "mediatek,mt6577-timer"
+- reg: Should contain location and length for timers register.
+- clocks: Clocks driving the timer hardware. This list shoud include two
+	clocks. The order is system clock and as second clock the RTC clock.
+
+Examples:
+
+	timer at 10008000 {
+		compatible = "mediatek,mt6577-timer";
+		reg = <0x10008000 0x80>;
+		interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_LOW>;
+		clocks = <&system_clk>, <&rtc_clk>;
+		clock-names = "system-clk", "rtc-clk";
+	};

Signature · 1 line

1.7.9.5

Rob Herring

2014-06-04 11:05 UTC #7 lore raw

PATCH v6 2/6 dt-bindings: add mtk-timer bindings

Quoted 4 lines · Matthias Brugger

Add binding documentation for the General Porpose Timer driver of the Mediatek SoCs.
Signed-off-by Matthias Brugger <[email protected]>

Acked-by Rob Herring <[email protected]>

but one typo below:

Quoted 11 lines

---
 .../bindings/timer/mediatek,mtk-timer.txt          |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt

Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt new file +0 -0

new file mode 100644
index 0000000..0558ddd0

Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt line 7

Quoted 7 lines

Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt new file +7 -0

@@ -0,0 +1,18 @@
+Mediatek MT6577, MT6572 and MT6589 Timers
+---------------------------------------
+
+Required properties:
+- compatible: Should be "mediatek,mt6577-timer"
+- reg: Should contain location and length for timers register.
+- clocks: Clocks driving the timer hardware. This list shoud include two

s/shoud/should/

Quoted 14 lines

Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt new file +11 -1

+       clocks. The order is system clock and as second clock the RTC clock.
+
+Examples:
+
+       timer at 10008000 {
+               compatible = "mediatek,mt6577-timer";
+               reg = <0x10008000 0x80>;
+               interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_LOW>;
+               clocks = <&system_clk>, <&rtc_clk>;
+               clock-names = "system-clk", "rtc-clk";
+       };
--

1.7.9.5

Matthias Brugger

author maintainer

2014-05-30 16:56 UTC #8 lore raw

PATCH v6 3/6 vendor-prefixes: add prefix for Mediaktek Inc.

In reply to Matthias Brugger

Signed-off-by Matthias Brugger <[email protected]>

---
 .../devicetree/bindings/vendor-prefixes.txt        |    1 +
 1 file changed, 1 insertion(+)

Documentation/devicetree/bindings/vendor-prefixes.txt +1 -0

index abc3080..73f9e4c 100644
@@ -75,6 +75,7 @@ linux	Linux-specific binding
 lsi	LSI Corp. (LSI Logic)
 marvell	Marvell Technology Group Ltd.
 maxim	Maxim Integrated Products
+mediatek	MediaTek Inc.
 microchip	Microchip Technology Inc.
 mosaixtech	Mosaix Technologies, Inc.
 moxa	Moxa

Signature · 1 line

1.7.9.5

Rob Herring

2014-06-04 11:06 UTC #9 lore raw

PATCH v6 3/6 vendor-prefixes: add prefix for Mediaktek Inc.

Quoted 1 line · Matthias Brugger

Signed-off-by Matthias Brugger <[email protected]>

Acked-by Rob Herring <[email protected]>

Quoted 19 lines

---
 .../devicetree/bindings/vendor-prefixes.txt        |    1 +
 1 file changed, 1 insertion(+)

Documentation/devicetree/bindings/vendor-prefixes.txt +1 -1

index abc3080..73f9e4c 100644
@@ -75,6 +75,7 @@ linux Linux-specific binding
 lsi    LSI Corp. (LSI Logic)
 marvell        Marvell Technology Group Ltd.
 maxim  Maxim Integrated Products
+mediatek       MediaTek Inc.
 microchip      Microchip Technology Inc.
 mosaixtech     Mosaix Technologies, Inc.
 moxa   Moxa
--

1.7.9.5

Matthias Brugger

author maintainer

2014-05-30 16:56 UTC #10 lore raw

PATCH v6 4/6 arm: add basic support for Mediatek MT6589 boards

In reply to Matthias Brugger

This adds a generic devicetree board file and a dtsi for boards based on MT6589 SoCs from Mediatek.

Apart from the generic parts (gic, clocks) the only component currently supported are the timers.

Signed-off-by Matthias Brugger <[email protected]>

---
 arch/arm/Kconfig                  |    2 +
 arch/arm/Makefile                 |    1 +
 arch/arm/boot/dts/mt6589.dtsi     |   94 +++++++++++++++++++++++++++++++++++++
 arch/arm/mach-mediatek/Kconfig    |    6 +++
 arch/arm/mach-mediatek/Makefile   |    1 +
 arch/arm/mach-mediatek/mediatek.c |   27 +++++++++++
 6 files changed, 131 insertions(+)
 create mode 100644 arch/arm/boot/dts/mt6589.dtsi
 create mode 100644 arch/arm/mach-mediatek/Kconfig
 create mode 100644 arch/arm/mach-mediatek/Makefile
 create mode 100644 arch/arm/mach-mediatek/mediatek.c

arch/arm/Kconfig +2 -0

index db3c541..0fc8acd 100644
@@ -997,6 +997,8 @@ source "arch/arm/mach-mv78xx0/Kconfig"
 
 source "arch/arm/mach-imx/Kconfig"
 
+source "arch/arm/mach-mediatek/Kconfig"
+
 source "arch/arm/mach-mxs/Kconfig"
 
 source "arch/arm/mach-netx/Kconfig"

arch/arm/Makefile +1 -0

index 41c1931..8ce9774 100644
@@ -170,6 +170,7 @@ machine-$(CONFIG_ARCH_MSM)		+= msm
 machine-$(CONFIG_ARCH_MV78XX0)		+= mv78xx0
 machine-$(CONFIG_ARCH_MVEBU)		+= mvebu
 machine-$(CONFIG_ARCH_MXC)		+= imx
+machine-$(CONFIG_ARCH_MEDIATEK)		+= mediatek
 machine-$(CONFIG_ARCH_MXS)		+= mxs
 machine-$(CONFIG_ARCH_NETX)		+= netx
 machine-$(CONFIG_ARCH_NOMADIK)		+= nomadik

arch/arm/boot/dts/mt6589.dtsi new file +94 -0

94 lines not on this page · raw message

arch/arm/mach-mediatek/Kconfig new file +6 -0

new file mode 100644
index 0000000..2c043a2
@@ -0,0 +1,6 @@
+config ARCH_MEDIATEK
+	bool "Mediatek MT6589 SoC" if ARCH_MULTI_V7
+	select ARM_GIC
+	select MTK_TIMER
+	help
+	  Support for Mediatek Cortex-A7 Quad-Core-SoC MT6589.

arch/arm/mach-mediatek/Makefile new file +1 -0

new file mode 100644
index 0000000..43e619f
@@ -0,0 +1 @@
+obj-$(CONFIG_ARCH_MEDIATEK) += mediatek.o

arch/arm/mach-mediatek/mediatek.c new file +27 -0

new file mode 100644
index 0000000..f2acf07
@@ -0,0 +1,27 @@
+/*
+ * Device Tree support for Mediatek SoCs
+ *
+ * Copyright (c) 2014 MundoReader S.L.
+ * Author: Matthias Brugger <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#include <linux/init.h>
+#include <asm/mach/arch.h>
+
+static const char * const mediatek_board_dt_compat[] = {
+	"mediatek,mt6589",
+	NULL,
+};
+
+DT_MACHINE_START(MEDIATEK_DT, "Mediatek Cortex-A7 (Device Tree)")
+	.dt_compat	= mediatek_board_dt_compat,
+MACHINE_END

Signature · 1 line

1.7.9.5

Matthias Brugger

author maintainer

2014-05-30 16:56 UTC #11 lore raw

PATCH v6 5/6 dt-bindings: add documentation for Mediatek SoC

In reply to Matthias Brugger

This adds a DT binding documentation for the MT6589 SoC from Mediatek.

Signed-off-by Matthias Brugger <[email protected]>

---
 .../devicetree/bindings/arm/mediatek-mt65xx.txt    |    8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/arm/mediatek-mt65xx.txt

Documentation/devicetree/bindings/arm/mediatek-mt65xx.txt new file +8 -0

new file mode 100644
index 0000000..d6ac71f
@@ -0,0 +1,8 @@
+Mediatek MT6589 Platforms Device Tree Bindings
+
+Boards with a SoC of the Mediatek MT6589 shall have the following property:
+
+Required root node property:
+
+compatible: must contain "mediatek,mt6589"
+

Signature · 1 line

1.7.9.5

Rob Herring

2014-06-03 12:51 UTC #12 lore raw

PATCH v6 5/6 dt-bindings: add documentation for Mediatek SoC

Quoted 5 lines · Matthias Brugger

This adds a DT binding documentation for the MT6589 SoC from Mediatek.
Signed-off-by Matthias Brugger <[email protected]>
---
 .../devicetree/bindings/arm/mediatek-mt65xx.txt    |    8 ++++++++

How about just mediatek.txt? Otherwise:

Acked-by Rob Herring <[email protected]>

Rob

Quoted 20 lines

 1 file changed, 8 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/arm/mediatek-mt65xx.txt

Documentation/devicetree/bindings/arm/mediatek-mt65xx.txt new file +8 -1

new file mode 100644
index 0000000..d6ac71f
@@ -0,0 +1,8 @@
+Mediatek MT6589 Platforms Device Tree Bindings
+
+Boards with a SoC of the Mediatek MT6589 shall have the following property:
+
+Required root node property:
+
+compatible: must contain "mediatek,mt6589"
+
--

1.7.9.5

Matthias Brugger

author maintainer

2014-06-05 10:26 UTC #13 lore raw

PATCH v6 5/6 dt-bindings: add documentation for Mediatek SoC

2014-06-03 14:51 GMT+02:00 Rob Herring <[email protected]>:

Quoted 9 lines

Quoted 5 lines · Matthias Brugger
This adds a DT binding documentation for the MT6589 SoC from Mediatek.
Signed-off-by Matthias Brugger <[email protected]>
---
 .../devicetree/bindings/arm/mediatek-mt65xx.txt    |    8 ++++++++
How about just mediatek.txt? Otherwise:

You are right, I will fix this for v7 of the series.

Quoted 25 lines

Acked-by Rob Herring <[email protected]>

Rob

Quoted 20 lines

 1 file changed, 8 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/arm/mediatek-mt65xx.txt

Documentation/devicetree/bindings/arm/mediatek-mt65xx.txt new file +8 -1

new file mode 100644
index 0000000..d6ac71f
@@ -0,0 +1,8 @@
+Mediatek MT6589 Platforms Device Tree Bindings
+
+Boards with a SoC of the Mediatek MT6589 shall have the following property:
+
+Required root node property:
+
+compatible: must contain "mediatek,mt6589"
+
--

1.7.9.5

Signature · 1 line

motzblog.wordpress.com

Matthias Brugger

author maintainer

2014-05-30 16:56 UTC #14 lore raw

PATCH v6 6/6 arm: mediatek: add dts for Aquaris5 mobile phone

In reply to Matthias Brugger

The Aquaris5 is a mobile phone based on the MT6589 SoC.

Signed-off-by Matthias Brugger <[email protected]>

---
 arch/arm/boot/dts/mt6589-aquaris5.dts |   25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 arch/arm/boot/dts/mt6589-aquaris5.dts

arch/arm/boot/dts/mt6589-aquaris5.dts new file +25 -0

new file mode 100644
index 0000000..443b446
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2014 MundoReader S.L.
+ * Author: Matthias Brugger <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+/dts-v1/;
+#include "mt6589.dtsi"
+
+/ {
+	model = "bq Aquaris5";
+
+	memory {
+		reg = <0x80000000 0x40000000>;
+	};
+};

Signature · 1 line

1.7.9.5

Daniel Lezcano

2014-06-03 12:48 UTC #15 lore raw

In reply to Matthias Brugger

Quoted 7 lines · Matthias Brugger

Sixth round for the Mediatek basic support patches.
I encapsulated the setup of the timer and the interrupt in seperate functions.
Apart I fixed the compatibily string to be consisten throughout the whole system (from mediatek,mtk6577 to mediatek,mt6577) and added the address to the bindings documentation.

Hi,

through which tree should this patchset to be merged ?

Thanks

-- Daniel

Quoted 112 lines

---
This patch set adds basic support for the Mediatek Cortex-A7 SoCs. Support is quite basic, as the only component working up to now are the timers.
The patch series is build against torvalds/master tree.
Signed-off-by Matthias Brugger <[email protected]>
Changes for v6:
- fix compatible string of the timer
- encapsulate timer setup in function
- add more information to the timer commit message
- add address in timer DTS bindings documentation
Changes for v5:
1. Clocksource timer
- Change the compatible string to mt6577
2. Timer DT bindings
- Change compatible string to mt6577
Changes for v4:
1. Clocksource timer
- use cpu_possible_mask
2. Timer DT bindings
- Delete comments about the frequency of the clocks
- Add clock-names for the input clocks
3. Basic SoC support
- add clock-names for the timer
- rename the label of the clocks nodes
Changes for v3:
1. Clocksource timer
- Set cpu_mask_all and irq in clock_event_device
- Use device private structure for driver specific values
2. Timer DT bindings
- Define order of the clock phandles
- Fix typos
3. Basic SoC support
- DTS: set gic to a15-gic
- DTS: order by physical address
- Remove call to dt_init function
Changes for v2:
1. Clocksource timer
- Delete unused parts for sched_clock_source
- Use irq_request instead of setup_irq
- Remove unused SMP parts
- Fix some style issues
- use of_address_to resource and request_mem_region
- delete use of named clock
- select CLKSRC_MMIO in driver Kconfig
2. DT bindings
- delete named clock bindings
3. Basic SoC support
- Clean-up Kconfig
- Add documentation of the SoC compatible property
- DTS: rename SoC file to mt6589.dts
- DTS: Delete not present cache controller
- DTS: Add missing GICv2 properties
- DTS: Change clock names
- DTS: Add Aquaris5 board
4. Add earlyprintk
- patch droped until serial driver is available
5. Add support for Aquaris5 mobile phone
Matthias Brugger (6):
clocksource: Add support for the Mediatek SoCs
dt-bindings: add mtk-timer bindings
vendor-prefixes: add prefix for Mediaktek Inc.
arm: add basic support for Mediatek MT6589 boards
dt-bindings: add documentation for Mediatek SoC
arm: mediatek: add dts for Aquaris5 mobile phone
  .../devicetree/bindings/arm/mediatek-mt65xx.txt    |    8 +
  .../bindings/timer/mediatek,mtk-timer.txt          |   18 ++
  .../devicetree/bindings/vendor-prefixes.txt        |    1 +
  arch/arm/Kconfig                                   |    2 +
  arch/arm/Makefile                                  |    1 +
  arch/arm/boot/dts/mt6589-aquaris5.dts              |   25 ++
  arch/arm/boot/dts/mt6589.dtsi                      |   94 ++++++++
  arch/arm/mach-mediatek/Kconfig                     |    6 +
  arch/arm/mach-mediatek/Makefile                    |    1 +
  arch/arm/mach-mediatek/mediatek.c                  |   27 +++
  drivers/clocksource/Kconfig                        |    4 +
  drivers/clocksource/Makefile                       |    1 +
  drivers/clocksource/mtk_timer.c                    |  242 ++++++++++++++++++++
  13 files changed, 430 insertions(+)
create mode 100644 Documentation/devicetree/bindings/arm/mediatek-mt65xx.txt create mode 100644 Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt create mode 100644 arch/arm/boot/dts/mt6589-aquaris5.dts
create mode 100644 arch/arm/boot/dts/mt6589.dtsi
create mode 100644 arch/arm/mach-mediatek/Kconfig
create mode 100644 arch/arm/mach-mediatek/Makefile
create mode 100644 arch/arm/mach-mediatek/mediatek.c
create mode 100644 drivers/clocksource/mtk_timer.c

Signature · 5 lines

 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

Matthias Brugger

author maintainer

2014-06-03 13:15 UTC #16 lore raw

v6 cover arm: Add basic support for Mediatek Cortex-A7 SoCs

2014-06-03 14:48 GMT+02:00 Daniel Lezcano <[email protected]>:

Quoted 12 lines · Matthias Brugger

Quoted 8 lines
Sixth round for the Mediatek basic support patches.
I encapsulated the setup of the timer and the interrupt in seperate functions.
Apart I fixed the compatibily string to be consisten throughout the whole system (from mediatek,mtk6577 to mediatek,mt6577) and added the address to the bindings documentation.

Quoted 3 lines

Hi,
through which tree should this patchset to be merged ?

If you like, you can pick the two clocksource patches for your clocksource tree or we can merge the whole series to arm-soc.

Cheers,
Matthias

Quoted 130 lines

Thanks
-- Daniel
Quoted 104 lines
---
This patch set adds basic support for the Mediatek Cortex-A7 SoCs. Support is quite basic, as the only component working up to now are the timers.
The patch series is build against torvalds/master tree.
Signed-off-by Matthias Brugger <[email protected]>
Changes for v6:
- fix compatible string of the timer
- encapsulate timer setup in function
- add more information to the timer commit message
- add address in timer DTS bindings documentation
Changes for v5:
1. Clocksource timer
- Change the compatible string to mt6577
2. Timer DT bindings
- Change compatible string to mt6577
Changes for v4:
1. Clocksource timer
- use cpu_possible_mask
2. Timer DT bindings
- Delete comments about the frequency of the clocks
- Add clock-names for the input clocks
3. Basic SoC support
- add clock-names for the timer
- rename the label of the clocks nodes
Changes for v3:
1. Clocksource timer
- Set cpu_mask_all and irq in clock_event_device
- Use device private structure for driver specific values
2. Timer DT bindings
- Define order of the clock phandles
- Fix typos
3. Basic SoC support
- DTS: set gic to a15-gic
- DTS: order by physical address
- Remove call to dt_init function
Changes for v2:
1. Clocksource timer
- Delete unused parts for sched_clock_source
- Use irq_request instead of setup_irq
- Remove unused SMP parts
- Fix some style issues
- use of_address_to resource and request_mem_region
- delete use of named clock
- select CLKSRC_MMIO in driver Kconfig
2. DT bindings
- delete named clock bindings
3. Basic SoC support
- Clean-up Kconfig
- Add documentation of the SoC compatible property
- DTS: rename SoC file to mt6589.dts
- DTS: Delete not present cache controller
- DTS: Add missing GICv2 properties
- DTS: Change clock names
- DTS: Add Aquaris5 board
4. Add earlyprintk
- patch droped until serial driver is available
5. Add support for Aquaris5 mobile phone
Matthias Brugger (6):
clocksource: Add support for the Mediatek SoCs
dt-bindings: add mtk-timer bindings
vendor-prefixes: add prefix for Mediaktek Inc.
arm: add basic support for Mediatek MT6589 boards
dt-bindings: add documentation for Mediatek SoC
arm: mediatek: add dts for Aquaris5 mobile phone
  .../devicetree/bindings/arm/mediatek-mt65xx.txt    |    8 +
  .../bindings/timer/mediatek,mtk-timer.txt          |   18 ++
  .../devicetree/bindings/vendor-prefixes.txt        |    1 +
  arch/arm/Kconfig                                   |    2 +
  arch/arm/Makefile                                  |    1 +
  arch/arm/boot/dts/mt6589-aquaris5.dts              |   25 ++
  arch/arm/boot/dts/mt6589.dtsi                      |   94 ++++++++
  arch/arm/mach-mediatek/Kconfig                     |    6 +
  arch/arm/mach-mediatek/Makefile                    |    1 +
  arch/arm/mach-mediatek/mediatek.c                  |   27 +++
  drivers/clocksource/Kconfig                        |    4 +
  drivers/clocksource/Makefile                       |    1 +
  drivers/clocksource/mtk_timer.c                    |  242
++++++++++++++++++++
  13 files changed, 430 insertions(+)
Quoted 11 lines
create mode 100644
Documentation/devicetree/bindings/arm/mediatek-mt65xx.txt
create mode 100644
Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt
create mode 100644 arch/arm/boot/dts/mt6589-aquaris5.dts create mode 100644 arch/arm/boot/dts/mt6589.dtsi create mode 100644 arch/arm/mach-mediatek/Kconfig create mode 100644 arch/arm/mach-mediatek/Makefile create mode 100644 arch/arm/mach-mediatek/mediatek.c create mode 100644 drivers/clocksource/mtk_timer.c
--
<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

Signature · 1 line

motzblog.wordpress.com