* [PATCHv2 0/4] ARM: bcm2835: add support for rpi power domain driver
@ 2015-11-29 16:59 Alexander Aring
2015-11-29 16:59 ` [PATCHv2 1/4] power: domain: add pm_genpd_exit Alexander Aring
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Alexander Aring @ 2015-11-29 16:59 UTC (permalink / raw
To: linux-rpi-kernel
Cc: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, swarren,
lee, eric, linux, f.fainelli, rjui, sbranden, rjw, khilman,
ulf.hansson, len.brown, pavel, gregkh, devicetree,
linux-arm-kernel, bcm-kernel-feedback-list, linux-pm, kernel,
Alexander Aring
Hi,
this patch series contains at first a patch for the power domain subsystem
which offers to exit generic power domains when init was called before.
The RPi Power-Domains need to be enabled/disabled by interacting with the
RPi firmware which can fail. To cleanup the probing we need to undo the
power domains again which was registered before.
- Alex
changes since PATCHv2:
- rename pm_genpd_uninit to pm_genpd_exit. I adapted here a review note
from another patch. Usually kernel naming style is like "foobar_init"
and "foobar_exit" but rarely "uninit". That's why I don't add the ack
from Ulf Hansson here.
- split dtsi updates into a separate patch.
- remove testing steps from commit message.
- change to "depends on ARCH_BCM2835 || COMPILE_TEST".
- Add Rob Herring ack.
- Add Eric Anholt sob.
changes since PATCH (was RFCv2 before):
- add WARN_ON_ONCE if there are still references from generic power domain
inside the power domain subsystem when running pm_genpd_uninit.
- add mutex_destroy when running pm_genpd_uninit.
- split devicetree binding for rpi power domain driver into a separate patch.
- rename config RASPBERRY_POWER to RASPBERRYPI_POWER
- order list of <linux/...> includes alphabetical.
- use rpi_ prefix than raspberrypi_ prefix.
- rename _DT_BINDINGS_ARM_BCM2835_MBOX_POWER_H to _DT_BINDINGS_ARM_BCM2835_RPI_POWER_H
changes since RFCv2:
- add pm_genpd_uninit to handle probing failure.
- move power domain drive to his own driver in arch/arm/mach-bcm/
Also add own devicetree node for this driver, "raspberrypi,bcm2835-power".
- Removing all power domains which might exists for the firmware API but
we currently have no use-case for it. I tried to keep the same domain
numbering in generic power domains subsystem like they are offered from
the firmware API. This works, all power_domains which are NULL inside
the array of genpd_onecell_data.domains[#] will be ignored.
- Adding Eric Anholt and me to the authors.
- Creating devicetree documentation for the power domain driver.
- fix error handling in raspberrypi_firmware_set_power.
- Remove comment about mapping between power domains array, this is not
necessary anymore. I add a "enabled" attribute to raspberrypi_power_domain
which indicates if a domain should be registered or not (zeroed values
does not indicate such handling, but enabled is false then).
- remove "goto mbox" not necessary anymore because an own driver
implementation.
- Update devicetrees for changes in v2.
Alexander Aring (4):
power: domain: add pm_genpd_exit
ARM: bcm2835: add rpi power domain driver
devicetree: add rpi power domain driver bindings
ARM: bcm2835: update rpi devicetree entries
.../bindings/arm/bcm/raspberrypi,bcm2835-power.txt | 25 +++
arch/arm/boot/dts/bcm2835-rpi.dtsi | 11 ++
arch/arm/boot/dts/bcm2835.dtsi | 2 +-
arch/arm/mach-bcm/Kconfig | 10 ++
arch/arm/mach-bcm/Makefile | 1 +
arch/arm/mach-bcm/raspberrypi-power.c | 180 +++++++++++++++++++++
drivers/base/power/domain.c | 22 +++
include/dt-bindings/arm/raspberrypi-power.h | 14 ++
include/linux/pm_domain.h | 4 +
9 files changed, 268 insertions(+), 1 deletion(-)
create mode 100644 Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-power.txt
create mode 100644 arch/arm/mach-bcm/raspberrypi-power.c
create mode 100644 include/dt-bindings/arm/raspberrypi-power.h
--
2.6.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCHv2 1/4] power: domain: add pm_genpd_exit
2015-11-29 16:59 [PATCHv2 0/4] ARM: bcm2835: add support for rpi power domain driver Alexander Aring
@ 2015-11-29 16:59 ` Alexander Aring
2015-11-30 9:38 ` Ulf Hansson
2015-11-29 16:59 ` [PATCHv2 2/4] ARM: bcm2835: add rpi power domain driver Alexander Aring
[not found] ` <1448816373-18235-1-git-send-email-alex.aring-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2 siblings, 1 reply; 9+ messages in thread
From: Alexander Aring @ 2015-11-29 16:59 UTC (permalink / raw
To: linux-rpi-kernel
Cc: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, swarren,
lee, eric, linux, f.fainelli, rjui, sbranden, rjw, khilman,
ulf.hansson, len.brown, pavel, gregkh, devicetree,
linux-arm-kernel, bcm-kernel-feedback-list, linux-pm, kernel,
Alexander Aring
This patch adds function pm_genpd_exit for undo a pm_genpd_init. This
is useful for multiple power domains while probing. If the probing fails
after one pm_genpd_init was called we need to undo all previous
registrations of generic pm domains inside the gpd_list list.
There is a check on IS_ERR_OR_NULL(genpd) which is useful to check again
registered power domains and not registered domains, the driver can use
this mechanism to have an array with registered and non-registered power
domains, where non-registered power domains are NULL.
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Kevin Hilman <khilman@kernel.org>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Len Brown <len.brown@intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
drivers/base/power/domain.c | 22 ++++++++++++++++++++++
include/linux/pm_domain.h | 4 ++++
2 files changed, 26 insertions(+)
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index e03b1ad..311cb0e 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -1509,6 +1509,28 @@ void pm_genpd_init(struct generic_pm_domain *genpd,
}
EXPORT_SYMBOL_GPL(pm_genpd_init);
+/**
+ * pm_genpd_exit - Uninitialize a generic I/O PM domain object.
+ * @genpd: PM domain object to uninitialize.
+ */
+void pm_genpd_exit(struct generic_pm_domain *genpd)
+{
+ if (IS_ERR_OR_NULL(genpd))
+ return;
+
+ /* check if domain is still in registered inside the pm subsystem */
+ WARN_ON_ONCE(!list_empty(&genpd->master_links) ||
+ !list_empty(&genpd->slave_links) ||
+ !list_empty(&genpd->dev_list));
+
+ mutex_lock(&gpd_list_lock);
+ list_del(&genpd->gpd_list_node);
+ mutex_unlock(&gpd_list_lock);
+
+ mutex_destroy(&genpd->lock);
+}
+EXPORT_SYMBOL_GPL(pm_genpd_exit);
+
#ifdef CONFIG_PM_GENERIC_DOMAINS_OF
/*
* Device Tree based PM domain providers.
diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
index ba4ced3..5020b36 100644
--- a/include/linux/pm_domain.h
+++ b/include/linux/pm_domain.h
@@ -123,6 +123,7 @@ extern int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd,
struct generic_pm_domain *target);
extern void pm_genpd_init(struct generic_pm_domain *genpd,
struct dev_power_governor *gov, bool is_off);
+extern void pm_genpd_exit(struct generic_pm_domain *genpd);
extern struct dev_power_governor simple_qos_governor;
extern struct dev_power_governor pm_domain_always_on_gov;
@@ -161,6 +162,9 @@ static inline void pm_genpd_init(struct generic_pm_domain *genpd,
struct dev_power_governor *gov, bool is_off)
{
}
+static inline void pm_genpd_exit(struct generic_pm_domain *genpd)
+{
+}
#endif
static inline int pm_genpd_add_device(struct generic_pm_domain *genpd,
--
2.6.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCHv2 2/4] ARM: bcm2835: add rpi power domain driver
2015-11-29 16:59 [PATCHv2 0/4] ARM: bcm2835: add support for rpi power domain driver Alexander Aring
2015-11-29 16:59 ` [PATCHv2 1/4] power: domain: add pm_genpd_exit Alexander Aring
@ 2015-11-29 16:59 ` Alexander Aring
[not found] ` <1448816373-18235-3-git-send-email-alex.aring-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
[not found] ` <1448816373-18235-1-git-send-email-alex.aring-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2 siblings, 1 reply; 9+ messages in thread
From: Alexander Aring @ 2015-11-29 16:59 UTC (permalink / raw
To: linux-rpi-kernel
Cc: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, swarren,
lee, eric, linux, f.fainelli, rjui, sbranden, rjw, khilman,
ulf.hansson, len.brown, pavel, gregkh, devicetree,
linux-arm-kernel, bcm-kernel-feedback-list, linux-pm, kernel,
Alexander Aring
This patch adds support for RPi several Power Domains and enable support
to enable the USB Power Domain when it's not enabled before.
This patch based on Eric Anholt's patch to support Power Domains. He had
an issue about -EPROBE_DEFER inside the power domain subsystem, this
issue was solved by commit <311fa6a> ("PM / Domains: Return -EPROBE_DEFER
if we fail to init or turn-on domain").
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Lee Jones <lee@kernel.org>
Cc: Eric Anholt <eric@anholt.net>
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
---
arch/arm/mach-bcm/Kconfig | 10 ++
arch/arm/mach-bcm/Makefile | 1 +
arch/arm/mach-bcm/raspberrypi-power.c | 180 ++++++++++++++++++++++++++++
include/dt-bindings/arm/raspberrypi-power.h | 14 +++
4 files changed, 205 insertions(+)
create mode 100644 arch/arm/mach-bcm/raspberrypi-power.c
create mode 100644 include/dt-bindings/arm/raspberrypi-power.h
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index 8c53c55..0f23bad 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -134,6 +134,16 @@ config ARCH_BCM2835
This enables support for the Broadcom BCM2835 SoC. This SoC is
used in the Raspberry Pi and Roku 2 devices.
+config RASPBERRYPI_POWER
+ bool "Raspberry Pi power domain driver"
+ depends on ARCH_BCM2835 || COMPILE_TEST
+ depends on RASPBERRYPI_FIRMWARE
+ select PM_GENERIC_DOMAINS if PM
+ select PM_GENERIC_DOMAINS_OF if PM
+ help
+ This enables support for the RPi power domains which can be enabled
+ or disabled via the RPi firmware.
+
config ARCH_BCM_63XX
bool "Broadcom BCM63xx DSL SoC" if ARCH_MULTI_V7
depends on MMU
diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile
index 892261f..fec2d6b 100644
--- a/arch/arm/mach-bcm/Makefile
+++ b/arch/arm/mach-bcm/Makefile
@@ -36,6 +36,7 @@ endif
# BCM2835
obj-$(CONFIG_ARCH_BCM2835) += board_bcm2835.o
+obj-$(CONFIG_RASPBERRYPI_POWER) += raspberrypi-power.o
# BCM5301X
obj-$(CONFIG_ARCH_BCM_5301X) += bcm_5301x.o
diff --git a/arch/arm/mach-bcm/raspberrypi-power.c b/arch/arm/mach-bcm/raspberrypi-power.c
new file mode 100644
index 0000000..3b61f18
--- /dev/null
+++ b/arch/arm/mach-bcm/raspberrypi-power.c
@@ -0,0 +1,180 @@
+/*
+ * 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.
+ *
+ * Authors:
+ * (C) 2015 Pengutronix, Alexander Aring <aar@pengutronix.de>
+ * Eric Anholt <eric@anholt.net>
+ */
+
+#include <linux/module.h>
+#include <linux/of_platform.h>
+#include <linux/platform_device.h>
+#include <linux/pm_domain.h>
+#include <dt-bindings/arm/raspberrypi-power.h>
+#include <soc/bcm2835/raspberrypi-firmware.h>
+
+#define RPI_POWER_DOMAIN(_domain, _name) \
+ [_domain] = { \
+ .domain = _domain, \
+ .enabled = true, \
+ .base = { \
+ .name = _name, \
+ .power_off = rpi_domain_off, \
+ .power_on = rpi_domain_on, \
+ }, \
+ }
+
+struct rpi_power_domain {
+ u32 domain;
+ bool enabled;
+ struct generic_pm_domain base;
+};
+
+struct rpi_power_domain_packet {
+ u32 domain;
+ u32 on;
+} __packet;
+
+static struct rpi_firmware *fw;
+static struct genpd_onecell_data rpi_genpd_xlate;
+
+/*
+ * Asks the firmware to enable or disable power on a specific power
+ * domain.
+ */
+static int rpi_firmware_set_power(u32 domain, bool on)
+{
+ struct rpi_power_domain_packet packet;
+
+ packet.domain = domain;
+ packet.on = on;
+ return rpi_firmware_property(fw, RPI_FIRMWARE_SET_POWER_STATE, &packet,
+ sizeof(packet));
+}
+
+/* Asks the firmware to if power is on for a specific power domain. */
+static int rpi_firmware_power_is_on(u32 domain)
+{
+ struct rpi_power_domain_packet packet;
+ int ret;
+
+ packet.domain = domain;
+ ret = rpi_firmware_property(fw, RPI_FIRMWARE_GET_POWER_STATE, &packet,
+ sizeof(packet));
+ if (ret < 0)
+ return ret;
+
+ return packet.on & BIT(0);
+}
+
+static int rpi_domain_off(struct generic_pm_domain *domain)
+{
+ struct rpi_power_domain *rpi_domain =
+ container_of(domain, struct rpi_power_domain, base);
+
+ return rpi_firmware_set_power(rpi_domain->domain, false);
+}
+
+static int rpi_domain_on(struct generic_pm_domain *domain)
+{
+ struct rpi_power_domain *rpi_domain =
+ container_of(domain, struct rpi_power_domain, base);
+
+ return rpi_firmware_set_power(rpi_domain->domain, true);
+}
+
+static struct rpi_power_domain rpi_power_domains[] = {
+ RPI_POWER_DOMAIN(RPI_POWER_DOMAIN_USB, "USB"),
+};
+
+static int rpi_power_probe(struct platform_device *pdev)
+{
+ struct device_node *fw_np;
+ struct device *dev = &pdev->dev;
+ struct generic_pm_domain **power_domains;
+ int i, ret, num_domains = ARRAY_SIZE(rpi_power_domains);
+
+ fw_np = of_parse_phandle(pdev->dev.of_node, "firmware", 0);
+ if (!fw_np) {
+ dev_err(&pdev->dev, "no firmware node\n");
+ return -ENODEV;
+ }
+
+ fw = rpi_firmware_get(fw_np);
+ if (!fw)
+ return -EPROBE_DEFER;
+
+ power_domains = devm_kzalloc(dev, sizeof(*power_domains) * num_domains,
+ GFP_KERNEL);
+ if (!power_domains)
+ return -ENOMEM;
+
+ rpi_genpd_xlate.domains = power_domains;
+ rpi_genpd_xlate.num_domains = num_domains;
+
+ for (i = 0; i < num_domains; i++) {
+ bool is_off;
+
+ if (!rpi_power_domains[i].enabled)
+ continue;
+
+ /* get the initial state */
+ ret = rpi_firmware_power_is_on(rpi_power_domains[i].domain);
+ if (ret < 0)
+ goto exit_pm;
+
+ /* pm_genpd_init needs is_off, invert the logic here */
+ is_off = !ret;
+ pm_genpd_init(&rpi_power_domains[i].base, NULL, is_off);
+ /* let power_domains array know about the registered pm */
+ power_domains[i] = &rpi_power_domains[i].base;
+ }
+
+ ret = of_genpd_add_provider_onecell(dev->of_node, &rpi_genpd_xlate);
+ if (ret < 0)
+ goto exit_pm;
+
+ return 0;
+
+exit_pm:
+ for (i = 0; i < num_domains; i++)
+ pm_genpd_exit(power_domains[i]);
+
+ return ret;
+}
+
+static int rpi_power_remove(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ int i;
+
+ for (i = 0; i < rpi_genpd_xlate.num_domains; i++)
+ pm_genpd_exit(rpi_genpd_xlate.domains[i]);
+
+ of_genpd_del_provider(dev->of_node);
+
+ return 0;
+}
+
+static const struct of_device_id rpi_power_of_match[] = {
+ { .compatible = "raspberrypi,bcm2835-power", },
+ {},
+};
+MODULE_DEVICE_TABLE(of, rpi_power_of_match);
+
+static struct platform_driver rpi_power_driver = {
+ .driver = {
+ .name = "raspberrypi-power",
+ .of_match_table = rpi_power_of_match,
+ },
+ .probe = rpi_power_probe,
+ .remove = rpi_power_remove,
+};
+module_platform_driver(rpi_power_driver);
+
+MODULE_AUTHOR("Alexander Aring <aar@pengutronix.de>");
+MODULE_AUTHOR("Eric Anholt <eric@anholt.net>");
+MODULE_DESCRIPTION("Raspberry Pi power domain driver");
+MODULE_LICENSE("GPL v2");
diff --git a/include/dt-bindings/arm/raspberrypi-power.h b/include/dt-bindings/arm/raspberrypi-power.h
new file mode 100644
index 0000000..c2ffbebc
--- /dev/null
+++ b/include/dt-bindings/arm/raspberrypi-power.h
@@ -0,0 +1,14 @@
+/*
+ * Copyright © 2015 Broadcom
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef _DT_BINDINGS_ARM_BCM2835_RPI_POWER_H
+#define _DT_BINDINGS_ARM_BCM2835_RPI_POWER_H
+
+#define RPI_POWER_DOMAIN_USB 3
+
+#endif /* _DT_BINDINGS_ARM_BCM2835_RPI_POWER_H */
--
2.6.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCHv2 3/4] devicetree: add rpi power domain driver bindings
[not found] ` <1448816373-18235-1-git-send-email-alex.aring-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
@ 2015-11-29 16:59 ` Alexander Aring
2015-11-30 22:09 ` Eric Anholt
2015-11-29 16:59 ` [PATCHv2 4/4] ARM: bcm2835: update rpi devicetree entries Alexander Aring
1 sibling, 1 reply; 9+ messages in thread
From: Alexander Aring @ 2015-11-29 16:59 UTC (permalink / raw
To: linux-rpi-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
Cc: robh+dt-DgEjT+Ai2ygdnm+yROfE0A, pawel.moll-5wv7dgnIgG8,
mark.rutland-5wv7dgnIgG8, ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg,
galak-sgV2jX0FEOL9JmXXK+q4OQ, swarren-3lzwWm7+Weoh9ZMKESR00Q,
lee-DgEjT+Ai2ygdnm+yROfE0A, eric-WhKQ6XTQaPysTnJN9+BGXg,
linux-lFZ/pmaqli7XmaaqVzeoHQ, f.fainelli-Re5JQEeQqe8AvxtiuMwx3w,
rjui-dY08KVG/lbpWk0Htik3J/w, sbranden-dY08KVG/lbpWk0Htik3J/w,
rjw-LthD3rsA81gm4RdzfppkhA, khilman-DgEjT+Ai2ygdnm+yROfE0A,
ulf.hansson-QSEj5FYQhm4dnm+yROfE0A,
len.brown-ral2JQCrhuEAvxtiuMwx3w, pavel-+ZI9xUNit7I,
gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
bcm-kernel-feedback-list-dY08KVG/lbpWk0Htik3J/w,
linux-pm-u79uwXL29TY76Z2rM5mHXA, kernel-bIcnvbaLZ9MEGnE8C9+IrQ,
Alexander Aring
This patch adds devicetree tree bindings for the Raspberry Pi power
domain driver.
Signed-off-by: Alexander Aring <alex.aring-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
---
.../bindings/arm/bcm/raspberrypi,bcm2835-power.txt | 25 ++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-power.txt
diff --git a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-power.txt b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-power.txt
new file mode 100644
index 0000000..c3abc24
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-power.txt
@@ -0,0 +1,25 @@
+Raspberry Pi power domain driver
+
+Required properties:
+
+- compatible: Should be "raspberrypi,bcm2835-power".
+- firmware: Reference to the RPi firmware device node.
+- #power-domain-cells: Should be <1>, we providing multiple power domains.
+
+The valid defines for power domain are:
+
+ RPI_POWER_DOMAIN_USB
+
+Example:
+
+power: power {
+ compatible = "raspberrypi,bcm2835-power";
+ firmware = <&firmware>;
+ #power-domain-cells = <1>;
+};
+
+Example for using power domain:
+
+&usb {
+ power-domains = <&power RPI_POWER_DOMAIN_USB>;
+};
--
2.6.1
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCHv2 4/4] ARM: bcm2835: update rpi devicetree entries
[not found] ` <1448816373-18235-1-git-send-email-alex.aring-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-11-29 16:59 ` [PATCHv2 3/4] devicetree: add rpi power domain driver bindings Alexander Aring
@ 2015-11-29 16:59 ` Alexander Aring
2015-11-30 22:09 ` Eric Anholt
1 sibling, 1 reply; 9+ messages in thread
From: Alexander Aring @ 2015-11-29 16:59 UTC (permalink / raw
To: linux-rpi-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
Cc: robh+dt-DgEjT+Ai2ygdnm+yROfE0A, pawel.moll-5wv7dgnIgG8,
mark.rutland-5wv7dgnIgG8, ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg,
galak-sgV2jX0FEOL9JmXXK+q4OQ, swarren-3lzwWm7+Weoh9ZMKESR00Q,
lee-DgEjT+Ai2ygdnm+yROfE0A, eric-WhKQ6XTQaPysTnJN9+BGXg,
linux-lFZ/pmaqli7XmaaqVzeoHQ, f.fainelli-Re5JQEeQqe8AvxtiuMwx3w,
rjui-dY08KVG/lbpWk0Htik3J/w, sbranden-dY08KVG/lbpWk0Htik3J/w,
rjw-LthD3rsA81gm4RdzfppkhA, khilman-DgEjT+Ai2ygdnm+yROfE0A,
ulf.hansson-QSEj5FYQhm4dnm+yROfE0A,
len.brown-ral2JQCrhuEAvxtiuMwx3w, pavel-+ZI9xUNit7I,
gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
bcm-kernel-feedback-list-dY08KVG/lbpWk0Htik3J/w,
linux-pm-u79uwXL29TY76Z2rM5mHXA, kernel-bIcnvbaLZ9MEGnE8C9+IrQ,
Alexander Aring
This patch updates the Raspberry Pi devicetree bindings to support the
power domain driver and enable the USB power domain.
Signed-off-by: Alexander Aring <alex.aring-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
arch/arm/boot/dts/bcm2835-rpi.dtsi | 11 +++++++++++
arch/arm/boot/dts/bcm2835.dtsi | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
index 3572f03..f828202 100644
--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
@@ -1,3 +1,4 @@
+#include <dt-bindings/arm/raspberrypi-power.h>
#include "bcm2835.dtsi"
/ {
@@ -20,6 +21,12 @@
compatible = "raspberrypi,bcm2835-firmware";
mboxes = <&mailbox>;
};
+
+ power: power {
+ compatible = "raspberrypi,bcm2835-power";
+ firmware = <&firmware>;
+ #power-domain-cells = <1>;
+ };
};
};
@@ -60,3 +67,7 @@
status = "okay";
bus-width = <4>;
};
+
+&usb {
+ power-domains = <&power RPI_POWER_DOMAIN_USB>;
+};
diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi
index aef64de..6d62af0 100644
--- a/arch/arm/boot/dts/bcm2835.dtsi
+++ b/arch/arm/boot/dts/bcm2835.dtsi
@@ -177,7 +177,7 @@
status = "disabled";
};
- usb@7e980000 {
+ usb: usb@7e980000 {
compatible = "brcm,bcm2835-usb";
reg = <0x7e980000 0x10000>;
interrupts = <1 9>;
--
2.6.1
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCHv2 1/4] power: domain: add pm_genpd_exit
2015-11-29 16:59 ` [PATCHv2 1/4] power: domain: add pm_genpd_exit Alexander Aring
@ 2015-11-30 9:38 ` Ulf Hansson
0 siblings, 0 replies; 9+ messages in thread
From: Ulf Hansson @ 2015-11-30 9:38 UTC (permalink / raw
To: Alexander Aring
Cc: linux-rpi-kernel, Rob Herring, Paweł Moll, Mark Rutland,
Ian Campbell, Kumar Gala, Stephen Warren, Lee Jones, Eric Anholt,
Russell King - ARM Linux, Florian Fainelli, Ray Jui,
Scott Branden, Rafael J. Wysocki, Kevin Hilman, Len Brown,
Pavel Machek, Greg Kroah-Hartman, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, bcm-kernel-feedback-list,
linux-pm
On 29 November 2015 at 17:59, Alexander Aring <alex.aring@gmail.com> wrote:
> This patch adds function pm_genpd_exit for undo a pm_genpd_init. This
> is useful for multiple power domains while probing. If the probing fails
> after one pm_genpd_init was called we need to undo all previous
> registrations of generic pm domains inside the gpd_list list.
>
> There is a check on IS_ERR_OR_NULL(genpd) which is useful to check again
> registered power domains and not registered domains, the driver can use
> this mechanism to have an array with registered and non-registered power
> domains, where non-registered power domains are NULL.
>
> Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
> Cc: Kevin Hilman <khilman@kernel.org>
> Cc: Ulf Hansson <ulf.hansson@linaro.org>
> Cc: Pavel Machek <pavel@ucw.cz>
> Cc: Len Brown <len.brown@intel.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Kind regards
Uffe
> ---
> drivers/base/power/domain.c | 22 ++++++++++++++++++++++
> include/linux/pm_domain.h | 4 ++++
> 2 files changed, 26 insertions(+)
>
> diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
> index e03b1ad..311cb0e 100644
> --- a/drivers/base/power/domain.c
> +++ b/drivers/base/power/domain.c
> @@ -1509,6 +1509,28 @@ void pm_genpd_init(struct generic_pm_domain *genpd,
> }
> EXPORT_SYMBOL_GPL(pm_genpd_init);
>
> +/**
> + * pm_genpd_exit - Uninitialize a generic I/O PM domain object.
> + * @genpd: PM domain object to uninitialize.
> + */
> +void pm_genpd_exit(struct generic_pm_domain *genpd)
> +{
> + if (IS_ERR_OR_NULL(genpd))
> + return;
> +
> + /* check if domain is still in registered inside the pm subsystem */
> + WARN_ON_ONCE(!list_empty(&genpd->master_links) ||
> + !list_empty(&genpd->slave_links) ||
> + !list_empty(&genpd->dev_list));
> +
> + mutex_lock(&gpd_list_lock);
> + list_del(&genpd->gpd_list_node);
> + mutex_unlock(&gpd_list_lock);
> +
> + mutex_destroy(&genpd->lock);
> +}
> +EXPORT_SYMBOL_GPL(pm_genpd_exit);
> +
> #ifdef CONFIG_PM_GENERIC_DOMAINS_OF
> /*
> * Device Tree based PM domain providers.
> diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
> index ba4ced3..5020b36 100644
> --- a/include/linux/pm_domain.h
> +++ b/include/linux/pm_domain.h
> @@ -123,6 +123,7 @@ extern int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd,
> struct generic_pm_domain *target);
> extern void pm_genpd_init(struct generic_pm_domain *genpd,
> struct dev_power_governor *gov, bool is_off);
> +extern void pm_genpd_exit(struct generic_pm_domain *genpd);
>
> extern struct dev_power_governor simple_qos_governor;
> extern struct dev_power_governor pm_domain_always_on_gov;
> @@ -161,6 +162,9 @@ static inline void pm_genpd_init(struct generic_pm_domain *genpd,
> struct dev_power_governor *gov, bool is_off)
> {
> }
> +static inline void pm_genpd_exit(struct generic_pm_domain *genpd)
> +{
> +}
> #endif
>
> static inline int pm_genpd_add_device(struct generic_pm_domain *genpd,
> --
> 2.6.1
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCHv2 4/4] ARM: bcm2835: update rpi devicetree entries
2015-11-29 16:59 ` [PATCHv2 4/4] ARM: bcm2835: update rpi devicetree entries Alexander Aring
@ 2015-11-30 22:09 ` Eric Anholt
0 siblings, 0 replies; 9+ messages in thread
From: Eric Anholt @ 2015-11-30 22:09 UTC (permalink / raw
To: linux-rpi-kernel
Cc: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, swarren,
lee, linux, f.fainelli, rjui, sbranden, rjw, khilman, ulf.hansson,
len.brown, pavel, gregkh, devicetree, linux-arm-kernel,
bcm-kernel-feedback-list, linux-pm, kernel, Alexander Aring
[-- Attachment #1: Type: text/plain, Size: 275 bytes --]
Alexander Aring <alex.aring@gmail.com> writes:
> This patch updates the Raspberry Pi devicetree bindings to support the
> power domain driver and enable the USB power domain.
>
> Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Acked-by: Eric Anholt <eric@anholt.net>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCHv2 3/4] devicetree: add rpi power domain driver bindings
2015-11-29 16:59 ` [PATCHv2 3/4] devicetree: add rpi power domain driver bindings Alexander Aring
@ 2015-11-30 22:09 ` Eric Anholt
0 siblings, 0 replies; 9+ messages in thread
From: Eric Anholt @ 2015-11-30 22:09 UTC (permalink / raw
To: linux-rpi-kernel
Cc: mark.rutland, ulf.hansson, devicetree, Alexander Aring, pavel,
f.fainelli, linux, khilman, lee, bcm-kernel-feedback-list,
len.brown, pawel.moll, swarren, rjui, robh+dt, linux-arm-kernel,
ijc+devicetree, sbranden, gregkh, linux-pm, rjw, kernel, galak
[-- Attachment #1.1: Type: text/plain, Size: 276 bytes --]
Alexander Aring <alex.aring@gmail.com> writes:
> This patch adds devicetree tree bindings for the Raspberry Pi power
> domain driver.
>
> Signed-off-by: Alexander Aring <alex.aring@gmail.com>
> Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Eric Anholt <eric@anholt.net>
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCHv2 2/4] ARM: bcm2835: add rpi power domain driver
[not found] ` <1448816373-18235-3-git-send-email-alex.aring-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
@ 2015-11-30 22:12 ` Eric Anholt
0 siblings, 0 replies; 9+ messages in thread
From: Eric Anholt @ 2015-11-30 22:12 UTC (permalink / raw
To: linux-rpi-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
Cc: robh+dt-DgEjT+Ai2ygdnm+yROfE0A, pawel.moll-5wv7dgnIgG8,
mark.rutland-5wv7dgnIgG8, ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg,
galak-sgV2jX0FEOL9JmXXK+q4OQ, swarren-3lzwWm7+Weoh9ZMKESR00Q,
lee-DgEjT+Ai2ygdnm+yROfE0A, linux-lFZ/pmaqli7XmaaqVzeoHQ,
f.fainelli-Re5JQEeQqe8AvxtiuMwx3w, rjui-dY08KVG/lbpWk0Htik3J/w,
sbranden-dY08KVG/lbpWk0Htik3J/w, rjw-LthD3rsA81gm4RdzfppkhA,
khilman-DgEjT+Ai2ygdnm+yROfE0A,
ulf.hansson-QSEj5FYQhm4dnm+yROfE0A,
len.brown-ral2JQCrhuEAvxtiuMwx3w, pavel-+ZI9xUNit7I,
gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
bcm-kernel-feedback-list-dY08KVG/lbpWk0Htik3J/w,
linux-pm-u79uwXL29TY76Z2rM5mHXA, kernel-bIcnvbaLZ9MEGnE8C9+IrQ,
Alexander Aring
[-- Attachment #1: Type: text/plain, Size: 1101 bytes --]
Alexander Aring <alex.aring-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> writes:
> This patch adds support for RPi several Power Domains and enable support
> to enable the USB Power Domain when it's not enabled before.
>
> This patch based on Eric Anholt's patch to support Power Domains. He had
> an issue about -EPROBE_DEFER inside the power domain subsystem, this
> issue was solved by commit <311fa6a> ("PM / Domains: Return -EPROBE_DEFER
> if we fail to init or turn-on domain").
>
> Cc: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
> Cc: Lee Jones <lee-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> Cc: Eric Anholt <eric-WhKQ6XTQaPysTnJN9+BGXg@public.gmane.org>
> Signed-off-by: Alexander Aring <alex.aring-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Signed-off-by: Eric Anholt <eric-WhKQ6XTQaPysTnJN9+BGXg@public.gmane.org>
Acked-by: Eric Anholt <eric-WhKQ6XTQaPysTnJN9+BGXg@public.gmane.org>
I'm still hoping Ulf will pull this patch along with the genpd change,
to reduce synchronization between trees. (That just leaves the DT
change's dependency on the header in this one).
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2015-11-30 22:12 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-29 16:59 [PATCHv2 0/4] ARM: bcm2835: add support for rpi power domain driver Alexander Aring
2015-11-29 16:59 ` [PATCHv2 1/4] power: domain: add pm_genpd_exit Alexander Aring
2015-11-30 9:38 ` Ulf Hansson
2015-11-29 16:59 ` [PATCHv2 2/4] ARM: bcm2835: add rpi power domain driver Alexander Aring
[not found] ` <1448816373-18235-3-git-send-email-alex.aring-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-11-30 22:12 ` Eric Anholt
[not found] ` <1448816373-18235-1-git-send-email-alex.aring-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-11-29 16:59 ` [PATCHv2 3/4] devicetree: add rpi power domain driver bindings Alexander Aring
2015-11-30 22:09 ` Eric Anholt
2015-11-29 16:59 ` [PATCHv2 4/4] ARM: bcm2835: update rpi devicetree entries Alexander Aring
2015-11-30 22:09 ` Eric Anholt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).