* [PATCH v10 0/5] Add SPMI support for Mediatek SoC IC @ 2021-08-03 6:34 Hsin-Hsiung Wang 2021-08-03 6:34 ` [PATCH v10 1/5] dt-bindings: spmi: modify the constraint 'maxItems' to 'minItems' Hsin-Hsiung Wang ` (4 more replies) 0 siblings, 5 replies; 11+ messages in thread From: Hsin-Hsiung Wang @ 2021-08-03 6:34 UTC (permalink / raw) To: Stephen Boyd, Rob Herring, Matthias Brugger Cc: Hsin-Hsiung Wang, linux-kernel, devicetree, linux-arm-kernel, linux-mediatek, srv_heupstream, Project_Global_Chrome_Upstream_Group This series adds support for new SoC MT6873/MT8192/MT8195 to the spmi driver. This series is based on Chun-Jie's patches[1][2]. [1] https://patchwork.kernel.org/project/linux-mediatek/list/?series=521127 [2] https://patchwork.kernel.org/project/linux-mediatek/list/?series=521655 changes since v9: - rebase to v5.14-rc1. Henry Chen (1): spmi: mediatek: Add support for MT8195 Hsin-Hsiung Wang (4): dt-bindings: spmi: modify the constraint 'maxItems' to 'minItems' dt-bindings: spmi: document binding for the Mediatek SPMI controller spmi: mediatek: Add support for MT6873/8192 arm64: dts: mt8192: add spmi node .../bindings/spmi/mtk,spmi-mtk-pmif.yaml | 76 +++ .../devicetree/bindings/spmi/spmi.yaml | 2 +- arch/arm64/boot/dts/mediatek/mt8192.dtsi | 17 + drivers/spmi/Kconfig | 10 + drivers/spmi/Makefile | 2 + drivers/spmi/spmi-mtk-pmif.c | 555 ++++++++++++++++++ 6 files changed, 661 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/spmi/mtk,spmi-mtk-pmif.yaml create mode 100644 drivers/spmi/spmi-mtk-pmif.c base-commit: e73f0f0ee7541171d89f2e2491130c7771ba58d3 prerequisite-patch-id: 8e70d378642e084a14296dbaa2aa4e07c1d30563 prerequisite-patch-id: 82ced16215cdd31201c6146ddb5c30bc17525996 prerequisite-patch-id: 7f2137e77cfc439c2e4b4e4369a6d6b48fec1ece prerequisite-patch-id: 15f52bb664f0f0436627d056a53afefb0b99f67a prerequisite-patch-id: 479b44dfdc6d7b367c0d441d8635d2dc02466057 prerequisite-patch-id: 5df1858972e343d3750cdda1063655fc232eb831 prerequisite-patch-id: 7e63a29430f65c2a0d56d7353df884645d70ed8c prerequisite-patch-id: 2a6200e8a05329d51aaa4fd63aacfbba66d16177 prerequisite-patch-id: 604d2702c4217b77de3dc305ff08f630ba38fdb4 prerequisite-patch-id: d3ece2688dbd45eee248a8c6ba3206c0c673c904 prerequisite-patch-id: 1bebe1cd9b267c974cae50c3df8c0f8f4f0b0b3d prerequisite-patch-id: 3b34fe85667da5287bde9fd2378359be4a126266 prerequisite-patch-id: 5d3d139212ab304739b75f7638251703b95948d5 prerequisite-patch-id: 621291b21be177a63eaf6769aa6d2ee8ddb2ea2b prerequisite-patch-id: 024f786586b409420782d24218b15f05f6476667 prerequisite-patch-id: 946aae93303bde26226289dc389c94de96a9dacd prerequisite-patch-id: b3ddf6f2079c3c269bd24091243030a971c43cbc prerequisite-patch-id: 5c0e0308aa8eb06ca6df6f5467bc925f2cc106ad prerequisite-patch-id: d4e481acd8b970f08d3e4da9c8fc0ad6e1fff551 prerequisite-patch-id: 99db7309fbe1b9f73a07e25d5174db8976c77a2c prerequisite-patch-id: cffbc99e9e60f6db43cf7879f17e05c5b041d312 prerequisite-patch-id: 69871b871ab339881b50a2d6988173050b6c7a4f prerequisite-patch-id: 4f5900b98a0c7cbe62694f2477a6cb410187714b -- 2.18.0 ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v10 1/5] dt-bindings: spmi: modify the constraint 'maxItems' to 'minItems' 2021-08-03 6:34 [PATCH v10 0/5] Add SPMI support for Mediatek SoC IC Hsin-Hsiung Wang @ 2021-08-03 6:34 ` Hsin-Hsiung Wang 2021-08-03 6:34 ` [PATCH v10 2/5] dt-bindings: spmi: document binding for the Mediatek SPMI controller Hsin-Hsiung Wang ` (3 subsequent siblings) 4 siblings, 0 replies; 11+ messages in thread From: Hsin-Hsiung Wang @ 2021-08-03 6:34 UTC (permalink / raw) To: Stephen Boyd, Rob Herring, Matthias Brugger Cc: Hsin-Hsiung Wang, linux-kernel, devicetree, linux-arm-kernel, linux-mediatek, srv_heupstream, Project_Global_Chrome_Upstream_Group The constraint of 'maxItem: 1' might be larger than 1, so we modify it to 'minItem: 1'. Signed-off-by: Hsin-Hsiung Wang <hsin-hsiung.wang@mediatek.com> Acked-by: Rob Herring <robh@kernel.org> --- changes since v9: - No change. --- Documentation/devicetree/bindings/spmi/spmi.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/spmi/spmi.yaml b/Documentation/devicetree/bindings/spmi/spmi.yaml index 1d243faef2f8..5938d807674f 100644 --- a/Documentation/devicetree/bindings/spmi/spmi.yaml +++ b/Documentation/devicetree/bindings/spmi/spmi.yaml @@ -25,7 +25,7 @@ properties: pattern: "^spmi@.*" reg: - maxItems: 1 + minItems: 1 "#address-cells": const: 2 -- 2.18.0 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v10 2/5] dt-bindings: spmi: document binding for the Mediatek SPMI controller 2021-08-03 6:34 [PATCH v10 0/5] Add SPMI support for Mediatek SoC IC Hsin-Hsiung Wang 2021-08-03 6:34 ` [PATCH v10 1/5] dt-bindings: spmi: modify the constraint 'maxItems' to 'minItems' Hsin-Hsiung Wang @ 2021-08-03 6:34 ` Hsin-Hsiung Wang 2021-08-03 6:34 ` [PATCH v10 3/5] spmi: mediatek: Add support for MT6873/8192 Hsin-Hsiung Wang ` (2 subsequent siblings) 4 siblings, 0 replies; 11+ messages in thread From: Hsin-Hsiung Wang @ 2021-08-03 6:34 UTC (permalink / raw) To: Stephen Boyd, Rob Herring, Matthias Brugger Cc: Hsin-Hsiung Wang, linux-kernel, devicetree, linux-arm-kernel, linux-mediatek, srv_heupstream, Project_Global_Chrome_Upstream_Group This adds documentation for the SPMI controller found on Mediatek SoCs. Signed-off-by: Hsin-Hsiung Wang <hsin-hsiung.wang@mediatek.com> Reviewed-by: Rob Herring <robh@kernel.org> --- changes since v9: - No change. --- .../bindings/spmi/mtk,spmi-mtk-pmif.yaml | 76 +++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 Documentation/devicetree/bindings/spmi/mtk,spmi-mtk-pmif.yaml diff --git a/Documentation/devicetree/bindings/spmi/mtk,spmi-mtk-pmif.yaml b/Documentation/devicetree/bindings/spmi/mtk,spmi-mtk-pmif.yaml new file mode 100644 index 000000000000..a221cc1ac6c6 --- /dev/null +++ b/Documentation/devicetree/bindings/spmi/mtk,spmi-mtk-pmif.yaml @@ -0,0 +1,76 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/spmi/mtk,spmi-mtk-pmif.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Mediatek SPMI Controller Device Tree Bindings + +maintainers: + - Hsin-Hsiung Wang <hsin-hsiung.wang@mediatek.com> + +description: |+ + On MediaTek SoCs the PMIC is connected via SPMI and the controller allows + for multiple SoCs to control a single SPMI master. + +allOf: + - $ref: "spmi.yaml" + +properties: + compatible: + enum: + - mediatek,mt6873-spmi + - mediatek,mt8195-spmi + + reg: + maxItems: 2 + + reg-names: + items: + - const: pmif + - const: spmimst + + clocks: + minItems: 3 + maxItems: 3 + + clock-names: + items: + - const: pmif_sys_ck + - const: pmif_tmr_ck + - const: spmimst_clk_mux + + assigned-clocks: + maxItems: 1 + + assigned-clock-parents: + maxItems: 1 + +required: + - compatible + - reg + - reg-names + - clocks + - clock-names + +unevaluatedProperties: false + +examples: + - | + #include <dt-bindings/clock/mt8192-clk.h> + + spmi: spmi@10027000 { + compatible = "mediatek,mt6873-spmi"; + reg = <0 0x10027000 0 0x000e00>, + <0 0x10029000 0 0x000100>; + reg-names = "pmif", "spmimst"; + clocks = <&infracfg CLK_INFRA_PMIC_AP>, + <&infracfg CLK_INFRA_PMIC_TMR>, + <&topckgen CLK_TOP_SPMI_MST_SEL>; + clock-names = "pmif_sys_ck", + "pmif_tmr_ck", + "spmimst_clk_mux"; + assigned-clocks = <&topckgen CLK_TOP_PWRAP_ULPOSC_SEL>; + assigned-clock-parents = <&topckgen CLK_TOP_OSC_D10>; + }; +... -- 2.18.0 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v10 3/5] spmi: mediatek: Add support for MT6873/8192 2021-08-03 6:34 [PATCH v10 0/5] Add SPMI support for Mediatek SoC IC Hsin-Hsiung Wang 2021-08-03 6:34 ` [PATCH v10 1/5] dt-bindings: spmi: modify the constraint 'maxItems' to 'minItems' Hsin-Hsiung Wang 2021-08-03 6:34 ` [PATCH v10 2/5] dt-bindings: spmi: document binding for the Mediatek SPMI controller Hsin-Hsiung Wang @ 2021-08-03 6:34 ` Hsin-Hsiung Wang 2021-08-09 17:55 ` Stephen Boyd 2021-08-03 6:34 ` [PATCH v10 4/5] spmi: mediatek: Add support for MT8195 Hsin-Hsiung Wang 2021-08-03 6:34 ` [PATCH v10 5/5] arm64: dts: mt8192: add spmi node Hsin-Hsiung Wang 4 siblings, 1 reply; 11+ messages in thread From: Hsin-Hsiung Wang @ 2021-08-03 6:34 UTC (permalink / raw) To: Stephen Boyd, Rob Herring, Matthias Brugger Cc: Hsin-Hsiung Wang, linux-kernel, devicetree, linux-arm-kernel, linux-mediatek, srv_heupstream, Project_Global_Chrome_Upstream_Group Add spmi support for MT6873/8192. Signed-off-by: Hsin-Hsiung Wang <hsin-hsiung.wang@mediatek.com> --- changes since v9: - No change. --- drivers/spmi/Kconfig | 10 + drivers/spmi/Makefile | 2 + drivers/spmi/spmi-mtk-pmif.c | 465 +++++++++++++++++++++++++++++++++++ 3 files changed, 477 insertions(+) create mode 100644 drivers/spmi/spmi-mtk-pmif.c diff --git a/drivers/spmi/Kconfig b/drivers/spmi/Kconfig index 2874b6c26028..ea5703f6e544 100644 --- a/drivers/spmi/Kconfig +++ b/drivers/spmi/Kconfig @@ -34,4 +34,14 @@ config SPMI_MSM_PMIC_ARB This is required for communicating with Qualcomm PMICs and other devices that have the SPMI interface. +config SPMI_MTK_PMIF + tristate "Mediatek SPMI Controller (PMIC Arbiter)" + help + If you say yes to this option, support will be included for the + built-in SPMI PMIC Arbiter interface on Mediatek family + processors. + + This is required for communicating with Mediatek PMICs and + other devices that have the SPMI interface. + endif diff --git a/drivers/spmi/Makefile b/drivers/spmi/Makefile index 6e092e6f290c..0b21aaffcbb9 100644 --- a/drivers/spmi/Makefile +++ b/drivers/spmi/Makefile @@ -6,3 +6,5 @@ obj-$(CONFIG_SPMI) += spmi.o obj-$(CONFIG_SPMI_HISI3670) += hisi-spmi-controller.o obj-$(CONFIG_SPMI_MSM_PMIC_ARB) += spmi-pmic-arb.o +obj-$(CONFIG_SPMI_MTK_PMIF) += spmi-mtk-pmif.o + diff --git a/drivers/spmi/spmi-mtk-pmif.c b/drivers/spmi/spmi-mtk-pmif.c new file mode 100644 index 000000000000..94c45d46ab0c --- /dev/null +++ b/drivers/spmi/spmi-mtk-pmif.c @@ -0,0 +1,465 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright (c) 2021 MediaTek Inc. + +#include <linux/clk.h> +#include <linux/iopoll.h> +#include <linux/module.h> +#include <linux/of_device.h> +#include <linux/spmi.h> + +#define SWINF_IDLE 0x00 +#define SWINF_WFVLDCLR 0x06 + +#define GET_SWINF(x) (((x) >> 1) & 0x7) + +#define PMIF_CMD_REG_0 0 +#define PMIF_CMD_REG 1 +#define PMIF_CMD_EXT_REG 2 +#define PMIF_CMD_EXT_REG_LONG 3 + +#define PMIF_DELAY_US 10 +#define PMIF_TIMEOUT_US (10 * 1000) + +#define PMIF_CHAN_OFFSET 0x5 + +#define PMIF_MAX_CLKS 3 + +#define SPMI_OP_ST_BUSY 1 + +struct ch_reg { + u32 ch_sta; + u32 wdata; + u32 rdata; + u32 ch_send; + u32 ch_rdy; +}; + +struct pmif_data { + const u32 *regs; + const u32 *spmimst_regs; + u32 soc_chan; +}; + +struct pmif { + void __iomem *base; + void __iomem *spmimst_base; + struct ch_reg chan; + struct clk_bulk_data clks[PMIF_MAX_CLKS]; + u32 nclks; + const struct pmif_data *data; +}; + +static const char * const pmif_clock_names[] = { + "pmif_sys_ck", "pmif_tmr_ck", "spmimst_clk_mux", +}; + +enum pmif_regs { + PMIF_INIT_DONE, + PMIF_INF_EN, + PMIF_ARB_EN, + PMIF_CMDISSUE_EN, + PMIF_TIMER_CTRL, + PMIF_SPI_MODE_CTRL, + PMIF_IRQ_EVENT_EN_0, + PMIF_IRQ_FLAG_0, + PMIF_IRQ_CLR_0, + PMIF_IRQ_EVENT_EN_1, + PMIF_IRQ_FLAG_1, + PMIF_IRQ_CLR_1, + PMIF_IRQ_EVENT_EN_2, + PMIF_IRQ_FLAG_2, + PMIF_IRQ_CLR_2, + PMIF_IRQ_EVENT_EN_3, + PMIF_IRQ_FLAG_3, + PMIF_IRQ_CLR_3, + PMIF_IRQ_EVENT_EN_4, + PMIF_IRQ_FLAG_4, + PMIF_IRQ_CLR_4, + PMIF_WDT_EVENT_EN_0, + PMIF_WDT_FLAG_0, + PMIF_WDT_EVENT_EN_1, + PMIF_WDT_FLAG_1, + PMIF_SWINF_0_STA, + PMIF_SWINF_0_WDATA_31_0, + PMIF_SWINF_0_RDATA_31_0, + PMIF_SWINF_0_ACC, + PMIF_SWINF_0_VLD_CLR, + PMIF_SWINF_1_STA, + PMIF_SWINF_1_WDATA_31_0, + PMIF_SWINF_1_RDATA_31_0, + PMIF_SWINF_1_ACC, + PMIF_SWINF_1_VLD_CLR, + PMIF_SWINF_2_STA, + PMIF_SWINF_2_WDATA_31_0, + PMIF_SWINF_2_RDATA_31_0, + PMIF_SWINF_2_ACC, + PMIF_SWINF_2_VLD_CLR, + PMIF_SWINF_3_STA, + PMIF_SWINF_3_WDATA_31_0, + PMIF_SWINF_3_RDATA_31_0, + PMIF_SWINF_3_ACC, + PMIF_SWINF_3_VLD_CLR, +}; + +static const u32 mt6873_regs[] = { + [PMIF_INIT_DONE] = 0x0000, + [PMIF_INF_EN] = 0x0024, + [PMIF_ARB_EN] = 0x0150, + [PMIF_CMDISSUE_EN] = 0x03B4, + [PMIF_TIMER_CTRL] = 0x03E0, + [PMIF_SPI_MODE_CTRL] = 0x0400, + [PMIF_IRQ_EVENT_EN_0] = 0x0418, + [PMIF_IRQ_FLAG_0] = 0x0420, + [PMIF_IRQ_CLR_0] = 0x0424, + [PMIF_IRQ_EVENT_EN_1] = 0x0428, + [PMIF_IRQ_FLAG_1] = 0x0430, + [PMIF_IRQ_CLR_1] = 0x0434, + [PMIF_IRQ_EVENT_EN_2] = 0x0438, + [PMIF_IRQ_FLAG_2] = 0x0440, + [PMIF_IRQ_CLR_2] = 0x0444, + [PMIF_IRQ_EVENT_EN_3] = 0x0448, + [PMIF_IRQ_FLAG_3] = 0x0450, + [PMIF_IRQ_CLR_3] = 0x0454, + [PMIF_IRQ_EVENT_EN_4] = 0x0458, + [PMIF_IRQ_FLAG_4] = 0x0460, + [PMIF_IRQ_CLR_4] = 0x0464, + [PMIF_WDT_EVENT_EN_0] = 0x046C, + [PMIF_WDT_FLAG_0] = 0x0470, + [PMIF_WDT_EVENT_EN_1] = 0x0474, + [PMIF_WDT_FLAG_1] = 0x0478, + [PMIF_SWINF_0_ACC] = 0x0C00, + [PMIF_SWINF_0_WDATA_31_0] = 0x0C04, + [PMIF_SWINF_0_RDATA_31_0] = 0x0C14, + [PMIF_SWINF_0_VLD_CLR] = 0x0C24, + [PMIF_SWINF_0_STA] = 0x0C28, + [PMIF_SWINF_1_ACC] = 0x0C40, + [PMIF_SWINF_1_WDATA_31_0] = 0x0C44, + [PMIF_SWINF_1_RDATA_31_0] = 0x0C54, + [PMIF_SWINF_1_VLD_CLR] = 0x0C64, + [PMIF_SWINF_1_STA] = 0x0C68, + [PMIF_SWINF_2_ACC] = 0x0C80, + [PMIF_SWINF_2_WDATA_31_0] = 0x0C84, + [PMIF_SWINF_2_RDATA_31_0] = 0x0C94, + [PMIF_SWINF_2_VLD_CLR] = 0x0CA4, + [PMIF_SWINF_2_STA] = 0x0CA8, + [PMIF_SWINF_3_ACC] = 0x0CC0, + [PMIF_SWINF_3_WDATA_31_0] = 0x0CC4, + [PMIF_SWINF_3_RDATA_31_0] = 0x0CD4, + [PMIF_SWINF_3_VLD_CLR] = 0x0CE4, + [PMIF_SWINF_3_STA] = 0x0CE8, +}; + +enum spmi_regs { + SPMI_OP_ST_CTRL, + SPMI_GRP_ID_EN, + SPMI_OP_ST_STA, + SPMI_MST_SAMPL, + SPMI_MST_REQ_EN, + SPMI_REC_CTRL, + SPMI_REC0, + SPMI_REC1, + SPMI_REC2, + SPMI_REC3, + SPMI_REC4, + SPMI_MST_DBG, +}; + +static const u32 mt6873_spmi_regs[] = { + [SPMI_OP_ST_CTRL] = 0x0000, + [SPMI_GRP_ID_EN] = 0x0004, + [SPMI_OP_ST_STA] = 0x0008, + [SPMI_MST_SAMPL] = 0x000c, + [SPMI_MST_REQ_EN] = 0x0010, + [SPMI_REC_CTRL] = 0x0040, + [SPMI_REC0] = 0x0044, + [SPMI_REC1] = 0x0048, + [SPMI_REC2] = 0x004c, + [SPMI_REC3] = 0x0050, + [SPMI_REC4] = 0x0054, + [SPMI_MST_DBG] = 0x00fc, +}; + +static u32 pmif_readl(struct pmif *arb, enum pmif_regs reg) +{ + return readl(arb->base + arb->data->regs[reg]); +} + +static void pmif_writel(struct pmif *arb, u32 val, enum pmif_regs reg) +{ + writel(val, arb->base + arb->data->regs[reg]); +} + +static void mtk_spmi_writel(struct pmif *arb, u32 val, enum spmi_regs reg) +{ + writel(val, arb->spmimst_base + arb->data->spmimst_regs[reg]); +} + +static bool pmif_is_fsm_vldclr(struct pmif *arb) +{ + u32 reg_rdata; + + reg_rdata = pmif_readl(arb, arb->chan.ch_sta); + return GET_SWINF(reg_rdata) == SWINF_WFVLDCLR; +} + +static int pmif_arb_cmd(struct spmi_controller *ctrl, u8 opc, u8 sid) +{ + struct pmif *arb = spmi_controller_get_drvdata(ctrl); + u32 rdata, cmd; + int ret; + + /* Check the opcode */ + if (opc < SPMI_CMD_RESET || opc > SPMI_CMD_WAKEUP) + return -EINVAL; + + cmd = opc - SPMI_CMD_RESET; + + mtk_spmi_writel(arb, (cmd << 0x4) | sid, SPMI_OP_ST_CTRL); + ret = readl_poll_timeout_atomic(arb->spmimst_base + arb->data->spmimst_regs[SPMI_OP_ST_STA], + rdata, (rdata & SPMI_OP_ST_BUSY) == SPMI_OP_ST_BUSY, + PMIF_DELAY_US, PMIF_TIMEOUT_US); + if (ret < 0) + dev_err(&ctrl->dev, "timeout, err = %d\n", ret); + + return ret; +} + +static int pmif_spmi_read_cmd(struct spmi_controller *ctrl, u8 opc, u8 sid, + u16 addr, u8 *buf, size_t len) +{ + struct pmif *arb = spmi_controller_get_drvdata(ctrl); + struct ch_reg *inf_reg; + int ret; + u32 data, cmd; + + /* Check for argument validation. */ + if (sid & ~0xf) { + dev_err(&ctrl->dev, "exceed the max slv id\n"); + return -EINVAL; + } + + if (len > 4) { + dev_err(&ctrl->dev, "pmif supports 1..4 bytes per trans, but:%zu requested", len); + return -EINVAL; + } + + if (opc >= 0x60 && opc <= 0x7f) + opc = PMIF_CMD_REG; + else if ((opc >= 0x20 && opc <= 0x2f) || (opc >= 0x38 && opc <= 0x3f)) + opc = PMIF_CMD_EXT_REG_LONG; + else + return -EINVAL; + + /* Wait for Software Interface FSM state to be IDLE. */ + inf_reg = &arb->chan; + ret = readl_poll_timeout_atomic(arb->base + arb->data->regs[inf_reg->ch_sta], + data, GET_SWINF(data) == SWINF_IDLE, + PMIF_DELAY_US, PMIF_TIMEOUT_US); + if (ret < 0) { + /* set channel ready if the data has transferred */ + if (pmif_is_fsm_vldclr(arb)) + pmif_writel(arb, 1, inf_reg->ch_rdy); + dev_err(&ctrl->dev, "failed to wait for SWINF_IDLE\n"); + goto out; + } + + /* Send the command. */ + cmd = (opc << 30) | (sid << 24) | ((len - 1) << 16) | addr; + pmif_writel(arb, cmd, inf_reg->ch_send); + + /* + * Wait for Software Interface FSM state to be WFVLDCLR, + * read the data and clear the valid flag. + */ + ret = readl_poll_timeout_atomic(arb->base + arb->data->regs[inf_reg->ch_sta], + data, GET_SWINF(data) == SWINF_WFVLDCLR, + PMIF_DELAY_US, PMIF_TIMEOUT_US); + if (ret < 0) { + dev_err(&ctrl->dev, "failed to wait for SWINF_WFVLDCLR\n"); + goto out; + } + + data = pmif_readl(arb, inf_reg->rdata); + memcpy(buf, &data, len); + pmif_writel(arb, 1, inf_reg->ch_rdy); + +out: + if (ret < 0) + return ret; + + return 0; +} + +static int pmif_spmi_write_cmd(struct spmi_controller *ctrl, u8 opc, u8 sid, + u16 addr, const u8 *buf, size_t len) +{ + struct pmif *arb = spmi_controller_get_drvdata(ctrl); + struct ch_reg *inf_reg; + int ret; + u32 data, cmd; + + if (len > 4) { + dev_err(&ctrl->dev, "pmif supports 1..4 bytes per trans, but:%zu requested", len); + return -EINVAL; + } + + /* Check the opcode */ + if (opc >= 0x40 && opc <= 0x5F) + opc = PMIF_CMD_REG; + else if ((opc <= 0xF) || (opc >= 0x30 && opc <= 0x37)) + opc = PMIF_CMD_EXT_REG_LONG; + else if (opc >= 0x80) + opc = PMIF_CMD_REG_0; + else + return -EINVAL; + + /* Wait for Software Interface FSM state to be IDLE. */ + inf_reg = &arb->chan; + ret = readl_poll_timeout_atomic(arb->base + arb->data->regs[inf_reg->ch_sta], + data, GET_SWINF(data) == SWINF_IDLE, + PMIF_DELAY_US, PMIF_TIMEOUT_US); + if (ret < 0) { + /* set channel ready if the data has transferred */ + if (pmif_is_fsm_vldclr(arb)) + pmif_writel(arb, 1, inf_reg->ch_rdy); + dev_err(&ctrl->dev, "failed to wait for SWINF_IDLE\n"); + goto out; + } + + /* Set the write data. */ + memcpy(&data, buf, len); + pmif_writel(arb, data, inf_reg->wdata); + + /* Send the command. */ + cmd = (opc << 30) | BIT(29) | (sid << 24) | ((len - 1) << 16) | addr; + pmif_writel(arb, cmd, inf_reg->ch_send); + +out: + if (ret < 0) + return ret; + + return 0; +} + +static const struct pmif_data mt6873_pmif_arb = { + .regs = mt6873_regs, + .spmimst_regs = mt6873_spmi_regs, + .soc_chan = 2, +}; + +static int mtk_spmi_probe(struct platform_device *pdev) +{ + struct pmif *arb; + struct spmi_controller *ctrl; + int err, i; + u32 chan_offset; + + ctrl = spmi_controller_alloc(&pdev->dev, sizeof(*arb)); + if (!ctrl) + return -ENOMEM; + + arb = spmi_controller_get_drvdata(ctrl); + arb->data = of_device_get_match_data(&pdev->dev); + if (!arb->data) { + err = -EINVAL; + dev_err(&pdev->dev, "Cannot get drv_data\n"); + goto err_put_ctrl; + } + + arb->base = devm_platform_ioremap_resource_byname(pdev, "pmif"); + if (IS_ERR(arb->base)) { + err = PTR_ERR(arb->base); + dev_err(&pdev->dev, "pmif failed to get the remappped memory\n"); + goto err_put_ctrl; + } + + arb->spmimst_base = devm_platform_ioremap_resource_byname(pdev, "spmimst"); + if (IS_ERR(arb->spmimst_base)) { + err = PTR_ERR(arb->spmimst_base); + dev_err(&pdev->dev, "spmimst failed to get the remappped memory\n"); + goto err_put_ctrl; + } + + arb->nclks = ARRAY_SIZE(pmif_clock_names); + if (arb->nclks > PMIF_MAX_CLKS) { + err = -EINVAL; + dev_err(&pdev->dev, "exceed the max clock numbers\n"); + goto err_put_ctrl; + } + + for (i = 0; i < arb->nclks; i++) + arb->clks[i].id = pmif_clock_names[i]; + + err = devm_clk_bulk_get(&pdev->dev, arb->nclks, arb->clks); + if (err) { + dev_err(&pdev->dev, "Failed to get clocks: %d\n", err); + goto err_put_ctrl; + } + + err = clk_bulk_prepare_enable(arb->nclks, arb->clks); + if (err) { + dev_err(&pdev->dev, "Failed to enable clocks: %d\n", err); + goto err_put_ctrl; + } + + ctrl->cmd = pmif_arb_cmd; + ctrl->read_cmd = pmif_spmi_read_cmd; + ctrl->write_cmd = pmif_spmi_write_cmd; + + chan_offset = PMIF_CHAN_OFFSET * arb->data->soc_chan; + arb->chan.ch_sta = PMIF_SWINF_0_STA + chan_offset; + arb->chan.wdata = PMIF_SWINF_0_WDATA_31_0 + chan_offset; + arb->chan.rdata = PMIF_SWINF_0_RDATA_31_0 + chan_offset; + arb->chan.ch_send = PMIF_SWINF_0_ACC + chan_offset; + arb->chan.ch_rdy = PMIF_SWINF_0_VLD_CLR + chan_offset; + + platform_set_drvdata(pdev, ctrl); + + err = spmi_controller_add(ctrl); + if (err) + goto err_domain_remove; + + return 0; + +err_domain_remove: + clk_bulk_disable_unprepare(arb->nclks, arb->clks); +err_put_ctrl: + spmi_controller_put(ctrl); + return err; +} + +static int mtk_spmi_remove(struct platform_device *pdev) +{ + struct spmi_controller *ctrl = platform_get_drvdata(pdev); + struct pmif *arb = spmi_controller_get_drvdata(ctrl); + + clk_bulk_disable_unprepare(arb->nclks, arb->clks); + spmi_controller_remove(ctrl); + spmi_controller_put(ctrl); + return 0; +} + +static const struct of_device_id mtk_spmi_match_table[] = { + { + .compatible = "mediatek,mt6873-spmi", + .data = &mt6873_pmif_arb, + }, { + /* sentinel */ + }, +}; +MODULE_DEVICE_TABLE(of, mtk_spmi_match_table); + +static struct platform_driver mtk_spmi_driver = { + .driver = { + .name = "spmi-mtk", + .of_match_table = of_match_ptr(mtk_spmi_match_table), + }, + .probe = mtk_spmi_probe, + .remove = mtk_spmi_remove, +}; +module_platform_driver(mtk_spmi_driver); + +MODULE_AUTHOR("Hsin-Hsiung Wang <hsin-hsiung.wang@mediatek.com>"); +MODULE_DESCRIPTION("MediaTek SPMI Driver"); +MODULE_LICENSE("GPL"); -- 2.18.0 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v10 3/5] spmi: mediatek: Add support for MT6873/8192 2021-08-03 6:34 ` [PATCH v10 3/5] spmi: mediatek: Add support for MT6873/8192 Hsin-Hsiung Wang @ 2021-08-09 17:55 ` Stephen Boyd 2021-08-16 12:11 ` Hsin-hsiung Wang 0 siblings, 1 reply; 11+ messages in thread From: Stephen Boyd @ 2021-08-09 17:55 UTC (permalink / raw) To: Hsin-Hsiung Wang, Matthias Brugger, Rob Herring Cc: Hsin-Hsiung Wang, linux-kernel, devicetree, linux-arm-kernel, linux-mediatek, srv_heupstream, Project_Global_Chrome_Upstream_Group Quoting Hsin-Hsiung Wang (2021-08-02 23:34:19) > diff --git a/drivers/spmi/spmi-mtk-pmif.c b/drivers/spmi/spmi-mtk-pmif.c > new file mode 100644 > index 000000000000..94c45d46ab0c > --- /dev/null > +++ b/drivers/spmi/spmi-mtk-pmif.c > @@ -0,0 +1,465 @@ > +// SPDX-License-Identifier: GPL-2.0 > +// > +// Copyright (c) 2021 MediaTek Inc. > + > +#include <linux/clk.h> > +#include <linux/iopoll.h> > +#include <linux/module.h> > +#include <linux/of_device.h> include platform_device.h for the platform device driver that this is. > +#include <linux/spmi.h> > + > +#define SWINF_IDLE 0x00 > +#define SWINF_WFVLDCLR 0x06 > + > +#define GET_SWINF(x) (((x) >> 1) & 0x7) > + > +#define PMIF_CMD_REG_0 0 > +#define PMIF_CMD_REG 1 > +#define PMIF_CMD_EXT_REG 2 > +#define PMIF_CMD_EXT_REG_LONG 3 > + > +#define PMIF_DELAY_US 10 > +#define PMIF_TIMEOUT_US (10 * 1000) > + > +#define PMIF_CHAN_OFFSET 0x5 > + > +#define PMIF_MAX_CLKS 3 > + > +#define SPMI_OP_ST_BUSY 1 > + > +struct ch_reg { > + u32 ch_sta; > + u32 wdata; > + u32 rdata; > + u32 ch_send; > + u32 ch_rdy; > +}; > + > +struct pmif_data { > + const u32 *regs; > + const u32 *spmimst_regs; > + u32 soc_chan; > +}; > + > +struct pmif { > + void __iomem *base; > + void __iomem *spmimst_base; > + struct ch_reg chan; > + struct clk_bulk_data clks[PMIF_MAX_CLKS]; > + u32 nclks; size_t? Surely 32-bits isn't important. > + const struct pmif_data *data; > +}; > + > +static const char * const pmif_clock_names[] = { > + "pmif_sys_ck", "pmif_tmr_ck", "spmimst_clk_mux", > +}; [...] > + > +static bool pmif_is_fsm_vldclr(struct pmif *arb) > +{ > + u32 reg_rdata; > + > + reg_rdata = pmif_readl(arb, arb->chan.ch_sta); Newline here please. > + return GET_SWINF(reg_rdata) == SWINF_WFVLDCLR; > +} > + > +static int pmif_arb_cmd(struct spmi_controller *ctrl, u8 opc, u8 sid) > +{ > + struct pmif *arb = spmi_controller_get_drvdata(ctrl); > + u32 rdata, cmd; > + int ret; > + > + /* Check the opcode */ > + if (opc < SPMI_CMD_RESET || opc > SPMI_CMD_WAKEUP) > + return -EINVAL; > + > + cmd = opc - SPMI_CMD_RESET; > + > + mtk_spmi_writel(arb, (cmd << 0x4) | sid, SPMI_OP_ST_CTRL); > + ret = readl_poll_timeout_atomic(arb->spmimst_base + arb->data->spmimst_regs[SPMI_OP_ST_STA], > + rdata, (rdata & SPMI_OP_ST_BUSY) == SPMI_OP_ST_BUSY, > + PMIF_DELAY_US, PMIF_TIMEOUT_US); > + if (ret < 0) > + dev_err(&ctrl->dev, "timeout, err = %d\n", ret); > + > + return ret; > +} > + > +static int pmif_spmi_read_cmd(struct spmi_controller *ctrl, u8 opc, u8 sid, > + u16 addr, u8 *buf, size_t len) > +{ > + struct pmif *arb = spmi_controller_get_drvdata(ctrl); > + struct ch_reg *inf_reg; > + int ret; > + u32 data, cmd; > + > + /* Check for argument validation. */ > + if (sid & ~0xf) { > + dev_err(&ctrl->dev, "exceed the max slv id\n"); > + return -EINVAL; > + } > + > + if (len > 4) { > + dev_err(&ctrl->dev, "pmif supports 1..4 bytes per trans, but:%zu requested", len); Missing newline > + return -EINVAL; > + } > + > + if (opc >= 0x60 && opc <= 0x7f) > + opc = PMIF_CMD_REG; > + else if ((opc >= 0x20 && opc <= 0x2f) || (opc >= 0x38 && opc <= 0x3f)) > + opc = PMIF_CMD_EXT_REG_LONG; > + else > + return -EINVAL; > + > + /* Wait for Software Interface FSM state to be IDLE. */ > + inf_reg = &arb->chan; > + ret = readl_poll_timeout_atomic(arb->base + arb->data->regs[inf_reg->ch_sta], > + data, GET_SWINF(data) == SWINF_IDLE, > + PMIF_DELAY_US, PMIF_TIMEOUT_US); > + if (ret < 0) { > + /* set channel ready if the data has transferred */ > + if (pmif_is_fsm_vldclr(arb)) > + pmif_writel(arb, 1, inf_reg->ch_rdy); > + dev_err(&ctrl->dev, "failed to wait for SWINF_IDLE\n"); > + goto out; > + } > + > + /* Send the command. */ > + cmd = (opc << 30) | (sid << 24) | ((len - 1) << 16) | addr; > + pmif_writel(arb, cmd, inf_reg->ch_send); > + > + /* > + * Wait for Software Interface FSM state to be WFVLDCLR, > + * read the data and clear the valid flag. > + */ > + ret = readl_poll_timeout_atomic(arb->base + arb->data->regs[inf_reg->ch_sta], > + data, GET_SWINF(data) == SWINF_WFVLDCLR, > + PMIF_DELAY_US, PMIF_TIMEOUT_US); > + if (ret < 0) { > + dev_err(&ctrl->dev, "failed to wait for SWINF_WFVLDCLR\n"); > + goto out; > + } > + > + data = pmif_readl(arb, inf_reg->rdata); > + memcpy(buf, &data, len); > + pmif_writel(arb, 1, inf_reg->ch_rdy); > + > +out: > + if (ret < 0) > + return ret; > + > + return 0; > +} > + > +static int pmif_spmi_write_cmd(struct spmi_controller *ctrl, u8 opc, u8 sid, > + u16 addr, const u8 *buf, size_t len) > +{ > + struct pmif *arb = spmi_controller_get_drvdata(ctrl); > + struct ch_reg *inf_reg; > + int ret; > + u32 data, cmd; > + > + if (len > 4) { > + dev_err(&ctrl->dev, "pmif supports 1..4 bytes per trans, but:%zu requested", len); Missing newline > + return -EINVAL; > + } > + > + /* Check the opcode */ > + if (opc >= 0x40 && opc <= 0x5F) > + opc = PMIF_CMD_REG; > + else if ((opc <= 0xF) || (opc >= 0x30 && opc <= 0x37)) > + opc = PMIF_CMD_EXT_REG_LONG; > + else if (opc >= 0x80) > + opc = PMIF_CMD_REG_0; > + else > + return -EINVAL; > + > + /* Wait for Software Interface FSM state to be IDLE. */ > + inf_reg = &arb->chan; > + ret = readl_poll_timeout_atomic(arb->base + arb->data->regs[inf_reg->ch_sta], > + data, GET_SWINF(data) == SWINF_IDLE, > + PMIF_DELAY_US, PMIF_TIMEOUT_US); > + if (ret < 0) { > + /* set channel ready if the data has transferred */ > + if (pmif_is_fsm_vldclr(arb)) > + pmif_writel(arb, 1, inf_reg->ch_rdy); > + dev_err(&ctrl->dev, "failed to wait for SWINF_IDLE\n"); > + goto out; > + } > + > + /* Set the write data. */ > + memcpy(&data, buf, len); > + pmif_writel(arb, data, inf_reg->wdata); > + > + /* Send the command. */ > + cmd = (opc << 30) | BIT(29) | (sid << 24) | ((len - 1) << 16) | addr; > + pmif_writel(arb, cmd, inf_reg->ch_send); > + > +out: > + if (ret < 0) > + return ret; > + > + return 0; Simplify to out: return ret; > +} > + > +static const struct pmif_data mt6873_pmif_arb = { > + .regs = mt6873_regs, > + .spmimst_regs = mt6873_spmi_regs, > + .soc_chan = 2, > +}; > + > +static int mtk_spmi_probe(struct platform_device *pdev) > +{ > + struct pmif *arb; > + struct spmi_controller *ctrl; > + int err, i; > + u32 chan_offset; > + > + ctrl = spmi_controller_alloc(&pdev->dev, sizeof(*arb)); > + if (!ctrl) > + return -ENOMEM; > + > + arb = spmi_controller_get_drvdata(ctrl); > + arb->data = of_device_get_match_data(&pdev->dev); Use device_get_match_data() instead please. > + if (!arb->data) { > + err = -EINVAL; > + dev_err(&pdev->dev, "Cannot get drv_data\n"); > + goto err_put_ctrl; > + } > + > + arb->base = devm_platform_ioremap_resource_byname(pdev, "pmif"); > + if (IS_ERR(arb->base)) { > + err = PTR_ERR(arb->base); > + dev_err(&pdev->dev, "pmif failed to get the remappped memory\n"); Please drop print as the API already prints errors for every problem. > + goto err_put_ctrl; > + } > + > + arb->spmimst_base = devm_platform_ioremap_resource_byname(pdev, "spmimst"); > + if (IS_ERR(arb->spmimst_base)) { > + err = PTR_ERR(arb->spmimst_base); > + dev_err(&pdev->dev, "spmimst failed to get the remappped memory\n"); Please drop print as the API already prints errors for every problem. > + goto err_put_ctrl; > + } > + > + arb->nclks = ARRAY_SIZE(pmif_clock_names); > + if (arb->nclks > PMIF_MAX_CLKS) { > + err = -EINVAL; > + dev_err(&pdev->dev, "exceed the max clock numbers\n"); Do we really care? The dt schema should be checking this instead of the driver. > + goto err_put_ctrl; > + } > + > + for (i = 0; i < arb->nclks; i++) > + arb->clks[i].id = pmif_clock_names[i]; > + ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v10 3/5] spmi: mediatek: Add support for MT6873/8192 2021-08-09 17:55 ` Stephen Boyd @ 2021-08-16 12:11 ` Hsin-hsiung Wang 0 siblings, 0 replies; 11+ messages in thread From: Hsin-hsiung Wang @ 2021-08-16 12:11 UTC (permalink / raw) To: Stephen Boyd Cc: Matthias Brugger, Rob Herring, linux-kernel, devicetree, linux-arm-kernel, linux-mediatek, srv_heupstream, Project_Global_Chrome_Upstream_Group Hi, On Mon, 2021-08-09 at 10:55 -0700, Stephen Boyd wrote: > Quoting Hsin-Hsiung Wang (2021-08-02 23:34:19) > > diff --git a/drivers/spmi/spmi-mtk-pmif.c b/drivers/spmi/spmi-mtk-pmif.c > > new file mode 100644 > > index 000000000000..94c45d46ab0c > > --- /dev/null > > +++ b/drivers/spmi/spmi-mtk-pmif.c > > @@ -0,0 +1,465 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +// > > +// Copyright (c) 2021 MediaTek Inc. > > + > > +#include <linux/clk.h> > > +#include <linux/iopoll.h> > > +#include <linux/module.h> > > +#include <linux/of_device.h> > > include platform_device.h for the platform device driver that this is. > Thanks for the commit, I will update it in the next patch. > > +#include <linux/spmi.h> > > + > > +#define SWINF_IDLE 0x00 > > +#define SWINF_WFVLDCLR 0x06 > > + > > +#define GET_SWINF(x) (((x) >> 1) & 0x7) > > + > > +#define PMIF_CMD_REG_0 0 > > +#define PMIF_CMD_REG 1 > > +#define PMIF_CMD_EXT_REG 2 > > +#define PMIF_CMD_EXT_REG_LONG 3 > > + > > +#define PMIF_DELAY_US 10 > > +#define PMIF_TIMEOUT_US (10 * 1000) > > + > > +#define PMIF_CHAN_OFFSET 0x5 > > + > > +#define PMIF_MAX_CLKS 3 > > + > > +#define SPMI_OP_ST_BUSY 1 > > + > > +struct ch_reg { > > + u32 ch_sta; > > + u32 wdata; > > + u32 rdata; > > + u32 ch_send; > > + u32 ch_rdy; > > +}; > > + > > +struct pmif_data { > > + const u32 *regs; > > + const u32 *spmimst_regs; > > + u32 soc_chan; > > +}; > > + > > +struct pmif { > > + void __iomem *base; > > + void __iomem *spmimst_base; > > + struct ch_reg chan; > > + struct clk_bulk_data clks[PMIF_MAX_CLKS]; > > + u32 nclks; > > size_t? Surely 32-bits isn't important. > Thanks. I will use size_t in the next patch. > > + const struct pmif_data *data; > > +}; > > + > > +static const char * const pmif_clock_names[] = { > > + "pmif_sys_ck", "pmif_tmr_ck", "spmimst_clk_mux", > > +}; > [...] > > + > > +static bool pmif_is_fsm_vldclr(struct pmif *arb) > > +{ > > + u32 reg_rdata; > > + > > + reg_rdata = pmif_readl(arb, arb->chan.ch_sta); > > Newline here please. > Thanks, I will update it in the next patch. > > + return GET_SWINF(reg_rdata) == SWINF_WFVLDCLR; > > +} > > + > > +static int pmif_arb_cmd(struct spmi_controller *ctrl, u8 opc, u8 sid) > > +{ > > + struct pmif *arb = spmi_controller_get_drvdata(ctrl); > > + u32 rdata, cmd; > > + int ret; > > + > > + /* Check the opcode */ > > + if (opc < SPMI_CMD_RESET || opc > SPMI_CMD_WAKEUP) > > + return -EINVAL; > > + > > + cmd = opc - SPMI_CMD_RESET; > > + > > + mtk_spmi_writel(arb, (cmd << 0x4) | sid, SPMI_OP_ST_CTRL); > > + ret = readl_poll_timeout_atomic(arb->spmimst_base + arb->data->spmimst_regs[SPMI_OP_ST_STA], > > + rdata, (rdata & SPMI_OP_ST_BUSY) == SPMI_OP_ST_BUSY, > > + PMIF_DELAY_US, PMIF_TIMEOUT_US); > > + if (ret < 0) > > + dev_err(&ctrl->dev, "timeout, err = %d\n", ret); > > + > > + return ret; > > +} > > + > > +static int pmif_spmi_read_cmd(struct spmi_controller *ctrl, u8 opc, u8 sid, > > + u16 addr, u8 *buf, size_t len) > > +{ > > + struct pmif *arb = spmi_controller_get_drvdata(ctrl); > > + struct ch_reg *inf_reg; > > + int ret; > > + u32 data, cmd; > > + > > + /* Check for argument validation. */ > > + if (sid & ~0xf) { > > + dev_err(&ctrl->dev, "exceed the max slv id\n"); > > + return -EINVAL; > > + } > > + > > + if (len > 4) { > > + dev_err(&ctrl->dev, "pmif supports 1..4 bytes per trans, but:%zu requested", len); > > Missing newline > Thanks, I will update it in the next patch. > > + return -EINVAL; > > + } > > + > > + if (opc >= 0x60 && opc <= 0x7f) > > + opc = PMIF_CMD_REG; > > + else if ((opc >= 0x20 && opc <= 0x2f) || (opc >= 0x38 && opc <= 0x3f)) > > + opc = PMIF_CMD_EXT_REG_LONG; > > + else > > + return -EINVAL; > > + > > + /* Wait for Software Interface FSM state to be IDLE. */ > > + inf_reg = &arb->chan; > > + ret = readl_poll_timeout_atomic(arb->base + arb->data->regs[inf_reg->ch_sta], > > + data, GET_SWINF(data) == SWINF_IDLE, > > + PMIF_DELAY_US, PMIF_TIMEOUT_US); > > + if (ret < 0) { > > + /* set channel ready if the data has transferred */ > > + if (pmif_is_fsm_vldclr(arb)) > > + pmif_writel(arb, 1, inf_reg->ch_rdy); > > + dev_err(&ctrl->dev, "failed to wait for SWINF_IDLE\n"); > > + goto out; > > + } > > + > > + /* Send the command. */ > > + cmd = (opc << 30) | (sid << 24) | ((len - 1) << 16) | addr; > > + pmif_writel(arb, cmd, inf_reg->ch_send); > > + > > + /* > > + * Wait for Software Interface FSM state to be WFVLDCLR, > > + * read the data and clear the valid flag. > > + */ > > + ret = readl_poll_timeout_atomic(arb->base + arb->data->regs[inf_reg->ch_sta], > > + data, GET_SWINF(data) == SWINF_WFVLDCLR, > > + PMIF_DELAY_US, PMIF_TIMEOUT_US); > > + if (ret < 0) { > > + dev_err(&ctrl->dev, "failed to wait for SWINF_WFVLDCLR\n"); > > + goto out; > > + } > > + > > + data = pmif_readl(arb, inf_reg->rdata); > > + memcpy(buf, &data, len); > > + pmif_writel(arb, 1, inf_reg->ch_rdy); > > + > > +out: > > + if (ret < 0) > > + return ret; > > + > > + return 0; > > +} > > + > > +static int pmif_spmi_write_cmd(struct spmi_controller *ctrl, u8 opc, u8 sid, > > + u16 addr, const u8 *buf, size_t len) > > +{ > > + struct pmif *arb = spmi_controller_get_drvdata(ctrl); > > + struct ch_reg *inf_reg; > > + int ret; > > + u32 data, cmd; > > + > > + if (len > 4) { > > + dev_err(&ctrl->dev, "pmif supports 1..4 bytes per trans, but:%zu requested", len); > > Missing newline > Thanks, I will update it in the next patch. > > + return -EINVAL; > > + } > > + > > + /* Check the opcode */ > > + if (opc >= 0x40 && opc <= 0x5F) > > + opc = PMIF_CMD_REG; > > + else if ((opc <= 0xF) || (opc >= 0x30 && opc <= 0x37)) > > + opc = PMIF_CMD_EXT_REG_LONG; > > + else if (opc >= 0x80) > > + opc = PMIF_CMD_REG_0; > > + else > > + return -EINVAL; > > + > > + /* Wait for Software Interface FSM state to be IDLE. */ > > + inf_reg = &arb->chan; > > + ret = readl_poll_timeout_atomic(arb->base + arb->data->regs[inf_reg->ch_sta], > > + data, GET_SWINF(data) == SWINF_IDLE, > > + PMIF_DELAY_US, PMIF_TIMEOUT_US); > > + if (ret < 0) { > > + /* set channel ready if the data has transferred */ > > + if (pmif_is_fsm_vldclr(arb)) > > + pmif_writel(arb, 1, inf_reg->ch_rdy); > > + dev_err(&ctrl->dev, "failed to wait for SWINF_IDLE\n"); > > + goto out; > > + } > > + > > + /* Set the write data. */ > > + memcpy(&data, buf, len); > > + pmif_writel(arb, data, inf_reg->wdata); > > + > > + /* Send the command. */ > > + cmd = (opc << 30) | BIT(29) | (sid << 24) | ((len - 1) << 16) | addr; > > + pmif_writel(arb, cmd, inf_reg->ch_send); > > + > > +out: > > + if (ret < 0) > > + return ret; > > + > > + return 0; > > Simplify to > > out: > return ret; > Thanks, I will update it in the next patch. > > +} > > + > > +static const struct pmif_data mt6873_pmif_arb = { > > + .regs = mt6873_regs, > > + .spmimst_regs = mt6873_spmi_regs, > > + .soc_chan = 2, > > +}; > > + > > +static int mtk_spmi_probe(struct platform_device *pdev) > > +{ > > + struct pmif *arb; > > + struct spmi_controller *ctrl; > > + int err, i; > > + u32 chan_offset; > > + > > + ctrl = spmi_controller_alloc(&pdev->dev, sizeof(*arb)); > > + if (!ctrl) > > + return -ENOMEM; > > + > > + arb = spmi_controller_get_drvdata(ctrl); > > + arb->data = of_device_get_match_data(&pdev->dev); > > Use device_get_match_data() instead please. > Thanks, I will change to use device_get_match_data in the next patch. > > + if (!arb->data) { > > + err = -EINVAL; > > + dev_err(&pdev->dev, "Cannot get drv_data\n"); > > + goto err_put_ctrl; > > + } > > + > > + arb->base = devm_platform_ioremap_resource_byname(pdev, "pmif"); > > + if (IS_ERR(arb->base)) { > > + err = PTR_ERR(arb->base); > > + dev_err(&pdev->dev, "pmif failed to get the remappped memory\n"); > > Please drop print as the API already prints errors for every problem. > Thanks, I will update it in the next patch. > > + goto err_put_ctrl; > > + } > > + > > + arb->spmimst_base = devm_platform_ioremap_resource_byname(pdev, "spmimst"); > > + if (IS_ERR(arb->spmimst_base)) { > > + err = PTR_ERR(arb->spmimst_base); > > + dev_err(&pdev->dev, "spmimst failed to get the remappped memory\n"); > > Please drop print as the API already prints errors for every problem. > Thanks, I will update it in the next patch. > > + goto err_put_ctrl; > > + } > > + > > + arb->nclks = ARRAY_SIZE(pmif_clock_names); > > + if (arb->nclks > PMIF_MAX_CLKS) { > > + err = -EINVAL; > > + dev_err(&pdev->dev, "exceed the max clock numbers\n"); > > Do we really care? The dt schema should be checking this instead of the > driver. > Thanks, I will remove the check in the next patch. > > + goto err_put_ctrl; > > + } > > + > > + for (i = 0; i < arb->nclks; i++) > > + arb->clks[i].id = pmif_clock_names[i]; > > + ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v10 4/5] spmi: mediatek: Add support for MT8195 2021-08-03 6:34 [PATCH v10 0/5] Add SPMI support for Mediatek SoC IC Hsin-Hsiung Wang ` (2 preceding siblings ...) 2021-08-03 6:34 ` [PATCH v10 3/5] spmi: mediatek: Add support for MT6873/8192 Hsin-Hsiung Wang @ 2021-08-03 6:34 ` Hsin-Hsiung Wang 2021-08-06 17:49 ` Stephen Boyd 2021-08-03 6:34 ` [PATCH v10 5/5] arm64: dts: mt8192: add spmi node Hsin-Hsiung Wang 4 siblings, 1 reply; 11+ messages in thread From: Hsin-Hsiung Wang @ 2021-08-03 6:34 UTC (permalink / raw) To: Stephen Boyd, Rob Herring, Matthias Brugger Cc: Hsin-Hsiung Wang, linux-kernel, devicetree, linux-arm-kernel, linux-mediatek, srv_heupstream, Project_Global_Chrome_Upstream_Group, Henry Chen From: Henry Chen <henryc.chen@mediatek.com> Add spmi support for MT8195. Signed-off-by: Henry Chen <henryc.chen@mediatek.com> --- changes since v9: - No change. --- drivers/spmi/spmi-mtk-pmif.c | 90 ++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/drivers/spmi/spmi-mtk-pmif.c b/drivers/spmi/spmi-mtk-pmif.c index 94c45d46ab0c..0c320801c9d5 100644 --- a/drivers/spmi/spmi-mtk-pmif.c +++ b/drivers/spmi/spmi-mtk-pmif.c @@ -150,6 +150,54 @@ static const u32 mt6873_regs[] = { [PMIF_SWINF_3_STA] = 0x0CE8, }; +static const u32 mt8195_regs[] = { + [PMIF_INIT_DONE] = 0x0000, + [PMIF_INF_EN] = 0x0024, + [PMIF_ARB_EN] = 0x0150, + [PMIF_CMDISSUE_EN] = 0x03B8, + [PMIF_TIMER_CTRL] = 0x03E4, + [PMIF_SPI_MODE_CTRL] = 0x0408, + [PMIF_IRQ_EVENT_EN_0] = 0x0420, + [PMIF_IRQ_FLAG_0] = 0x0428, + [PMIF_IRQ_CLR_0] = 0x042C, + [PMIF_IRQ_EVENT_EN_1] = 0x0430, + [PMIF_IRQ_FLAG_1] = 0x0438, + [PMIF_IRQ_CLR_1] = 0x043C, + [PMIF_IRQ_EVENT_EN_2] = 0x0440, + [PMIF_IRQ_FLAG_2] = 0x0448, + [PMIF_IRQ_CLR_2] = 0x044C, + [PMIF_IRQ_EVENT_EN_3] = 0x0450, + [PMIF_IRQ_FLAG_3] = 0x0458, + [PMIF_IRQ_CLR_3] = 0x045C, + [PMIF_IRQ_EVENT_EN_4] = 0x0460, + [PMIF_IRQ_FLAG_4] = 0x0468, + [PMIF_IRQ_CLR_4] = 0x046C, + [PMIF_WDT_EVENT_EN_0] = 0x0474, + [PMIF_WDT_FLAG_0] = 0x0478, + [PMIF_WDT_EVENT_EN_1] = 0x047C, + [PMIF_WDT_FLAG_1] = 0x0480, + [PMIF_SWINF_0_ACC] = 0x0800, + [PMIF_SWINF_0_WDATA_31_0] = 0x0804, + [PMIF_SWINF_0_RDATA_31_0] = 0x0814, + [PMIF_SWINF_0_VLD_CLR] = 0x0824, + [PMIF_SWINF_0_STA] = 0x0828, + [PMIF_SWINF_1_ACC] = 0x0840, + [PMIF_SWINF_1_WDATA_31_0] = 0x0844, + [PMIF_SWINF_1_RDATA_31_0] = 0x0854, + [PMIF_SWINF_1_VLD_CLR] = 0x0864, + [PMIF_SWINF_1_STA] = 0x0868, + [PMIF_SWINF_2_ACC] = 0x0880, + [PMIF_SWINF_2_WDATA_31_0] = 0x0884, + [PMIF_SWINF_2_RDATA_31_0] = 0x0894, + [PMIF_SWINF_2_VLD_CLR] = 0x08A4, + [PMIF_SWINF_2_STA] = 0x08A8, + [PMIF_SWINF_3_ACC] = 0x08C0, + [PMIF_SWINF_3_WDATA_31_0] = 0x08C4, + [PMIF_SWINF_3_RDATA_31_0] = 0x08D4, + [PMIF_SWINF_3_VLD_CLR] = 0x08E4, + [PMIF_SWINF_3_STA] = 0x08E8, +}; + enum spmi_regs { SPMI_OP_ST_CTRL, SPMI_GRP_ID_EN, @@ -163,6 +211,15 @@ enum spmi_regs { SPMI_REC3, SPMI_REC4, SPMI_MST_DBG, + + /* MT8195 spmi regs */ + SPMI_MST_RCS_CTRL, + SPMI_SLV_3_0_EINT, + SPMI_SLV_7_4_EINT, + SPMI_SLV_B_8_EINT, + SPMI_SLV_F_C_EINT, + SPMI_REC_CMD_DEC, + SPMI_DEC_DBG, }; static const u32 mt6873_spmi_regs[] = { @@ -180,6 +237,28 @@ static const u32 mt6873_spmi_regs[] = { [SPMI_MST_DBG] = 0x00fc, }; +static const u32 mt8195_spmi_regs[] = { + [SPMI_OP_ST_CTRL] = 0x0000, + [SPMI_GRP_ID_EN] = 0x0004, + [SPMI_OP_ST_STA] = 0x0008, + [SPMI_MST_SAMPL] = 0x000C, + [SPMI_MST_REQ_EN] = 0x0010, + [SPMI_MST_RCS_CTRL] = 0x0014, + [SPMI_SLV_3_0_EINT] = 0x0020, + [SPMI_SLV_7_4_EINT] = 0x0024, + [SPMI_SLV_B_8_EINT] = 0x0028, + [SPMI_SLV_F_C_EINT] = 0x002C, + [SPMI_REC_CTRL] = 0x0040, + [SPMI_REC0] = 0x0044, + [SPMI_REC1] = 0x0048, + [SPMI_REC2] = 0x004C, + [SPMI_REC3] = 0x0050, + [SPMI_REC4] = 0x0054, + [SPMI_REC_CMD_DEC] = 0x005C, + [SPMI_DEC_DBG] = 0x00F8, + [SPMI_MST_DBG] = 0x00FC, +}; + static u32 pmif_readl(struct pmif *arb, enum pmif_regs reg) { return readl(arb->base + arb->data->regs[reg]); @@ -348,6 +427,14 @@ static const struct pmif_data mt6873_pmif_arb = { .soc_chan = 2, }; +static const struct pmif_data mt8195_pmif_arb[] = { + { + .regs = mt8195_regs, + .spmimst_regs = mt8195_spmi_regs, + .soc_chan = 2, + }, +}; + static int mtk_spmi_probe(struct platform_device *pdev) { struct pmif *arb; @@ -444,6 +531,9 @@ static const struct of_device_id mtk_spmi_match_table[] = { { .compatible = "mediatek,mt6873-spmi", .data = &mt6873_pmif_arb, + }, { + .compatible = "mediatek,mt8195-spmi", + .data = &mt8195_pmif_arb, }, { /* sentinel */ }, -- 2.18.0 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v10 4/5] spmi: mediatek: Add support for MT8195 2021-08-03 6:34 ` [PATCH v10 4/5] spmi: mediatek: Add support for MT8195 Hsin-Hsiung Wang @ 2021-08-06 17:49 ` Stephen Boyd 2021-08-07 3:28 ` Hsin-hsiung Wang 2021-08-07 3:51 ` Hsin-hsiung Wang 0 siblings, 2 replies; 11+ messages in thread From: Stephen Boyd @ 2021-08-06 17:49 UTC (permalink / raw) To: Hsin-Hsiung Wang, Matthias Brugger, Rob Herring Cc: Hsin-Hsiung Wang, linux-kernel, devicetree, linux-arm-kernel, linux-mediatek, srv_heupstream, Project_Global_Chrome_Upstream_Group, Henry Chen Quoting Hsin-Hsiung Wang (2021-08-02 23:34:20) > From: Henry Chen <henryc.chen@mediatek.com> > > Add spmi support for MT8195. > > Signed-off-by: Henry Chen <henryc.chen@mediatek.com> Missing Signed-off-by from hsin-hsiung.wang here > --- > changes since v9: > - No change. > --- > drivers/spmi/spmi-mtk-pmif.c | 90 ++++++++++++++++++++++++++++++++++++ > 1 file changed, 90 insertions(+) > > diff --git a/drivers/spmi/spmi-mtk-pmif.c b/drivers/spmi/spmi-mtk-pmif.c > index 94c45d46ab0c..0c320801c9d5 100644 > --- a/drivers/spmi/spmi-mtk-pmif.c > +++ b/drivers/spmi/spmi-mtk-pmif.c > @@ -348,6 +427,14 @@ static const struct pmif_data mt6873_pmif_arb = { > .soc_chan = 2, > }; > > +static const struct pmif_data mt8195_pmif_arb[] = { This is an array of type pmif_data. > + { > + .regs = mt8195_regs, > + .spmimst_regs = mt8195_spmi_regs, > + .soc_chan = 2, > + }, > +}; > + > static int mtk_spmi_probe(struct platform_device *pdev) > { > struct pmif *arb; > @@ -444,6 +531,9 @@ static const struct of_device_id mtk_spmi_match_table[] = { > { > .compatible = "mediatek,mt6873-spmi", > .data = &mt6873_pmif_arb, mt6873_pmif_arb is not an array, see the context header above. How does this work? Has this been tested? > + }, { > + .compatible = "mediatek,mt8195-spmi", > + .data = &mt8195_pmif_arb, > }, { > /* sentinel */ > }, > -- > 2.18.0 > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v10 4/5] spmi: mediatek: Add support for MT8195 2021-08-06 17:49 ` Stephen Boyd @ 2021-08-07 3:28 ` Hsin-hsiung Wang 2021-08-07 3:51 ` Hsin-hsiung Wang 1 sibling, 0 replies; 11+ messages in thread From: Hsin-hsiung Wang @ 2021-08-07 3:28 UTC (permalink / raw) To: Stephen Boyd Cc: Matthias Brugger, Rob Herring, linux-kernel, devicetree, linux-arm-kernel, linux-mediatek, srv_heupstream, Project_Global_Chrome_Upstream_Group, Henry Chen Hi, On Fri, 2021-08-06 at 10:49 -0700, Stephen Boyd wrote: > Quoting Hsin-Hsiung Wang (2021-08-02 23:34:20) > > From: Henry Chen <henryc.chen@mediatek.com> > > > > Add spmi support for MT8195. > > > > Signed-off-by: Henry Chen <henryc.chen@mediatek.com> > > Missing Signed-off-by from hsin-hsiung.wang here > Sorry for the missing. I will add it in the next patch. Thanks. > > --- > > changes since v9: > > - No change. > > --- > > drivers/spmi/spmi-mtk-pmif.c | 90 ++++++++++++++++++++++++++++++++++++ > > 1 file changed, 90 insertions(+) > > > > diff --git a/drivers/spmi/spmi-mtk-pmif.c b/drivers/spmi/spmi-mtk-pmif.c > > index 94c45d46ab0c..0c320801c9d5 100644 > > --- a/drivers/spmi/spmi-mtk-pmif.c > > +++ b/drivers/spmi/spmi-mtk-pmif.c > > @@ -348,6 +427,14 @@ static const struct pmif_data mt6873_pmif_arb = { > > .soc_chan = 2, > > }; > > > > +static const struct pmif_data mt8195_pmif_arb[] = { > > This is an array of type pmif_data. > > > + { > > + .regs = mt8195_regs, > > + .spmimst_regs = mt8195_spmi_regs, > > + .soc_chan = 2, > > + }, > > +}; > > + > > static int mtk_spmi_probe(struct platform_device *pdev) > > { > > struct pmif *arb; > > @@ -444,6 +531,9 @@ static const struct of_device_id mtk_spmi_match_table[] = { > > { > > .compatible = "mediatek,mt6873-spmi", > > .data = &mt6873_pmif_arb, > > mt6873_pmif_arb is not an array, see the context header above. > > How does this work? Has this been tested? > > > + }, { > > + .compatible = "mediatek,mt8195-spmi", > > + .data = &mt8195_pmif_arb, > > }, { > > /* sentinel */ > > }, > > -- > > 2.18.0 > > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v10 4/5] spmi: mediatek: Add support for MT8195 2021-08-06 17:49 ` Stephen Boyd 2021-08-07 3:28 ` Hsin-hsiung Wang @ 2021-08-07 3:51 ` Hsin-hsiung Wang 1 sibling, 0 replies; 11+ messages in thread From: Hsin-hsiung Wang @ 2021-08-07 3:51 UTC (permalink / raw) To: Stephen Boyd Cc: Matthias Brugger, Rob Herring, linux-kernel, devicetree, linux-arm-kernel, linux-mediatek, srv_heupstream, Project_Global_Chrome_Upstream_Group, Henry Chen Hi, sorry for missing other comments, I will confirm it internally and update it. Thanks a lot. On Fri, 2021-08-06 at 10:49 -0700, Stephen Boyd wrote: > Quoting Hsin-Hsiung Wang (2021-08-02 23:34:20) > > From: Henry Chen <henryc.chen@mediatek.com> > > > > Add spmi support for MT8195. > > > > Signed-off-by: Henry Chen <henryc.chen@mediatek.com> > > Missing Signed-off-by from hsin-hsiung.wang here > > > --- > > changes since v9: > > - No change. > > --- > > drivers/spmi/spmi-mtk-pmif.c | 90 ++++++++++++++++++++++++++++++++++++ > > 1 file changed, 90 insertions(+) > > > > diff --git a/drivers/spmi/spmi-mtk-pmif.c b/drivers/spmi/spmi-mtk-pmif.c > > index 94c45d46ab0c..0c320801c9d5 100644 > > --- a/drivers/spmi/spmi-mtk-pmif.c > > +++ b/drivers/spmi/spmi-mtk-pmif.c > > @@ -348,6 +427,14 @@ static const struct pmif_data mt6873_pmif_arb = { > > .soc_chan = 2, > > }; > > > > +static const struct pmif_data mt8195_pmif_arb[] = { > > This is an array of type pmif_data. > > > + { > > + .regs = mt8195_regs, > > + .spmimst_regs = mt8195_spmi_regs, > > + .soc_chan = 2, > > + }, > > +}; > > + > > static int mtk_spmi_probe(struct platform_device *pdev) > > { > > struct pmif *arb; > > @@ -444,6 +531,9 @@ static const struct of_device_id mtk_spmi_match_table[] = { > > { > > .compatible = "mediatek,mt6873-spmi", > > .data = &mt6873_pmif_arb, > > mt6873_pmif_arb is not an array, see the context header above. > > How does this work? Has this been tested? > > > + }, { > > + .compatible = "mediatek,mt8195-spmi", > > + .data = &mt8195_pmif_arb, > > }, { > > /* sentinel */ > > }, > > -- > > 2.18.0 > > ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v10 5/5] arm64: dts: mt8192: add spmi node 2021-08-03 6:34 [PATCH v10 0/5] Add SPMI support for Mediatek SoC IC Hsin-Hsiung Wang ` (3 preceding siblings ...) 2021-08-03 6:34 ` [PATCH v10 4/5] spmi: mediatek: Add support for MT8195 Hsin-Hsiung Wang @ 2021-08-03 6:34 ` Hsin-Hsiung Wang 4 siblings, 0 replies; 11+ messages in thread From: Hsin-Hsiung Wang @ 2021-08-03 6:34 UTC (permalink / raw) To: Stephen Boyd, Rob Herring, Matthias Brugger Cc: Hsin-Hsiung Wang, linux-kernel, devicetree, linux-arm-kernel, linux-mediatek, srv_heupstream, Project_Global_Chrome_Upstream_Group Add spmi node to SOC MT8192. Signed-off-by: Hsin-Hsiung Wang <hsin-hsiung.wang@mediatek.com> --- changes since v9: - No change. --- arch/arm64/boot/dts/mediatek/mt8192.dtsi | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/arch/arm64/boot/dts/mediatek/mt8192.dtsi b/arch/arm64/boot/dts/mediatek/mt8192.dtsi index 9810f1d441da..1237e3624e44 100644 --- a/arch/arm64/boot/dts/mediatek/mt8192.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8192.dtsi @@ -316,6 +316,23 @@ clock-names = "clk13m"; }; + spmi: spmi@10027000 { + compatible = "mediatek,mt6873-spmi"; + reg = <0 0x10027000 0 0x000e00>, + <0 0x10029000 0 0x000100>; + reg-names = "pmif", "spmimst"; + clocks = <&infracfg CLK_INFRA_PMIC_AP>, + <&infracfg CLK_INFRA_PMIC_TMR>, + <&topckgen CLK_TOP_SPMI_MST_SEL>; + clock-names = "pmif_sys_ck", + "pmif_tmr_ck", + "spmimst_clk_mux"; + assigned-clocks = <&topckgen CLK_TOP_PWRAP_ULPOSC_SEL>; + assigned-clock-parents = <&topckgen CLK_TOP_OSC_D10>; + #address-cells = <2>; + #size-cells = <0>; + }; + scp_adsp: clock-controller@10720000 { compatible = "mediatek,mt8192-scp_adsp"; reg = <0 0x10720000 0 0x1000>; -- 2.18.0 ^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2021-08-16 12:11 UTC | newest] Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-08-03 6:34 [PATCH v10 0/5] Add SPMI support for Mediatek SoC IC Hsin-Hsiung Wang 2021-08-03 6:34 ` [PATCH v10 1/5] dt-bindings: spmi: modify the constraint 'maxItems' to 'minItems' Hsin-Hsiung Wang 2021-08-03 6:34 ` [PATCH v10 2/5] dt-bindings: spmi: document binding for the Mediatek SPMI controller Hsin-Hsiung Wang 2021-08-03 6:34 ` [PATCH v10 3/5] spmi: mediatek: Add support for MT6873/8192 Hsin-Hsiung Wang 2021-08-09 17:55 ` Stephen Boyd 2021-08-16 12:11 ` Hsin-hsiung Wang 2021-08-03 6:34 ` [PATCH v10 4/5] spmi: mediatek: Add support for MT8195 Hsin-Hsiung Wang 2021-08-06 17:49 ` Stephen Boyd 2021-08-07 3:28 ` Hsin-hsiung Wang 2021-08-07 3:51 ` Hsin-hsiung Wang 2021-08-03 6:34 ` [PATCH v10 5/5] arm64: dts: mt8192: add spmi node Hsin-Hsiung Wang
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 NNTP newsgroup(s).