* [PATCH v2 1/4] ARM: common: vic: Parse interrupt and resume masks from device tree
2013-02-10 13:54 [PATCH v2 0/4] Initial Device Tree support for S3C64xx Tomasz Figa
@ 2013-02-10 13:54 ` Tomasz Figa
2013-02-10 13:54 ` [PATCH v2 2/4] ARM: s3c64xx: Add board file for boot using Device Tree Tomasz Figa
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Tomasz Figa @ 2013-02-10 13:54 UTC (permalink / raw)
To: linux-arm-kernel
This patch extends vic_of_init to parse valid interrupt sources
and resume sources masks from device tree.
If mask values are not specified in device tree, all sources
are assumed to be valid, as before this patch.
Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
---
Documentation/devicetree/bindings/arm/vic.txt | 6 ++++++
arch/arm/common/vic.c | 7 ++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/arm/vic.txt b/Documentation/devicetree/bindings/arm/vic.txt
index 266716b..bb7137c 100644
--- a/Documentation/devicetree/bindings/arm/vic.txt
+++ b/Documentation/devicetree/bindings/arm/vic.txt
@@ -18,6 +18,9 @@ Required properties:
Optional properties:
- interrupts : Interrupt source for parent controllers if the VIC is nested.
+- interrupt-mask : Bit mask of valid interrupt sources (defaults to all valid)
+- wakeup-mask : Bit mask of interrupt sources that can wake up the system
+ (defaults to all allowed)
Example:
@@ -26,4 +29,7 @@ Example:
interrupt-controller;
#interrupt-cells = <1>;
reg = <0x60000 0x1000>;
+
+ interrupt-mask = <0xffffff7f>;
+ wakeup-mask = <0x0000ff7f>;
};
diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c
index 8f324b9..676a938 100644
--- a/arch/arm/common/vic.c
+++ b/arch/arm/common/vic.c
@@ -412,6 +412,8 @@ void __init vic_init(void __iomem *base, unsigned int irq_start,
int __init vic_of_init(struct device_node *node, struct device_node *parent)
{
void __iomem *regs;
+ u32 interrupt_mask = ~0;
+ u32 wakeup_mask = ~0;
if (WARN(parent, "non-root VICs are not supported"))
return -EINVAL;
@@ -420,10 +422,13 @@ int __init vic_of_init(struct device_node *node, struct device_node *parent)
if (WARN_ON(!regs))
return -EIO;
+ of_property_read_u32(node, "interrupt-mask", &interrupt_mask);
+ of_property_read_u32(node, "wakeup-mask", &wakeup_mask);
+
/*
* Passing 0 as first IRQ makes the simple domain allocate descriptors
*/
- __vic_init(regs, 0, ~0, ~0, node);
+ __vic_init(regs, 0, interrupt_mask, wakeup_mask, node);
return 0;
}
--
1.8.1.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2 2/4] ARM: s3c64xx: Add board file for boot using Device Tree
2013-02-10 13:54 [PATCH v2 0/4] Initial Device Tree support for S3C64xx Tomasz Figa
2013-02-10 13:54 ` [PATCH v2 1/4] ARM: common: vic: Parse interrupt and resume masks from device tree Tomasz Figa
@ 2013-02-10 13:54 ` Tomasz Figa
2013-02-10 13:54 ` [PATCH v2 3/4] ARM: dts: Add basic dts include files for Samsung S3C64xx SoCs Tomasz Figa
2013-02-10 13:54 ` [PATCH v2 4/4] ARM: dts: Add dts file for S3C6410-based Mini6410 board Tomasz Figa
3 siblings, 0 replies; 5+ messages in thread
From: Tomasz Figa @ 2013-02-10 13:54 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds board file that will be used to boot S3C64xx-based boards
using Device Tree.
Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
---
arch/arm/mach-s3c64xx/Kconfig | 14 +++++
arch/arm/mach-s3c64xx/Makefile | 1 +
arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c | 94 +++++++++++++++++++++++++++++++++
3 files changed, 109 insertions(+)
create mode 100644 arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index 283cb77..771e2c2 100644
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -311,3 +311,17 @@ config MACH_WLF_CRAGG_6410
select SAMSUNG_GPIO_EXTRA128
help
Machine support for the Wolfson Cragganmore S3C6410 variant.
+
+config MACH_S3C64XX_DT
+ bool "Samsung S3C6400/S3C6410 machine using Device Tree"
+ select CLKSRC_OF
+ select CPU_S3C6400
+ select CPU_S3C6410
+ select USE_OF
+ help
+ Machine support for Samsung S3C6400/S3C6410 machines with Device Tree
+ enabled.
+ Select this if a fdt blob is available for your S3C64XX SoC based
+ board.
+ Note: This is under development and not all peripherals can be
+ supported with this machine file.
diff --git a/arch/arm/mach-s3c64xx/Makefile b/arch/arm/mach-s3c64xx/Makefile
index f9ce1dc..59b3d06 100644
--- a/arch/arm/mach-s3c64xx/Makefile
+++ b/arch/arm/mach-s3c64xx/Makefile
@@ -58,3 +58,4 @@ obj-$(CONFIG_MACH_SMARTQ7) += mach-smartq7.o
obj-$(CONFIG_MACH_SMDK6400) += mach-smdk6400.o
obj-$(CONFIG_MACH_SMDK6410) += mach-smdk6410.o
obj-$(CONFIG_MACH_WLF_CRAGG_6410) += mach-crag6410.o mach-crag6410-module.o
+obj-$(CONFIG_MACH_S3C64XX_DT) += mach-s3c64xx-dt.o
diff --git a/arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c b/arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c
new file mode 100644
index 0000000..c2e56aa
--- /dev/null
+++ b/arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c
@@ -0,0 +1,94 @@
+/*
+ * Samsung's S3C64XX flattened device tree enabled machine
+ *
+ * Copyright (c) 2013 Tomasz Figa <tomasz.figa@gmail.com>
+ *
+ * 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.
+*/
+
+#include <linux/clocksource.h>
+#include <linux/of_irq.h>
+#include <linux/of_platform.h>
+#include <linux/serial_core.h>
+
+#include <asm/mach/arch.h>
+#include <asm/hardware/vic.h>
+#include <mach/map.h>
+
+#include <plat/cpu.h>
+#include <plat/regs-serial.h>
+
+#include "common.h"
+
+/*
+ * The following lookup table is used to override device names when devices
+ * are registered from device tree. This is temporarily added to enable
+ * device tree support addition for the S3C64xx architecture.
+ *
+ * For drivers that require platform data to be provided from the machine
+ * file, a platform data pointer can also be supplied along with the
+ * devices names. Usually, the platform data elements that cannot be parsed
+ * from the device tree by the drivers (example: function pointers) are
+ * supplied. But it should be noted that this is a temporary mechanism and
+ * at some point, the drivers should be capable of parsing all the platform
+ * data from the device tree.
+ */
+static const struct of_dev_auxdata s3c64xx_auxdata_lookup[] __initconst = {
+ OF_DEV_AUXDATA("samsung,s3c6400-uart", 0x7f005000,
+ "s3c6400-uart.0", NULL),
+ OF_DEV_AUXDATA("samsung,s3c6400-uart", 0x7f005400,
+ "s3c6400-uart.1", NULL),
+ OF_DEV_AUXDATA("samsung,s3c6400-uart", 0x7f005800,
+ "s3c6400-uart.2", NULL),
+ OF_DEV_AUXDATA("samsung,s3c6400-uart", 0x7f005c00,
+ "s3c6400-uart.3", NULL),
+ OF_DEV_AUXDATA("samsung,s3c6410-sdhci", 0x7c200000,
+ "s3c-sdhci.0", NULL),
+ OF_DEV_AUXDATA("samsung,s3c6410-sdhci", 0x7c300000,
+ "s3c-sdhci.1", NULL),
+ OF_DEV_AUXDATA("samsung,s3c6410-sdhci", 0x7c400000,
+ "s3c-sdhci.2", NULL),
+ {},
+};
+
+static void __init s3c64xx_dt_init_irq(void)
+{
+ static const struct of_device_id vic_of_match[] = {
+ { .compatible = "arm,pl192-vic", .data = vic_of_init, },
+ {},
+ };
+
+ of_irq_init(vic_of_match);
+}
+
+static void __init s3c64xx_dt_map_io(void)
+{
+ s3c64xx_init_io(NULL, 0);
+ s3c24xx_init_clocks(12000000);
+}
+
+static void __init s3c64xx_dt_machine_init(void)
+{
+ of_platform_populate(NULL, of_default_bus_match_table,
+ s3c64xx_auxdata_lookup, NULL);
+}
+
+static char const *s3c64xx_dt_compat[] __initdata = {
+ "samsung,s3c6400",
+ "samsung,s3c6410",
+ NULL
+};
+
+DT_MACHINE_START(S3C6400_DT, "Samsung S3C64xx (Flattened Device Tree)")
+ /* Maintainer: Tomasz Figa <tomasz.figa@gmail.com> */
+ .init_irq = s3c64xx_dt_init_irq,
+ .map_io = s3c64xx_dt_map_io,
+ .handle_irq = vic_handle_irq,
+ .init_machine = s3c64xx_dt_machine_init,
+ .init_late = s3c64xx_init_late,
+ .init_time = clocksource_of_init,
+ .dt_compat = s3c64xx_dt_compat,
+ .restart = s3c64xx_restart,
+MACHINE_END
--
1.8.1.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2 3/4] ARM: dts: Add basic dts include files for Samsung S3C64xx SoCs
2013-02-10 13:54 [PATCH v2 0/4] Initial Device Tree support for S3C64xx Tomasz Figa
2013-02-10 13:54 ` [PATCH v2 1/4] ARM: common: vic: Parse interrupt and resume masks from device tree Tomasz Figa
2013-02-10 13:54 ` [PATCH v2 2/4] ARM: s3c64xx: Add board file for boot using Device Tree Tomasz Figa
@ 2013-02-10 13:54 ` Tomasz Figa
2013-02-10 13:54 ` [PATCH v2 4/4] ARM: dts: Add dts file for S3C6410-based Mini6410 board Tomasz Figa
3 siblings, 0 replies; 5+ messages in thread
From: Tomasz Figa @ 2013-02-10 13:54 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds basic device tree definitions for Samsung S3C64xx SoCs.
Since all the SoCs in the series are very similar, the files are created
hierarchically - one file for the whole series and then separate files
for particular SoCs including the common one.
Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
---
arch/arm/boot/dts/s3c6400.dtsi | 33 +++++++++++++
arch/arm/boot/dts/s3c6410.dtsi | 33 +++++++++++++
arch/arm/boot/dts/s3c64xx.dtsi | 108 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 174 insertions(+)
create mode 100644 arch/arm/boot/dts/s3c6400.dtsi
create mode 100644 arch/arm/boot/dts/s3c6410.dtsi
create mode 100644 arch/arm/boot/dts/s3c64xx.dtsi
diff --git a/arch/arm/boot/dts/s3c6400.dtsi b/arch/arm/boot/dts/s3c6400.dtsi
new file mode 100644
index 0000000..76106b8
--- /dev/null
+++ b/arch/arm/boot/dts/s3c6400.dtsi
@@ -0,0 +1,33 @@
+/*
+ * Samsung's S3C6400 SoC device tree source
+ *
+ * Copyright (c) 2013 Tomasz Figa <tomasz.figa@gmail.com>
+ *
+ * Samsung's S3C6400 SoC device nodes are listed in this file. S3C6400
+ * based board files can include this file and provide values for board specfic
+ * bindings.
+ *
+ * Note: This file does not include device nodes for all the controllers in
+ * S3C6400 SoC. As device tree coverage for S3C6400 increases, additional
+ * nodes can be added to this file.
+ *
+ * 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.
+*/
+
+/include/ "s3c64xx.dtsi"
+
+/ {
+ compatible = "samsung,s3c6400";
+
+ vic0: interrupt-controller at 71200000 {
+ interrupt-mask = <0xfffffe1f>;
+ wakeup-mask = <0x00200004>;
+ };
+
+ vic1: interrupt-controller at 71300000 {
+ interrupt-mask = <0xffffffff>;
+ wakeup-mask = <0x53020000>;
+ };
+};
diff --git a/arch/arm/boot/dts/s3c6410.dtsi b/arch/arm/boot/dts/s3c6410.dtsi
new file mode 100644
index 0000000..4a74df9
--- /dev/null
+++ b/arch/arm/boot/dts/s3c6410.dtsi
@@ -0,0 +1,33 @@
+/*
+ * Samsung's S3C6410 SoC device tree source
+ *
+ * Copyright (c) 2013 Tomasz Figa <tomasz.figa@gmail.com>
+ *
+ * Samsung's S3C6410 SoC device nodes are listed in this file. S3C6410
+ * based board files can include this file and provide values for board specfic
+ * bindings.
+ *
+ * Note: This file does not include device nodes for all the controllers in
+ * S3C6410 SoC. As device tree coverage for S3C6410 increases, additional
+ * nodes can be added to this file.
+ *
+ * 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.
+*/
+
+/include/ "s3c64xx.dtsi"
+
+/ {
+ compatible = "samsung,s3c6410";
+
+ vic0: interrupt-controller at 71200000 {
+ interrupt-mask = <0xffffff7f>;
+ wakeup-mask = <0x00200004>;
+ };
+
+ vic1: interrupt-controller at 71300000 {
+ interrupt-mask = <0xffffffff>;
+ wakeup-mask = <0x53020000>;
+ };
+};
diff --git a/arch/arm/boot/dts/s3c64xx.dtsi b/arch/arm/boot/dts/s3c64xx.dtsi
new file mode 100644
index 0000000..a9a394f
--- /dev/null
+++ b/arch/arm/boot/dts/s3c64xx.dtsi
@@ -0,0 +1,108 @@
+/*
+ * Samsung's S3C64xx SoC series common device tree source
+ *
+ * Copyright (c) 2013 Tomasz Figa <tomasz.figa@gmail.com>
+ *
+ * Samsung's S3C64xx SoC series device nodes are listed in this file.
+ * Particular SoCs from S3C64xx series can include this file and provide
+ * values for SoCs specfic bindings.
+ *
+ * Note: This file does not include device nodes for all the controllers in
+ * S3C64xx SoCs. As device tree coverage for S3C64xx increases, additional
+ * nodes can be added to this file.
+ *
+ * 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.
+ */
+
+/include/ "skeleton.dtsi"
+
+/ {
+ cpus {
+ cpu {
+ compatible = "arm,arm1176jzf-s", "arm,arm1176";
+ };
+ };
+
+ vic0: interrupt-controller at 71200000 {
+ compatible = "arm,pl192-vic";
+ interrupt-controller;
+ reg = <0x71200000 0x1000>;
+ #interrupt-cells = <1>;
+ };
+
+ vic1: interrupt-controller at 71300000 {
+ compatible = "arm,pl192-vic";
+ interrupt-controller;
+ reg = <0x71300000 0x1000>;
+ #interrupt-cells = <1>;
+ };
+
+ timer at 7f006000 {
+ compatible = "samsung,s3c64xx-pwm-timer";
+ reg = <0x7f006000 0x1000>;
+ interrupt-parent = <&vic0>;
+ interrupts = <23>, <24>, <25>, <27>, <28>;
+ samsung,source-timer = <4>;
+ samsung,event-timer = <3>;
+ samsung,prescale = <2>;
+ samsung,divisor = <1>;
+ };
+
+ serial at 7f005000 {
+ compatible = "samsung,s3c6400-uart";
+ reg = <0x7f005000 0x100>;
+ interrupt-parent = <&vic1>;
+ interrupts = <5>;
+ status = "disabled";
+ };
+
+ serial at 7f005400 {
+ compatible = "samsung,s3c6400-uart";
+ reg = <0x7f005400 0x100>;
+ interrupt-parent = <&vic1>;
+ interrupts = <6>;
+ status = "disabled";
+ };
+
+ serial at 7f005800 {
+ compatible = "samsung,s3c6400-uart";
+ reg = <0x7f005800 0x100>;
+ interrupt-parent = <&vic1>;
+ interrupts = <7>;
+ status = "disabled";
+ };
+
+ serial at 7f005c00 {
+ compatible = "samsung,s3c6400-uart";
+ reg = <0x7f005c00 0x100>;
+ interrupt-parent = <&vic1>;
+ interrupts = <8>;
+ status = "disabled";
+ };
+
+ sdhci at 7c200000 {
+ compatible = "samsung,s3c6410-sdhci";
+ reg = <0x7c200000 0x100>;
+ interrupt-parent = <&vic1>;
+ interrupts = <24>;
+ status = "disabled";
+ };
+
+ sdhci at 7c300000 {
+ compatible = "samsung,s3c6410-sdhci";
+ reg = <0x7c300000 0x100>;
+ interrupt-parent = <&vic1>;
+ interrupts = <25>;
+ status = "disabled";
+ };
+
+ sdhci at 7c400000 {
+ compatible = "samsung,s3c6410-sdhci";
+ reg = <0x7c400000 0x100>;
+ interrupt-parent = <&vic1>;
+ interrupts = <17>;
+ status = "disabled";
+ };
+};
--
1.8.1.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2 4/4] ARM: dts: Add dts file for S3C6410-based Mini6410 board
2013-02-10 13:54 [PATCH v2 0/4] Initial Device Tree support for S3C64xx Tomasz Figa
` (2 preceding siblings ...)
2013-02-10 13:54 ` [PATCH v2 3/4] ARM: dts: Add basic dts include files for Samsung S3C64xx SoCs Tomasz Figa
@ 2013-02-10 13:54 ` Tomasz Figa
3 siblings, 0 replies; 5+ messages in thread
From: Tomasz Figa @ 2013-02-10 13:54 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds basic device tree sources for FriendlyARM Mini6410 board
based on Samsung S3C6410 SoC.
Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
---
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/s3c6410-mini6410.dts | 50 ++++++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+)
create mode 100644 arch/arm/boot/dts/s3c6410-mini6410.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index de00f15..b3e5448 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -122,6 +122,7 @@ dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \
hrefprev60.dtb \
hrefv60plus.dtb \
ccu9540.dtb
+dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb
dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
r8a7740-armadillo800eva.dtb \
sh73a0-kzm9g.dtb \
diff --git a/arch/arm/boot/dts/s3c6410-mini6410.dts b/arch/arm/boot/dts/s3c6410-mini6410.dts
new file mode 100644
index 0000000..9ac82c2
--- /dev/null
+++ b/arch/arm/boot/dts/s3c6410-mini6410.dts
@@ -0,0 +1,50 @@
+/*
+ * Samsung's S3C6410 based Mini6410 board device tree source
+ *
+ * Copyright (c) 2013 Tomasz Figa <tomasz.figa@gmail.com>
+ *
+ * Device tree source file for FriendlyARM Mini6410 board which is based on
+ * Samsung's S3C6410 SoC.
+ *
+ * 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.
+*/
+
+/dts-v1/;
+/include/ "s3c6410.dtsi"
+
+/ {
+ model = "FriendlyARM Mini6410 board based on S3C6410";
+ compatible = "friendlyarm,mini6410", "samsung,s3c6410";
+
+ memory {
+ reg = <0x50000000 0x10000000>;
+ };
+
+ chosen {
+ bootargs = "console=ttySAC0,115200n8 earlyprintk rootwait root=/dev/mmcblk0p1";
+ };
+
+ serial at 7f005000 {
+ status = "okay";
+ };
+
+ serial at 7f005400 {
+ status = "okay";
+ };
+
+ serial at 7f005800 {
+ status = "okay";
+ };
+
+ serial at 7f005c00 {
+ status = "okay";
+ };
+
+ sdhci at 7c200000 {
+ bus-width = <4>;
+ non-removable;
+ status = "okay";
+ };
+};
--
1.8.1.2
^ permalink raw reply related [flat|nested] 5+ messages in thread