* [PATCH v2] imx: power-domain: Add i.MX8MP HSIOMIX driver
@ 2022-04-01 14:06 Marek Vasut
2022-04-07 22:21 ` Tim Harvey
0 siblings, 1 reply; 2+ messages in thread
From: Marek Vasut @ 2022-04-01 14:06 UTC (permalink / raw)
To: u-boot; +Cc: Marek Vasut, Fabio Estevam, Peng Fan, Stefano Babic
Add trivial driver for i.MX8MP HSIOMIX handling. This is responsible
for enabling the GPCv2 power domains and clock for USB 3.0 and PCIe
in the correct order. Currently supported is the USB 3.0 part which
can be tested, PCIe support should be easy to add.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
---
V2: Drop two left over unused variables which triggered build warning
---
drivers/power/domain/Kconfig | 7 ++
drivers/power/domain/Makefile | 1 +
drivers/power/domain/imx8mp-hsiomix.c | 159 ++++++++++++++++++++++++++
3 files changed, 167 insertions(+)
create mode 100644 drivers/power/domain/imx8mp-hsiomix.c
diff --git a/drivers/power/domain/Kconfig b/drivers/power/domain/Kconfig
index 04fc0054323..7e1b8c072fa 100644
--- a/drivers/power/domain/Kconfig
+++ b/drivers/power/domain/Kconfig
@@ -40,6 +40,13 @@ config IMX8M_POWER_DOMAIN
Enable support for manipulating NXP i.MX8M on-SoC power domains via
requests to the ATF.
+config IMX8MP_HSIOMIX_BLKCTRL
+ bool "Enable i.MX8MP HSIOMIX domain driver"
+ depends on POWER_DOMAIN && IMX8MP
+ select CLK
+ help
+ Enable support for manipulating NXP i.MX8MP on-SoC HSIOMIX block controller.
+
config MTK_POWER_DOMAIN
bool "Enable the MediaTek power domain driver"
depends on POWER_DOMAIN && ARCH_MEDIATEK
diff --git a/drivers/power/domain/Makefile b/drivers/power/domain/Makefile
index 7c8af67dbd6..e6244776216 100644
--- a/drivers/power/domain/Makefile
+++ b/drivers/power/domain/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_APPLE_PMGR_POWER_DOMAIN) += apple-pmgr.o
obj-$(CONFIG_BCM6328_POWER_DOMAIN) += bcm6328-power-domain.o
obj-$(CONFIG_IMX8_POWER_DOMAIN) += imx8-power-domain-legacy.o imx8-power-domain.o
obj-$(CONFIG_IMX8M_POWER_DOMAIN) += imx8m-power-domain.o
+obj-$(CONFIG_IMX8MP_HSIOMIX_BLKCTRL) += imx8mp-hsiomix.o
obj-$(CONFIG_MTK_POWER_DOMAIN) += mtk-power-domain.o
obj-$(CONFIG_MESON_GX_VPU_POWER_DOMAIN) += meson-gx-pwrc-vpu.o
obj-$(CONFIG_MESON_EE_POWER_DOMAIN) += meson-ee-pwrc.o
diff --git a/drivers/power/domain/imx8mp-hsiomix.c b/drivers/power/domain/imx8mp-hsiomix.c
new file mode 100644
index 00000000000..6a721a934a7
--- /dev/null
+++ b/drivers/power/domain/imx8mp-hsiomix.c
@@ -0,0 +1,159 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2022 Marek Vasut <marex@denx.de>
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <clk.h>
+#include <dm.h>
+#include <dm/device.h>
+#include <dm/device_compat.h>
+#include <power-domain-uclass.h>
+
+#include <dt-bindings/power/imx8mp-power.h>
+
+#define GPR_REG0 0x0
+#define PCIE_CLOCK_MODULE_EN BIT(0)
+#define USB_CLOCK_MODULE_EN BIT(1)
+
+struct imx8mp_hsiomix_priv {
+ void __iomem *base;
+ struct clk clk_usb;
+ struct power_domain pd_bus;
+ struct power_domain pd_usb;
+ struct power_domain pd_usb_phy1;
+ struct power_domain pd_usb_phy2;
+};
+
+static int imx8mp_hsiomix_on(struct power_domain *power_domain)
+{
+ struct udevice *dev = power_domain->dev;
+ struct imx8mp_hsiomix_priv *priv = dev_get_priv(dev);
+ struct power_domain *domain;
+ int ret;
+
+ ret = power_domain_on(&priv->pd_bus);
+ if (ret)
+ return ret;
+
+ if (power_domain->id == IMX8MP_HSIOBLK_PD_USB) {
+ domain = &priv->pd_usb;
+ } else if (power_domain->id == IMX8MP_HSIOBLK_PD_USB_PHY1) {
+ domain = &priv->pd_usb_phy1;
+ } else if (power_domain->id == IMX8MP_HSIOBLK_PD_USB_PHY2) {
+ domain = &priv->pd_usb_phy2;
+ } else {
+ ret = -EINVAL;
+ goto err_pd;
+ }
+
+ ret = power_domain_on(domain);
+ if (ret)
+ goto err_pd;
+
+ ret = clk_enable(&priv->clk_usb);
+ if (ret)
+ goto err_clk;
+
+ if (power_domain->id == IMX8MP_HSIOBLK_PD_USB)
+ setbits_le32(priv->base + GPR_REG0, USB_CLOCK_MODULE_EN);
+
+ return 0;
+
+err_clk:
+ power_domain_off(domain);
+err_pd:
+ power_domain_off(&priv->pd_bus);
+ return ret;
+}
+
+static int imx8mp_hsiomix_off(struct power_domain *power_domain)
+{
+ struct udevice *dev = power_domain->dev;
+ struct imx8mp_hsiomix_priv *priv = dev_get_priv(dev);
+
+ if (power_domain->id == IMX8MP_HSIOBLK_PD_USB)
+ clrbits_le32(priv->base + GPR_REG0, USB_CLOCK_MODULE_EN);
+
+ clk_disable(&priv->clk_usb);
+
+ if (power_domain->id == IMX8MP_HSIOBLK_PD_USB)
+ power_domain_off(&priv->pd_usb);
+ else if (power_domain->id == IMX8MP_HSIOBLK_PD_USB_PHY1)
+ power_domain_off(&priv->pd_usb_phy1);
+ else if (power_domain->id == IMX8MP_HSIOBLK_PD_USB_PHY2)
+ power_domain_off(&priv->pd_usb_phy2);
+
+ power_domain_off(&priv->pd_bus);
+
+ return 0;
+}
+
+static int imx8mp_hsiomix_of_xlate(struct power_domain *power_domain,
+ struct ofnode_phandle_args *args)
+{
+ power_domain->id = args->args[0];
+
+ return 0;
+}
+
+static int imx8mp_hsiomix_probe(struct udevice *dev)
+{
+ struct imx8mp_hsiomix_priv *priv = dev_get_priv(dev);
+ int ret;
+
+ priv->base = dev_read_addr_ptr(dev);
+
+ ret = clk_get_by_name(dev, "usb", &priv->clk_usb);
+ if (ret < 0)
+ return ret;
+
+ ret = power_domain_get_by_name(dev, &priv->pd_bus, "bus");
+ if (ret < 0)
+ goto err_pd_bus;
+
+ ret = power_domain_get_by_name(dev, &priv->pd_usb, "usb");
+ if (ret < 0)
+ goto err_pd_usb;
+
+ ret = power_domain_get_by_name(dev, &priv->pd_usb_phy1, "usb-phy1");
+ if (ret < 0)
+ goto err_pd_usb_phy1;
+
+ ret = power_domain_get_by_name(dev, &priv->pd_usb_phy2, "usb-phy2");
+ if (ret < 0)
+ goto err_pd_usb_phy2;
+
+ return 0;
+
+err_pd_usb_phy2:
+ power_domain_free(&priv->pd_usb_phy1);
+err_pd_usb_phy1:
+ power_domain_free(&priv->pd_usb);
+err_pd_usb:
+ power_domain_free(&priv->pd_bus);
+err_pd_bus:
+ clk_free(&priv->clk_usb);
+ return ret;
+}
+
+static const struct udevice_id imx8mp_hsiomix_ids[] = {
+ { .compatible = "fsl,imx8mp-hsio-blk-ctrl" },
+ { }
+};
+
+struct power_domain_ops imx8mp_hsiomix_ops = {
+ .on = imx8mp_hsiomix_on,
+ .off = imx8mp_hsiomix_off,
+ .of_xlate = imx8mp_hsiomix_of_xlate,
+};
+
+U_BOOT_DRIVER(imx8mp_hsiomix) = {
+ .name = "imx8mp_hsiomix",
+ .id = UCLASS_POWER_DOMAIN,
+ .of_match = imx8mp_hsiomix_ids,
+ .probe = imx8mp_hsiomix_probe,
+ .priv_auto = sizeof(struct imx8mp_hsiomix_priv),
+ .ops = &imx8mp_hsiomix_ops,
+};
--
2.35.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] imx: power-domain: Add i.MX8MP HSIOMIX driver
2022-04-01 14:06 [PATCH v2] imx: power-domain: Add i.MX8MP HSIOMIX driver Marek Vasut
@ 2022-04-07 22:21 ` Tim Harvey
0 siblings, 0 replies; 2+ messages in thread
From: Tim Harvey @ 2022-04-07 22:21 UTC (permalink / raw)
To: Marek Vasut; +Cc: u-boot, Fabio Estevam, Peng Fan, Stefano Babic
On Fri, Apr 1, 2022 at 7:06 AM Marek Vasut <marex@denx.de> wrote:
>
> Add trivial driver for i.MX8MP HSIOMIX handling. This is responsible
> for enabling the GPCv2 power domains and clock for USB 3.0 and PCIe
> in the correct order. Currently supported is the USB 3.0 part which
> can be tested, PCIe support should be easy to add.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Fabio Estevam <festevam@gmail.com>
> Cc: Peng Fan <peng.fan@nxp.com>
> Cc: Stefano Babic <sbabic@denx.de>
> ---
> V2: Drop two left over unused variables which triggered build warning
> ---
> drivers/power/domain/Kconfig | 7 ++
> drivers/power/domain/Makefile | 1 +
> drivers/power/domain/imx8mp-hsiomix.c | 159 ++++++++++++++++++++++++++
> 3 files changed, 167 insertions(+)
> create mode 100644 drivers/power/domain/imx8mp-hsiomix.c
>
> diff --git a/drivers/power/domain/Kconfig b/drivers/power/domain/Kconfig
> index 04fc0054323..7e1b8c072fa 100644
> --- a/drivers/power/domain/Kconfig
> +++ b/drivers/power/domain/Kconfig
> @@ -40,6 +40,13 @@ config IMX8M_POWER_DOMAIN
> Enable support for manipulating NXP i.MX8M on-SoC power domains via
> requests to the ATF.
>
> +config IMX8MP_HSIOMIX_BLKCTRL
> + bool "Enable i.MX8MP HSIOMIX domain driver"
> + depends on POWER_DOMAIN && IMX8MP
> + select CLK
> + help
> + Enable support for manipulating NXP i.MX8MP on-SoC HSIOMIX block controller.
> +
> config MTK_POWER_DOMAIN
> bool "Enable the MediaTek power domain driver"
> depends on POWER_DOMAIN && ARCH_MEDIATEK
> diff --git a/drivers/power/domain/Makefile b/drivers/power/domain/Makefile
> index 7c8af67dbd6..e6244776216 100644
> --- a/drivers/power/domain/Makefile
> +++ b/drivers/power/domain/Makefile
> @@ -8,6 +8,7 @@ obj-$(CONFIG_APPLE_PMGR_POWER_DOMAIN) += apple-pmgr.o
> obj-$(CONFIG_BCM6328_POWER_DOMAIN) += bcm6328-power-domain.o
> obj-$(CONFIG_IMX8_POWER_DOMAIN) += imx8-power-domain-legacy.o imx8-power-domain.o
> obj-$(CONFIG_IMX8M_POWER_DOMAIN) += imx8m-power-domain.o
> +obj-$(CONFIG_IMX8MP_HSIOMIX_BLKCTRL) += imx8mp-hsiomix.o
> obj-$(CONFIG_MTK_POWER_DOMAIN) += mtk-power-domain.o
> obj-$(CONFIG_MESON_GX_VPU_POWER_DOMAIN) += meson-gx-pwrc-vpu.o
> obj-$(CONFIG_MESON_EE_POWER_DOMAIN) += meson-ee-pwrc.o
> diff --git a/drivers/power/domain/imx8mp-hsiomix.c b/drivers/power/domain/imx8mp-hsiomix.c
> new file mode 100644
> index 00000000000..6a721a934a7
> --- /dev/null
> +++ b/drivers/power/domain/imx8mp-hsiomix.c
> @@ -0,0 +1,159 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (C) 2022 Marek Vasut <marex@denx.de>
> + */
> +
> +#include <common.h>
> +#include <asm/io.h>
> +#include <clk.h>
> +#include <dm.h>
> +#include <dm/device.h>
> +#include <dm/device_compat.h>
> +#include <power-domain-uclass.h>
> +
> +#include <dt-bindings/power/imx8mp-power.h>
> +
> +#define GPR_REG0 0x0
> +#define PCIE_CLOCK_MODULE_EN BIT(0)
> +#define USB_CLOCK_MODULE_EN BIT(1)
> +
> +struct imx8mp_hsiomix_priv {
> + void __iomem *base;
> + struct clk clk_usb;
> + struct power_domain pd_bus;
> + struct power_domain pd_usb;
> + struct power_domain pd_usb_phy1;
> + struct power_domain pd_usb_phy2;
> +};
> +
> +static int imx8mp_hsiomix_on(struct power_domain *power_domain)
> +{
> + struct udevice *dev = power_domain->dev;
> + struct imx8mp_hsiomix_priv *priv = dev_get_priv(dev);
> + struct power_domain *domain;
> + int ret;
> +
> + ret = power_domain_on(&priv->pd_bus);
> + if (ret)
> + return ret;
> +
> + if (power_domain->id == IMX8MP_HSIOBLK_PD_USB) {
> + domain = &priv->pd_usb;
> + } else if (power_domain->id == IMX8MP_HSIOBLK_PD_USB_PHY1) {
> + domain = &priv->pd_usb_phy1;
> + } else if (power_domain->id == IMX8MP_HSIOBLK_PD_USB_PHY2) {
> + domain = &priv->pd_usb_phy2;
> + } else {
> + ret = -EINVAL;
> + goto err_pd;
> + }
> +
> + ret = power_domain_on(domain);
> + if (ret)
> + goto err_pd;
> +
> + ret = clk_enable(&priv->clk_usb);
> + if (ret)
> + goto err_clk;
> +
> + if (power_domain->id == IMX8MP_HSIOBLK_PD_USB)
> + setbits_le32(priv->base + GPR_REG0, USB_CLOCK_MODULE_EN);
> +
> + return 0;
> +
> +err_clk:
> + power_domain_off(domain);
> +err_pd:
> + power_domain_off(&priv->pd_bus);
> + return ret;
> +}
> +
> +static int imx8mp_hsiomix_off(struct power_domain *power_domain)
> +{
> + struct udevice *dev = power_domain->dev;
> + struct imx8mp_hsiomix_priv *priv = dev_get_priv(dev);
> +
> + if (power_domain->id == IMX8MP_HSIOBLK_PD_USB)
> + clrbits_le32(priv->base + GPR_REG0, USB_CLOCK_MODULE_EN);
> +
> + clk_disable(&priv->clk_usb);
> +
> + if (power_domain->id == IMX8MP_HSIOBLK_PD_USB)
> + power_domain_off(&priv->pd_usb);
> + else if (power_domain->id == IMX8MP_HSIOBLK_PD_USB_PHY1)
> + power_domain_off(&priv->pd_usb_phy1);
> + else if (power_domain->id == IMX8MP_HSIOBLK_PD_USB_PHY2)
> + power_domain_off(&priv->pd_usb_phy2);
> +
> + power_domain_off(&priv->pd_bus);
> +
> + return 0;
> +}
> +
> +static int imx8mp_hsiomix_of_xlate(struct power_domain *power_domain,
> + struct ofnode_phandle_args *args)
> +{
> + power_domain->id = args->args[0];
> +
> + return 0;
> +}
> +
> +static int imx8mp_hsiomix_probe(struct udevice *dev)
> +{
> + struct imx8mp_hsiomix_priv *priv = dev_get_priv(dev);
> + int ret;
> +
> + priv->base = dev_read_addr_ptr(dev);
> +
> + ret = clk_get_by_name(dev, "usb", &priv->clk_usb);
> + if (ret < 0)
> + return ret;
> +
> + ret = power_domain_get_by_name(dev, &priv->pd_bus, "bus");
> + if (ret < 0)
> + goto err_pd_bus;
> +
> + ret = power_domain_get_by_name(dev, &priv->pd_usb, "usb");
> + if (ret < 0)
> + goto err_pd_usb;
> +
> + ret = power_domain_get_by_name(dev, &priv->pd_usb_phy1, "usb-phy1");
> + if (ret < 0)
> + goto err_pd_usb_phy1;
> +
> + ret = power_domain_get_by_name(dev, &priv->pd_usb_phy2, "usb-phy2");
> + if (ret < 0)
> + goto err_pd_usb_phy2;
> +
> + return 0;
> +
> +err_pd_usb_phy2:
> + power_domain_free(&priv->pd_usb_phy1);
> +err_pd_usb_phy1:
> + power_domain_free(&priv->pd_usb);
> +err_pd_usb:
> + power_domain_free(&priv->pd_bus);
> +err_pd_bus:
> + clk_free(&priv->clk_usb);
> + return ret;
> +}
> +
> +static const struct udevice_id imx8mp_hsiomix_ids[] = {
> + { .compatible = "fsl,imx8mp-hsio-blk-ctrl" },
> + { }
> +};
> +
> +struct power_domain_ops imx8mp_hsiomix_ops = {
> + .on = imx8mp_hsiomix_on,
> + .off = imx8mp_hsiomix_off,
> + .of_xlate = imx8mp_hsiomix_of_xlate,
> +};
> +
> +U_BOOT_DRIVER(imx8mp_hsiomix) = {
> + .name = "imx8mp_hsiomix",
> + .id = UCLASS_POWER_DOMAIN,
> + .of_match = imx8mp_hsiomix_ids,
> + .probe = imx8mp_hsiomix_probe,
> + .priv_auto = sizeof(struct imx8mp_hsiomix_priv),
> + .ops = &imx8mp_hsiomix_ops,
> +};
> --
> 2.35.1
>
Marek,
Thanks for submitting this!
Tested-By: Tim Harvey <tharvey@gateworks.com> #imx8mp-venice-gw74xx
Best Regards,
Tim
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-04-07 22:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-01 14:06 [PATCH v2] imx: power-domain: Add i.MX8MP HSIOMIX driver Marek Vasut
2022-04-07 22:21 ` Tim Harvey
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.