* [PATCH v4 0/2] Add SPMI support for Mediatek MT6873/8192 SoC IC @ 2020-10-16 16:10 Hsin-Hsiung Wang 2020-10-16 16:10 ` [PATCH v4 1/2] dt-bindings: spmi: document binding for the Mediatek SPMI controller Hsin-Hsiung Wang 2020-10-16 16:10 ` [PATCH v4 2/2] spmi: mediatek: Add support for MT6873/8192 Hsin-Hsiung Wang 0 siblings, 2 replies; 8+ messages in thread From: Hsin-Hsiung Wang @ 2020-10-16 16:10 UTC (permalink / raw) To: Stephen Boyd, Rob Herring, Matthias Brugger Cc: Hsin-Hsiung Wang, linux-arm-msm, devicetree, linux-arm-kernel, linux-mediatek, linux-kernel, srv_heupstream This series adds support for new SoC MT6873/8192 to the spmi driver. changes since v3: - update correct maintainer of the binding document. - modify debug messages in the mtk spmi probe function. - enable the sys clk and timer clk for spmi driver. Hsin-Hsiung Wang (2): dt-bindings: spmi: document binding for the Mediatek SPMI controller spmi: mediatek: Add support for MT6873/8192 .../bindings/spmi/mtk,spmi-mtk-pmif.yaml | 70 +++ drivers/spmi/Kconfig | 9 + drivers/spmi/Makefile | 1 + drivers/spmi/spmi-mtk-pmif.c | 490 ++++++++++++++++++ 4 files changed, 570 insertions(+) create mode 100644 Documentation/devicetree/bindings/spmi/mtk,spmi-mtk-pmif.yaml create mode 100644 drivers/spmi/spmi-mtk-pmif.c -- 2.18.0 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v4 1/2] dt-bindings: spmi: document binding for the Mediatek SPMI controller 2020-10-16 16:10 [PATCH v4 0/2] Add SPMI support for Mediatek MT6873/8192 SoC IC Hsin-Hsiung Wang @ 2020-10-16 16:10 ` Hsin-Hsiung Wang 2020-10-19 19:52 ` Rob Herring 2020-10-19 19:54 ` Rob Herring 2020-10-16 16:10 ` [PATCH v4 2/2] spmi: mediatek: Add support for MT6873/8192 Hsin-Hsiung Wang 1 sibling, 2 replies; 8+ messages in thread From: Hsin-Hsiung Wang @ 2020-10-16 16:10 UTC (permalink / raw) To: Stephen Boyd, Rob Herring, Matthias Brugger Cc: Hsin-Hsiung Wang, linux-arm-msm, devicetree, linux-arm-kernel, linux-mediatek, linux-kernel, srv_heupstream This adds documentation for the SPMI controller found on Mediatek SoCs. Signed-off-by: Hsin-Hsiung Wang <hsin-hsiung.wang@mediatek.com> --- .../bindings/spmi/mtk,spmi-mtk-pmif.yaml | 70 +++++++++++++++++++ 1 file changed, 70 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..9945200a35b3 --- /dev/null +++ b/Documentation/devicetree/bindings/spmi/mtk,spmi-mtk-pmif.yaml @@ -0,0 +1,70 @@ +# 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. + +properties: + compatible: + const: mediatek,mt6873-spmi + + reg: + minItems: 2 + 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 + +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] 8+ messages in thread
* Re: [PATCH v4 1/2] dt-bindings: spmi: document binding for the Mediatek SPMI controller 2020-10-16 16:10 ` [PATCH v4 1/2] dt-bindings: spmi: document binding for the Mediatek SPMI controller Hsin-Hsiung Wang @ 2020-10-19 19:52 ` Rob Herring 2020-10-20 4:00 ` Hsin-Hsiung Wang 2020-10-19 19:54 ` Rob Herring 1 sibling, 1 reply; 8+ messages in thread From: Rob Herring @ 2020-10-19 19:52 UTC (permalink / raw) To: Hsin-Hsiung Wang Cc: linux-kernel, srv_heupstream, Stephen Boyd, Rob Herring, linux-arm-kernel, linux-mediatek, Matthias Brugger, devicetree, linux-arm-msm On Sat, 17 Oct 2020 00:10:33 +0800, Hsin-Hsiung Wang wrote: > This adds documentation for the SPMI controller found on Mediatek SoCs. > > Signed-off-by: Hsin-Hsiung Wang <hsin-hsiung.wang@mediatek.com> > --- > .../bindings/spmi/mtk,spmi-mtk-pmif.yaml | 70 +++++++++++++++++++ > 1 file changed, 70 insertions(+) > create mode 100644 Documentation/devicetree/bindings/spmi/mtk,spmi-mtk-pmif.yaml > My bot found errors running 'make dt_binding_check' on your patch: Documentation/devicetree/bindings/spmi/mtk,spmi-mtk-pmif.example.dts:19:18: fatal error: dt-bindings/clock/mt8192-clk.h: No such file or directory 19 | #include <dt-bindings/clock/mt8192-clk.h> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. make[1]: *** [scripts/Makefile.lib:342: Documentation/devicetree/bindings/spmi/mtk,spmi-mtk-pmif.example.dt.yaml] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:1366: dt_binding_check] Error 2 See https://patchwork.ozlabs.org/patch/1383441 If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure dt-schema is up to date: pip3 install git+https://github.com/devicetree-org/dt-schema.git@master --upgrade Please check and re-submit. ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v4 1/2] dt-bindings: spmi: document binding for the Mediatek SPMI controller 2020-10-19 19:52 ` Rob Herring @ 2020-10-20 4:00 ` Hsin-Hsiung Wang 0 siblings, 0 replies; 8+ messages in thread From: Hsin-Hsiung Wang @ 2020-10-20 4:00 UTC (permalink / raw) To: Rob Herring Cc: linux-kernel, srv_heupstream, Stephen Boyd, Rob Herring, linux-arm-kernel, linux-mediatek, Matthias Brugger, devicetree, linux-arm-msm Hi, On Mon, 2020-10-19 at 14:52 -0500, Rob Herring wrote: > On Sat, 17 Oct 2020 00:10:33 +0800, Hsin-Hsiung Wang wrote: > > This adds documentation for the SPMI controller found on Mediatek SoCs. > > > > Signed-off-by: Hsin-Hsiung Wang <hsin-hsiung.wang@mediatek.com> > > --- > > .../bindings/spmi/mtk,spmi-mtk-pmif.yaml | 70 +++++++++++++++++++ > > 1 file changed, 70 insertions(+) > > create mode 100644 Documentation/devicetree/bindings/spmi/mtk,spmi-mtk-pmif.yaml > > > > > My bot found errors running 'make dt_binding_check' on your patch: > > Documentation/devicetree/bindings/spmi/mtk,spmi-mtk-pmif.example.dts:19:18: fatal error: dt-bindings/clock/mt8192-clk.h: No such file or directory > 19 | #include <dt-bindings/clock/mt8192-clk.h> > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > compilation terminated. > make[1]: *** [scripts/Makefile.lib:342: Documentation/devicetree/bindings/spmi/mtk,spmi-mtk-pmif.example.dt.yaml] Error 1 > make[1]: *** Waiting for unfinished jobs.... > make: *** [Makefile:1366: dt_binding_check] Error 2 > > > See https://patchwork.ozlabs.org/patch/1383441 > > If you already ran 'make dt_binding_check' and didn't see the above > error(s), then make sure dt-schema is up to date: > > pip3 install git+https://github.com/devicetree-org/dt-schema.git@master --upgrade > > Please check and re-submit. > Sorry, I don't add the necessary series[1] into the commit message. I will update it in the next patch, thanks for the review. [1] https://patchwork.kernel.org/project/linux-mediatek/list/?series=342593 ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v4 1/2] dt-bindings: spmi: document binding for the Mediatek SPMI controller 2020-10-16 16:10 ` [PATCH v4 1/2] dt-bindings: spmi: document binding for the Mediatek SPMI controller Hsin-Hsiung Wang 2020-10-19 19:52 ` Rob Herring @ 2020-10-19 19:54 ` Rob Herring 2020-10-20 4:04 ` Hsin-Hsiung Wang 1 sibling, 1 reply; 8+ messages in thread From: Rob Herring @ 2020-10-19 19:54 UTC (permalink / raw) To: Hsin-Hsiung Wang Cc: Stephen Boyd, Matthias Brugger, linux-arm-msm, devicetree, linux-arm-kernel, linux-mediatek, linux-kernel, srv_heupstream On Sat, Oct 17, 2020 at 12:10:33AM +0800, Hsin-Hsiung Wang wrote: > This adds documentation for the SPMI controller found on Mediatek SoCs. > > Signed-off-by: Hsin-Hsiung Wang <hsin-hsiung.wang@mediatek.com> > --- If you have a dependency such as the include, please note it here. > .../bindings/spmi/mtk,spmi-mtk-pmif.yaml | 70 +++++++++++++++++++ > 1 file changed, 70 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..9945200a35b3 > --- /dev/null > +++ b/Documentation/devicetree/bindings/spmi/mtk,spmi-mtk-pmif.yaml > @@ -0,0 +1,70 @@ > +# 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. Need a $ref to spmi.yaml. > + > +properties: > + compatible: > + const: mediatek,mt6873-spmi > + > + reg: > + minItems: 2 > + maxItems: 2 > + > + reg-names: > + items: > + - const: "pmif" > + - const: "spmimst" Don't need quotes > + > + 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 [flat|nested] 8+ messages in thread
* Re: [PATCH v4 1/2] dt-bindings: spmi: document binding for the Mediatek SPMI controller 2020-10-19 19:54 ` Rob Herring @ 2020-10-20 4:04 ` Hsin-Hsiung Wang 0 siblings, 0 replies; 8+ messages in thread From: Hsin-Hsiung Wang @ 2020-10-20 4:04 UTC (permalink / raw) To: Rob Herring Cc: Stephen Boyd, Matthias Brugger, linux-arm-msm, devicetree, linux-arm-kernel, linux-mediatek, linux-kernel, srv_heupstream Hi, On Mon, 2020-10-19 at 14:54 -0500, Rob Herring wrote: > On Sat, Oct 17, 2020 at 12:10:33AM +0800, Hsin-Hsiung Wang wrote: > > This adds documentation for the SPMI controller found on Mediatek SoCs. > > > > Signed-off-by: Hsin-Hsiung Wang <hsin-hsiung.wang@mediatek.com> > > --- > > If you have a dependency such as the include, please note it here. > Sorry, I don't add the necessary patchset[1] into the commit message. I will update it in the next patch. [1] https://patchwork.kernel.org/project/linux-mediatek/list/?series=342593 > > .../bindings/spmi/mtk,spmi-mtk-pmif.yaml | 70 +++++++++++++++++++ > > 1 file changed, 70 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..9945200a35b3 > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/spmi/mtk,spmi-mtk-pmif.yaml > > @@ -0,0 +1,70 @@ > > +# 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. > > Need a $ref to spmi.yaml. > Thanks, I will update it in the next patch. > > + > > +properties: > > + compatible: > > + const: mediatek,mt6873-spmi > > + > > + reg: > > + minItems: 2 > > + maxItems: 2 > > + > > + reg-names: > > + items: > > + - const: "pmif" > > + - const: "spmimst" > > Don't need quotes > Thanks, I will update it in the next patch. > > + > > + 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 > Thanks, I will update it in the next patch. > > + > > +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 [flat|nested] 8+ messages in thread
* [PATCH v4 2/2] spmi: mediatek: Add support for MT6873/8192 2020-10-16 16:10 [PATCH v4 0/2] Add SPMI support for Mediatek MT6873/8192 SoC IC Hsin-Hsiung Wang 2020-10-16 16:10 ` [PATCH v4 1/2] dt-bindings: spmi: document binding for the Mediatek SPMI controller Hsin-Hsiung Wang @ 2020-10-16 16:10 ` Hsin-Hsiung Wang 2020-10-22 7:47 ` Fei Shao 1 sibling, 1 reply; 8+ messages in thread From: Hsin-Hsiung Wang @ 2020-10-16 16:10 UTC (permalink / raw) To: Stephen Boyd, Rob Herring, Matthias Brugger Cc: Hsin-Hsiung Wang, linux-arm-msm, devicetree, linux-arm-kernel, linux-mediatek, linux-kernel, srv_heupstream add spmi support for MT6873/8192. Signed-off-by: Hsin-Hsiung Wang <hsin-hsiung.wang@mediatek.com> --- drivers/spmi/Kconfig | 9 + drivers/spmi/Makefile | 1 + drivers/spmi/spmi-mtk-pmif.c | 490 +++++++++++++++++++++++++++++++++++ 3 files changed, 500 insertions(+) create mode 100644 drivers/spmi/spmi-mtk-pmif.c diff --git a/drivers/spmi/Kconfig b/drivers/spmi/Kconfig index a53bad541f1a..418848840999 100644 --- a/drivers/spmi/Kconfig +++ b/drivers/spmi/Kconfig @@ -25,4 +25,13 @@ 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 55a94cadeffe..91f303b96925 100644 --- a/drivers/spmi/Makefile +++ b/drivers/spmi/Makefile @@ -5,3 +5,4 @@ obj-$(CONFIG_SPMI) += spmi.o obj-$(CONFIG_SPMI_MSM_PMIC_ARB) += spmi-pmic-arb.o +obj-$(CONFIG_SPMI_MTK_PMIF) += spmi-mtk-pmif.o \ No newline at end of file diff --git a/drivers/spmi/spmi-mtk-pmif.c b/drivers/spmi/spmi-mtk-pmif.c new file mode 100644 index 000000000000..1b8b628fc9b6 --- /dev/null +++ b/drivers/spmi/spmi-mtk-pmif.c @@ -0,0 +1,490 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright (c) 2020 MediaTek Inc. + +#include <linux/clk.h> +#include <linux/iopoll.h> +#include <linux/module.h> +#include <linux/of_address.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 (10 * 1000) + +#define PMIF_CHAN_OFFSET 0x5 + +#define SPMI_OP_ST_BUSY 1 + +struct ch_reg { + u32 ch_sta; + u32 wdata; + u32 rdata; + u32 ch_send; + u32 ch_rdy; +}; + +struct pmif { + void __iomem *base; + const u32 *regs; + void __iomem *spmimst_base; + const u32 *spmimst_regs; + u32 soc_chan; + int grpid; + raw_spinlock_t lock; + struct clk *pmif_sys_ck; + struct clk *pmif_tmr_ck; + struct clk *spmimst_clk_mux; + struct ch_reg chan; +}; + +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->regs[reg]); +} + +static void pmif_writel(struct pmif *arb, u32 val, enum pmif_regs reg) +{ + writel(val, arb->base + arb->regs[reg]); +} + +static void mtk_spmi_writel(struct pmif *arb, u32 val, enum spmi_regs reg) +{ + writel(val, arb->spmimst_base + arb->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; + u8 cmd; + int ret; + + /* Check the opcode */ + if (opc == SPMI_CMD_RESET) + cmd = 0; + else if (opc == SPMI_CMD_SLEEP) + cmd = 1; + else if (opc == SPMI_CMD_SHUTDOWN) + cmd = 2; + else if (opc == SPMI_CMD_WAKEUP) + cmd = 3; + else + return -EINVAL; + + mtk_spmi_writel(arb, (cmd << 0x4) | sid, SPMI_OP_ST_CTRL); + ret = readl_poll_timeout_atomic(arb->spmimst_base + arb->spmimst_regs[SPMI_OP_ST_STA], + rdata, (rdata & SPMI_OP_ST_BUSY) == SPMI_OP_ST_BUSY, + PMIF_DELAY_US, PMIF_TIMEOUT); + if (ret < 0) + dev_err(&ctrl->dev, "timeout, err = %d\r\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 = NULL; + int ret; + u32 data = 0; + u8 bc = len - 1; + unsigned long flags; + + /* Check for argument validation. */ + if (sid & ~(0xf)) + return -EINVAL; + + if (!arb) + return -EINVAL; + + inf_reg = &arb->chan; + /* Check the opcode */ + if (opc >= 0x60 && opc <= 0x7f) + opc = PMIF_CMD_REG; + else if (opc >= 0x20 && opc <= 0x2f) + opc = PMIF_CMD_EXT_REG_LONG; + else if (opc >= 0x38 && opc <= 0x3f) + opc = PMIF_CMD_EXT_REG_LONG; + else + return -EINVAL; + + raw_spin_lock_irqsave(&arb->lock, flags); + /* Wait for Software Interface FSM state to be IDLE. */ + ret = readl_poll_timeout_atomic(arb->base + arb->regs[inf_reg->ch_sta], + data, GET_SWINF(data) == SWINF_IDLE, + PMIF_DELAY_US, PMIF_TIMEOUT); + 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); + raw_spin_unlock_irqrestore(&arb->lock, flags); + return ret; + } + + /* Send the command. */ + pmif_writel(arb, + (opc << 30) | (sid << 24) | (bc << 16) | addr, + 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->regs[inf_reg->ch_sta], + data, GET_SWINF(data) == SWINF_WFVLDCLR, + PMIF_DELAY_US, PMIF_TIMEOUT); + if (ret < 0) { + raw_spin_unlock_irqrestore(&arb->lock, flags); + return ret; + } + + data = pmif_readl(arb, inf_reg->rdata); + memcpy(buf, &data, (bc & 3) + 1); + pmif_writel(arb, 1, inf_reg->ch_rdy); + raw_spin_unlock_irqrestore(&arb->lock, flags); + + 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 = NULL; + int ret; + u32 data = 0; + u8 bc = len - 1; + unsigned long flags = 0; + + /* Check for argument validation. */ + if (sid & ~(0xf)) + return -EINVAL; + + if (!arb) + return -EINVAL; + + inf_reg = &arb->chan; + + /* Check the opcode */ + if (opc >= 0x40 && opc <= 0x5F) + opc = PMIF_CMD_REG; + else if (opc <= 0x0F) + opc = PMIF_CMD_EXT_REG_LONG; + else if (opc >= 0x30 && opc <= 0x37) + opc = PMIF_CMD_EXT_REG_LONG; + else if (opc >= 0x80) + opc = PMIF_CMD_REG_0; + else + return -EINVAL; + + raw_spin_lock_irqsave(&arb->lock, flags); + /* Wait for Software Interface FSM state to be IDLE. */ + ret = readl_poll_timeout_atomic(arb->base + arb->regs[inf_reg->ch_sta], + data, GET_SWINF(data) == SWINF_IDLE, + PMIF_DELAY_US, PMIF_TIMEOUT); + 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); + raw_spin_unlock_irqrestore(&arb->lock, flags); + return ret; + } + + /* Set the write data. */ + memcpy(&data, buf, (bc & 3) + 1); + pmif_writel(arb, data, inf_reg->wdata); + + /* Send the command. */ + pmif_writel(arb, + (opc << 30) | BIT(29) | (sid << 24) | (bc << 16) | addr, + inf_reg->ch_send); + raw_spin_unlock_irqrestore(&arb->lock, flags); + + return 0; +} + +static struct pmif 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 resource *res; + struct spmi_controller *ctrl; + int err = 0; + + ctrl = spmi_controller_alloc(&pdev->dev, sizeof(*arb)); + if (!ctrl) + return -ENOMEM; + + ctrl->cmd = pmif_arb_cmd; + ctrl->read_cmd = pmif_spmi_read_cmd; + ctrl->write_cmd = pmif_spmi_write_cmd; + + /* re-assign of_id->data */ + spmi_controller_set_drvdata(ctrl, (void *)of_device_get_match_data(&pdev->dev)); + arb = spmi_controller_get_drvdata(ctrl); + + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pmif"); + arb->base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(arb->base)) { + err = PTR_ERR(arb->base); + goto err_put_ctrl; + } + + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "spmimst"); + arb->spmimst_base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(arb->spmimst_base)) { + err = PTR_ERR(arb->spmimst_base); + goto err_put_ctrl; + } + + arb->pmif_sys_ck = devm_clk_get(&pdev->dev, "pmif_sys_ck"); + if (IS_ERR(arb->pmif_sys_ck)) { + dev_err(&pdev->dev, "[%s] Failed to get ap clock: %ld\n", + __func__, PTR_ERR(arb->pmif_sys_ck)); + goto err_put_ctrl; + } + + arb->pmif_tmr_ck = devm_clk_get(&pdev->dev, "pmif_tmr_ck"); + if (IS_ERR(arb->pmif_tmr_ck)) { + dev_err(&pdev->dev, "[%s] Failed to get tmr clock: %ld\n", + __func__, PTR_ERR(arb->pmif_tmr_ck)); + goto err_put_ctrl; + } + + arb->spmimst_clk_mux = devm_clk_get(&pdev->dev, "spmimst_clk_mux"); + if (IS_ERR(arb->spmimst_clk_mux)) { + dev_err(&pdev->dev, "[%s] Failed to get clock: %ld\n", + __func__, PTR_ERR(arb->spmimst_clk_mux)); + goto err_put_ctrl; + } + + err = clk_prepare_enable(arb->pmif_sys_ck); + if (err) { + dev_err(&pdev->dev, "[%s] Failed to enable ap clk.\n", __func__); + goto err_put_ctrl; + } + + err = clk_prepare_enable(arb->pmif_tmr_ck); + if (err) { + dev_err(&pdev->dev, "[%s] Failed to enable tmr clk.\n", __func__); + goto err_clk_1; + } + + err = clk_prepare_enable(arb->spmimst_clk_mux); + if (err) { + dev_err(&pdev->dev, "[%s] Failed to enable spmi master clk.\n", __func__); + goto err_clk_2; + } + + arb->chan.ch_sta = PMIF_SWINF_0_STA + (PMIF_CHAN_OFFSET * arb->soc_chan); + arb->chan.wdata = PMIF_SWINF_0_WDATA_31_0 + (PMIF_CHAN_OFFSET * arb->soc_chan); + arb->chan.rdata = PMIF_SWINF_0_RDATA_31_0 + (PMIF_CHAN_OFFSET * arb->soc_chan); + arb->chan.ch_send = PMIF_SWINF_0_ACC + (PMIF_CHAN_OFFSET * arb->soc_chan); + arb->chan.ch_rdy = PMIF_SWINF_0_VLD_CLR + (PMIF_CHAN_OFFSET * arb->soc_chan); + + raw_spin_lock_init(&arb->lock); + + platform_set_drvdata(pdev, ctrl); + + err = spmi_controller_add(ctrl); + if (err) + goto err_domain_remove; + + return 0; + +err_domain_remove: + clk_disable_unprepare(arb->spmimst_clk_mux); +err_clk_2: + clk_disable_unprepare(arb->pmif_tmr_ck); +err_clk_1: + clk_disable_unprepare(arb->pmif_sys_ck); +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); + + 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] 8+ messages in thread
* Re: [PATCH v4 2/2] spmi: mediatek: Add support for MT6873/8192 2020-10-16 16:10 ` [PATCH v4 2/2] spmi: mediatek: Add support for MT6873/8192 Hsin-Hsiung Wang @ 2020-10-22 7:47 ` Fei Shao 0 siblings, 0 replies; 8+ messages in thread From: Fei Shao @ 2020-10-22 7:47 UTC (permalink / raw) To: Hsin-Hsiung Wang Cc: Stephen Boyd, Rob Herring, Matthias Brugger, devicetree, srv_heupstream, linux-arm-msm, linux-kernel, linux-mediatek, linux-arm-kernel On Sat, Oct 17, 2020 at 12:11 AM Hsin-Hsiung Wang <hsin-hsiung.wang@mediatek.com> wrote: > > add spmi support for MT6873/8192. > > Signed-off-by: Hsin-Hsiung Wang <hsin-hsiung.wang@mediatek.com> > --- > drivers/spmi/Kconfig | 9 + > drivers/spmi/Makefile | 1 + > drivers/spmi/spmi-mtk-pmif.c | 490 +++++++++++++++++++++++++++++++++++ > 3 files changed, 500 insertions(+) > create mode 100644 drivers/spmi/spmi-mtk-pmif.c > > diff --git a/drivers/spmi/Kconfig b/drivers/spmi/Kconfig > index a53bad541f1a..418848840999 100644 > --- a/drivers/spmi/Kconfig > +++ b/drivers/spmi/Kconfig > @@ -25,4 +25,13 @@ 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 55a94cadeffe..91f303b96925 100644 > --- a/drivers/spmi/Makefile > +++ b/drivers/spmi/Makefile > @@ -5,3 +5,4 @@ > obj-$(CONFIG_SPMI) += spmi.o > > obj-$(CONFIG_SPMI_MSM_PMIC_ARB) += spmi-pmic-arb.o > +obj-$(CONFIG_SPMI_MTK_PMIF) += spmi-mtk-pmif.o > \ No newline at end of file > diff --git a/drivers/spmi/spmi-mtk-pmif.c b/drivers/spmi/spmi-mtk-pmif.c > new file mode 100644 > index 000000000000..1b8b628fc9b6 > --- /dev/null > +++ b/drivers/spmi/spmi-mtk-pmif.c > @@ -0,0 +1,490 @@ > +// SPDX-License-Identifier: GPL-2.0 > +// > +// Copyright (c) 2020 MediaTek Inc. > + > +#include <linux/clk.h> > +#include <linux/iopoll.h> > +#include <linux/module.h> > +#include <linux/of_address.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 (10 * 1000) > + > +#define PMIF_CHAN_OFFSET 0x5 > + > +#define SPMI_OP_ST_BUSY 1 > + > +struct ch_reg { > + u32 ch_sta; > + u32 wdata; > + u32 rdata; > + u32 ch_send; > + u32 ch_rdy; > +}; > + > +struct pmif { > + void __iomem *base; > + const u32 *regs; > + void __iomem *spmimst_base; > + const u32 *spmimst_regs; > + u32 soc_chan; > + int grpid; > + raw_spinlock_t lock; > + struct clk *pmif_sys_ck; > + struct clk *pmif_tmr_ck; > + struct clk *spmimst_clk_mux; > + struct ch_reg chan; Nit: use tab to align. > +}; > + > +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->regs[reg]); > +} > + > +static void pmif_writel(struct pmif *arb, u32 val, enum pmif_regs reg) > +{ > + writel(val, arb->base + arb->regs[reg]); > +} > + > +static void mtk_spmi_writel(struct pmif *arb, u32 val, enum spmi_regs reg) > +{ > + writel(val, arb->spmimst_base + arb->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; > + u8 cmd; > + int ret; > + Validate arb and sid (like what pmif_spmi_read_cmd() does). > + /* Check the opcode */ > + if (opc == SPMI_CMD_RESET) > + cmd = 0; > + else if (opc == SPMI_CMD_SLEEP) > + cmd = 1; > + else if (opc == SPMI_CMD_SHUTDOWN) > + cmd = 2; > + else if (opc == SPMI_CMD_WAKEUP) > + cmd = 3; > + else > + return -EINVAL; > + > + mtk_spmi_writel(arb, (cmd << 0x4) | sid, SPMI_OP_ST_CTRL); > + ret = readl_poll_timeout_atomic(arb->spmimst_base + arb->spmimst_regs[SPMI_OP_ST_STA], > + rdata, (rdata & SPMI_OP_ST_BUSY) == SPMI_OP_ST_BUSY, > + PMIF_DELAY_US, PMIF_TIMEOUT); > + if (ret < 0) > + dev_err(&ctrl->dev, "timeout, err = %d\r\n", ret); Remove "\r" > + > + 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 = NULL; > + int ret; > + u32 data = 0; > + u8 bc = len - 1; > + unsigned long flags; > + > + /* Check for argument validation. */ > + if (sid & ~(0xf)) > + return -EINVAL; > + > + if (!arb) > + return -EINVAL; Add dev_err()s to explain why -EINVAL is returned (for both checkers). > + > + inf_reg = &arb->chan; > + /* Check the opcode */ > + if (opc >= 0x60 && opc <= 0x7f) > + opc = PMIF_CMD_REG; > + else if (opc >= 0x20 && opc <= 0x2f) > + opc = PMIF_CMD_EXT_REG_LONG; > + else if (opc >= 0x38 && opc <= 0x3f) > + opc = PMIF_CMD_EXT_REG_LONG; > + else > + return -EINVAL; > + > + raw_spin_lock_irqsave(&arb->lock, flags); > + /* Wait for Software Interface FSM state to be IDLE. */ > + ret = readl_poll_timeout_atomic(arb->base + arb->regs[inf_reg->ch_sta], > + data, GET_SWINF(data) == SWINF_IDLE, > + PMIF_DELAY_US, PMIF_TIMEOUT); > + 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); > + raw_spin_unlock_irqrestore(&arb->lock, flags); > + return ret; There are 3 raw_spin_unlock_irqrestore()s, consider using goto? (and dev_err() to say we failed to wait for SWINF_IDLE) > + } > + > + /* Send the command. */ > + pmif_writel(arb, > + (opc << 30) | (sid << 24) | (bc << 16) | addr, > + 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->regs[inf_reg->ch_sta], > + data, GET_SWINF(data) == SWINF_WFVLDCLR, > + PMIF_DELAY_US, PMIF_TIMEOUT); > + if (ret < 0) { Add dev_err(). > + raw_spin_unlock_irqrestore(&arb->lock, flags); > + return ret; > + } > + > + data = pmif_readl(arb, inf_reg->rdata); > + memcpy(buf, &data, (bc & 3) + 1); > + pmif_writel(arb, 1, inf_reg->ch_rdy); > + raw_spin_unlock_irqrestore(&arb->lock, flags); > + > + return 0; > +} > + > +static int pmif_spmi_write_cmd(struct spmi_controller *ctrl, u8 opc, u8 sid, > + u16 addr, const u8 *buf, size_t len) > +{ Please refer to the comments in pmif_spmi_read_cmd(). > + struct pmif *arb = spmi_controller_get_drvdata(ctrl); > + struct ch_reg *inf_reg = NULL; > + int ret; > + u32 data = 0; > + u8 bc = len - 1; > + unsigned long flags = 0; > + > + /* Check for argument validation. */ > + if (sid & ~(0xf)) > + return -EINVAL; > + > + if (!arb) > + return -EINVAL; > + > + inf_reg = &arb->chan; > + > + /* Check the opcode */ > + if (opc >= 0x40 && opc <= 0x5F) > + opc = PMIF_CMD_REG; > + else if (opc <= 0x0F) > + opc = PMIF_CMD_EXT_REG_LONG; > + else if (opc >= 0x30 && opc <= 0x37) > + opc = PMIF_CMD_EXT_REG_LONG; > + else if (opc >= 0x80) > + opc = PMIF_CMD_REG_0; > + else > + return -EINVAL; > + > + raw_spin_lock_irqsave(&arb->lock, flags); > + /* Wait for Software Interface FSM state to be IDLE. */ > + ret = readl_poll_timeout_atomic(arb->base + arb->regs[inf_reg->ch_sta], > + data, GET_SWINF(data) == SWINF_IDLE, > + PMIF_DELAY_US, PMIF_TIMEOUT); > + 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); > + raw_spin_unlock_irqrestore(&arb->lock, flags); > + return ret; > + } > + > + /* Set the write data. */ > + memcpy(&data, buf, (bc & 3) + 1); > + pmif_writel(arb, data, inf_reg->wdata); > + > + /* Send the command. */ > + pmif_writel(arb, > + (opc << 30) | BIT(29) | (sid << 24) | (bc << 16) | addr, > + inf_reg->ch_send); > + raw_spin_unlock_irqrestore(&arb->lock, flags); > + > + return 0; > +} > + > +static struct pmif 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 resource *res; > + struct spmi_controller *ctrl; > + int err = 0; > + > + ctrl = spmi_controller_alloc(&pdev->dev, sizeof(*arb)); > + if (!ctrl) > + return -ENOMEM; > + > + ctrl->cmd = pmif_arb_cmd; > + ctrl->read_cmd = pmif_spmi_read_cmd; > + ctrl->write_cmd = pmif_spmi_write_cmd; > + > + /* re-assign of_id->data */ > + spmi_controller_set_drvdata(ctrl, (void *)of_device_get_match_data(&pdev->dev)); > + arb = spmi_controller_get_drvdata(ctrl); Validate arb is not NULL. > + > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pmif"); Validate res. > + arb->base = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(arb->base)) { dev_err(). > + err = PTR_ERR(arb->base); > + goto err_put_ctrl; > + } > + > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "spmimst"); Same here. > + arb->spmimst_base = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(arb->spmimst_base)) { dev_err(). > + err = PTR_ERR(arb->spmimst_base); > + goto err_put_ctrl; > + } ;> + > + arb->pmif_sys_ck = devm_clk_get(&pdev->dev, "pmif_sys_ck"); > + if (IS_ERR(arb->pmif_sys_ck)) { > + dev_err(&pdev->dev, "[%s] Failed to get ap clock: %ld\n", > + __func__, PTR_ERR(arb->pmif_sys_ck)); err = PTR_ERR(arb->pmif_sys_ck); > + goto err_put_ctrl; > + } > + > + arb->pmif_tmr_ck = devm_clk_get(&pdev->dev, "pmif_tmr_ck"); > + if (IS_ERR(arb->pmif_tmr_ck)) { > + dev_err(&pdev->dev, "[%s] Failed to get tmr clock: %ld\n", > + __func__, PTR_ERR(arb->pmif_tmr_ck)); err = PTR_ERR(arb->pmif_tmr_ck); > + goto err_put_ctrl; > + } > + > + arb->spmimst_clk_mux = devm_clk_get(&pdev->dev, "spmimst_clk_mux"); > + if (IS_ERR(arb->spmimst_clk_mux)) { > + dev_err(&pdev->dev, "[%s] Failed to get clock: %ld\n", Failed to get "spmi master" clock. > + __func__, PTR_ERR(arb->spmimst_clk_mux)); err = PTR_ERR(arb->spmimst_clk_mux); > + goto err_put_ctrl; > + } > + > + err = clk_prepare_enable(arb->pmif_sys_ck); > + if (err) { > + dev_err(&pdev->dev, "[%s] Failed to enable ap clk.\n", __func__); > + goto err_put_ctrl; > + } > + > + err = clk_prepare_enable(arb->pmif_tmr_ck); > + if (err) { > + dev_err(&pdev->dev, "[%s] Failed to enable tmr clk.\n", __func__); > + goto err_clk_1; I'd prefer a more informative label e.g. err_disable_sys_ck. > + } > + > + err = clk_prepare_enable(arb->spmimst_clk_mux); > + if (err) { > + dev_err(&pdev->dev, "[%s] Failed to enable spmi master clk.\n", __func__); > + goto err_clk_2; Ditto. > + } > + > + arb->chan.ch_sta = PMIF_SWINF_0_STA + (PMIF_CHAN_OFFSET * arb->soc_chan); > + arb->chan.wdata = PMIF_SWINF_0_WDATA_31_0 + (PMIF_CHAN_OFFSET * arb->soc_chan); > + arb->chan.rdata = PMIF_SWINF_0_RDATA_31_0 + (PMIF_CHAN_OFFSET * arb->soc_chan); > + arb->chan.ch_send = PMIF_SWINF_0_ACC + (PMIF_CHAN_OFFSET * arb->soc_chan); > + arb->chan.ch_rdy = PMIF_SWINF_0_VLD_CLR + (PMIF_CHAN_OFFSET * arb->soc_chan); Define "(PMIF_CHAN_OFFSET * arb->soc_chan)" as a variable (or a macro). > + > + raw_spin_lock_init(&arb->lock); > + > + platform_set_drvdata(pdev, ctrl); > + > + err = spmi_controller_add(ctrl); > + if (err) > + goto err_domain_remove; > + > + return 0; > + > +err_domain_remove: > + clk_disable_unprepare(arb->spmimst_clk_mux); > +err_clk_2: > + clk_disable_unprepare(arb->pmif_tmr_ck); > +err_clk_1: > + clk_disable_unprepare(arb->pmif_sys_ck); > +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); > + > + 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 > _______________________________________________ > Linux-mediatek mailing list > Linux-mediatek@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-mediatek ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-10-22 7:48 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-10-16 16:10 [PATCH v4 0/2] Add SPMI support for Mediatek MT6873/8192 SoC IC Hsin-Hsiung Wang 2020-10-16 16:10 ` [PATCH v4 1/2] dt-bindings: spmi: document binding for the Mediatek SPMI controller Hsin-Hsiung Wang 2020-10-19 19:52 ` Rob Herring 2020-10-20 4:00 ` Hsin-Hsiung Wang 2020-10-19 19:54 ` Rob Herring 2020-10-20 4:04 ` Hsin-Hsiung Wang 2020-10-16 16:10 ` [PATCH v4 2/2] spmi: mediatek: Add support for MT6873/8192 Hsin-Hsiung Wang 2020-10-22 7:47 ` Fei Shao
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).