* [PATCH 1/3] dt-bindings: arm: mediatek: mmsys: convert to YAML format
@ 2021-05-19 16:18 Fabien Parent
2021-05-19 16:18 ` [PATCH 2/3] dt-bindings: arm: mediatek: mmsys: add MT8365 SoC binding Fabien Parent
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Fabien Parent @ 2021-05-19 16:18 UTC (permalink / raw)
To: Rob Herring, Matthias Brugger
Cc: mkorpershoek, Fabien Parent, devicetree, linux-kernel,
linux-arm-kernel, linux-mediatek
Convert the mmsys bindings to the YAML format.
Signed-off-by: Fabien Parent <fparent@baylibre.com>
---
.../bindings/arm/mediatek/mediatek,mmsys.txt | 31 ----------
.../bindings/arm/mediatek/mediatek,mmsys.yaml | 57 +++++++++++++++++++
2 files changed, 57 insertions(+), 31 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt
create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml
diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt b/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt
deleted file mode 100644
index 78c50733985c..000000000000
--- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Mediatek mmsys controller
-============================
-
-The Mediatek mmsys system controller provides clock control, routing control,
-and miscellaneous control in mmsys partition.
-
-Required Properties:
-
-- compatible: Should be one of:
- - "mediatek,mt2701-mmsys", "syscon"
- - "mediatek,mt2712-mmsys", "syscon"
- - "mediatek,mt6765-mmsys", "syscon"
- - "mediatek,mt6779-mmsys", "syscon"
- - "mediatek,mt6797-mmsys", "syscon"
- - "mediatek,mt7623-mmsys", "mediatek,mt2701-mmsys", "syscon"
- - "mediatek,mt8167-mmsys", "syscon"
- - "mediatek,mt8173-mmsys", "syscon"
- - "mediatek,mt8183-mmsys", "syscon"
-- #clock-cells: Must be 1
-
-For the clock control, the mmsys controller uses the common clk binding from
-Documentation/devicetree/bindings/clock/clock-bindings.txt
-The available clocks are defined in dt-bindings/clock/mt*-clk.h.
-
-Example:
-
-mmsys: syscon@14000000 {
- compatible = "mediatek,mt8173-mmsys", "syscon";
- reg = <0 0x14000000 0 0x1000>;
- #clock-cells = <1>;
-};
diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml b/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml
new file mode 100644
index 000000000000..a419da33e10b
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml
@@ -0,0 +1,57 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/arm/mediatek/mediatek,mmsys.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: MediaTek mmsys controller
+
+maintainers:
+ - Matthias Brugger <matthias.bgg@gmail.com>
+
+description:
+ The MediaTek mmsys system controller provides clock control, routing control,
+ and miscellaneous control in mmsys partition.
+
+properties:
+ $nodename:
+ pattern: "^syscon@[0-9a-f]+$"
+
+ compatible:
+ oneOf:
+ - items:
+ - enum:
+ - mediatek,mt2701-mmsys
+ - mediatek,mt2712-mmsys
+ - mediatek,mt6765-mmsys
+ - mediatek,mt6779-mmsys
+ - mediatek,mt6797-mmsys
+ - mediatek,mt8167-mmsys
+ - mediatek,mt8173-mmsys
+ - mediatek,mt8183-mmsys
+ - const: syscon
+ - items:
+ - const: mediatek,mt7623-mmsys
+ - const: mediatek,mt2701-mmsys
+ - const: syscon
+
+ reg:
+ maxItems: 1
+
+ "#clock-cells":
+ const: 1
+
+required:
+ - compatible
+ - reg
+ - "#clock-cells"
+
+additionalProperties: false
+
+examples:
+ - |
+ mmsys: syscon@14000000 {
+ compatible = "mediatek,mt8173-mmsys", "syscon";
+ reg = <0x14000000 0x1000>;
+ #clock-cells = <1>;
+ };
--
2.31.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/3] dt-bindings: arm: mediatek: mmsys: add MT8365 SoC binding
2021-05-19 16:18 [PATCH 1/3] dt-bindings: arm: mediatek: mmsys: convert to YAML format Fabien Parent
@ 2021-05-19 16:18 ` Fabien Parent
2021-05-21 1:50 ` Rob Herring
2021-05-19 16:18 ` [PATCH 3/3] soc: mediatek: mmsys: add MT8365 support Fabien Parent
2021-05-21 1:48 ` [PATCH 1/3] dt-bindings: arm: mediatek: mmsys: convert to YAML format Rob Herring
2 siblings, 1 reply; 9+ messages in thread
From: Fabien Parent @ 2021-05-19 16:18 UTC (permalink / raw)
To: Rob Herring, Matthias Brugger
Cc: mkorpershoek, Fabien Parent, devicetree, linux-kernel,
linux-arm-kernel, linux-mediatek
Add the MMSYS binding documentation for the MT8365 SoC.
Signed-off-by: Fabien Parent <fparent@baylibre.com>
---
.../devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml b/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml
index a419da33e10b..2d4ff0ce387b 100644
--- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml
+++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml
@@ -29,6 +29,7 @@ properties:
- mediatek,mt8167-mmsys
- mediatek,mt8173-mmsys
- mediatek,mt8183-mmsys
+ - mediatek,mt8365-mmsys
- const: syscon
- items:
- const: mediatek,mt7623-mmsys
--
2.31.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/3] soc: mediatek: mmsys: add MT8365 support
2021-05-19 16:18 [PATCH 1/3] dt-bindings: arm: mediatek: mmsys: convert to YAML format Fabien Parent
2021-05-19 16:18 ` [PATCH 2/3] dt-bindings: arm: mediatek: mmsys: add MT8365 SoC binding Fabien Parent
@ 2021-05-19 16:18 ` Fabien Parent
2021-08-04 17:08 ` Matthias Brugger
2021-05-21 1:48 ` [PATCH 1/3] dt-bindings: arm: mediatek: mmsys: convert to YAML format Rob Herring
2 siblings, 1 reply; 9+ messages in thread
From: Fabien Parent @ 2021-05-19 16:18 UTC (permalink / raw)
To: Matthias Brugger
Cc: mkorpershoek, Fabien Parent, linux-kernel, linux-arm-kernel,
linux-mediatek
Add DSI mmsys connections for the MT8365 SoC.
Signed-off-by: Fabien Parent <fparent@baylibre.com>
---
drivers/soc/mediatek/mt8365-mmsys.h | 60 +++++++++++++++++++++++++++++
drivers/soc/mediatek/mtk-mmsys.c | 11 ++++++
2 files changed, 71 insertions(+)
create mode 100644 drivers/soc/mediatek/mt8365-mmsys.h
diff --git a/drivers/soc/mediatek/mt8365-mmsys.h b/drivers/soc/mediatek/mt8365-mmsys.h
new file mode 100644
index 000000000000..2475aeb79791
--- /dev/null
+++ b/drivers/soc/mediatek/mt8365-mmsys.h
@@ -0,0 +1,60 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef __SOC_MEDIATEK_MT8365_MMSYS_H
+#define __SOC_MEDIATEK_MT8365_MMSYS_H
+
+#define MT8365_DISP_REG_CONFIG_DISP_OVL0_MOUT_EN 0xf3c
+#define MT8365_DISP_REG_CONFIG_DISP_RDMA0_SOUT_SEL 0xf4c
+#define MT8365_DISP_REG_CONFIG_DISP_DITHER0_MOUT_EN 0xf50
+#define MT8365_DISP_REG_CONFIG_DISP_RDMA0_SEL_IN 0xf54
+#define MT8365_DISP_REG_CONFIG_DISP_RDMA0_RSZ0_SEL_IN 0xf60
+#define MT8365_DISP_REG_CONFIG_DISP_COLOR0_SEL_IN 0xf64
+#define MT8365_DISP_REG_CONFIG_DISP_DSI0_SEL_IN 0xf68
+
+#define MT8365_RDMA0_SOUT_COLOR0 0x1
+#define MT8365_DITHER_MOUT_EN_DSI0 0x1
+#define MT8365_DSI0_SEL_IN_DITHER 0x1
+#define MT8365_RDMA0_SEL_IN_OVL0 0x0
+#define MT8365_RDMA0_RSZ0_SEL_IN_RDMA0 0x0
+#define MT8365_DISP_COLOR_SEL_IN_COLOR0 0x0
+#define MT8365_OVL0_MOUT_PATH0_SEL BIT(0)
+
+static const struct mtk_mmsys_routes mt8365_mmsys_routing_table[] = {
+ {
+ DDP_COMPONENT_OVL0, DDP_COMPONENT_RDMA0,
+ MT8365_DISP_REG_CONFIG_DISP_OVL0_MOUT_EN,
+ MT8365_OVL0_MOUT_PATH0_SEL
+ },
+ {
+ DDP_COMPONENT_OVL0, DDP_COMPONENT_RDMA0,
+ MT8365_DISP_REG_CONFIG_DISP_RDMA0_SEL_IN,
+ MT8365_RDMA0_SEL_IN_OVL0
+ },
+ {
+ DDP_COMPONENT_RDMA0, DDP_COMPONENT_COLOR0,
+ MT8365_DISP_REG_CONFIG_DISP_RDMA0_SOUT_SEL,
+ MT8365_RDMA0_SOUT_COLOR0
+ },
+ {
+ DDP_COMPONENT_COLOR0, DDP_COMPONENT_CCORR,
+ MT8365_DISP_REG_CONFIG_DISP_COLOR0_SEL_IN,
+ MT8365_DISP_COLOR_SEL_IN_COLOR0
+ },
+ {
+ DDP_COMPONENT_DITHER, DDP_COMPONENT_DSI0,
+ MT8365_DISP_REG_CONFIG_DISP_DITHER0_MOUT_EN,
+ MT8365_DITHER_MOUT_EN_DSI0
+ },
+ {
+ DDP_COMPONENT_DITHER, DDP_COMPONENT_DSI0,
+ MT8365_DISP_REG_CONFIG_DISP_DSI0_SEL_IN,
+ MT8365_DSI0_SEL_IN_DITHER
+ },
+ {
+ DDP_COMPONENT_RDMA0, DDP_COMPONENT_COLOR0,
+ MT8365_DISP_REG_CONFIG_DISP_RDMA0_RSZ0_SEL_IN,
+ MT8365_RDMA0_RSZ0_SEL_IN_RDMA0
+ },
+};
+
+#endif /* __SOC_MEDIATEK_MT8365_MMSYS_H */
diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c
index 080660ef11bf..44aff822d035 100644
--- a/drivers/soc/mediatek/mtk-mmsys.c
+++ b/drivers/soc/mediatek/mtk-mmsys.c
@@ -13,6 +13,7 @@
#include "mtk-mmsys.h"
#include "mt8167-mmsys.h"
#include "mt8183-mmsys.h"
+#include "mt8365-mmsys.h"
static const struct mtk_mmsys_driver_data mt2701_mmsys_driver_data = {
.clk_driver = "clk-mt2701-mm",
@@ -52,6 +53,12 @@ static const struct mtk_mmsys_driver_data mt8183_mmsys_driver_data = {
.num_routes = ARRAY_SIZE(mmsys_mt8183_routing_table),
};
+static const struct mtk_mmsys_driver_data mt8365_mmsys_driver_data = {
+ .clk_driver = "clk-mt8365-mm",
+ .routes = mt8365_mmsys_routing_table,
+ .num_routes = ARRAY_SIZE(mt8365_mmsys_routing_table),
+};
+
struct mtk_mmsys {
void __iomem *regs;
const struct mtk_mmsys_driver_data *data;
@@ -157,6 +164,10 @@ static const struct of_device_id of_match_mtk_mmsys[] = {
.compatible = "mediatek,mt8183-mmsys",
.data = &mt8183_mmsys_driver_data,
},
+ {
+ .compatible = "mediatek,mt8365-mmsys",
+ .data = &mt8365_mmsys_driver_data,
+ },
{ }
};
--
2.31.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] dt-bindings: arm: mediatek: mmsys: convert to YAML format
2021-05-19 16:18 [PATCH 1/3] dt-bindings: arm: mediatek: mmsys: convert to YAML format Fabien Parent
2021-05-19 16:18 ` [PATCH 2/3] dt-bindings: arm: mediatek: mmsys: add MT8365 SoC binding Fabien Parent
2021-05-19 16:18 ` [PATCH 3/3] soc: mediatek: mmsys: add MT8365 support Fabien Parent
@ 2021-05-21 1:48 ` Rob Herring
2021-05-21 1:49 ` Rob Herring
2 siblings, 1 reply; 9+ messages in thread
From: Rob Herring @ 2021-05-21 1:48 UTC (permalink / raw)
To: Fabien Parent
Cc: linux-mediatek, linux-arm-kernel, Rob Herring, Matthias Brugger,
linux-kernel, mkorpershoek, devicetree
On Wed, 19 May 2021 18:18:44 +0200, Fabien Parent wrote:
> Convert the mmsys bindings to the YAML format.
>
> Signed-off-by: Fabien Parent <fparent@baylibre.com>
> ---
> .../bindings/arm/mediatek/mediatek,mmsys.txt | 31 ----------
> .../bindings/arm/mediatek/mediatek,mmsys.yaml | 57 +++++++++++++++++++
> 2 files changed, 57 insertions(+), 31 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt
> create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml
>
Applied, thanks!
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] dt-bindings: arm: mediatek: mmsys: convert to YAML format
2021-05-21 1:48 ` [PATCH 1/3] dt-bindings: arm: mediatek: mmsys: convert to YAML format Rob Herring
@ 2021-05-21 1:49 ` Rob Herring
2021-07-23 9:44 ` Enric Balletbo Serra
0 siblings, 1 reply; 9+ messages in thread
From: Rob Herring @ 2021-05-21 1:49 UTC (permalink / raw)
To: Fabien Parent
Cc: moderated list:ARM/Mediatek SoC support, linux-arm-kernel,
Matthias Brugger, linux-kernel, Mattijs Korpershoek, devicetree
On Thu, May 20, 2021 at 8:48 PM Rob Herring <robh@kernel.org> wrote:
>
> On Wed, 19 May 2021 18:18:44 +0200, Fabien Parent wrote:
> > Convert the mmsys bindings to the YAML format.
> >
> > Signed-off-by: Fabien Parent <fparent@baylibre.com>
> > ---
> > .../bindings/arm/mediatek/mediatek,mmsys.txt | 31 ----------
> > .../bindings/arm/mediatek/mediatek,mmsys.yaml | 57 +++++++++++++++++++
> > 2 files changed, 57 insertions(+), 31 deletions(-)
> > delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt
> > create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml
> >
>
> Applied, thanks!
Actually, should go with patch 3. So dropped and:
Reviewed-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/3] dt-bindings: arm: mediatek: mmsys: add MT8365 SoC binding
2021-05-19 16:18 ` [PATCH 2/3] dt-bindings: arm: mediatek: mmsys: add MT8365 SoC binding Fabien Parent
@ 2021-05-21 1:50 ` Rob Herring
0 siblings, 0 replies; 9+ messages in thread
From: Rob Herring @ 2021-05-21 1:50 UTC (permalink / raw)
To: Fabien Parent
Cc: Matthias Brugger, Rob Herring, linux-mediatek, linux-arm-kernel,
mkorpershoek, linux-kernel, devicetree
On Wed, 19 May 2021 18:18:45 +0200, Fabien Parent wrote:
> Add the MMSYS binding documentation for the MT8365 SoC.
>
> Signed-off-by: Fabien Parent <fparent@baylibre.com>
> ---
> .../devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml | 1 +
> 1 file changed, 1 insertion(+)
>
Reviewed-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] dt-bindings: arm: mediatek: mmsys: convert to YAML format
2021-05-21 1:49 ` Rob Herring
@ 2021-07-23 9:44 ` Enric Balletbo Serra
2021-07-23 23:36 ` Rob Herring
0 siblings, 1 reply; 9+ messages in thread
From: Enric Balletbo Serra @ 2021-07-23 9:44 UTC (permalink / raw)
To: Rob Herring
Cc: Fabien Parent, moderated list:ARM/Mediatek SoC support,
linux-arm-kernel, Matthias Brugger, linux-kernel,
Mattijs Korpershoek, devicetree
Hi Rob,
Missatge de Rob Herring <robh+dt@kernel.org> del dia dv., 21 de maig
2021 a les 3:51:
>
> On Thu, May 20, 2021 at 8:48 PM Rob Herring <robh@kernel.org> wrote:
> >
> > On Wed, 19 May 2021 18:18:44 +0200, Fabien Parent wrote:
> > > Convert the mmsys bindings to the YAML format.
> > >
> > > Signed-off-by: Fabien Parent <fparent@baylibre.com>
> > > ---
> > > .../bindings/arm/mediatek/mediatek,mmsys.txt | 31 ----------
> > > .../bindings/arm/mediatek/mediatek,mmsys.yaml | 57 +++++++++++++++++++
> > > 2 files changed, 57 insertions(+), 31 deletions(-)
> > > delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt
> > > create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml
> > >
> >
> > Applied, thanks!
>
> Actually, should go with patch 3. So dropped and:
>
I think that this patch can be applied alone through your tree, patch
2 and 3 can be applied later for the maintainers when they are fine.
There are other patches in the ML that depend on having this meged, so
it would be really nice to have it. Although it has already your
ack/review if it help I also took a look and I know the hardware so:
Reviewed-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Thanks,
Enric
> Reviewed-by: Rob Herring <robh@kernel.org>
>
> _______________________________________________
> Linux-mediatek mailing list
> Linux-mediatek@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] dt-bindings: arm: mediatek: mmsys: convert to YAML format
2021-07-23 9:44 ` Enric Balletbo Serra
@ 2021-07-23 23:36 ` Rob Herring
0 siblings, 0 replies; 9+ messages in thread
From: Rob Herring @ 2021-07-23 23:36 UTC (permalink / raw)
To: Enric Balletbo Serra
Cc: Fabien Parent, moderated list:ARM/Mediatek SoC support,
linux-arm-kernel, Matthias Brugger, linux-kernel,
Mattijs Korpershoek, devicetree
On Fri, Jul 23, 2021 at 3:45 AM Enric Balletbo Serra
<eballetbo@gmail.com> wrote:
>
> Hi Rob,
>
> Missatge de Rob Herring <robh+dt@kernel.org> del dia dv., 21 de maig
> 2021 a les 3:51:
> >
> > On Thu, May 20, 2021 at 8:48 PM Rob Herring <robh@kernel.org> wrote:
> > >
> > > On Wed, 19 May 2021 18:18:44 +0200, Fabien Parent wrote:
> > > > Convert the mmsys bindings to the YAML format.
> > > >
> > > > Signed-off-by: Fabien Parent <fparent@baylibre.com>
> > > > ---
> > > > .../bindings/arm/mediatek/mediatek,mmsys.txt | 31 ----------
> > > > .../bindings/arm/mediatek/mediatek,mmsys.yaml | 57 +++++++++++++++++++
> > > > 2 files changed, 57 insertions(+), 31 deletions(-)
> > > > delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt
> > > > create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml
> > > >
> > >
> > > Applied, thanks!
> >
> > Actually, should go with patch 3. So dropped and:
> >
>
> I think that this patch can be applied alone through your tree, patch
> 2 and 3 can be applied later for the maintainers when they are fine.
> There are other patches in the ML that depend on having this meged, so
> it would be really nice to have it. Although it has already your
> ack/review if it help I also took a look and I know the hardware so:
>
> Reviewed-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Okay, patch 1 and 2 applied.
Rob
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 3/3] soc: mediatek: mmsys: add MT8365 support
2021-05-19 16:18 ` [PATCH 3/3] soc: mediatek: mmsys: add MT8365 support Fabien Parent
@ 2021-08-04 17:08 ` Matthias Brugger
0 siblings, 0 replies; 9+ messages in thread
From: Matthias Brugger @ 2021-08-04 17:08 UTC (permalink / raw)
To: Fabien Parent
Cc: mkorpershoek, linux-kernel, linux-arm-kernel, linux-mediatek
Hi Fabien,
On 19/05/2021 18:18, Fabien Parent wrote:
> Add DSI mmsys connections for the MT8365 SoC.
>
> Signed-off-by: Fabien Parent <fparent@baylibre.com>
> ---
> drivers/soc/mediatek/mt8365-mmsys.h | 60 +++++++++++++++++++++++++++++
> drivers/soc/mediatek/mtk-mmsys.c | 11 ++++++
> 2 files changed, 71 insertions(+)
> create mode 100644 drivers/soc/mediatek/mt8365-mmsys.h
>
> diff --git a/drivers/soc/mediatek/mt8365-mmsys.h b/drivers/soc/mediatek/mt8365-mmsys.h
> new file mode 100644
> index 000000000000..2475aeb79791
> --- /dev/null
> +++ b/drivers/soc/mediatek/mt8365-mmsys.h
> @@ -0,0 +1,60 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> +
> +#ifndef __SOC_MEDIATEK_MT8365_MMSYS_H
> +#define __SOC_MEDIATEK_MT8365_MMSYS_H
> +
> +#define MT8365_DISP_REG_CONFIG_DISP_OVL0_MOUT_EN 0xf3c
> +#define MT8365_DISP_REG_CONFIG_DISP_RDMA0_SOUT_SEL 0xf4c
> +#define MT8365_DISP_REG_CONFIG_DISP_DITHER0_MOUT_EN 0xf50
> +#define MT8365_DISP_REG_CONFIG_DISP_RDMA0_SEL_IN 0xf54
> +#define MT8365_DISP_REG_CONFIG_DISP_RDMA0_RSZ0_SEL_IN 0xf60
> +#define MT8365_DISP_REG_CONFIG_DISP_COLOR0_SEL_IN 0xf64
> +#define MT8365_DISP_REG_CONFIG_DISP_DSI0_SEL_IN 0xf68
> +
> +#define MT8365_RDMA0_SOUT_COLOR0 0x1
> +#define MT8365_DITHER_MOUT_EN_DSI0 0x1
> +#define MT8365_DSI0_SEL_IN_DITHER 0x1
> +#define MT8365_RDMA0_SEL_IN_OVL0 0x0
> +#define MT8365_RDMA0_RSZ0_SEL_IN_RDMA0 0x0
> +#define MT8365_DISP_COLOR_SEL_IN_COLOR0 0x0
> +#define MT8365_OVL0_MOUT_PATH0_SEL BIT(0)
> +
> +static const struct mtk_mmsys_routes mt8365_mmsys_routing_table[] = {
> + {
> + DDP_COMPONENT_OVL0, DDP_COMPONENT_RDMA0,
> + MT8365_DISP_REG_CONFIG_DISP_OVL0_MOUT_EN,
> + MT8365_OVL0_MOUT_PATH0_SEL
I pushed this patch to v4.15-next/soc
As we now include the mask field in mtk_mmsys_routes I updated that in the patch.
Please let me know if I screwed something up.
Regards,
Matthias
> + },
> + {
> + DDP_COMPONENT_OVL0, DDP_COMPONENT_RDMA0,
> + MT8365_DISP_REG_CONFIG_DISP_RDMA0_SEL_IN,
> + MT8365_RDMA0_SEL_IN_OVL0
> + },
> + {
> + DDP_COMPONENT_RDMA0, DDP_COMPONENT_COLOR0,
> + MT8365_DISP_REG_CONFIG_DISP_RDMA0_SOUT_SEL,
> + MT8365_RDMA0_SOUT_COLOR0
> + },
> + {
> + DDP_COMPONENT_COLOR0, DDP_COMPONENT_CCORR,
> + MT8365_DISP_REG_CONFIG_DISP_COLOR0_SEL_IN,
> + MT8365_DISP_COLOR_SEL_IN_COLOR0
> + },
> + {
> + DDP_COMPONENT_DITHER, DDP_COMPONENT_DSI0,
> + MT8365_DISP_REG_CONFIG_DISP_DITHER0_MOUT_EN,
> + MT8365_DITHER_MOUT_EN_DSI0
> + },
> + {
> + DDP_COMPONENT_DITHER, DDP_COMPONENT_DSI0,
> + MT8365_DISP_REG_CONFIG_DISP_DSI0_SEL_IN,
> + MT8365_DSI0_SEL_IN_DITHER
> + },
> + {
> + DDP_COMPONENT_RDMA0, DDP_COMPONENT_COLOR0,
> + MT8365_DISP_REG_CONFIG_DISP_RDMA0_RSZ0_SEL_IN,
> + MT8365_RDMA0_RSZ0_SEL_IN_RDMA0
> + },
> +};
> +
> +#endif /* __SOC_MEDIATEK_MT8365_MMSYS_H */
> diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c
> index 080660ef11bf..44aff822d035 100644
> --- a/drivers/soc/mediatek/mtk-mmsys.c
> +++ b/drivers/soc/mediatek/mtk-mmsys.c
> @@ -13,6 +13,7 @@
> #include "mtk-mmsys.h"
> #include "mt8167-mmsys.h"
> #include "mt8183-mmsys.h"
> +#include "mt8365-mmsys.h"
>
> static const struct mtk_mmsys_driver_data mt2701_mmsys_driver_data = {
> .clk_driver = "clk-mt2701-mm",
> @@ -52,6 +53,12 @@ static const struct mtk_mmsys_driver_data mt8183_mmsys_driver_data = {
> .num_routes = ARRAY_SIZE(mmsys_mt8183_routing_table),
> };
>
> +static const struct mtk_mmsys_driver_data mt8365_mmsys_driver_data = {
> + .clk_driver = "clk-mt8365-mm",
> + .routes = mt8365_mmsys_routing_table,
> + .num_routes = ARRAY_SIZE(mt8365_mmsys_routing_table),
> +};
> +
> struct mtk_mmsys {
> void __iomem *regs;
> const struct mtk_mmsys_driver_data *data;
> @@ -157,6 +164,10 @@ static const struct of_device_id of_match_mtk_mmsys[] = {
> .compatible = "mediatek,mt8183-mmsys",
> .data = &mt8183_mmsys_driver_data,
> },
> + {
> + .compatible = "mediatek,mt8365-mmsys",
> + .data = &mt8365_mmsys_driver_data,
> + },
> { }
> };
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-08-04 17:08 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-19 16:18 [PATCH 1/3] dt-bindings: arm: mediatek: mmsys: convert to YAML format Fabien Parent
2021-05-19 16:18 ` [PATCH 2/3] dt-bindings: arm: mediatek: mmsys: add MT8365 SoC binding Fabien Parent
2021-05-21 1:50 ` Rob Herring
2021-05-19 16:18 ` [PATCH 3/3] soc: mediatek: mmsys: add MT8365 support Fabien Parent
2021-08-04 17:08 ` Matthias Brugger
2021-05-21 1:48 ` [PATCH 1/3] dt-bindings: arm: mediatek: mmsys: convert to YAML format Rob Herring
2021-05-21 1:49 ` Rob Herring
2021-07-23 9:44 ` Enric Balletbo Serra
2021-07-23 23:36 ` Rob Herring
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).