* [PATCH v5 0/4] Add support i.MX95 BLK CTL module clock features @ 2024-03-24 7:51 Peng Fan (OSS) 2024-03-24 7:52 ` [PATCH v5 1/4] dt-bindings: clock: support i.MX95 BLK CTL module Peng Fan (OSS) ` (4 more replies) 0 siblings, 5 replies; 19+ messages in thread From: Peng Fan (OSS) @ 2024-03-24 7:51 UTC (permalink / raw) To: Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, Abel Vesa Cc: linux-clk, devicetree, imx, linux-arm-kernel, linux-kernel, Peng Fan i.MX95's several MIXes has BLK CTL module which could be used for clk settings, QoS settings, Misc settings for a MIX. This patchset is to add the clk feature support, including dt-bindings Signed-off-by: Peng Fan <peng.fan@nxp.com> --- Changes in v5: - Merge bindings except the one has mux-controller - Separate clock ID headers in a separate patch per Rob's comments - Link to v4: https://lore.kernel.org/r/20240314-imx95-blk-ctl-v4-0-d23de23b6ff2@nxp.com Changes in v4: - Separate binding doc for each modules, I still keep the syscon as node name, because the module is not just for clock - Pass dt-schema check - Update node compatibles - Link to v3: https://lore.kernel.org/r/20240228-imx95-blk-ctl-v3-0-40ceba01a211@nxp.com Changes in v3: - Correct example node compatible string - Pass "make ARCH=arm64 DT_CHECKER_FLAGS=-m -j32 dt_binding_check" - Link to v2: https://lore.kernel.org/r/20240228-imx95-blk-ctl-v2-0-ffb7eefb6dcd@nxp.com Changes in v2: - Correct example node compatible string - Link to v1: https://lore.kernel.org/r/20240228-imx95-blk-ctl-v1-0-9b5ae3c14d83@nxp.com --- Peng Fan (4): dt-bindings: clock: support i.MX95 BLK CTL module dt-bindings: clock: support i.MX95 Display Master CSR module dt-bindings: clock: add i.MX95 clock header clk: imx: add i.MX95 BLK CTL clk driver .../bindings/clock/nxp,imx95-blk-ctl.yaml | 56 +++ .../clock/nxp,imx95-display-master-csr.yaml | 64 +++ drivers/clk/imx/Kconfig | 7 + drivers/clk/imx/Makefile | 1 + drivers/clk/imx/clk-imx95-blk-ctl.c | 438 +++++++++++++++++++++ include/dt-bindings/clock/nxp,imx95-clock.h | 32 ++ 6 files changed, 598 insertions(+) --- base-commit: c9c32620af65fee2b1ac8390fe1349b33f9d0888 change-id: 20240228-imx95-blk-ctl-9ef8c1fc4c22 Best regards, -- Peng Fan <peng.fan@nxp.com> ^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v5 1/4] dt-bindings: clock: support i.MX95 BLK CTL module 2024-03-24 7:51 [PATCH v5 0/4] Add support i.MX95 BLK CTL module clock features Peng Fan (OSS) @ 2024-03-24 7:52 ` Peng Fan (OSS) 2024-03-25 19:24 ` Krzysztof Kozlowski 2024-03-24 7:52 ` [PATCH v5 2/4] dt-bindings: clock: support i.MX95 Display Master CSR module Peng Fan (OSS) ` (3 subsequent siblings) 4 siblings, 1 reply; 19+ messages in thread From: Peng Fan (OSS) @ 2024-03-24 7:52 UTC (permalink / raw) To: Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, Abel Vesa Cc: linux-clk, devicetree, imx, linux-arm-kernel, linux-kernel, Peng Fan From: Peng Fan <peng.fan@nxp.com> i.MX95 includes BLK CTL module in several MIXes, such as VPU_CSR in VPUMIX, CAMERA_CSR in CAMERAMIX and etc. The BLK CTL module is used for various settings of a specific MIX, such as clock, QoS and etc. This patch is to add some BLK CTL modules that has clock features. Signed-off-by: Peng Fan <peng.fan@nxp.com> --- .../bindings/clock/nxp,imx95-blk-ctl.yaml | 56 ++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml b/Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml new file mode 100644 index 000000000000..2dffc02dcd8b --- /dev/null +++ b/Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml @@ -0,0 +1,56 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/clock/nxp,imx95-blk-ctl.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: NXP i.MX95 Block Control + +maintainers: + - Peng Fan <peng.fan@nxp.com> + +properties: + compatible: + items: + - enum: + - nxp,imx95-lvds-csr + - nxp,imx95-display-csr + - nxp,imx95-camera-csr + - nxp,imx95-vpu-csr + - const: syscon + + reg: + maxItems: 1 + + power-domains: + maxItems: 1 + + clocks: + maxItems: 1 + + '#clock-cells': + const: 1 + description: + The clock consumer should specify the desired clock by having the clock + ID in its "clocks" phandle cell. See + include/dt-bindings/clock/nxp,imx95-clock.h + +required: + - compatible + - reg + - '#clock-cells' + - power-domains + - clocks + +additionalProperties: false + +examples: + - | + syscon@4c410000 { + compatible = "nxp,imx95-vpu-csr", "syscon"; + reg = <0x4c410000 0x10000>; + #clock-cells = <1>; + clocks = <&scmi_clk 114>; + power-domains = <&scmi_devpd 21>; + }; +... -- 2.37.1 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH v5 1/4] dt-bindings: clock: support i.MX95 BLK CTL module 2024-03-24 7:52 ` [PATCH v5 1/4] dt-bindings: clock: support i.MX95 BLK CTL module Peng Fan (OSS) @ 2024-03-25 19:24 ` Krzysztof Kozlowski 2024-03-31 11:58 ` Peng Fan 0 siblings, 1 reply; 19+ messages in thread From: Krzysztof Kozlowski @ 2024-03-25 19:24 UTC (permalink / raw) To: Peng Fan (OSS), Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, Abel Vesa Cc: linux-clk, devicetree, imx, linux-arm-kernel, linux-kernel, Peng Fan On 24/03/2024 08:52, Peng Fan (OSS) wrote: > From: Peng Fan <peng.fan@nxp.com> > > i.MX95 includes BLK CTL module in several MIXes, such as VPU_CSR in > VPUMIX, CAMERA_CSR in CAMERAMIX and etc. > > The BLK CTL module is used for various settings of a specific MIX, such > as clock, QoS and etc. > > This patch is to add some BLK CTL modules that has clock features. > > Signed-off-by: Peng Fan <peng.fan@nxp.com> > --- > .../bindings/clock/nxp,imx95-blk-ctl.yaml | 56 ++++++++++++++++++++++ > 1 file changed, 56 insertions(+) > > diff --git a/Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml b/Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml > new file mode 100644 > index 000000000000..2dffc02dcd8b > --- /dev/null > +++ b/Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml > @@ -0,0 +1,56 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/clock/nxp,imx95-blk-ctl.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: NXP i.MX95 Block Control > + > +maintainers: > + - Peng Fan <peng.fan@nxp.com> > + > +properties: > + compatible: > + items: > + - enum: > + - nxp,imx95-lvds-csr > + - nxp,imx95-display-csr > + - nxp,imx95-camera-csr > + - nxp,imx95-vpu-csr > + - const: syscon > + > + reg: > + maxItems: 1 > + > + power-domains: > + maxItems: 1 > + > + clocks: > + maxItems: 1 > + > + '#clock-cells': > + const: 1 > + description: > + The clock consumer should specify the desired clock by having the clock > + ID in its "clocks" phandle cell. See > + include/dt-bindings/clock/nxp,imx95-clock.h In such case, put header as your first patch in the patchset. I don't understand why it was split in the first place... Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof ^ permalink raw reply [flat|nested] 19+ messages in thread
* RE: [PATCH v5 1/4] dt-bindings: clock: support i.MX95 BLK CTL module 2024-03-25 19:24 ` Krzysztof Kozlowski @ 2024-03-31 11:58 ` Peng Fan 2024-03-31 19:54 ` Krzysztof Kozlowski 0 siblings, 1 reply; 19+ messages in thread From: Peng Fan @ 2024-03-31 11:58 UTC (permalink / raw) To: Krzysztof Kozlowski, Peng Fan (OSS), Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, Abel Vesa Cc: linux-clk@vger.kernel.org, devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org > Subject: Re: [PATCH v5 1/4] dt-bindings: clock: support i.MX95 BLK CTL > module > > On 24/03/2024 08:52, Peng Fan (OSS) wrote: > > From: Peng Fan <peng.fan@nxp.com> > > > > i.MX95 includes BLK CTL module in several MIXes, such as VPU_CSR in > > VPUMIX, CAMERA_CSR in CAMERAMIX and etc. > > > > The BLK CTL module is used for various settings of a specific MIX, > > such as clock, QoS and etc. > > > > This patch is to add some BLK CTL modules that has clock features. > > > > Signed-off-by: Peng Fan <peng.fan@nxp.com> > > --- > > .../bindings/clock/nxp,imx95-blk-ctl.yaml | 56 > ++++++++++++++++++++++ > > 1 file changed, 56 insertions(+) > > > > diff --git > > a/Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml > > b/Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml > > new file mode 100644 > > index 000000000000..2dffc02dcd8b > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml > > @@ -0,0 +1,56 @@ > > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) %YAML 1.2 > > +--- > > +$id: > > +https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdevi > > +cetree.org%2Fschemas%2Fclock%2Fnxp%2Cimx95-blk- > ctl.yaml%23&data=05%7C > > > +02%7Cpeng.fan%40nxp.com%7Cd713a861f155495c922a08dc4d01346d%7 > C686ea1d3 > > > +bc2b4c6fa92cd99c5c301635%7C0%7C0%7C638469914764776121%7CUnk > nown%7CTWF > > > +pbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJX > VCI6 > > > +Mn0%3D%7C0%7C%7C%7C&sdata=rW7%2BGedk3bloLsAqBIkMlXQNjDmRd > Z0cHacQtKxjc > > +mQ%3D&reserved=0 > > +$schema: > > +https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdevi > > +cetree.org%2Fmeta- > schemas%2Fcore.yaml%23&data=05%7C02%7Cpeng.fan%40nx > > > +p.com%7Cd713a861f155495c922a08dc4d01346d%7C686ea1d3bc2b4c6fa9 > 2cd99c5c > > > +301635%7C0%7C0%7C638469914764787067%7CUnknown%7CTWFpbGZs > b3d8eyJWIjoiM > > > +C4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C0%7 > C%7C%7 > > > +C&sdata=tFzM3%2BxuQVsit9lCEnNz8kYnZjT%2FXj%2Fdqzk9DB9oy1c%3D&r > eserved > > +=0 > > + > > +title: NXP i.MX95 Block Control > > + > > +maintainers: > > + - Peng Fan <peng.fan@nxp.com> > > + > > +properties: > > + compatible: > > + items: > > + - enum: > > + - nxp,imx95-lvds-csr > > + - nxp,imx95-display-csr > > + - nxp,imx95-camera-csr > > + - nxp,imx95-vpu-csr > > + - const: syscon > > + > > + reg: > > + maxItems: 1 > > + > > + power-domains: > > + maxItems: 1 > > + > > + clocks: > > + maxItems: 1 > > + > > + '#clock-cells': > > + const: 1 > > + description: > > + The clock consumer should specify the desired clock by having the > clock > > + ID in its "clocks" phandle cell. See > > + include/dt-bindings/clock/nxp,imx95-clock.h > > In such case, put header as your first patch in the patchset. I don't understand > why it was split in the first place... Rob gave a comment in v4, so I split the headers. " If this number can change, then it is not ABI and doesn't go in this header. With that dropped, " https://lore.kernel.org/all/20240315165422.GA1472059-robh@kernel.org/ Thanks, Peng. > > > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > > Best regards, > Krzysztof ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v5 1/4] dt-bindings: clock: support i.MX95 BLK CTL module 2024-03-31 11:58 ` Peng Fan @ 2024-03-31 19:54 ` Krzysztof Kozlowski 0 siblings, 0 replies; 19+ messages in thread From: Krzysztof Kozlowski @ 2024-03-31 19:54 UTC (permalink / raw) To: Peng Fan, Peng Fan (OSS), Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, Abel Vesa Cc: linux-clk@vger.kernel.org, devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org On 31/03/2024 13:58, Peng Fan wrote: >>> + const: 1 >>> + description: >>> + The clock consumer should specify the desired clock by having the >> clock >>> + ID in its "clocks" phandle cell. See >>> + include/dt-bindings/clock/nxp,imx95-clock.h >> >> In such case, put header as your first patch in the patchset. I don't understand >> why it was split in the first place... > > Rob gave a comment in v4, so I split the headers. > " > If this number can change, then it is not ABI and doesn't go in this > header. With that dropped, > " Nothing here speaks about splitting headers. Absolutely NOTHING. Rob commented that you added number which can change, thus this is not a binding. Best regards, Krzysztof ^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v5 2/4] dt-bindings: clock: support i.MX95 Display Master CSR module 2024-03-24 7:51 [PATCH v5 0/4] Add support i.MX95 BLK CTL module clock features Peng Fan (OSS) 2024-03-24 7:52 ` [PATCH v5 1/4] dt-bindings: clock: support i.MX95 BLK CTL module Peng Fan (OSS) @ 2024-03-24 7:52 ` Peng Fan (OSS) 2024-03-25 19:23 ` Krzysztof Kozlowski 2024-03-24 7:52 ` [PATCH v5 3/4] dt-bindings: clock: add i.MX95 clock header Peng Fan (OSS) ` (2 subsequent siblings) 4 siblings, 1 reply; 19+ messages in thread From: Peng Fan (OSS) @ 2024-03-24 7:52 UTC (permalink / raw) To: Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, Abel Vesa Cc: linux-clk, devicetree, imx, linux-arm-kernel, linux-kernel, Peng Fan From: Peng Fan <peng.fan@nxp.com> i.MX95 DISPLAY_MASTER_CSR includes registers to control DSI clock settings, clock gating, and pixel link select. Add dt-schema for it. Signed-off-by: Peng Fan <peng.fan@nxp.com> --- .../clock/nxp,imx95-display-master-csr.yaml | 64 ++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/Documentation/devicetree/bindings/clock/nxp,imx95-display-master-csr.yaml b/Documentation/devicetree/bindings/clock/nxp,imx95-display-master-csr.yaml new file mode 100644 index 000000000000..07f7412e7658 --- /dev/null +++ b/Documentation/devicetree/bindings/clock/nxp,imx95-display-master-csr.yaml @@ -0,0 +1,64 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/clock/nxp,imx95-display-master-csr.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: NXP i.MX95 Display Master Block Control + +maintainers: + - Peng Fan <peng.fan@nxp.com> + +properties: + compatible: + items: + - const: nxp,imx95-display-master-csr + - const: syscon + + reg: + maxItems: 1 + + power-domains: + maxItems: 1 + + clocks: + maxItems: 1 + + '#clock-cells': + const: 1 + description: + The clock consumer should specify the desired clock by having the clock + ID in its "clocks" phandle cell. See + include/dt-bindings/clock/nxp,imx95-clock.h + + mux-controller: + type: object + $ref: /schemas/mux/reg-mux.yaml + +required: + - compatible + - reg + - '#clock-cells' + - mux-controller + - power-domains + - clocks + +additionalProperties: false + +examples: + - | + syscon@4c410000 { + compatible = "nxp,imx95-display-master-csr", "syscon"; + reg = <0x4c410000 0x10000>; + #clock-cells = <1>; + clocks = <&scmi_clk 62>; + power-domains = <&scmi_devpd 3>; + + mux: mux-controller { + compatible = "mmio-mux"; + #mux-control-cells = <1>; + mux-reg-masks = <0x4 0x00000001>; /* Pixel_link_sel */ + idle-states = <0>; + }; + }; +... -- 2.37.1 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH v5 2/4] dt-bindings: clock: support i.MX95 Display Master CSR module 2024-03-24 7:52 ` [PATCH v5 2/4] dt-bindings: clock: support i.MX95 Display Master CSR module Peng Fan (OSS) @ 2024-03-25 19:23 ` Krzysztof Kozlowski 0 siblings, 0 replies; 19+ messages in thread From: Krzysztof Kozlowski @ 2024-03-25 19:23 UTC (permalink / raw) To: Peng Fan (OSS), Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, Abel Vesa Cc: linux-clk, devicetree, imx, linux-arm-kernel, linux-kernel, Peng Fan On 24/03/2024 08:52, Peng Fan (OSS) wrote: > From: Peng Fan <peng.fan@nxp.com> > > i.MX95 DISPLAY_MASTER_CSR includes registers to control DSI clock settings, > clock gating, and pixel link select. Add dt-schema for it. > > Signed-off-by: Peng Fan <peng.fan@nxp.com> > --- > .../clock/nxp,imx95-display-master-csr.yaml | 64 ++++++++++++++++++++++ > 1 file changed, 64 insertions(+) Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof ^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v5 3/4] dt-bindings: clock: add i.MX95 clock header 2024-03-24 7:51 [PATCH v5 0/4] Add support i.MX95 BLK CTL module clock features Peng Fan (OSS) 2024-03-24 7:52 ` [PATCH v5 1/4] dt-bindings: clock: support i.MX95 BLK CTL module Peng Fan (OSS) 2024-03-24 7:52 ` [PATCH v5 2/4] dt-bindings: clock: support i.MX95 Display Master CSR module Peng Fan (OSS) @ 2024-03-24 7:52 ` Peng Fan (OSS) 2024-03-25 19:22 ` Krzysztof Kozlowski 2024-03-24 7:52 ` [PATCH v5 4/4] clk: imx: add i.MX95 BLK CTL clk driver Peng Fan (OSS) 2024-03-25 19:21 ` [PATCH v5 0/4] Add support i.MX95 BLK CTL module clock features Krzysztof Kozlowski 4 siblings, 1 reply; 19+ messages in thread From: Peng Fan (OSS) @ 2024-03-24 7:52 UTC (permalink / raw) To: Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, Abel Vesa Cc: linux-clk, devicetree, imx, linux-arm-kernel, linux-kernel, Peng Fan From: Peng Fan <peng.fan@nxp.com> Add clock header for i.MX95 BLK CTL modules Signed-off-by: Peng Fan <peng.fan@nxp.com> --- include/dt-bindings/clock/nxp,imx95-clock.h | 32 +++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/include/dt-bindings/clock/nxp,imx95-clock.h b/include/dt-bindings/clock/nxp,imx95-clock.h new file mode 100644 index 000000000000..83fa3ffe78a8 --- /dev/null +++ b/include/dt-bindings/clock/nxp,imx95-clock.h @@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MIT */ +/* + * Copyright 2024 NXP + */ + +#ifndef __DT_BINDINGS_CLOCK_IMX95_H +#define __DT_BINDINGS_CLOCK_IMX95_H + +#define IMX95_CLK_VPUBLK_WAVE 0 +#define IMX95_CLK_VPUBLK_JPEG_ENC 1 +#define IMX95_CLK_VPUBLK_JPEG_DEC 2 +#define IMX95_CLK_VPUBLK_END 3 + +#define IMX95_CLK_CAMBLK_CSI2_FOR0 0 +#define IMX95_CLK_CAMBLK_CSI2_FOR1 1 +#define IMX95_CLK_CAMBLK_ISP_AXI 2 +#define IMX95_CLK_CAMBLK_ISP_PIXEL 3 +#define IMX95_CLK_CAMBLK_ISP 4 +#define IMX95_CLK_CAMBLK_END 5 + +#define IMX95_CLK_DISPMIX_LVDS_PHY_DIV 0 +#define IMX95_CLK_DISPMIX_LVDS_CH0_GATE 1 +#define IMX95_CLK_DISPMIX_LVDS_CH1_GATE 2 +#define IMX95_CLK_DISPMIX_PIX_DI0_GATE 3 +#define IMX95_CLK_DISPMIX_PIX_DI1_GATE 4 +#define IMX95_CLK_DISPMIX_LVDS_CSR_END 5 + +#define IMX95_CLK_DISPMIX_ENG0_SEL 0 +#define IMX95_CLK_DISPMIX_ENG1_SEL 1 +#define IMX95_CLK_DISPMIX_END 2 + +#endif /* __DT_BINDINGS_CLOCK_IMX95_H */ -- 2.37.1 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH v5 3/4] dt-bindings: clock: add i.MX95 clock header 2024-03-24 7:52 ` [PATCH v5 3/4] dt-bindings: clock: add i.MX95 clock header Peng Fan (OSS) @ 2024-03-25 19:22 ` Krzysztof Kozlowski 2024-04-01 7:26 ` Peng Fan 0 siblings, 1 reply; 19+ messages in thread From: Krzysztof Kozlowski @ 2024-03-25 19:22 UTC (permalink / raw) To: Peng Fan (OSS), Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, Abel Vesa Cc: linux-clk, devicetree, imx, linux-arm-kernel, linux-kernel, Peng Fan On 24/03/2024 08:52, Peng Fan (OSS) wrote: > From: Peng Fan <peng.fan@nxp.com> > > Add clock header for i.MX95 BLK CTL modules > > Signed-off-by: Peng Fan <peng.fan@nxp.com> > --- > include/dt-bindings/clock/nxp,imx95-clock.h | 32 +++++++++++++++++++++++++++++ > 1 file changed, 32 insertions(+) > > diff --git a/include/dt-bindings/clock/nxp,imx95-clock.h b/include/dt-bindings/clock/nxp,imx95-clock.h > new file mode 100644 > index 000000000000..83fa3ffe78a8 > --- /dev/null > +++ b/include/dt-bindings/clock/nxp,imx95-clock.h > @@ -0,0 +1,32 @@ > +/* SPDX-License-Identifier: GPL-2.0-only OR MIT */ > +/* > + * Copyright 2024 NXP > + */ > + > +#ifndef __DT_BINDINGS_CLOCK_IMX95_H > +#define __DT_BINDINGS_CLOCK_IMX95_H > + > +#define IMX95_CLK_VPUBLK_WAVE 0 > +#define IMX95_CLK_VPUBLK_JPEG_ENC 1 > +#define IMX95_CLK_VPUBLK_JPEG_DEC 2 > +#define IMX95_CLK_VPUBLK_END 3 No improvements, so again: drop counting. Same in other places. Best regards, Krzysztof ^ permalink raw reply [flat|nested] 19+ messages in thread
* RE: [PATCH v5 3/4] dt-bindings: clock: add i.MX95 clock header 2024-03-25 19:22 ` Krzysztof Kozlowski @ 2024-04-01 7:26 ` Peng Fan 2024-04-01 9:51 ` Krzysztof Kozlowski 0 siblings, 1 reply; 19+ messages in thread From: Peng Fan @ 2024-04-01 7:26 UTC (permalink / raw) To: Krzysztof Kozlowski, Peng Fan (OSS), Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, Abel Vesa Cc: linux-clk@vger.kernel.org, devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org > Subject: Re: [PATCH v5 3/4] dt-bindings: clock: add i.MX95 clock header > > On 24/03/2024 08:52, Peng Fan (OSS) wrote: > > From: Peng Fan <peng.fan@nxp.com> > > > > Add clock header for i.MX95 BLK CTL modules > > > > Signed-off-by: Peng Fan <peng.fan@nxp.com> > > --- > > include/dt-bindings/clock/nxp,imx95-clock.h | 32 > +++++++++++++++++++++++++++++ > > 1 file changed, 32 insertions(+) > > > > diff --git a/include/dt-bindings/clock/nxp,imx95-clock.h b/include/dt- > bindings/clock/nxp,imx95-clock.h > > new file mode 100644 > > index 000000000000..83fa3ffe78a8 > > --- /dev/null > > +++ b/include/dt-bindings/clock/nxp,imx95-clock.h > > @@ -0,0 +1,32 @@ > > +/* SPDX-License-Identifier: GPL-2.0-only OR MIT */ > > +/* > > + * Copyright 2024 NXP > > + */ > > + > > +#ifndef __DT_BINDINGS_CLOCK_IMX95_H > > +#define __DT_BINDINGS_CLOCK_IMX95_H > > + > > +#define IMX95_CLK_VPUBLK_WAVE 0 > > +#define IMX95_CLK_VPUBLK_JPEG_ENC 1 > > +#define IMX95_CLK_VPUBLK_JPEG_DEC 2 > > +#define IMX95_CLK_VPUBLK_END 3 > > No improvements, so again: drop counting. Could you please give more details on what you think needs to be addressed here? I may overlook your comments before, but I search v1-v4, not find comments on the headers, except the one file name align with binding if 1:1 match. Thanks, Peng. > > Same in other places. > > Best regards, > Krzysztof ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v5 3/4] dt-bindings: clock: add i.MX95 clock header 2024-04-01 7:26 ` Peng Fan @ 2024-04-01 9:51 ` Krzysztof Kozlowski 0 siblings, 0 replies; 19+ messages in thread From: Krzysztof Kozlowski @ 2024-04-01 9:51 UTC (permalink / raw) To: Peng Fan, Peng Fan (OSS), Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, Abel Vesa Cc: linux-clk@vger.kernel.org, devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org On 01/04/2024 09:26, Peng Fan wrote: >> Subject: Re: [PATCH v5 3/4] dt-bindings: clock: add i.MX95 clock header >> >> On 24/03/2024 08:52, Peng Fan (OSS) wrote: >>> From: Peng Fan <peng.fan@nxp.com> >>> >>> Add clock header for i.MX95 BLK CTL modules >>> >>> Signed-off-by: Peng Fan <peng.fan@nxp.com> >>> --- >>> include/dt-bindings/clock/nxp,imx95-clock.h | 32 >> +++++++++++++++++++++++++++++ >>> 1 file changed, 32 insertions(+) >>> >>> diff --git a/include/dt-bindings/clock/nxp,imx95-clock.h b/include/dt- >> bindings/clock/nxp,imx95-clock.h >>> new file mode 100644 >>> index 000000000000..83fa3ffe78a8 >>> --- /dev/null >>> +++ b/include/dt-bindings/clock/nxp,imx95-clock.h >>> @@ -0,0 +1,32 @@ >>> +/* SPDX-License-Identifier: GPL-2.0-only OR MIT */ >>> +/* >>> + * Copyright 2024 NXP >>> + */ >>> + >>> +#ifndef __DT_BINDINGS_CLOCK_IMX95_H >>> +#define __DT_BINDINGS_CLOCK_IMX95_H >>> + >>> +#define IMX95_CLK_VPUBLK_WAVE 0 >>> +#define IMX95_CLK_VPUBLK_JPEG_ENC 1 >>> +#define IMX95_CLK_VPUBLK_JPEG_DEC 2 >>> +#define IMX95_CLK_VPUBLK_END 3 >> >> No improvements, so again: drop counting. > > Could you please give more details on what you think needs > to be addressed here? I may overlook your comments before, > but I search v1-v4, not find comments on the headers, > except the one file name align with binding if 1:1 match. Drop all defines which count number of clocks. Best regards, Krzysztof ^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v5 4/4] clk: imx: add i.MX95 BLK CTL clk driver 2024-03-24 7:51 [PATCH v5 0/4] Add support i.MX95 BLK CTL module clock features Peng Fan (OSS) ` (2 preceding siblings ...) 2024-03-24 7:52 ` [PATCH v5 3/4] dt-bindings: clock: add i.MX95 clock header Peng Fan (OSS) @ 2024-03-24 7:52 ` Peng Fan (OSS) 2024-03-25 19:25 ` Krzysztof Kozlowski 2024-03-25 19:21 ` [PATCH v5 0/4] Add support i.MX95 BLK CTL module clock features Krzysztof Kozlowski 4 siblings, 1 reply; 19+ messages in thread From: Peng Fan (OSS) @ 2024-03-24 7:52 UTC (permalink / raw) To: Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, Abel Vesa Cc: linux-clk, devicetree, imx, linux-arm-kernel, linux-kernel, Peng Fan From: Peng Fan <peng.fan@nxp.com> i.MX95 has BLK CTL modules in various MIXes, the BLK CTL modules support clock features such as mux/gate/div. This patch is to add the clock feature of BLK CTL modules Signed-off-by: Peng Fan <peng.fan@nxp.com> --- drivers/clk/imx/Kconfig | 7 + drivers/clk/imx/Makefile | 1 + drivers/clk/imx/clk-imx95-blk-ctl.c | 438 ++++++++++++++++++++++++++++++++++++ 3 files changed, 446 insertions(+) diff --git a/drivers/clk/imx/Kconfig b/drivers/clk/imx/Kconfig index db3bca5f4ec9..6da0fba68225 100644 --- a/drivers/clk/imx/Kconfig +++ b/drivers/clk/imx/Kconfig @@ -114,6 +114,13 @@ config CLK_IMX93 help Build the driver for i.MX93 CCM Clock Driver +config CLK_IMX95_BLK_CTL + tristate "IMX95 Clock Driver for BLK CTL" + depends on ARCH_MXC || COMPILE_TEST + select MXC_CLK + help + Build the clock driver for i.MX95 BLK CTL + config CLK_IMXRT1050 tristate "IMXRT1050 CCM Clock Driver" depends on SOC_IMXRT || COMPILE_TEST diff --git a/drivers/clk/imx/Makefile b/drivers/clk/imx/Makefile index d4b8e10b1970..03f2b2a1ab63 100644 --- a/drivers/clk/imx/Makefile +++ b/drivers/clk/imx/Makefile @@ -31,6 +31,7 @@ obj-$(CONFIG_CLK_IMX8MP) += clk-imx8mp.o clk-imx8mp-audiomix.o obj-$(CONFIG_CLK_IMX8MQ) += clk-imx8mq.o obj-$(CONFIG_CLK_IMX93) += clk-imx93.o +obj-$(CONFIG_CLK_IMX95_BLK_CTL) += clk-imx95-blk-ctl.o obj-$(CONFIG_MXC_CLK_SCU) += clk-imx-scu.o clk-imx-lpcg-scu.o clk-imx-acm.o clk-imx-scu-$(CONFIG_CLK_IMX8QXP) += clk-scu.o clk-imx8qxp.o \ diff --git a/drivers/clk/imx/clk-imx95-blk-ctl.c b/drivers/clk/imx/clk-imx95-blk-ctl.c new file mode 100644 index 000000000000..afda463e28b1 --- /dev/null +++ b/drivers/clk/imx/clk-imx95-blk-ctl.c @@ -0,0 +1,438 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2024 NXP + */ + +#include <dt-bindings/clock/nxp,imx95-clock.h> +#include <linux/clk.h> +#include <linux/clk-provider.h> +#include <linux/pm_runtime.h> +#include <linux/debugfs.h> +#include <linux/device.h> +#include <linux/err.h> +#include <linux/io.h> +#include <linux/module.h> +#include <linux/of_address.h> +#include <linux/of_device.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> +#include <linux/slab.h> +#include <linux/spinlock.h> +#include <linux/types.h> + +enum { + CLK_GATE, + CLK_DIVIDER, + CLK_MUX, +}; + +struct imx95_blk_ctl { + struct device *dev; + spinlock_t lock; + struct clk *clk_apb; + + void __iomem *base; + /* clock gate register */ + u32 clk_reg_restore; +}; + +struct imx95_blk_ctl_clk_dev_data { + const char *name; + const char * const *parent_names; + u32 num_parents; + u32 reg; + u32 bit_idx; + u32 bit_width; + u32 clk_type; + u32 flags; + u32 flags2; + u32 type; +}; + +struct imx95_blk_ctl_dev_data { + const struct imx95_blk_ctl_clk_dev_data *clk_dev_data; + u32 num_clks; + bool rpm_enabled; + u32 clk_reg_offset; +}; + +static const struct imx95_blk_ctl_clk_dev_data vpublk_clk_dev_data[] = { + [IMX95_CLK_VPUBLK_WAVE] = { + .name = "vpublk_wave_vpu", + .parent_names = (const char *[]){ "vpu", }, + .num_parents = 1, + .reg = 8, + .bit_idx = 0, + .type = CLK_GATE, + .flags = CLK_SET_RATE_PARENT, + .flags2 = CLK_GATE_SET_TO_DISABLE, + }, + [IMX95_CLK_VPUBLK_JPEG_ENC] = { + .name = "vpublk_jpeg_enc", + .parent_names = (const char *[]){ "vpujpeg", }, + .num_parents = 1, + .reg = 8, + .bit_idx = 1, + .type = CLK_GATE, + .flags = CLK_SET_RATE_PARENT, + .flags2 = CLK_GATE_SET_TO_DISABLE, + }, + [IMX95_CLK_VPUBLK_JPEG_DEC] = { + .name = "vpublk_jpeg_dec", + .parent_names = (const char *[]){ "vpujpeg", }, + .num_parents = 1, + .reg = 8, + .bit_idx = 2, + .type = CLK_GATE, + .flags = CLK_SET_RATE_PARENT, + .flags2 = CLK_GATE_SET_TO_DISABLE, + } +}; + +static const struct imx95_blk_ctl_dev_data vpublk_dev_data = { + .num_clks = IMX95_CLK_VPUBLK_END, + .clk_dev_data = vpublk_clk_dev_data, + .rpm_enabled = true, + .clk_reg_offset = 8, +}; + +static const struct imx95_blk_ctl_clk_dev_data camblk_clk_dev_data[] = { + [IMX95_CLK_CAMBLK_CSI2_FOR0] = { + .name = "camblk_csi2_for0", + .parent_names = (const char *[]){ "camisi", }, + .num_parents = 1, + .reg = 0, + .bit_idx = 0, + .type = CLK_GATE, + .flags = CLK_SET_RATE_PARENT, + .flags2 = CLK_GATE_SET_TO_DISABLE, + }, + [IMX95_CLK_CAMBLK_CSI2_FOR1] = { + .name = "camblk_csi2_for1", + .parent_names = (const char *[]){ "camisi", }, + .num_parents = 1, + .reg = 0, + .bit_idx = 1, + .type = CLK_GATE, + .flags = CLK_SET_RATE_PARENT, + .flags2 = CLK_GATE_SET_TO_DISABLE, + }, + [IMX95_CLK_CAMBLK_ISP_AXI] = { + .name = "camblk_isp_axi", + .parent_names = (const char *[]){ "camaxi", }, + .num_parents = 1, + .reg = 0, + .bit_idx = 4, + .type = CLK_GATE, + .flags = CLK_SET_RATE_PARENT, + .flags2 = CLK_GATE_SET_TO_DISABLE, + }, + [IMX95_CLK_CAMBLK_ISP_PIXEL] = { + .name = "camblk_isp_pixel", + .parent_names = (const char *[]){ "camisi", }, + .num_parents = 1, + .reg = 0, + .bit_idx = 5, + .type = CLK_GATE, + .flags = CLK_SET_RATE_PARENT, + .flags2 = CLK_GATE_SET_TO_DISABLE, + }, + [IMX95_CLK_CAMBLK_ISP] = { + .name = "camblk_isp", + .parent_names = (const char *[]){ "camisi", }, + .num_parents = 1, + .reg = 0, + .bit_idx = 6, + .type = CLK_GATE, + .flags = CLK_SET_RATE_PARENT, + .flags2 = CLK_GATE_SET_TO_DISABLE, + } +}; + +static const struct imx95_blk_ctl_dev_data camblk_dev_data = { + .num_clks = IMX95_CLK_CAMBLK_END, + .clk_dev_data = camblk_clk_dev_data, + .clk_reg_offset = 0, +}; + +static const struct imx95_blk_ctl_clk_dev_data lvds_clk_dev_data[] = { + [IMX95_CLK_DISPMIX_LVDS_PHY_DIV] = { + .name = "ldb_phy_div", + .parent_names = (const char *[]){ "ldbpll", }, + .num_parents = 1, + .reg = 0, + .bit_idx = 0, + .bit_width = 1, + .type = CLK_DIVIDER, + .flags2 = CLK_DIVIDER_POWER_OF_TWO, + }, + [IMX95_CLK_DISPMIX_LVDS_CH0_GATE] = { + .name = "lvds_ch0_gate", + .parent_names = (const char *[]){ "ldb_phy_div", }, + .num_parents = 1, + .reg = 0, + .bit_idx = 1, + .bit_width = 1, + .type = CLK_GATE, + .flags = CLK_SET_RATE_PARENT, + .flags2 = CLK_GATE_SET_TO_DISABLE, + }, + [IMX95_CLK_DISPMIX_LVDS_CH1_GATE] = { + .name = "lvds_ch1_gate", + .parent_names = (const char *[]){ "ldb_phy_div", }, + .num_parents = 1, + .reg = 0, + .bit_idx = 2, + .bit_width = 1, + .type = CLK_GATE, + .flags = CLK_SET_RATE_PARENT, + .flags2 = CLK_GATE_SET_TO_DISABLE, + }, + [IMX95_CLK_DISPMIX_PIX_DI0_GATE] = { + .name = "lvds_di0_gate", + .parent_names = (const char *[]){ "ldb_pll_div7", }, + .num_parents = 1, + .reg = 0, + .bit_idx = 3, + .bit_width = 1, + .type = CLK_GATE, + .flags = CLK_SET_RATE_PARENT, + .flags2 = CLK_GATE_SET_TO_DISABLE, + }, + [IMX95_CLK_DISPMIX_PIX_DI1_GATE] = { + .name = "lvds_di1_gate", + .parent_names = (const char *[]){ "ldb_pll_div7", }, + .num_parents = 1, + .reg = 0, + .bit_idx = 4, + .bit_width = 1, + .type = CLK_GATE, + .flags = CLK_SET_RATE_PARENT, + .flags2 = CLK_GATE_SET_TO_DISABLE, + }, +}; + +static const struct imx95_blk_ctl_dev_data lvds_csr_dev_data = { + .num_clks = IMX95_CLK_DISPMIX_LVDS_CSR_END, + .clk_dev_data = lvds_clk_dev_data, + .clk_reg_offset = 0, +}; + +static const struct imx95_blk_ctl_clk_dev_data dispmix_csr_clk_dev_data[] = { + [IMX95_CLK_DISPMIX_ENG0_SEL] = { + .name = "disp_engine0_sel", + .parent_names = (const char *[]){"videopll1", "dsi_pll", "ldb_pll_div7", }, + .num_parents = 4, + .reg = 0, + .bit_idx = 0, + .bit_width = 2, + .type = CLK_MUX, + .flags = CLK_SET_RATE_NO_REPARENT | CLK_SET_RATE_PARENT, + }, + [IMX95_CLK_DISPMIX_ENG1_SEL] = { + .name = "disp_engine1_sel", + .parent_names = (const char *[]){"videopll1", "dsi_pll", "ldb_pll_div7", }, + .num_parents = 4, + .reg = 0, + .bit_idx = 2, + .bit_width = 2, + .type = CLK_MUX, + .flags = CLK_SET_RATE_NO_REPARENT | CLK_SET_RATE_PARENT, + } +}; + +static const struct imx95_blk_ctl_dev_data dispmix_csr_dev_data = { + .num_clks = IMX95_CLK_DISPMIX_END, + .clk_dev_data = dispmix_csr_clk_dev_data, + .clk_reg_offset = 0, +}; + +static int imx95_bc_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + const struct imx95_blk_ctl_dev_data *bc_data; + struct imx95_blk_ctl *bc; + struct clk_hw_onecell_data *clk_hw_data; + struct clk_hw **hws; + void __iomem *base; + int i, ret; + + bc = devm_kzalloc(dev, sizeof(*bc), GFP_KERNEL); + if (!bc) + return -ENOMEM; + bc->dev = dev; + dev_set_drvdata(&pdev->dev, bc); + + spin_lock_init(&bc->lock); + + base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(base)) + return PTR_ERR(base); + + bc->base = base; + bc->clk_apb = devm_clk_get(dev, NULL); + if (IS_ERR(bc->clk_apb)) + return dev_err_probe(dev, PTR_ERR(bc->clk_apb), "failed to get APB clock\n"); + + ret = clk_prepare_enable(bc->clk_apb); + if (ret) { + dev_err(dev, "failed to enable apb clock: %d\n", ret); + return ret; + } + + bc_data = of_device_get_match_data(dev); + if (!bc_data) + return devm_of_platform_populate(dev); + + clk_hw_data = devm_kzalloc(dev, struct_size(clk_hw_data, hws, bc_data->num_clks), + GFP_KERNEL); + if (!clk_hw_data) + return -ENOMEM; + + if (bc_data->rpm_enabled) + pm_runtime_enable(&pdev->dev); + + clk_hw_data->num = bc_data->num_clks; + hws = clk_hw_data->hws; + + for (i = 0; i < bc_data->num_clks; i++) { + const struct imx95_blk_ctl_clk_dev_data *data = &bc_data->clk_dev_data[i]; + void __iomem *reg = base + data->reg; + + if (data->type == CLK_MUX) { + hws[i] = clk_hw_register_mux(dev, data->name, data->parent_names, + data->num_parents, data->flags, reg, + data->bit_idx, data->bit_width, + data->flags2, &bc->lock); + } else if (data->type == CLK_DIVIDER) { + hws[i] = clk_hw_register_divider(dev, data->name, data->parent_names[0], + data->flags, reg, data->bit_idx, + data->bit_width, data->flags2, &bc->lock); + } else { + hws[i] = clk_hw_register_gate(dev, data->name, data->parent_names[0], + data->flags, reg, data->bit_idx, + data->flags2, &bc->lock); + } + if (IS_ERR(hws[i])) { + ret = PTR_ERR(hws[i]); + dev_err(dev, "failed to register: %s:%d\n", data->name, ret); + goto cleanup; + } + } + + ret = of_clk_add_hw_provider(dev->of_node, of_clk_hw_onecell_get, clk_hw_data); + if (ret) + goto cleanup; + + ret = devm_of_platform_populate(dev); + if (ret) { + of_clk_del_provider(dev->of_node); + goto cleanup; + } + + if (pm_runtime_enabled(bc->dev)) + clk_disable_unprepare(bc->clk_apb); + + return 0; + +cleanup: + for (i = 0; i < bc_data->num_clks; i++) { + if (IS_ERR_OR_NULL(hws[i])) + continue; + clk_hw_unregister(hws[i]); + } + + if (bc_data->rpm_enabled) + pm_runtime_disable(&pdev->dev); + + return ret; +} + +#ifdef CONFIG_PM +static int imx95_bc_runtime_suspend(struct device *dev) +{ + struct imx95_blk_ctl *bc = dev_get_drvdata(dev); + + clk_disable_unprepare(bc->clk_apb); + return 0; +} + +static int imx95_bc_runtime_resume(struct device *dev) +{ + struct imx95_blk_ctl *bc = dev_get_drvdata(dev); + + return clk_prepare_enable(bc->clk_apb); +} +#endif + +#ifdef CONFIG_PM_SLEEP +static int imx95_bc_suspend(struct device *dev) +{ + struct imx95_blk_ctl *bc = dev_get_drvdata(dev); + const struct imx95_blk_ctl_dev_data *bc_data; + int ret; + + bc_data = of_device_get_match_data(dev); + if (!bc_data) + return 0; + + if (bc_data->rpm_enabled) { + ret = pm_runtime_get_sync(bc->dev); + if (ret < 0) { + pm_runtime_put_noidle(bc->dev); + return ret; + } + } + + bc->clk_reg_restore = readl(bc->base + bc_data->clk_reg_offset); + + return 0; +} + +static int imx95_bc_resume(struct device *dev) +{ + struct imx95_blk_ctl *bc = dev_get_drvdata(dev); + const struct imx95_blk_ctl_dev_data *bc_data; + + bc_data = of_device_get_match_data(dev); + if (!bc_data) + return 0; + + writel(bc->clk_reg_restore, bc->base + bc_data->clk_reg_offset); + + if (bc_data->rpm_enabled) + pm_runtime_put(bc->dev); + + return 0; +} +#endif + +static const struct dev_pm_ops imx95_bc_pm_ops = { + SET_RUNTIME_PM_OPS(imx95_bc_runtime_suspend, imx95_bc_runtime_resume, NULL) + SET_SYSTEM_SLEEP_PM_OPS(imx95_bc_suspend, imx95_bc_resume) +}; + +static const struct of_device_id imx95_bc_of_match[] = { + { .compatible = "nxp,imx95-camera-csr", .data = &camblk_dev_data }, + { .compatible = "nxp,imx95-display-master-csr", }, + { .compatible = "nxp,imx95-lvds-csr", .data = &lvds_csr_dev_data }, + { .compatible = "nxp,imx95-display-csr", .data = &dispmix_csr_dev_data }, + { .compatible = "nxp,imx95-vpu-csr", .data = &vpublk_dev_data }, + { /* Sentinel */ }, +}; +MODULE_DEVICE_TABLE(of, imx95_bc_of_match); + +static struct platform_driver imx95_bc_driver = { + .probe = imx95_bc_probe, + .driver = { + .name = "imx95-blk-ctl", + .of_match_table = of_match_ptr(imx95_bc_of_match), + .pm = &imx95_bc_pm_ops, + }, +}; +module_platform_driver(imx95_bc_driver); + +MODULE_DESCRIPTION("NXP i.MX95 blk ctl driver"); +MODULE_AUTHOR("Peng Fan <peng.fan@nxp.com>"); +MODULE_LICENSE("GPL"); -- 2.37.1 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH v5 4/4] clk: imx: add i.MX95 BLK CTL clk driver 2024-03-24 7:52 ` [PATCH v5 4/4] clk: imx: add i.MX95 BLK CTL clk driver Peng Fan (OSS) @ 2024-03-25 19:25 ` Krzysztof Kozlowski 2024-03-31 12:01 ` Peng Fan 0 siblings, 1 reply; 19+ messages in thread From: Krzysztof Kozlowski @ 2024-03-25 19:25 UTC (permalink / raw) To: Peng Fan (OSS), Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, Abel Vesa Cc: linux-clk, devicetree, imx, linux-arm-kernel, linux-kernel, Peng Fan On 24/03/2024 08:52, Peng Fan (OSS) wrote: > From: Peng Fan <peng.fan@nxp.com> > ... > + > +static const struct of_device_id imx95_bc_of_match[] = { > + { .compatible = "nxp,imx95-camera-csr", .data = &camblk_dev_data }, > + { .compatible = "nxp,imx95-display-master-csr", }, > + { .compatible = "nxp,imx95-lvds-csr", .data = &lvds_csr_dev_data }, > + { .compatible = "nxp,imx95-display-csr", .data = &dispmix_csr_dev_data }, > + { .compatible = "nxp,imx95-vpu-csr", .data = &vpublk_dev_data }, > + { /* Sentinel */ }, > +}; > +MODULE_DEVICE_TABLE(of, imx95_bc_of_match); > + > +static struct platform_driver imx95_bc_driver = { > + .probe = imx95_bc_probe, > + .driver = { > + .name = "imx95-blk-ctl", > + .of_match_table = of_match_ptr(imx95_bc_of_match), Drop of_match_ptr(), causes warnings. From where did you copy such code? Which mainline driver has such pattern? Best regards, Krzysztof ^ permalink raw reply [flat|nested] 19+ messages in thread
* RE: [PATCH v5 4/4] clk: imx: add i.MX95 BLK CTL clk driver 2024-03-25 19:25 ` Krzysztof Kozlowski @ 2024-03-31 12:01 ` Peng Fan 2024-03-31 19:52 ` Krzysztof Kozlowski 0 siblings, 1 reply; 19+ messages in thread From: Peng Fan @ 2024-03-31 12:01 UTC (permalink / raw) To: Krzysztof Kozlowski, Peng Fan (OSS), Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, Abel Vesa Cc: linux-clk@vger.kernel.org, devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org > Subject: Re: [PATCH v5 4/4] clk: imx: add i.MX95 BLK CTL clk driver > > On 24/03/2024 08:52, Peng Fan (OSS) wrote: > > From: Peng Fan <peng.fan@nxp.com> > > > > ... > > > + > > +static const struct of_device_id imx95_bc_of_match[] = { > > + { .compatible = "nxp,imx95-camera-csr", .data = &camblk_dev_data }, > > + { .compatible = "nxp,imx95-display-master-csr", }, > > + { .compatible = "nxp,imx95-lvds-csr", .data = &lvds_csr_dev_data }, > > + { .compatible = "nxp,imx95-display-csr", .data = > &dispmix_csr_dev_data }, > > + { .compatible = "nxp,imx95-vpu-csr", .data = &vpublk_dev_data }, > > + { /* Sentinel */ }, > > +}; > > +MODULE_DEVICE_TABLE(of, imx95_bc_of_match); > > + > > +static struct platform_driver imx95_bc_driver = { > > + .probe = imx95_bc_probe, > > + .driver = { > > + .name = "imx95-blk-ctl", > > + .of_match_table = of_match_ptr(imx95_bc_of_match), > > Drop of_match_ptr(), causes warnings. From where did you copy such code? > Which mainline driver has such pattern? I recall that when COMPILE_TEST is selected, OF is not selected, kernel robot reports warning. This may not be true now. I could drop it in v6. Thanks, Peng. > > Best regards, > Krzysztof ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v5 4/4] clk: imx: add i.MX95 BLK CTL clk driver 2024-03-31 12:01 ` Peng Fan @ 2024-03-31 19:52 ` Krzysztof Kozlowski 0 siblings, 0 replies; 19+ messages in thread From: Krzysztof Kozlowski @ 2024-03-31 19:52 UTC (permalink / raw) To: Peng Fan, Peng Fan (OSS), Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, Abel Vesa Cc: linux-clk@vger.kernel.org, devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org On 31/03/2024 14:01, Peng Fan wrote: >> Subject: Re: [PATCH v5 4/4] clk: imx: add i.MX95 BLK CTL clk driver >> >> On 24/03/2024 08:52, Peng Fan (OSS) wrote: >>> From: Peng Fan <peng.fan@nxp.com> >>> >> >> ... >> >>> + >>> +static const struct of_device_id imx95_bc_of_match[] = { >>> + { .compatible = "nxp,imx95-camera-csr", .data = &camblk_dev_data }, >>> + { .compatible = "nxp,imx95-display-master-csr", }, >>> + { .compatible = "nxp,imx95-lvds-csr", .data = &lvds_csr_dev_data }, >>> + { .compatible = "nxp,imx95-display-csr", .data = >> &dispmix_csr_dev_data }, >>> + { .compatible = "nxp,imx95-vpu-csr", .data = &vpublk_dev_data }, >>> + { /* Sentinel */ }, >>> +}; >>> +MODULE_DEVICE_TABLE(of, imx95_bc_of_match); >>> + >>> +static struct platform_driver imx95_bc_driver = { >>> + .probe = imx95_bc_probe, >>> + .driver = { >>> + .name = "imx95-blk-ctl", >>> + .of_match_table = of_match_ptr(imx95_bc_of_match), >> >> Drop of_match_ptr(), causes warnings. From where did you copy such code? >> Which mainline driver has such pattern? > > I recall that when COMPILE_TEST is selected, OF is not selected, kernel > robot reports warning. This may not be true now. > This itself was never true. Any compilation, not robots, which you can test by yourself will report warnings if your code is not correct. Don't use random C syntax to suppress warnings, but actually something which will work. of_match_ptr does not make sense without maybe_unused or ifdef. But anyway of_match_ptr is not recommended. Best regards, Krzysztof ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v5 0/4] Add support i.MX95 BLK CTL module clock features 2024-03-24 7:51 [PATCH v5 0/4] Add support i.MX95 BLK CTL module clock features Peng Fan (OSS) ` (3 preceding siblings ...) 2024-03-24 7:52 ` [PATCH v5 4/4] clk: imx: add i.MX95 BLK CTL clk driver Peng Fan (OSS) @ 2024-03-25 19:21 ` Krzysztof Kozlowski 2024-03-31 12:00 ` Peng Fan 4 siblings, 1 reply; 19+ messages in thread From: Krzysztof Kozlowski @ 2024-03-25 19:21 UTC (permalink / raw) To: Peng Fan (OSS), Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, Abel Vesa Cc: linux-clk, devicetree, imx, linux-arm-kernel, linux-kernel, Peng Fan On 24/03/2024 08:51, Peng Fan (OSS) wrote: > i.MX95's several MIXes has BLK CTL module which could be used for > clk settings, QoS settings, Misc settings for a MIX. This patchset > is to add the clk feature support, including dt-bindings > > Signed-off-by: Peng Fan <peng.fan@nxp.com> > --- > Changes in v5: > - Merge bindings except the one has mux-controller > - Separate clock ID headers in a separate patch per Rob's comments Where did he suggest it? Best regards, Krzysztof ^ permalink raw reply [flat|nested] 19+ messages in thread
* RE: [PATCH v5 0/4] Add support i.MX95 BLK CTL module clock features 2024-03-25 19:21 ` [PATCH v5 0/4] Add support i.MX95 BLK CTL module clock features Krzysztof Kozlowski @ 2024-03-31 12:00 ` Peng Fan 2024-03-31 19:53 ` Krzysztof Kozlowski 0 siblings, 1 reply; 19+ messages in thread From: Peng Fan @ 2024-03-31 12:00 UTC (permalink / raw) To: Krzysztof Kozlowski, Peng Fan (OSS), Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, Abel Vesa Cc: linux-clk@vger.kernel.org, devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org > Subject: Re: [PATCH v5 0/4] Add support i.MX95 BLK CTL module clock > features > > On 24/03/2024 08:51, Peng Fan (OSS) wrote: > > i.MX95's several MIXes has BLK CTL module which could be used for clk > > settings, QoS settings, Misc settings for a MIX. This patchset is to > > add the clk feature support, including dt-bindings > > > > Signed-off-by: Peng Fan <peng.fan@nxp.com> > > --- > > Changes in v5: > > - Merge bindings except the one has mux-controller > > - Separate clock ID headers in a separate patch per Rob's comments > > Where did he suggest it? See https://lore.kernel.org/all/20240315165422.GA1472059-robh@kernel.org/ Thanks, Peng. > > > > Best regards, > Krzysztof ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v5 0/4] Add support i.MX95 BLK CTL module clock features 2024-03-31 12:00 ` Peng Fan @ 2024-03-31 19:53 ` Krzysztof Kozlowski 2024-04-01 1:32 ` Peng Fan 0 siblings, 1 reply; 19+ messages in thread From: Krzysztof Kozlowski @ 2024-03-31 19:53 UTC (permalink / raw) To: Peng Fan, Peng Fan (OSS), Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, Abel Vesa Cc: linux-clk@vger.kernel.org, devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org On 31/03/2024 14:00, Peng Fan wrote: >> Subject: Re: [PATCH v5 0/4] Add support i.MX95 BLK CTL module clock >> features >> >> On 24/03/2024 08:51, Peng Fan (OSS) wrote: >>> i.MX95's several MIXes has BLK CTL module which could be used for clk >>> settings, QoS settings, Misc settings for a MIX. This patchset is to >>> add the clk feature support, including dt-bindings >>> >>> Signed-off-by: Peng Fan <peng.fan@nxp.com> >>> --- >>> Changes in v5: >>> - Merge bindings except the one has mux-controller >>> - Separate clock ID headers in a separate patch per Rob's comments >> >> Where did he suggest it? > > See https://lore.kernel.org/all/20240315165422.GA1472059-robh@kernel.org/ > He said under specific line about one specific define. There is absolutely nothing about splitting the header into new patch. NAK Best regards, Krzysztof ^ permalink raw reply [flat|nested] 19+ messages in thread
* RE: [PATCH v5 0/4] Add support i.MX95 BLK CTL module clock features 2024-03-31 19:53 ` Krzysztof Kozlowski @ 2024-04-01 1:32 ` Peng Fan 0 siblings, 0 replies; 19+ messages in thread From: Peng Fan @ 2024-04-01 1:32 UTC (permalink / raw) To: Krzysztof Kozlowski, Peng Fan (OSS), Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, Abel Vesa Cc: linux-clk@vger.kernel.org, devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org > Subject: Re: [PATCH v5 0/4] Add support i.MX95 BLK CTL module clock > features > > On 31/03/2024 14:00, Peng Fan wrote: > >> Subject: Re: [PATCH v5 0/4] Add support i.MX95 BLK CTL module clock > >> features > >> > >> On 24/03/2024 08:51, Peng Fan (OSS) wrote: > >>> i.MX95's several MIXes has BLK CTL module which could be used for > >>> clk settings, QoS settings, Misc settings for a MIX. This patchset > >>> is to add the clk feature support, including dt-bindings > >>> > >>> Signed-off-by: Peng Fan <peng.fan@nxp.com> > >>> --- > >>> Changes in v5: > >>> - Merge bindings except the one has mux-controller > >>> - Separate clock ID headers in a separate patch per Rob's comments > >> > >> Where did he suggest it? > > > > See > > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore > > .kernel.org%2Fall%2F20240315165422.GA1472059- > robh%40kernel.org%2F&data > > > =05%7C02%7Cpeng.fan%40nxp.com%7C95289dc4bed24c3d125808dc51bc4 > 4e0%7C686 > > > ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C638475116243825697%7 > CUnknown%7 > > > CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwi > LCJXV > > > CI6Mn0%3D%7C0%7C%7C%7C&sdata=Dt6KYhWwp%2B4NSwHJlXwUjyRqYU > CkN0MvlSOE22w > > vRE0%3D&reserved=0 > > > > He said under specific line about one specific define. There is absolutely > nothing about splitting the header into new patch. I misunderstood your point, I will put the header patch(patch 2/4) as the 1st patch V6. Thanks, Peng. > > NAK > > Best regards, > Krzysztof ^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2024-04-01 9:51 UTC | newest] Thread overview: 19+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-03-24 7:51 [PATCH v5 0/4] Add support i.MX95 BLK CTL module clock features Peng Fan (OSS) 2024-03-24 7:52 ` [PATCH v5 1/4] dt-bindings: clock: support i.MX95 BLK CTL module Peng Fan (OSS) 2024-03-25 19:24 ` Krzysztof Kozlowski 2024-03-31 11:58 ` Peng Fan 2024-03-31 19:54 ` Krzysztof Kozlowski 2024-03-24 7:52 ` [PATCH v5 2/4] dt-bindings: clock: support i.MX95 Display Master CSR module Peng Fan (OSS) 2024-03-25 19:23 ` Krzysztof Kozlowski 2024-03-24 7:52 ` [PATCH v5 3/4] dt-bindings: clock: add i.MX95 clock header Peng Fan (OSS) 2024-03-25 19:22 ` Krzysztof Kozlowski 2024-04-01 7:26 ` Peng Fan 2024-04-01 9:51 ` Krzysztof Kozlowski 2024-03-24 7:52 ` [PATCH v5 4/4] clk: imx: add i.MX95 BLK CTL clk driver Peng Fan (OSS) 2024-03-25 19:25 ` Krzysztof Kozlowski 2024-03-31 12:01 ` Peng Fan 2024-03-31 19:52 ` Krzysztof Kozlowski 2024-03-25 19:21 ` [PATCH v5 0/4] Add support i.MX95 BLK CTL module clock features Krzysztof Kozlowski 2024-03-31 12:00 ` Peng Fan 2024-03-31 19:53 ` Krzysztof Kozlowski 2024-04-01 1:32 ` Peng Fan
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).