* [PATCH 1/6] leds: add a driver for syscon-based LEDs
2014-07-25 13:23 [PATCH 0/6] ARM RealView DeviceTree support v4 Linus Walleij
@ 2014-07-25 13:23 ` Linus Walleij
2014-08-13 9:14 ` Linus Walleij
2014-07-25 13:23 ` [PATCH 2/6] leds: add device tree bindings for syscon LEDs Linus Walleij
` (4 subsequent siblings)
5 siblings, 1 reply; 19+ messages in thread
From: Linus Walleij @ 2014-07-25 13:23 UTC (permalink / raw)
To: linux-arm-kernel
This makes it possible to create a set of LEDs from a syscon
MFD instance, which is lean mean and clean on the ARM
reference designs and can replace the Versatile LEDs driver
in the long run, as well as other custom syscon LEDs drivers.
Cc: Bryan Wu <cooloney@gmail.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/leds/Kconfig | 10 +++
drivers/leds/Makefile | 1 +
drivers/leds/leds-syscon.c | 152 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 163 insertions(+)
create mode 100644 drivers/leds/leds-syscon.c
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index a1b044e7eaad..f5f2110d8e7c 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -479,6 +479,16 @@ config LEDS_BLINKM
This option enables support for the BlinkM RGB LED connected
through I2C. Say Y to enable support for the BlinkM LED.
+config LEDS_SYSCON
+ bool "LED support for LEDs on system controllers"
+ depends on LEDS_CLASS
+ depends on MFD_SYSCON
+ depends on OF
+ help
+ This option enabled support for the LEDs on syscon type
+ devices. This will only work with device tree enabled
+ devices.
+
config LEDS_VERSATILE
tristate "LED support for the ARM Versatile and RealView"
depends on ARCH_REALVIEW || ARCH_VERSATILE
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
index 79c5155199a7..2c81971633f7 100644
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -53,6 +53,7 @@ obj-$(CONFIG_LEDS_ASIC3) += leds-asic3.o
obj-$(CONFIG_LEDS_MAX8997) += leds-max8997.o
obj-$(CONFIG_LEDS_LM355x) += leds-lm355x.o
obj-$(CONFIG_LEDS_BLINKM) += leds-blinkm.o
+obj-$(CONFIG_LEDS_SYSCON) += leds-syscon.o
obj-$(CONFIG_LEDS_VERSATILE) += leds-versatile.o
# LED SPI Drivers
diff --git a/drivers/leds/leds-syscon.c b/drivers/leds/leds-syscon.c
new file mode 100644
index 000000000000..00f60f447f10
--- /dev/null
+++ b/drivers/leds/leds-syscon.c
@@ -0,0 +1,152 @@
+/*
+ * Generic Syscon LEDs Driver
+ *
+ * Copyright (c) 2014, Linaro Limited
+ * Author: Linus Walleij <linus.walleij@linaro.org>
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ * This driver provides system reboot functionality for APM X-Gene SoC.
+ * For system shutdown, this is board specify. If a board designer
+ * implements GPIO shutdown, use the gpio-poweroff.c driver.
+ */
+#include <linux/io.h>
+#include <linux/of_device.h>
+#include <linux/of_address.h>
+#include <linux/platform_device.h>
+#include <linux/stat.h>
+#include <linux/slab.h>
+#include <linux/mfd/syscon.h>
+#include <linux/regmap.h>
+#include <linux/leds.h>
+
+/**
+ * struct syscon_led - state container for syscon based LEDs
+ * @cdev: LED class device for this LED
+ * @map: regmap to access the syscon device backing this LED
+ * @offset: the offset into the syscon regmap for the LED register
+ * @mask: the bit in the register corresponding to the LED
+ * @state: current state of the LED
+ */
+struct syscon_led {
+ struct led_classdev cdev;
+ struct regmap *map;
+ u32 offset;
+ u32 mask;
+ bool state;
+};
+
+static void syscon_led_set(struct led_classdev *led_cdev,
+ enum led_brightness value)
+{
+ struct syscon_led *sled =
+ container_of(led_cdev, struct syscon_led, cdev);
+ u32 val;
+ int ret;
+
+ if (value == LED_OFF) {
+ val = 0;
+ sled->state = false;
+ } else {
+ val = sled->mask;
+ sled->state = true;
+ }
+
+ ret = regmap_update_bits(sled->map, sled->offset, sled->mask, val);
+ if (ret < 0)
+ dev_err(sled->cdev.dev, "error updating LED status\n");
+}
+
+static int syscon_leds_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct device_node *np = dev->of_node, *child;
+ struct regmap *map;
+ int ret;
+
+ map = syscon_regmap_lookup_by_phandle(np, "regmap");
+ if (IS_ERR(map))
+ return PTR_ERR(map);
+
+ for_each_available_child_of_node(np, child) {
+ struct syscon_led *sled;
+ const char *state;
+
+ sled = devm_kzalloc(dev, sizeof(*sled), GFP_KERNEL);
+ if (!sled)
+ return -ENOMEM;
+
+ sled->map = map;
+
+ if (of_property_read_u32(child, "offset", &sled->offset))
+ return -EINVAL;
+ if (of_property_read_u32(child, "mask", &sled->mask))
+ return -EINVAL;
+ sled->cdev.name =
+ of_get_property(child, "label", NULL) ? : child->name;
+ sled->cdev.default_trigger =
+ of_get_property(child, "linux,default-trigger", NULL);
+
+ state = of_get_property(child, "default-state", NULL);
+ if (state) {
+ if (!strcmp(state, "keep")) {
+ u32 val;
+
+ ret = regmap_read(map, sled->offset, &val);
+ if (ret < 0)
+ return ret;
+ sled->state = !!(val & sled->mask);
+ } else if (!strcmp(state, "on")) {
+ sled->state = true;
+ ret = regmap_update_bits(map, sled->offset,
+ sled->mask,
+ sled->mask);
+ if (ret < 0)
+ return ret;
+ } else {
+ sled->state = false;
+ ret = regmap_update_bits(map, sled->offset,
+ sled->mask, 0);
+ if (ret < 0)
+ return ret;
+ }
+
+ }
+ sled->cdev.brightness_set = syscon_led_set;
+
+ ret = led_classdev_register(dev, &sled->cdev);
+ if (ret < 0)
+ return ret;
+
+ dev_info(dev, "registered LED %s\n", sled->cdev.name);
+ }
+
+ return 0;
+}
+
+static struct of_device_id syscon_leds_of_match[] = {
+ { .compatible = "syscon-leds" },
+ {}
+};
+
+static struct platform_driver syscon_leds_driver = {
+ .probe = syscon_leds_probe,
+ .driver = {
+ .name = "syscon-leds",
+ .of_match_table = syscon_leds_of_match,
+ },
+};
+module_platform_driver(syscon_leds_driver);
--
1.9.3
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 1/6] leds: add a driver for syscon-based LEDs
2014-07-25 13:23 ` [PATCH 1/6] leds: add a driver for syscon-based LEDs Linus Walleij
@ 2014-08-13 9:14 ` Linus Walleij
0 siblings, 0 replies; 19+ messages in thread
From: Linus Walleij @ 2014-08-13 9:14 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Jul 25, 2014 at 3:23 PM, Linus Walleij <linus.walleij@linaro.org> wrote:
> This makes it possible to create a set of LEDs from a syscon
> MFD instance, which is lean mean and clean on the ARM
> reference designs and can replace the Versatile LEDs driver
> in the long run, as well as other custom syscon LEDs drivers.
>
> Cc: Bryan Wu <cooloney@gmail.com>
> Cc: Richard Purdie <rpurdie@rpsys.net>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Bryan can you have a look at this driver? It can be merged
stand-alone through the LEDs tree for v3.18 once you're
happy with it.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 2/6] leds: add device tree bindings for syscon LEDs
2014-07-25 13:23 [PATCH 0/6] ARM RealView DeviceTree support v4 Linus Walleij
2014-07-25 13:23 ` [PATCH 1/6] leds: add a driver for syscon-based LEDs Linus Walleij
@ 2014-07-25 13:23 ` Linus Walleij
2014-07-25 14:07 ` Rob Herring
2014-07-25 13:23 ` [PATCH 3/6] power: reset: driver for the Versatile syscon reboot Linus Walleij
` (3 subsequent siblings)
5 siblings, 1 reply; 19+ messages in thread
From: Linus Walleij @ 2014-07-25 13:23 UTC (permalink / raw)
To: linux-arm-kernel
This adds the device tree bindings used by syscon-based LEDs.
Cc: devicetree at vger.kernel.org
Cc: Bryan Wu <cooloney@gmail.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
.../devicetree/bindings/leds/leds-syscon.txt | 83 ++++++++++++++++++++++
1 file changed, 83 insertions(+)
create mode 100644 Documentation/devicetree/bindings/leds/leds-syscon.txt
diff --git a/Documentation/devicetree/bindings/leds/leds-syscon.txt b/Documentation/devicetree/bindings/leds/leds-syscon.txt
new file mode 100644
index 000000000000..460b9c3d1bd3
--- /dev/null
+++ b/Documentation/devicetree/bindings/leds/leds-syscon.txt
@@ -0,0 +1,83 @@
+Device Tree Bindings for Syscon LEDs
+
+Required properties:
+- compatible : must be "syscon-leds".
+- regmap : a phandle to a syscon node containing a regmap
+
+Each LED is represented as a sub-node of the syscon-leds device. Each
+node's name represents the name of the corresponding LED.
+
+LED sub-node properties:
+- offset : register offset to the register controlling this LED
+- mask : bit mask for the bit controlling this LED in the register
+ typically 0x01, 0x02, 0x04 ...
+- label : (optional)
+ see Documentation/devicetree/bindings/leds/common.txt
+- linux,default-trigger : (optional)
+ see Documentation/devicetree/bindings/leds/common.txt
+- default-state: (optional) The initial state of the LED. Valid
+ values are "on", "off", and "keep". If the LED is already on or off
+ and the default-state property is set the to same value, then no
+ glitch should be produced where the LED momentarily turns off (or
+ on). The "keep" setting will keep the LED at whatever its current
+ state is, without producing a glitch. The default is off if this
+ property is not present.
+
+Example:
+
+leds: leds at 08 {
+ compatible = "syscon-leds";
+ regmap = <&syscon>;
+
+ led at bit0 {
+ offset = <0x08>;
+ mask = <0x01>;
+ label = "versatile:0";
+ linux,default-trigger = "heartbeat";
+ default-state = "on";
+ };
+ led at bit1 {
+ offset = <0x08>;
+ mask = <0x02>;
+ label = "versatile:1";
+ linux,default-trigger = "mmc0";
+ default-state = "off";
+ };
+ led at bit2 {
+ offset = <0x08>;
+ mask = <0x04>;
+ label = "versatile:2";
+ linux,default-trigger = "cpu0";
+ default-state = "off";
+ };
+ led at bit3 {
+ offset = <0x08>;
+ mask = <0x08>;
+ label = "versatile:3";
+ default-state = "off";
+ };
+ led at bit4 {
+ offset = <0x08>;
+ mask = <0x10>;
+ label = "versatile:4";
+ default-state = "off";
+ };
+ led at bit5 {
+ offset = <0x08>;
+ mask = <0x20>;
+ label = "versatile:5";
+ default-state = "off";
+ };
+ led at bit6 {
+ offset = <0x08>;
+ mask = <0x40>;
+ label = "versatile:6";
+ default-state = "off";
+ };
+ led at bit7 {
+ offset = <0x08>;
+ mask = <0x80>;
+ label = "versatile:7";
+ default-state = "off";
+ };
+};
--
1.9.3
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 2/6] leds: add device tree bindings for syscon LEDs
2014-07-25 13:23 ` [PATCH 2/6] leds: add device tree bindings for syscon LEDs Linus Walleij
@ 2014-07-25 14:07 ` Rob Herring
2014-08-13 9:31 ` Linus Walleij
0 siblings, 1 reply; 19+ messages in thread
From: Rob Herring @ 2014-07-25 14:07 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Jul 25, 2014 at 8:23 AM, Linus Walleij <linus.walleij@linaro.org> wrote:
> This adds the device tree bindings used by syscon-based LEDs.
>
> Cc: devicetree at vger.kernel.org
> Cc: Bryan Wu <cooloney@gmail.com>
> Cc: Richard Purdie <rpurdie@rpsys.net>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> .../devicetree/bindings/leds/leds-syscon.txt | 83 ++++++++++++++++++++++
> 1 file changed, 83 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/leds/leds-syscon.txt
>
> diff --git a/Documentation/devicetree/bindings/leds/leds-syscon.txt b/Documentation/devicetree/bindings/leds/leds-syscon.txt
> new file mode 100644
> index 000000000000..460b9c3d1bd3
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/leds/leds-syscon.txt
> @@ -0,0 +1,83 @@
> +Device Tree Bindings for Syscon LEDs
> +
> +Required properties:
> +- compatible : must be "syscon-leds".
Not really happy with the name... More below.
> +- regmap : a phandle to a syscon node containing a regmap
> +
> +Each LED is represented as a sub-node of the syscon-leds device. Each
> +node's name represents the name of the corresponding LED.
> +
> +LED sub-node properties:
> +- offset : register offset to the register controlling this LED
> +- mask : bit mask for the bit controlling this LED in the register
> + typically 0x01, 0x02, 0x04 ...
This would be a single bit, right? What about inverted bits (i.e. 0 is
on or 1 is on)?
> +- label : (optional)
Please group all required and optional properties under those headings.
> + see Documentation/devicetree/bindings/leds/common.txt
> +- linux,default-trigger : (optional)
> + see Documentation/devicetree/bindings/leds/common.txt
> +- default-state: (optional) The initial state of the LED. Valid
> + values are "on", "off", and "keep". If the LED is already on or off
> + and the default-state property is set the to same value, then no
> + glitch should be produced where the LED momentarily turns off (or
> + on). The "keep" setting will keep the LED at whatever its current
> + state is, without producing a glitch. The default is off if this
> + property is not present.
> +
> +Example:
> +
> +leds: leds at 08 {
> + compatible = "syscon-leds";
> + regmap = <&syscon>;
> +
> + led at bit0 {
Perhaps we can define a way to express unit address as offset+bit like
<offset>_<bit> or <offset>.<bit>.
I think we should get rid of the leds node and put this within the
syscon device node and each node here should have a compatible
property. I think the compatible should be something like
"register-bit-led" (perhaps someone has a better name) as syscon is
somewhat linux specific term and you could use this binding for any
LEDs that have a single register bit control.
Rob
> + offset = <0x08>;
> + mask = <0x01>;
> + label = "versatile:0";
> + linux,default-trigger = "heartbeat";
> + default-state = "on";
> + };
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH 2/6] leds: add device tree bindings for syscon LEDs
2014-07-25 14:07 ` Rob Herring
@ 2014-08-13 9:31 ` Linus Walleij
0 siblings, 0 replies; 19+ messages in thread
From: Linus Walleij @ 2014-08-13 9:31 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Jul 25, 2014 at 4:07 PM, Rob Herring <robh@kernel.org> wrote:
> On Fri, Jul 25, 2014 at 8:23 AM, Linus Walleij <linus.walleij@linaro.org> wrote:
>> This adds the device tree bindings used by syscon-based LEDs.
(...)
>> +Device Tree Bindings for Syscon LEDs
>> +
>> +Required properties:
>> +- compatible : must be "syscon-leds".
>
> Not really happy with the name... More below.
[copy paste]
> I think the compatible should be something like
> "register-bit-led" (perhaps someone has a better name) as syscon is
> somewhat linux specific term and you could use this binding for any
> LEDs that have a single register bit control.
Hm... this driver:
drivers/gpio/gpio-syscon.c
Has some bindings specific to a certain controller here:
Documentation/devicetree/bindings/gpio/cirrus,clps711x-mctrl-gpio.txt
Maybe I should think of something generic for that one
along the same lines then, so we get some consensus on
this.
Documentation/devicetree/bindings/mfd/syscon.txt
Specifies the string "syscon" for such regmap ranges, maybe
it should rather use the compatible string "misc-register-range"
or something.
>> +LED sub-node properties:
>> +- offset : register offset to the register controlling this LED
>> +- mask : bit mask for the bit controlling this LED in the register
>> + typically 0x01, 0x02, 0x04 ...
>
> This would be a single bit, right? What about inverted bits (i.e. 0 is
> on or 1 is on)?
I can of course add inversion bindings, but cannot add it to
the driver as I can't test it. Just an "active-low;" string would
do I guess.
>> +- label : (optional)
>
> Please group all required and optional properties under those headings.
OK.
>> +Example:
>> +
>> +leds: leds at 08 {
>> + compatible = "syscon-leds";
>> + regmap = <&syscon>;
>> +
>> + led at bit0 {
>
> Perhaps we can define a way to express unit address as offset+bit like
> <offset>_<bit> or <offset>.<bit>.
I'll come up with something. We don't really have a place to
document such schemas do we?
> I think we should get rid of the leds node and put this within the
> syscon device node and each node here should have a compatible
> property.
OK. But then I guess you also expect to get rid of the
phandle <&syscon> from the node, so that it implicitly uses
the syscon it's embedded in? Or is it OK to keep? Or should
it be optional, so the (syscon) driver will look upward when
locating the syscon for a node?
Like I need to add a new function
syscon_regmap_lookup_by_hierarchy() to syscon.c...
It already has like three ways to look up syscons, now
we add another one.
I know that is a Linux implementation detail but it reflects the
fact that similar code will be needed in all operating systems
using syscon-type things, if it's a case-by-case question
whether a phandle or hierarchy traversal is to be used for
getting hold of the interface.
Your,
Linus Walleij
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 3/6] power: reset: driver for the Versatile syscon reboot
2014-07-25 13:23 [PATCH 0/6] ARM RealView DeviceTree support v4 Linus Walleij
2014-07-25 13:23 ` [PATCH 1/6] leds: add a driver for syscon-based LEDs Linus Walleij
2014-07-25 13:23 ` [PATCH 2/6] leds: add device tree bindings for syscon LEDs Linus Walleij
@ 2014-07-25 13:23 ` Linus Walleij
2014-07-25 13:23 ` [PATCH 4/6] power: reset: DT bindings for the Versatile reset driver Linus Walleij
` (2 subsequent siblings)
5 siblings, 0 replies; 19+ messages in thread
From: Linus Walleij @ 2014-07-25 13:23 UTC (permalink / raw)
To: linux-arm-kernel
This driver enabled us to drive the reboot of the Versatile family
of ARM reference boards. Even though only the RealView boards are
supported initially, these boards all have the same procedure for
reboot:
- Write a magic value into an unlocking register
- Write another magic value into a reset control register
The driver will be reusable for Versatile and possibly also the
Integrator family of reference boards.
Cc: Sebastian Reichel <sre@kernel.org>
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/power/reset/Kconfig | 9 +++
drivers/power/reset/Makefile | 1 +
drivers/power/reset/arm-versatile-reboot.c | 121 +++++++++++++++++++++++++++++
3 files changed, 131 insertions(+)
create mode 100644 drivers/power/reset/arm-versatile-reboot.c
diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig
index bdcf5173e377..3dde8fd5e3a0 100644
--- a/drivers/power/reset/Kconfig
+++ b/drivers/power/reset/Kconfig
@@ -58,6 +58,15 @@ config POWER_RESET_SUN6I
help
Reboot support for the Allwinner A31 SoCs.
+config POWER_RESET_VERSATILE
+ bool "ARM Versatile family reboot driver"
+ depends on ARM
+ depends on MFD_SYSCON
+ depends on OF
+ help
+ Power off and restart support for ARM Versatile family of
+ reference boards.
+
config POWER_RESET_VEXPRESS
bool "ARM Versatile Express power-off and reset driver"
depends on ARM || ARM64
diff --git a/drivers/power/reset/Makefile b/drivers/power/reset/Makefile
index dde2e8bbac53..5b2ec9521dc6 100644
--- a/drivers/power/reset/Makefile
+++ b/drivers/power/reset/Makefile
@@ -5,6 +5,7 @@ obj-$(CONFIG_POWER_RESET_MSM) += msm-poweroff.o
obj-$(CONFIG_POWER_RESET_QNAP) += qnap-poweroff.o
obj-$(CONFIG_POWER_RESET_RESTART) += restart-poweroff.o
obj-$(CONFIG_POWER_RESET_SUN6I) += sun6i-reboot.o
+obj-$(CONFIG_POWER_RESET_VERSATILE) += arm-versatile-reboot.o
obj-$(CONFIG_POWER_RESET_VEXPRESS) += vexpress-poweroff.o
obj-$(CONFIG_POWER_RESET_XGENE) += xgene-reboot.o
obj-$(CONFIG_POWER_RESET_KEYSTONE) += keystone-reset.o
diff --git a/drivers/power/reset/arm-versatile-reboot.c b/drivers/power/reset/arm-versatile-reboot.c
new file mode 100644
index 000000000000..b2fca4678970
--- /dev/null
+++ b/drivers/power/reset/arm-versatile-reboot.c
@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2014 Linaro Ltd.
+ *
+ * Author: Linus Walleij <linus.walleij@linaro.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.
+ *
+ */
+#include <linux/init.h>
+#include <linux/mfd/syscon.h>
+#include <linux/reboot.h>
+#include <linux/regmap.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <asm/system_misc.h>
+
+#define REALVIEW_SYS_LOCK_OFFSET 0x20
+#define REALVIEW_SYS_LOCK_VAL 0xA05F
+#define REALVIEW_SYS_RESETCTL_OFFSET 0x40
+
+/*
+ * We detect the different syscon types from the compatible strings.
+ */
+enum versatile_reboot {
+ REALVIEW_REBOOT_EB,
+ REALVIEW_REBOOT_PB1176,
+ REALVIEW_REBOOT_PB11MP,
+ REALVIEW_REBOOT_PBA8,
+ REALVIEW_REBOOT_PBX,
+};
+
+/* Pointer to the system controller */
+static struct regmap *syscon_regmap;
+static enum versatile_reboot versatile_reboot_type;
+
+static const struct of_device_id versatile_reboot_of_match[] = {
+ {
+ .compatible = "arm,realview-eb-reboot",
+ .data = (void *)REALVIEW_REBOOT_EB,
+ },
+ {
+ .compatible = "arm,realview-pb1176-reboot",
+ .data = (void *)REALVIEW_REBOOT_PB1176,
+ },
+ {
+ .compatible = "arm,realview-pb11mp-reboot",
+ .data = (void *)REALVIEW_REBOOT_PB11MP,
+ },
+ {
+ .compatible = "arm,realview-pba8-reboot",
+ .data = (void *)REALVIEW_REBOOT_PBA8,
+ },
+ {
+ .compatible = "arm,realview-pbx-reboot",
+ .data = (void *)REALVIEW_REBOOT_PBX,
+ },
+};
+
+static void versatile_reboot(enum reboot_mode mode, const char *cmd)
+{
+ /* Unlock the reset register */
+ regmap_write(syscon_regmap, REALVIEW_SYS_LOCK_OFFSET,
+ REALVIEW_SYS_LOCK_VAL);
+ /* Then hit reset on the different machines */
+ switch (versatile_reboot_type) {
+ case REALVIEW_REBOOT_EB:
+ regmap_write(syscon_regmap,
+ REALVIEW_SYS_RESETCTL_OFFSET, 0x0008);
+ break;
+ case REALVIEW_REBOOT_PB1176:
+ regmap_write(syscon_regmap,
+ REALVIEW_SYS_RESETCTL_OFFSET, 0x0100);
+ break;
+ case REALVIEW_REBOOT_PB11MP:
+ case REALVIEW_REBOOT_PBA8:
+ regmap_write(syscon_regmap, REALVIEW_SYS_RESETCTL_OFFSET,
+ 0x0000);
+ regmap_write(syscon_regmap, REALVIEW_SYS_RESETCTL_OFFSET,
+ 0x0004);
+ break;
+ case REALVIEW_REBOOT_PBX:
+ regmap_write(syscon_regmap, REALVIEW_SYS_RESETCTL_OFFSET,
+ 0x00f0);
+ regmap_write(syscon_regmap, REALVIEW_SYS_RESETCTL_OFFSET,
+ 0x00f4);
+ break;
+ }
+ dsb();
+}
+
+static int versatile_reboot_probe(struct platform_device *pdev)
+{
+ const struct of_device_id *reboot_id;
+ struct device_node *np;
+
+ np = of_find_matching_node_and_match(NULL, versatile_reboot_of_match,
+ &reboot_id);
+ if (!np)
+ return -ENODEV;
+ versatile_reboot_type = (enum versatile_reboot)reboot_id->data;
+
+ syscon_regmap = syscon_regmap_lookup_by_phandle(pdev->dev.of_node,
+ "regmap");
+ if (IS_ERR(syscon_regmap))
+ return PTR_ERR(syscon_regmap);
+
+ arm_pm_restart = versatile_reboot;
+ dev_info(&pdev->dev, "versatile reboot driver registered\n");
+ return 0;
+}
+
+static struct platform_driver versatile_reboot_driver = {
+ .probe = versatile_reboot_probe,
+ .driver = {
+ .name = "realview-reboot",
+ .of_match_table = versatile_reboot_of_match,
+ },
+};
+module_platform_driver(versatile_reboot_driver);
--
1.9.3
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 4/6] power: reset: DT bindings for the Versatile reset driver
2014-07-25 13:23 [PATCH 0/6] ARM RealView DeviceTree support v4 Linus Walleij
` (2 preceding siblings ...)
2014-07-25 13:23 ` [PATCH 3/6] power: reset: driver for the Versatile syscon reboot Linus Walleij
@ 2014-07-25 13:23 ` Linus Walleij
2014-07-25 13:23 ` [PATCH 5/6] soc: add driver for the ARM RealView Linus Walleij
2014-07-25 13:23 ` [PATCH 6/6 v4] ARM: realview: basic device tree implementation Linus Walleij
5 siblings, 0 replies; 19+ messages in thread
From: Linus Walleij @ 2014-07-25 13:23 UTC (permalink / raw)
To: linux-arm-kernel
This adds the device tree bindings for the Versatile reset driver.
Cc: devicetree at vger.kernel.org
Cc: Sebastian Reichel <sre@kernel.org>
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
.../devicetree/bindings/reset/arm-versatile-reboot.txt | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 Documentation/devicetree/bindings/reset/arm-versatile-reboot.txt
diff --git a/Documentation/devicetree/bindings/reset/arm-versatile-reboot.txt b/Documentation/devicetree/bindings/reset/arm-versatile-reboot.txt
new file mode 100644
index 000000000000..fabb6cddf333
--- /dev/null
+++ b/Documentation/devicetree/bindings/reset/arm-versatile-reboot.txt
@@ -0,0 +1,18 @@
+ARM Versatile Family Reboot bindings
+
+Required nodes:
+
+- compatible: must be one of these to identify the system:
+ "arm,realview-eb-reboot"
+ "arm,realview-pb1176-reboot"
+ "arm,realview-pb11mp-reboot"
+ "arm,realview-pba8-reboot"
+ "arm,realview-pbx-reboot"
+- regmap : a phandle to a syscon node containing a regmap
+
+Example:
+
+reboot: reboot at 0x40 {
+ compatible = "arm,realview-pb1176-reboot";
+ regmap = <&syscon>;
+};
--
1.9.3
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 5/6] soc: add driver for the ARM RealView
2014-07-25 13:23 [PATCH 0/6] ARM RealView DeviceTree support v4 Linus Walleij
` (3 preceding siblings ...)
2014-07-25 13:23 ` [PATCH 4/6] power: reset: DT bindings for the Versatile reset driver Linus Walleij
@ 2014-07-25 13:23 ` Linus Walleij
2014-07-25 13:23 ` [PATCH 6/6 v4] ARM: realview: basic device tree implementation Linus Walleij
5 siblings, 0 replies; 19+ messages in thread
From: Linus Walleij @ 2014-07-25 13:23 UTC (permalink / raw)
To: linux-arm-kernel
This adds a SoC driver to be used by the ARM RealView
reference boards. We create the "versatile" directory to hold
the different ARM reference designs as per the pattern of the
clk directory layout. The driver utilze the syscon to get to
the register needed. After this we can use sysfs to get at
some SoC properties on RealView DT variants like this:
> cd /sysbus/soc/devices/soc0
> ls
board family machine power subsystem
build fpga manufacturer soc_id uevent
> cat family
Versatile
> cat fpga
Multi-layer AXI
> cat board
HBI-0147
> cat build
03
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/soc/Kconfig | 1 +
drivers/soc/Makefile | 1 +
drivers/soc/versatile/Kconfig | 10 +++
drivers/soc/versatile/Makefile | 1 +
drivers/soc/versatile/soc-realview.c | 144 +++++++++++++++++++++++++++++++++++
5 files changed, 157 insertions(+)
create mode 100644 drivers/soc/versatile/Kconfig
create mode 100644 drivers/soc/versatile/Makefile
create mode 100644 drivers/soc/versatile/soc-realview.c
diff --git a/drivers/soc/Kconfig b/drivers/soc/Kconfig
index c8543855aa82..6ed3590253cf 100644
--- a/drivers/soc/Kconfig
+++ b/drivers/soc/Kconfig
@@ -1,5 +1,6 @@
menu "SOC (System On Chip) specific Drivers"
source "drivers/soc/qcom/Kconfig"
+source "drivers/soc/versatile/Kconfig"
endmenu
diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
index 0f7c44793b29..9e9d0b6b63d3 100644
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@ -3,3 +3,4 @@
#
obj-$(CONFIG_ARCH_QCOM) += qcom/
+obj-$(CONFIG_PLAT_VERSATILE) += versatile/
diff --git a/drivers/soc/versatile/Kconfig b/drivers/soc/versatile/Kconfig
new file mode 100644
index 000000000000..bf5ee9c85330
--- /dev/null
+++ b/drivers/soc/versatile/Kconfig
@@ -0,0 +1,10 @@
+#
+# ARM Versatile SoC drivers
+#
+config SOC_REALVIEW
+ bool "SoC bus device for the ARM RealView platforms"
+ depends on ARCH_REALVIEW
+ select SOC_BUS
+ help
+ Include support for the SoC bus on the ARM RealView platforms
+ providing some sysfs information about the ASIC variant.
diff --git a/drivers/soc/versatile/Makefile b/drivers/soc/versatile/Makefile
new file mode 100644
index 000000000000..ad547435648e
--- /dev/null
+++ b/drivers/soc/versatile/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_SOC_REALVIEW) += soc-realview.o
diff --git a/drivers/soc/versatile/soc-realview.c b/drivers/soc/versatile/soc-realview.c
new file mode 100644
index 000000000000..cea8ea3491d2
--- /dev/null
+++ b/drivers/soc/versatile/soc-realview.c
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2014 Linaro Ltd.
+ *
+ * Author: Linus Walleij <linus.walleij@linaro.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.
+ *
+ */
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/slab.h>
+#include <linux/sys_soc.h>
+#include <linux/platform_device.h>
+#include <linux/mfd/syscon.h>
+#include <linux/regmap.h>
+#include <linux/of.h>
+
+/* System ID in syscon */
+#define REALVIEW_SYS_ID_OFFSET 0x00
+
+static const struct of_device_id realview_soc_of_match[] = {
+ { .compatible = "arm,realview-eb-soc", },
+ { .compatible = "arm,realview-pb1176-soc", },
+ { .compatible = "arm,realview-pb11mp-soc", },
+ { .compatible = "arm,realview-pba8-soc", },
+ { .compatible = "arm,realview-pbx-soc", },
+};
+
+static u32 realview_coreid;
+
+static const char *realview_board_str(u32 id)
+{
+ switch ((id >> 16) & 0xfff) {
+ case 0x0147:
+ return "HBI-0147";
+ default:
+ return "Unknown";
+ }
+}
+
+static const char *realview_arch_str(u32 id)
+{
+ switch ((id >> 8) & 0xf) {
+ case 0x05:
+ return "Multi-layer AXI";
+ default:
+ return "Unknown";
+ }
+}
+
+static ssize_t realview_get_manf(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ return sprintf(buf, "%02x\n", realview_coreid >> 24);
+}
+
+static struct device_attribute realview_manf_attr =
+ __ATTR(manufacturer, S_IRUGO, realview_get_manf, NULL);
+
+static ssize_t realview_get_board(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ return sprintf(buf, "%s\n", realview_board_str(realview_coreid));
+}
+
+static struct device_attribute realview_board_attr =
+ __ATTR(board, S_IRUGO, realview_get_board, NULL);
+
+static ssize_t realview_get_arch(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ return sprintf(buf, "%s\n", realview_arch_str(realview_coreid));
+}
+
+static struct device_attribute realview_arch_attr =
+ __ATTR(fpga, S_IRUGO, realview_get_arch, NULL);
+
+static ssize_t realview_get_build(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ return sprintf(buf, "%02x\n", (realview_coreid & 0xFF));
+}
+
+static struct device_attribute realview_build_attr =
+ __ATTR(build, S_IRUGO, realview_get_build, NULL);
+
+static int realview_soc_probe(struct platform_device *pdev)
+{
+ static struct regmap *syscon_regmap;
+ struct soc_device *soc_dev;
+ struct soc_device_attribute *soc_dev_attr;
+ struct device_node *np = pdev->dev.of_node;
+ int ret;
+
+ syscon_regmap = syscon_regmap_lookup_by_phandle(np, "regmap");
+ if (IS_ERR(syscon_regmap))
+ return PTR_ERR(syscon_regmap);
+
+ soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
+ if (!soc_dev_attr)
+ return -ENOMEM;
+
+ ret = of_property_read_string(np, "compatible",
+ &soc_dev_attr->soc_id);
+ if (ret)
+ return -EINVAL;
+
+ soc_dev_attr->machine = "RealView";
+ soc_dev_attr->family = "Versatile";
+ soc_dev = soc_device_register(soc_dev_attr);
+ if (IS_ERR(soc_dev)) {
+ kfree(soc_dev_attr);
+ return -ENODEV;
+ }
+ ret = regmap_read(syscon_regmap, REALVIEW_SYS_ID_OFFSET,
+ &realview_coreid);
+ if (ret)
+ return -ENODEV;
+
+ device_create_file(soc_device_to_device(soc_dev), &realview_manf_attr);
+ device_create_file(soc_device_to_device(soc_dev), &realview_board_attr);
+ device_create_file(soc_device_to_device(soc_dev), &realview_arch_attr);
+ device_create_file(soc_device_to_device(soc_dev), &realview_build_attr);
+
+ dev_info(&pdev->dev, "RealView Syscon Core ID: 0x%08x\n",
+ realview_coreid);
+ /* FIXME: add attributes for SoC to sysfs */
+ return 0;
+}
+
+static struct platform_driver realview_soc_driver = {
+ .probe = realview_soc_probe,
+ .driver = {
+ .name = "realview-soc",
+ .of_match_table = realview_soc_of_match,
+ },
+};
+module_platform_driver(realview_soc_driver);
--
1.9.3
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 6/6 v4] ARM: realview: basic device tree implementation
2014-07-25 13:23 [PATCH 0/6] ARM RealView DeviceTree support v4 Linus Walleij
` (4 preceding siblings ...)
2014-07-25 13:23 ` [PATCH 5/6] soc: add driver for the ARM RealView Linus Walleij
@ 2014-07-25 13:23 ` Linus Walleij
2014-07-25 15:24 ` Mark Rutland
5 siblings, 1 reply; 19+ messages in thread
From: Linus Walleij @ 2014-07-25 13:23 UTC (permalink / raw)
To: linux-arm-kernel
This implements basic device tree boot support for the RealView
platforms, with a basic device tree for ARM PB1176 as an example.
The implementation is done with a new DT-specific board file
using only pre-existing bindings for the basic IRQ, timer and
serial port drivers. A new compatible type is added to the GIC
for the ARM1176.
This implementation uses the MFD syscon handle from day one to
access the system controller registers, and register the devices
using the SoC bus.
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Rob Herring <robh@kernel.org>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ChangeLog v3->v4:
- Switch the LEDs to usa a new syscon-LEDs driver so we can
use the syscon as a hub for all these registers
- Split out the SoC driver to its own file in drivers/soc
ChangeLog v2->v3:
- Rename uart at 0x12345678 to serial at 0x12345678 in DTS file
- Drop static remapping for the LEDs, using my new invention
syscon-leds instead
- Drop the hunk selecting ARM_DMA_MEM_BUFFERABLE for the DT
version of the RealView platform. We think this is a local
optimization we can live without.
- Split off the reset driver to a separate syscon-based reset
driver in drivers/power/reset, add separate device tree
bindings for this driver.
- To make sure the reset driver is always available for this
system a few extra select statements are needed in Kconfig
- Split off the SoC bus driver to an easily identifiable chunk
inside the mach-realview/realview-dt.c file. This *can* be
spun off as a separate driver under drivers/soc for example
but we need some separate discussion on this subject.
- Augment the SoC driver to display some system info so it's
clear why this driver is there.
- Drop surplus string "with device tree" from machine
description in the DTS file.
- Move the new GIC compatible string in alphabetic order.
ChangeLog v1->v2:
- Adjust timer clock names to be the same as the example in the
device tree binding.
- Remove all memory fixup code - this should be handled by the
device tree specification of memory areas or by special MM hacks
for the RealView PBX.
- Fix the documentation around syscon to specify that it can be in
any node, need not be the root node.
- Switch device tree license to the BSD license, taken from
arch/powerpc/boot/dts/p1024rdb_32b.dts
- Add a hunk for the new compatible string to
Documentation/devicetree/bindings/arm/gic.txt
- Move the clocks out of the SoC node, certainly the xtal is not
sitting on the SoC...
- Sort the selects in Kconfig alphabetically
- Use IS_ENABLED() for the l2x0 code snippet
- Instead of checking the board variant in the reset routine to
figure out how to tweak the reset controller, have a compatible
string for each syscon variant, map it to an enum that provides a
unique type ID and that way figure out how to handle it in a maybe
more elegant way.
- Open issue: what do to with the l2x0 stuff?
---
Documentation/devicetree/bindings/arm/arm-boards | 66 +++++++
Documentation/devicetree/bindings/arm/gic.txt | 1 +
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/arm-realview-pb1176.dts | 240 +++++++++++++++++++++++
arch/arm/mach-realview/Kconfig | 13 ++
arch/arm/mach-realview/Makefile | 1 +
arch/arm/mach-realview/realview-dt.c | 72 +++++++
drivers/irqchip/irq-gic.c | 1 +
8 files changed, 395 insertions(+)
create mode 100644 arch/arm/boot/dts/arm-realview-pb1176.dts
create mode 100644 arch/arm/mach-realview/realview-dt.c
diff --git a/Documentation/devicetree/bindings/arm/arm-boards b/Documentation/devicetree/bindings/arm/arm-boards
index 3509707f9320..d2399e6f1378 100644
--- a/Documentation/devicetree/bindings/arm/arm-boards
+++ b/Documentation/devicetree/bindings/arm/arm-boards
@@ -86,3 +86,69 @@ Interrupt controllers:
compatible = "arm,versatile-sic";
interrupt-controller;
#interrupt-cells = <1>;
+
+
+ARM RealView Boards
+-------------------
+The RealView boards cover tailored evaluation boards that are used to explore
+the ARM11 and Cortex A-8 and Cortex A-9 processors.
+
+Required properties (in root node):
+ /* RealView Emulation Baseboard */
+ compatible = "arm,realview-eb";
+ /* RealView Platform Baseboard for ARM1176JZF-S */
+ compatible = "arm,realview-pb1176";
+ /* RealView Platform Baseboard for ARM11 MPCore */
+ compatible = "arm,realview-pb11mp";
+ /* RealView Platform Baseboard for Cortex A-8 */
+ compatible = "arm,realview-pba8";
+ /* RealView Platform Baseboard Explore for Cortex A-9 */
+ compatible = "arm,realview-pbx";
+
+Required nodes:
+
+- soc: some node of the RealView platforms must be the SoC
+ node that contain the SoC-specific devices, withe the compatible
+ string set to one of these tuples:
+ "simple-bus", "arm,realview-eb-soc"
+ "simple-bus", "arm,realview-pb1176-soc"
+ "simple-bus", "arm,realview-pb11mp-soc"
+ "simple-bus", "arm,realview-pba8-soc"
+ "simple-bus", "arm,realview-pbx-soc"
+
+- syscon: some subnode of the RealView SoC node must be a
+ system controller node pointing to the control registers,
+ with the compatible string set to one of these tuples:
+ "arm,realview-eb-syscon", "syscon"
+ "arm,realview-pb1176-syscon", "syscon"
+ "arm,realview-pb11mp-syscon", "syscon"
+ "arm,realview-pba8-syscon", "syscon"
+ "arm,realview-pbx-syscon", "syscon"
+
+ Required properties for the system controller:
+ - regs: the location and size of the system controller registers,
+ one range of 0x1000 bytes.
+
+Example:
+
+/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+#include "skeleton.dtsi"
+
+/ {
+ model = "ARM RealView PB1176 with device tree";
+ compatible = "arm,realview-pb1176";
+
+ soc {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "simple-bus", "arm,realview-pb1176-soc";
+ ranges;
+
+ syscon: syscon at 10000000 {
+ compatible = "arm,realview-syscon", "syscon";
+ reg = <0x10000000 0x1000>;
+ };
+
+ };
+};
diff --git a/Documentation/devicetree/bindings/arm/gic.txt b/Documentation/devicetree/bindings/arm/gic.txt
index 5573c08d3180..539420194efd 100644
--- a/Documentation/devicetree/bindings/arm/gic.txt
+++ b/Documentation/devicetree/bindings/arm/gic.txt
@@ -16,6 +16,7 @@ Main node required properties:
"arm,cortex-a9-gic"
"arm,cortex-a7-gic"
"arm,arm11mp-gic"
+ "arm,arm1176jzf-gic"
- interrupt-controller : Identifies the node as an interrupt controller
- #interrupt-cells : Specifies the number of cells needed to encode an
interrupt source. The type shall be a <u32> and the value shall be 3.
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index adb5ed9e269e..0a02ff749750 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -318,6 +318,7 @@ dtb-$(CONFIG_ARCH_QCOM) += \
qcom-apq8084-mtp.dtb \
qcom-msm8660-surf.dtb \
qcom-msm8960-cdp.dtb
+dtb-$(CONFIG_ARCH_REALVIEW) += arm-realview-pb1176.dtb
dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \
s3c6410-smdk6410.dtb
diff --git a/arch/arm/boot/dts/arm-realview-pb1176.dts b/arch/arm/boot/dts/arm-realview-pb1176.dts
new file mode 100644
index 000000000000..d80d0af24fa6
--- /dev/null
+++ b/arch/arm/boot/dts/arm-realview-pb1176.dts
@@ -0,0 +1,240 @@
+/*
+ * Copyright 2014 Linaro Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+#include "skeleton.dtsi"
+
+/ {
+ model = "ARM RealView PB1176";
+ compatible = "arm,realview-pb1176";
+
+ chosen { };
+
+ aliases {
+ serial0 = &pb1176_serial0;
+ serial1 = &pb1176_serial1;
+ serial2 = &pb1176_serial2;
+ serial3 = &pb1176_serial3;
+ };
+
+ memory {
+ /* 128 MiB memory @ 0x0 */
+ reg = <0x00000000 0x08000000>;
+ };
+
+ xtal24mhz: xtal24mhz at 24M {
+ #clock-cells = <0>;
+ compatible = "fixed-clock";
+ clock-frequency = <24000000>;
+ };
+
+ timclk: timclk at 1M {
+ #clock-cells = <0>;
+ compatible = "fixed-factor-clock";
+ clock-div = <24>;
+ clock-mult = <1>;
+ clocks = <&xtal24mhz>;
+ };
+
+ uartclk: uartclk at 24M {
+ #clock-cells = <0>;
+ compatible = "fixed-factor-clock";
+ clock-div = <1>;
+ clock-mult = <1>;
+ clocks = <&xtal24mhz>;
+ };
+
+ /* FIXME: this actually hangs off the PLL clocks */
+ pclk: pclk at 0 {
+ #clock-cells = <0>;
+ compatible = "fixed-clock";
+ clock-frequency = <0>;
+ };
+
+ soc {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "simple-bus", "arm,realview-pb1176-soc";
+ regmap = <&syscon>;
+ ranges;
+
+ syscon: syscon at 10000000 {
+ compatible = "arm,realview-pb1176-syscon", "syscon";
+ reg = <0x10000000 0x1000>;
+ };
+
+ reboot: reboot at 0x40 {
+ compatible = "arm,realview-pb1176-reboot";
+ regmap = <&syscon>;
+ };
+
+ leds: leds at 08 {
+ compatible = "syscon-leds";
+ regmap = <&syscon>;
+
+ led at bit0 {
+ offset = <0x08>;
+ mask = <0x01>;
+ label = "versatile:0";
+ linux,default-trigger = "heartbeat";
+ default-state = "on";
+ };
+ led at bit1 {
+ offset = <0x08>;
+ mask = <0x02>;
+ label = "versatile:1";
+ linux,default-trigger = "mmc0";
+ default-state = "off";
+ };
+ led at bit2 {
+ offset = <0x08>;
+ mask = <0x04>;
+ label = "versatile:2";
+ linux,default-trigger = "cpu0";
+ default-state = "off";
+ };
+ led at bit3 {
+ offset = <0x08>;
+ mask = <0x08>;
+ label = "versatile:3";
+ default-state = "off";
+ };
+ led at bit4 {
+ offset = <0x08>;
+ mask = <0x10>;
+ label = "versatile:4";
+ default-state = "off";
+ };
+ led at bit5 {
+ offset = <0x08>;
+ mask = <0x20>;
+ label = "versatile:5";
+ default-state = "off";
+ };
+ led at bit6 {
+ offset = <0x08>;
+ mask = <0x40>;
+ label = "versatile:6";
+ default-state = "off";
+ };
+ led at bit7 {
+ offset = <0x08>;
+ mask = <0x80>;
+ label = "versatile:7";
+ default-state = "off";
+ };
+ };
+
+ /* Primary DevChip GIC synthesized with the CPU */
+ intc_dc1176: interrupt-controller at 10120000 {
+ compatible = "arm,arm1176jzf-gic";
+ #interrupt-cells = <3>;
+ #address-cells = <1>;
+ interrupt-controller;
+ reg = <0x10121000 0x1000>,
+ <0x10120000 0x100>;
+ };
+
+ /* This GIC on the board is cascaded off the DevChip GIC */
+ intc_pb1176: interrupt-controller at 10040000 {
+ compatible = "arm,arm1176jzf-gic";
+ #interrupt-cells = <3>;
+ #address-cells = <1>;
+ interrupt-controller;
+ reg = <0x10041000 0x1000>,
+ <0x10040000 0x100>;
+ interrupt-parent = <&intc_dc1176>;
+ interrupts = <0 31 IRQ_TYPE_LEVEL_HIGH>;
+ };
+
+ L2: l2-cache {
+ compatible = "arm,l220-cache";
+ reg = <0x10110000 0x1000>;
+ interrupt-parent = <&intc_dc1176>;
+ interrupts = <0 13 IRQ_TYPE_LEVEL_HIGH>;
+ cache-unified;
+ cache-level = <2>;
+ };
+
+ pmu {
+ compatible = "arm,arm1176-pmu";
+ interrupt-parent = <&intc_dc1176>;
+ interrupts = <0 7 IRQ_TYPE_LEVEL_HIGH>;
+ };
+
+ timer01: timer at 10104000 {
+ compatible = "arm,sp804", "arm,primecell";
+ reg = <0x10104000 0x1000>;
+ interrupt-parent = <&intc_dc1176>;
+ interrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>, <0 9 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&timclk>, <&timclk>, <&pclk>;
+ clock-names = "timer1", "timer2", "apb_pclk";
+ };
+
+ timer23: timer at 10105000 {
+ compatible = "arm,sp804", "arm,primecell";
+ reg = <0x10105000 0x1000>;
+ interrupt-parent = <&intc_dc1176>;
+ interrupts = <0 10 IRQ_TYPE_LEVEL_HIGH>;
+ arm,sp804-has-irq = <1>;
+ clocks = <&timclk>, <&timclk>, <&pclk>;
+ clock-names = "timer1", "timer2", "apb_pclk";
+ };
+
+ pb1176_serial0: serial at 1010c000 {
+ compatible = "arm,pl011", "arm,primecell";
+ reg = <0x1010c000 0x1000>;
+ interrupt-parent = <&intc_dc1176>;
+ interrupts = <0 18 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&uartclk>, <&pclk>;
+ clock-names = "uartclk", "apb_pclk";
+ };
+
+ pb1176_serial1: serial at 1010d000 {
+ compatible = "arm,pl011", "arm,primecell";
+ reg = <0x1010d000 0x1000>;
+ interrupt-parent = <&intc_dc1176>;
+ interrupts = <0 19 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&uartclk>, <&pclk>;
+ clock-names = "uartclk", "apb_pclk";
+ };
+
+ pb1176_serial2: serial at 1010e000 {
+ compatible = "arm,pl011", "arm,primecell";
+ reg = <0x1010e000 0x1000>;
+ interrupt-parent = <&intc_dc1176>;
+ interrupts = <0 20 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&uartclk>, <&pclk>;
+ clock-names = "uartclk", "apb_pclk";
+ };
+
+ pb1176_serial3: serial at 1010f000 {
+ compatible = "arm,pl011", "arm,primecell";
+ reg = <0x1010f000 0x1000>;
+ interrupt-parent = <&intc_dc1176>;
+ interrupts = <0 21 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&uartclk>, <&pclk>;
+ clock-names = "uartclk", "apb_pclk";
+ };
+ };
+};
diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig
index 9db2029aa632..565925f37dc5 100644
--- a/arch/arm/mach-realview/Kconfig
+++ b/arch/arm/mach-realview/Kconfig
@@ -1,6 +1,19 @@
menu "RealView platform type"
depends on ARCH_REALVIEW
+config REALVIEW_DT
+ bool "Support RealView(R) Device Tree based boot"
+ select ARM_GIC
+ select MFD_SYSCON
+ select POWER_RESET
+ select POWER_RESET_VERSATILE
+ select POWER_SUPPLY
+ select SOC_REALVIEW
+ select USE_OF
+ help
+ Include support for booting the ARM(R) RealView(R) evaluation
+ boards using a device tree machine description.
+
config MACH_REALVIEW_EB
bool "Support RealView(R) Emulation Baseboard"
select ARM_GIC
diff --git a/arch/arm/mach-realview/Makefile b/arch/arm/mach-realview/Makefile
index 541fa4c109ef..e07fdf7ae8a7 100644
--- a/arch/arm/mach-realview/Makefile
+++ b/arch/arm/mach-realview/Makefile
@@ -3,6 +3,7 @@
#
obj-y := core.o
+obj-$(CONFIG_REALVIEW_DT) += realview-dt.o
obj-$(CONFIG_MACH_REALVIEW_EB) += realview_eb.o
obj-$(CONFIG_MACH_REALVIEW_PB11MP) += realview_pb11mp.o
obj-$(CONFIG_MACH_REALVIEW_PB1176) += realview_pb1176.o
diff --git a/arch/arm/mach-realview/realview-dt.c b/arch/arm/mach-realview/realview-dt.c
new file mode 100644
index 000000000000..ebee421e1a10
--- /dev/null
+++ b/arch/arm/mach-realview/realview-dt.c
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2014 Linaro Ltd.
+ *
+ * Author: Linus Walleij <linus.walleij@linaro.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.
+ *
+ */
+#include <linux/of_platform.h>
+#include <asm/mach/arch.h>
+#include <asm/hardware/cache-l2x0.h>
+#include "core.h"
+
+static void __init realview_dt_init_machine(void)
+{
+ int ret;
+
+#if IS_ENABLED(CONFIG_CACHE_L2X0)
+ if (of_machine_is_compatible("arm,realview-eb"))
+ /*
+ * 1MB (128KB/way), 8-way associativity,
+ * evmon/parity/share enabled
+ * Bits: .... ...0 0111 1001 0000 .... .... ....
+ */
+ l2x0_of_init(0x00790000, 0xfe000fff);
+ else if (of_machine_is_compatible("arm,realview-pb1176"))
+ /*
+ * 128Kb (16Kb/way) 8-way associativity.
+ * evmon/parity/share enabled.
+ */
+ l2x0_of_init(0x00730000, 0xfe000fff);
+ else if (of_machine_is_compatible("arm,realview-pb11mp"))
+ /*
+ * 1MB (128KB/way), 8-way associativity,
+ * evmon/parity/share enabled
+ * Bits: .... ...0 0111 1001 0000 .... .... ....
+ */
+ l2x0_of_init(0x00730000, 0xfe000fff);
+ else if (of_machine_is_compatible("arm,realview-pbx"))
+ /*
+ * 16KB way size, 8-way associativity, parity disabled
+ * Bits: .. 0 0 0 0 1 00 1 0 1 001 0 000 0 .... .... ....
+ */
+ l2x0_of_init(0x02520000, 0xc0000fff);
+#endif
+
+ ret = of_platform_populate(NULL, of_default_bus_match_table,
+ NULL, NULL);
+ if (ret) {
+ pr_crit("could not populate device tree\n");
+ return;
+ }
+}
+
+static const char *realview_dt_platform_compat[] __initconst = {
+ "arm,realview-eb",
+ "arm,realview-pb1176",
+ "arm,realview-pb11mp",
+ "arm,realview-pba8",
+ "arm,realview-pbx",
+ NULL,
+};
+
+DT_MACHINE_START(REALVIEW_DT, "ARM RealView Machine (Device Tree Support)")
+ .init_machine = realview_dt_init_machine,
+#ifdef CONFIG_ZONE_DMA
+ .dma_zone_size = SZ_256M,
+#endif
+ .dt_compat = realview_dt_platform_compat,
+MACHINE_END
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index 7c131cf7cc13..8f2e1a97a92a 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -1075,6 +1075,7 @@ gic_of_init(struct device_node *node, struct device_node *parent)
return 0;
}
IRQCHIP_DECLARE(gic_400, "arm,gic-400", gic_of_init);
+IRQCHIP_DECLARE(arm1176jzf_gic, "arm,arm1176jzf-gic", gic_of_init);
IRQCHIP_DECLARE(cortex_a15_gic, "arm,cortex-a15-gic", gic_of_init);
IRQCHIP_DECLARE(cortex_a9_gic, "arm,cortex-a9-gic", gic_of_init);
IRQCHIP_DECLARE(cortex_a7_gic, "arm,cortex-a7-gic", gic_of_init);
--
1.9.3
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 6/6 v4] ARM: realview: basic device tree implementation
2014-07-25 13:23 ` [PATCH 6/6 v4] ARM: realview: basic device tree implementation Linus Walleij
@ 2014-07-25 15:24 ` Mark Rutland
2014-07-25 15:50 ` Russell King - ARM Linux
2014-09-01 11:52 ` Linus Walleij
0 siblings, 2 replies; 19+ messages in thread
From: Mark Rutland @ 2014-07-25 15:24 UTC (permalink / raw)
To: linux-arm-kernel
Hi Linus,
On Fri, Jul 25, 2014 at 02:23:48PM +0100, Linus Walleij wrote:
> This implements basic device tree boot support for the RealView
> platforms, with a basic device tree for ARM PB1176 as an example.
>
> The implementation is done with a new DT-specific board file
> using only pre-existing bindings for the basic IRQ, timer and
> serial port drivers. A new compatible type is added to the GIC
> for the ARM1176.
>
> This implementation uses the MFD syscon handle from day one to
> access the system controller registers, and register the devices
> using the SoC bus.
>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Rob Herring <robh@kernel.org>
> Acked-by: Jason Cooper <jason@lakedaemon.net>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> ChangeLog v3->v4:
> - Switch the LEDs to usa a new syscon-LEDs driver so we can
> use the syscon as a hub for all these registers
> - Split out the SoC driver to its own file in drivers/soc
> ChangeLog v2->v3:
> - Rename uart at 0x12345678 to serial at 0x12345678 in DTS file
> - Drop static remapping for the LEDs, using my new invention
> syscon-leds instead
> - Drop the hunk selecting ARM_DMA_MEM_BUFFERABLE for the DT
> version of the RealView platform. We think this is a local
> optimization we can live without.
> - Split off the reset driver to a separate syscon-based reset
> driver in drivers/power/reset, add separate device tree
> bindings for this driver.
> - To make sure the reset driver is always available for this
> system a few extra select statements are needed in Kconfig
> - Split off the SoC bus driver to an easily identifiable chunk
> inside the mach-realview/realview-dt.c file. This *can* be
> spun off as a separate driver under drivers/soc for example
> but we need some separate discussion on this subject.
> - Augment the SoC driver to display some system info so it's
> clear why this driver is there.
> - Drop surplus string "with device tree" from machine
> description in the DTS file.
> - Move the new GIC compatible string in alphabetic order.
> ChangeLog v1->v2:
> - Adjust timer clock names to be the same as the example in the
> device tree binding.
> - Remove all memory fixup code - this should be handled by the
> device tree specification of memory areas or by special MM hacks
> for the RealView PBX.
> - Fix the documentation around syscon to specify that it can be in
> any node, need not be the root node.
> - Switch device tree license to the BSD license, taken from
> arch/powerpc/boot/dts/p1024rdb_32b.dts
> - Add a hunk for the new compatible string to
> Documentation/devicetree/bindings/arm/gic.txt
> - Move the clocks out of the SoC node, certainly the xtal is not
> sitting on the SoC...
> - Sort the selects in Kconfig alphabetically
> - Use IS_ENABLED() for the l2x0 code snippet
> - Instead of checking the board variant in the reset routine to
> figure out how to tweak the reset controller, have a compatible
> string for each syscon variant, map it to an enum that provides a
> unique type ID and that way figure out how to handle it in a maybe
> more elegant way.
> - Open issue: what do to with the l2x0 stuff?
> ---
> Documentation/devicetree/bindings/arm/arm-boards | 66 +++++++
> Documentation/devicetree/bindings/arm/gic.txt | 1 +
> arch/arm/boot/dts/Makefile | 1 +
> arch/arm/boot/dts/arm-realview-pb1176.dts | 240 +++++++++++++++++++++++
> arch/arm/mach-realview/Kconfig | 13 ++
> arch/arm/mach-realview/Makefile | 1 +
> arch/arm/mach-realview/realview-dt.c | 72 +++++++
> drivers/irqchip/irq-gic.c | 1 +
> 8 files changed, 395 insertions(+)
> create mode 100644 arch/arm/boot/dts/arm-realview-pb1176.dts
> create mode 100644 arch/arm/mach-realview/realview-dt.c
>
> diff --git a/Documentation/devicetree/bindings/arm/arm-boards b/Documentation/devicetree/bindings/arm/arm-boards
> index 3509707f9320..d2399e6f1378 100644
> --- a/Documentation/devicetree/bindings/arm/arm-boards
> +++ b/Documentation/devicetree/bindings/arm/arm-boards
> @@ -86,3 +86,69 @@ Interrupt controllers:
> compatible = "arm,versatile-sic";
> interrupt-controller;
> #interrupt-cells = <1>;
> +
> +
> +ARM RealView Boards
> +-------------------
> +The RealView boards cover tailored evaluation boards that are used to explore
> +the ARM11 and Cortex A-8 and Cortex A-9 processors.
> +
> +Required properties (in root node):
> + /* RealView Emulation Baseboard */
> + compatible = "arm,realview-eb";
> + /* RealView Platform Baseboard for ARM1176JZF-S */
> + compatible = "arm,realview-pb1176";
> + /* RealView Platform Baseboard for ARM11 MPCore */
> + compatible = "arm,realview-pb11mp";
> + /* RealView Platform Baseboard for Cortex A-8 */
> + compatible = "arm,realview-pba8";
> + /* RealView Platform Baseboard Explore for Cortex A-9 */
> + compatible = "arm,realview-pbx";
> +
> +Required nodes:
> +
> +- soc: some node of the RealView platforms must be the SoC
> + node that contain the SoC-specific devices, withe the compatible
> + string set to one of these tuples:
> + "simple-bus", "arm,realview-eb-soc"
> + "simple-bus", "arm,realview-pb1176-soc"
> + "simple-bus", "arm,realview-pb11mp-soc"
> + "simple-bus", "arm,realview-pba8-soc"
> + "simple-bus", "arm,realview-pbx-soc"
If you have simple-bus in a compatible list, it should come last. The
list is meant to go from most specific to least specific.
That'll need to be swapped in the example and dts too.
[...]
> + soc {
> + #address-cells = <1>;
> + #size-cells = <1>;
> + compatible = "simple-bus", "arm,realview-pb1176-soc";
> + regmap = <&syscon>;
> + ranges;
> +
> + syscon: syscon at 10000000 {
> + compatible = "arm,realview-pb1176-syscon", "syscon";
> + reg = <0x10000000 0x1000>;
> + };
> +
> + reboot: reboot at 0x40 {
> + compatible = "arm,realview-pb1176-reboot";
> + regmap = <&syscon>;
> + };
What's the @0x40 for?
Why don't we just have a property on the arm,realview-pb1176-syscon node
to say it can do reset (or just assume that it can)?
This looks like a leak of Linux internals, this isn't really a device.
[...]
> + /* Primary DevChip GIC synthesized with the CPU */
> + intc_dc1176: interrupt-controller at 10120000 {
> + compatible = "arm,arm1176jzf-gic";
As far as I am aware, the JZF flags haven nothing to do with the GIC
implementation. I think they can be dropped from this string (following
the example of "arm,arm1176-pmu").
> + #interrupt-cells = <3>;
> + #address-cells = <1>;
> + interrupt-controller;
> + reg = <0x10121000 0x1000>,
> + <0x10120000 0x100>;
> + };
> +
> + /* This GIC on the board is cascaded off the DevChip GIC */
> + intc_pb1176: interrupt-controller at 10040000 {
> + compatible = "arm,arm1176jzf-gic";
And this isn't part of the CPU, so that string doesn't look right. I'd
at least like to see an additional string earlier in the list
> + #interrupt-cells = <3>;
> + #address-cells = <1>;
> + interrupt-controller;
> + reg = <0x10041000 0x1000>,
> + <0x10040000 0x100>;
> + interrupt-parent = <&intc_dc1176>;
> + interrupts = <0 31 IRQ_TYPE_LEVEL_HIGH>;
> + };
[...]
> +static void __init realview_dt_init_machine(void)
> +{
> + int ret;
> +
> +#if IS_ENABLED(CONFIG_CACHE_L2X0)
> + if (of_machine_is_compatible("arm,realview-eb"))
> + /*
> + * 1MB (128KB/way), 8-way associativity,
> + * evmon/parity/share enabled
> + * Bits: .... ...0 0111 1001 0000 .... .... ....
> + */
> + l2x0_of_init(0x00790000, 0xfe000fff);
> + else if (of_machine_is_compatible("arm,realview-pb1176"))
> + /*
> + * 128Kb (16Kb/way) 8-way associativity.
> + * evmon/parity/share enabled.
> + */
> + l2x0_of_init(0x00730000, 0xfe000fff);
> + else if (of_machine_is_compatible("arm,realview-pb11mp"))
> + /*
> + * 1MB (128KB/way), 8-way associativity,
> + * evmon/parity/share enabled
> + * Bits: .... ...0 0111 1001 0000 .... .... ....
> + */
> + l2x0_of_init(0x00730000, 0xfe000fff);
> + else if (of_machine_is_compatible("arm,realview-pbx"))
> + /*
> + * 16KB way size, 8-way associativity, parity disabled
> + * Bits: .. 0 0 0 0 1 00 1 0 1 001 0 000 0 .... .... ....
> + */
> + l2x0_of_init(0x02520000, 0xc0000fff);
> +#endif
Are these just copied form what we already have for non-DT?
Do we know that these are all necessary?
> +DT_MACHINE_START(REALVIEW_DT, "ARM RealView Machine (Device Tree Support)")
As a general point, we seem to have so many different ways of formatting
this, and we should standardise.
Thanks,
Mark.
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH 6/6 v4] ARM: realview: basic device tree implementation
2014-07-25 15:24 ` Mark Rutland
@ 2014-07-25 15:50 ` Russell King - ARM Linux
2014-07-25 15:58 ` Arnd Bergmann
2014-09-01 11:52 ` Linus Walleij
1 sibling, 1 reply; 19+ messages in thread
From: Russell King - ARM Linux @ 2014-07-25 15:50 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Jul 25, 2014 at 04:24:02PM +0100, Mark Rutland wrote:
> Hi Linus,
>
> On Fri, Jul 25, 2014 at 02:23:48PM +0100, Linus Walleij wrote:
> > +static void __init realview_dt_init_machine(void)
> > +{
> > + int ret;
> > +
> > +#if IS_ENABLED(CONFIG_CACHE_L2X0)
> > + if (of_machine_is_compatible("arm,realview-eb"))
> > + /*
> > + * 1MB (128KB/way), 8-way associativity,
> > + * evmon/parity/share enabled
> > + * Bits: .... ...0 0111 1001 0000 .... .... ....
> > + */
> > + l2x0_of_init(0x00790000, 0xfe000fff);
> > + else if (of_machine_is_compatible("arm,realview-pb1176"))
> > + /*
> > + * 128Kb (16Kb/way) 8-way associativity.
> > + * evmon/parity/share enabled.
> > + */
> > + l2x0_of_init(0x00730000, 0xfe000fff);
> > + else if (of_machine_is_compatible("arm,realview-pb11mp"))
> > + /*
> > + * 1MB (128KB/way), 8-way associativity,
> > + * evmon/parity/share enabled
> > + * Bits: .... ...0 0111 1001 0000 .... .... ....
> > + */
> > + l2x0_of_init(0x00730000, 0xfe000fff);
> > + else if (of_machine_is_compatible("arm,realview-pbx"))
> > + /*
> > + * 16KB way size, 8-way associativity, parity disabled
> > + * Bits: .. 0 0 0 0 1 00 1 0 1 001 0 000 0 .... .... ....
> > + */
> > + l2x0_of_init(0x02520000, 0xc0000fff);
> > +#endif
>
> Are these just copied form what we already have for non-DT?
>
> Do we know that these are all necessary?
It is necessary to provide the cache sizes on Realview because the
older L2C210/L2C220 do not have a method of encoding that information
in the register - and given that ARM doesn't seem to like shipping
Linux compatible boot loaders on their eval hardware, we can't really
say that it should be dealt with there.
I toyed with the idea of adding the standard cache size specifications
to the L2C code, it sounds like there's a reason to do that now.
Let's not mess around with adding stuff like the above to work around
the L2 code not parsing the appropriate specs from DT, let's do the
right thing and add bindings to allow DT to provide the cache geometry.
--
FTTC broadband for 0.8mile line: currently at 9.5Mbps down 400kbps up
according to speedtest.net.
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH 6/6 v4] ARM: realview: basic device tree implementation
2014-07-25 15:50 ` Russell King - ARM Linux
@ 2014-07-25 15:58 ` Arnd Bergmann
2014-09-01 12:03 ` Russell King - ARM Linux
0 siblings, 1 reply; 19+ messages in thread
From: Arnd Bergmann @ 2014-07-25 15:58 UTC (permalink / raw)
To: linux-arm-kernel
On Friday 25 July 2014 16:50:10 Russell King - ARM Linux wrote:
>
> I toyed with the idea of adding the standard cache size specifications
> to the L2C code, it sounds like there's a reason to do that now.
>
> Let's not mess around with adding stuff like the above to work around
> the L2 code not parsing the appropriate specs from DT, let's do the
> right thing and add bindings to allow DT to provide the cache geometry.
Yes, please!
That would actually reduce the realview to just the dma_zone_size
definition, and I think someone also posted a patch to get that from
DT recently. Having realview booting with an empty board file would
be ideal.
Arnd
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 6/6 v4] ARM: realview: basic device tree implementation
2014-07-25 15:58 ` Arnd Bergmann
@ 2014-09-01 12:03 ` Russell King - ARM Linux
2014-09-01 12:11 ` Arnd Bergmann
0 siblings, 1 reply; 19+ messages in thread
From: Russell King - ARM Linux @ 2014-09-01 12:03 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Jul 25, 2014 at 05:58:24PM +0200, Arnd Bergmann wrote:
> On Friday 25 July 2014 16:50:10 Russell King - ARM Linux wrote:
> >
> > I toyed with the idea of adding the standard cache size specifications
> > to the L2C code, it sounds like there's a reason to do that now.
> >
> > Let's not mess around with adding stuff like the above to work around
> > the L2 code not parsing the appropriate specs from DT, let's do the
> > right thing and add bindings to allow DT to provide the cache geometry.
>
> Yes, please!
>
> That would actually reduce the realview to just the dma_zone_size
> definition, and I think someone also posted a patch to get that from
> DT recently. Having realview booting with an empty board file would
> be ideal.
I did have a patch in my L2C cleanup series to provide these properties,
but it got discarded - even though we have existing platforms which
provide these values.
The reason for that was because requiring new properties causes a DT
breakage - previous versions of the DT suddenly stop working because
the values necessary to setup the L2C have been removed from the
kernel, and the older DT files do not contain the neccessary values
either.
--
FTTC broadband for 0.8mile line: currently at 9.5Mbps down 400kbps up
according to speedtest.net.
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 6/6 v4] ARM: realview: basic device tree implementation
2014-09-01 12:03 ` Russell King - ARM Linux
@ 2014-09-01 12:11 ` Arnd Bergmann
0 siblings, 0 replies; 19+ messages in thread
From: Arnd Bergmann @ 2014-09-01 12:11 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 01 September 2014 13:03:13 Russell King - ARM Linux wrote:
> On Fri, Jul 25, 2014 at 05:58:24PM +0200, Arnd Bergmann wrote:
> > On Friday 25 July 2014 16:50:10 Russell King - ARM Linux wrote:
> > >
> > > I toyed with the idea of adding the standard cache size specifications
> > > to the L2C code, it sounds like there's a reason to do that now.
> > >
> > > Let's not mess around with adding stuff like the above to work around
> > > the L2 code not parsing the appropriate specs from DT, let's do the
> > > right thing and add bindings to allow DT to provide the cache geometry.
> >
> > Yes, please!
> >
> > That would actually reduce the realview to just the dma_zone_size
> > definition, and I think someone also posted a patch to get that from
> > DT recently. Having realview booting with an empty board file would
> > be ideal.
>
> I did have a patch in my L2C cleanup series to provide these properties,
> but it got discarded - even though we have existing platforms which
> provide these values.
>
> The reason for that was because requiring new properties causes a DT
> breakage - previous versions of the DT suddenly stop working because
> the values necessary to setup the L2C have been removed from the
> kernel, and the older DT files do not contain the neccessary values
> either.
But in case of realview or any other platform that does not have
mainline DT support, nothing would break. There is no need to remove
the settings from the kernel, I would just prefer not to add any
other ones.
Arnd
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 6/6 v4] ARM: realview: basic device tree implementation
2014-07-25 15:24 ` Mark Rutland
2014-07-25 15:50 ` Russell King - ARM Linux
@ 2014-09-01 11:52 ` Linus Walleij
2014-09-01 12:17 ` Mark Rutland
1 sibling, 1 reply; 19+ messages in thread
From: Linus Walleij @ 2014-09-01 11:52 UTC (permalink / raw)
To: linux-arm-kernel
Some ARM1176JZF confusion in as separate thread...
On Fri, Jul 25, 2014 at 5:24 PM, Mark Rutland <mark.rutland@arm.com> wrote:
> On Fri, Jul 25, 2014 at 02:23:48PM +0100, Linus Walleij wrote:
>> + /* Primary DevChip GIC synthesized with the CPU */
>> + intc_dc1176: interrupt-controller at 10120000 {
>> + compatible = "arm,arm1176jzf-gic";
>
> As far as I am aware, the JZF flags haven nothing to do with the GIC
> implementation. I think they can be dropped from this string (following
> the example of "arm,arm1176-pmu").
FWIW I changed the string to "arm,arm1176-gic"
But this isn't about the CPU actually. It is the ARM1176JZF development
chip. See:
http://infocenter.arm.com/help/topic/com.arm.doc.ddi0375a/DDI0375A_arm1176jzf_dev_chip_r0p0_trm.pdf
I know it is confusingly named as a name of a SoC that has this
CPU inside it but what can I do ... some guys named ARM came
up with this.
Should use the string "arm,arm1176jzf-devchip-gic"?
>> + /* This GIC on the board is cascaded off the DevChip GIC */
>> + intc_pb1176: interrupt-controller at 10040000 {
>> + compatible = "arm,arm1176jzf-gic";
>
> And this isn't part of the CPU, so that string doesn't look right. I'd
> at least like to see an additional string earlier in the list
This seems to be a follow-on to the above confusion.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH 6/6 v4] ARM: realview: basic device tree implementation
2014-09-01 11:52 ` Linus Walleij
@ 2014-09-01 12:17 ` Mark Rutland
2014-09-01 12:27 ` Linus Walleij
0 siblings, 1 reply; 19+ messages in thread
From: Mark Rutland @ 2014-09-01 12:17 UTC (permalink / raw)
To: linux-arm-kernel
Hi Linus,
On Mon, Sep 01, 2014 at 12:52:49PM +0100, Linus Walleij wrote:
> Some ARM1176JZF confusion in as separate thread...
>
> On Fri, Jul 25, 2014 at 5:24 PM, Mark Rutland <mark.rutland@arm.com> wrote:
> > On Fri, Jul 25, 2014 at 02:23:48PM +0100, Linus Walleij wrote:
>
> >> + /* Primary DevChip GIC synthesized with the CPU */
> >> + intc_dc1176: interrupt-controller at 10120000 {
> >> + compatible = "arm,arm1176jzf-gic";
> >
> > As far as I am aware, the JZF flags haven nothing to do with the GIC
> > implementation. I think they can be dropped from this string (following
> > the example of "arm,arm1176-pmu").
>
> FWIW I changed the string to "arm,arm1176-gic"
Ok.
> But this isn't about the CPU actually. It is the ARM1176JZF development
> chip. See:
> http://infocenter.arm.com/help/topic/com.arm.doc.ddi0375a/DDI0375A_arm1176jzf_dev_chip_r0p0_trm.pdf
>
> I know it is confusingly named as a name of a SoC that has this
> CPU inside it but what can I do ... some guys named ARM came
> up with this.
Ah, I see. Sorry for the confusion there.
> Should use the string "arm,arm1176jzf-devchip-gic"?
That sounds fine to me.
The document you've linked to says the GIC is derived from the MPCore
GIC, so I'd place "arm,arm11mp-gic" as a fallback entry in the
compatible list. Until we need to distinguish the two the driver
shouldn't need to be updated.
>
> >> + /* This GIC on the board is cascaded off the DevChip GIC */
> >> + intc_pb1176: interrupt-controller at 10040000 {
> >> + compatible = "arm,arm1176jzf-gic";
> >
> > And this isn't part of the CPU, so that string doesn't look right. I'd
> > at least like to see an additional string earlier in the list
>
> This seems to be a follow-on to the above confusion.
Yup.
Thanks,
Mark.
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH 6/6 v4] ARM: realview: basic device tree implementation
2014-09-01 12:17 ` Mark Rutland
@ 2014-09-01 12:27 ` Linus Walleij
2014-09-01 12:44 ` Mark Rutland
0 siblings, 1 reply; 19+ messages in thread
From: Linus Walleij @ 2014-09-01 12:27 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Sep 1, 2014 at 2:17 PM, Mark Rutland <mark.rutland@arm.com> wrote:
> On Mon, Sep 01, 2014 at 12:52:49PM +0100, Linus Walleij wrote:
>> Should use the string "arm,arm1176jzf-devchip-gic"?
>
> That sounds fine to me.
>
> The document you've linked to says the GIC is derived from the MPCore
> GIC, so I'd place "arm,arm11mp-gic" as a fallback entry in the
> compatible list. Until we need to distinguish the two the driver
> shouldn't need to be updated.
Well the driver doesn't have a IRQCHIP_DECLARE() for arm11mp-gic
either so I'll have to add that instead.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 6/6 v4] ARM: realview: basic device tree implementation
2014-09-01 12:27 ` Linus Walleij
@ 2014-09-01 12:44 ` Mark Rutland
0 siblings, 0 replies; 19+ messages in thread
From: Mark Rutland @ 2014-09-01 12:44 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Sep 01, 2014 at 01:27:17PM +0100, Linus Walleij wrote:
> On Mon, Sep 1, 2014 at 2:17 PM, Mark Rutland <mark.rutland@arm.com> wrote:
> > On Mon, Sep 01, 2014 at 12:52:49PM +0100, Linus Walleij wrote:
>
> >> Should use the string "arm,arm1176jzf-devchip-gic"?
> >
> > That sounds fine to me.
> >
> > The document you've linked to says the GIC is derived from the MPCore
> > GIC, so I'd place "arm,arm11mp-gic" as a fallback entry in the
> > compatible list. Until we need to distinguish the two the driver
> > shouldn't need to be updated.
>
> Well the driver doesn't have a IRQCHIP_DECLARE() for arm11mp-gic
> either so I'll have to add that instead.
Sorry, I's assumed that because it was documented the driver already
supported it. I should know better ;)
let's add an IRQCHIP_DECLARE for both "arm,arm1176jzf-devchip-gic" and
"arm,arm11mp-gic" (given it was already documented), so as to make
things less painful.
Thanks,
Mark.
^ permalink raw reply [flat|nested] 19+ messages in thread