Skip to content

Commit f03e950

Browse files
committed
Merge tag 'v5.18-next-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/soc
mmsys: - add SW reset to MT8192 - add support for MT8195 pmic wrapper: - update binding description needed for future MT8195 support mutex: - add support for MT8195 cmdq helper: - remove legacy callback * tag 'v5.18-next-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux: soc: mediatek: mutex: remove mt8195 MOD0 and SOF0 definition dt-bindings: pwrap: mediatek: Update pwrap document for mt8195 soc: mediatek: add DDP_DOMPONENT_DITHER0 enum for mt8195 vdosys0 soc: mediatek: add mtk-mutex support for mt8195 vdosys0 soc: mediatek: add mtk-mmsys support for mt8195 vdosys0 soc: mediatek: cmdq: Use mailbox rx_callback instead of cmdq_task_cb dt-bindings: arm: mediatek: mmsys: add mt8195 SoC binding dt-bindings: arm: mediatek: mmsys: add power and gce properties soc: mediatek: mmsys: Add sw0_rst_offset for MT8192 Link: https://lore.kernel.org/r/6412eecf-a4c3-cf06-55ff-9df8b0656d21@gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 30258ae + 537f8ff commit f03e950

14 files changed

Lines changed: 662 additions & 59 deletions

File tree

Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ properties:
3131
- mediatek,mt8183-mmsys
3232
- mediatek,mt8186-mmsys
3333
- mediatek,mt8192-mmsys
34+
- mediatek,mt8195-mmsys
3435
- mediatek,mt8365-mmsys
3536
- const: syscon
3637
- items:
@@ -41,6 +42,30 @@ properties:
4142
reg:
4243
maxItems: 1
4344

45+
power-domains:
46+
description:
47+
A phandle and PM domain specifier as defined by bindings
48+
of the power controller specified by phandle. See
49+
Documentation/devicetree/bindings/power/power-domain.yaml for details.
50+
51+
mboxes:
52+
description:
53+
Using mailbox to communicate with GCE, it should have this
54+
property and list of phandle, mailbox specifiers. See
55+
Documentation/devicetree/bindings/mailbox/mtk-gce.txt for details.
56+
$ref: /schemas/types.yaml#/definitions/phandle-array
57+
58+
mediatek,gce-client-reg:
59+
description:
60+
The register of client driver can be configured by gce with 4 arguments
61+
defined in this property, such as phandle of gce, subsys id,
62+
register offset and size.
63+
Each subsys id is mapping to a base address of display function blocks
64+
register which is defined in the gce header
65+
include/dt-bindings/gce/<chip>-gce.h.
66+
$ref: /schemas/types.yaml#/definitions/phandle-array
67+
maxItems: 1
68+
4469
"#clock-cells":
4570
const: 1
4671

@@ -56,9 +81,16 @@ additionalProperties: false
5681

5782
examples:
5883
- |
84+
#include <dt-bindings/power/mt8173-power.h>
85+
#include <dt-bindings/gce/mt8173-gce.h>
86+
5987
mmsys: syscon@14000000 {
6088
compatible = "mediatek,mt8173-mmsys", "syscon";
6189
reg = <0x14000000 0x1000>;
90+
power-domains = <&spm MT8173_POWER_DOMAIN_MM>;
6291
#clock-cells = <1>;
6392
#reset-cells = <1>;
93+
mboxes = <&gce 0 CMDQ_THR_PRIO_HIGHEST>,
94+
<&gce 1 CMDQ_THR_PRIO_HIGHEST>;
95+
mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0 0x1000>;
6496
};

Documentation/devicetree/bindings/soc/mediatek/pwrap.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,20 @@ Required properties in pwrap device node.
3131
"mediatek,mt8195-pwrap" for MT8195 SoCs
3232
"mediatek,mt8516-pwrap" for MT8516 SoCs
3333
- interrupts: IRQ for pwrap in SOC
34-
- reg-names: Must include the following entries:
34+
- reg-names: "pwrap" is required; "pwrap-bridge" is optional.
3535
"pwrap": Main registers base
3636
"pwrap-bridge": bridge base (IP Pairing)
3737
- reg: Must contain an entry for each entry in reg-names.
38-
- reset-names: Must include the following entries:
39-
"pwrap"
40-
"pwrap-bridge" (IP Pairing)
41-
- resets: Must contain an entry for each entry in reset-names.
4238
- clock-names: Must include the following entries:
4339
"spi": SPI bus clock
4440
"wrap": Main module clock
4541
- clocks: Must contain an entry for each entry in clock-names.
4642

4743
Optional properities:
44+
- reset-names: Some SoCs include the following entries:
45+
"pwrap"
46+
"pwrap-bridge" (IP Pairing)
47+
- resets: Must contain an entry for each entry in reset-names.
4848
- pmic: Using either MediaTek PMIC MFD as the child device of pwrap
4949
See the following for child node definitions:
5050
Documentation/devicetree/bindings/mfd/mt6397.txt

drivers/soc/mediatek/mt8167-mmsys.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ static const struct mtk_mmsys_routes mt8167_mmsys_routing_table[] = {
1818
DDP_COMPONENT_OVL0, DDP_COMPONENT_COLOR0,
1919
MT8167_DISP_REG_CONFIG_DISP_OVL0_MOUT_EN, OVL0_MOUT_EN_COLOR0,
2020
}, {
21-
DDP_COMPONENT_DITHER, DDP_COMPONENT_RDMA0,
21+
DDP_COMPONENT_DITHER0, DDP_COMPONENT_RDMA0,
2222
MT8167_DISP_REG_CONFIG_DISP_DITHER_MOUT_EN, MT8167_DITHER_MOUT_EN_RDMA0
2323
}, {
2424
DDP_COMPONENT_OVL0, DDP_COMPONENT_COLOR0,

drivers/soc/mediatek/mt8183-mmsys.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ static const struct mtk_mmsys_routes mmsys_mt8183_routing_table[] = {
4141
MT8183_DISP_OVL1_2L_MOUT_EN, MT8183_OVL1_2L_MOUT_EN_RDMA1,
4242
MT8183_OVL1_2L_MOUT_EN_RDMA1
4343
}, {
44-
DDP_COMPONENT_DITHER, DDP_COMPONENT_DSI0,
44+
DDP_COMPONENT_DITHER0, DDP_COMPONENT_DSI0,
4545
MT8183_DISP_DITHER0_MOUT_EN, MT8183_DITHER0_MOUT_IN_DSI0,
4646
MT8183_DITHER0_MOUT_IN_DSI0
4747
}, {

drivers/soc/mediatek/mt8186-mmsys.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ static const struct mtk_mmsys_routes mmsys_mt8186_routing_table[] = {
7676
MT8186_RDMA0_SOUT_TO_COLOR0
7777
},
7878
{
79-
DDP_COMPONENT_DITHER, DDP_COMPONENT_DSI0,
79+
DDP_COMPONENT_DITHER0, DDP_COMPONENT_DSI0,
8080
MT8186_DISP_DITHER0_MOUT_EN, MT8186_DITHER0_MOUT_EN_MASK,
8181
MT8186_DITHER0_MOUT_TO_DSI0,
8282
},
8383
{
84-
DDP_COMPONENT_DITHER, DDP_COMPONENT_DSI0,
84+
DDP_COMPONENT_DITHER0, DDP_COMPONENT_DSI0,
8585
MT8186_DISP_DSI0_SEL_IN, MT8186_DSI0_SEL_IN_MASK,
8686
MT8186_DSI0_FROM_DITHER0
8787
},

drivers/soc/mediatek/mt8192-mmsys.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ static const struct mtk_mmsys_routes mmsys_mt8192_routing_table[] = {
4040
MT8192_DISP_OVL2_2L_MOUT_EN, MT8192_OVL2_2L_MOUT_EN_RDMA4,
4141
MT8192_OVL2_2L_MOUT_EN_RDMA4
4242
}, {
43-
DDP_COMPONENT_DITHER, DDP_COMPONENT_DSI0,
43+
DDP_COMPONENT_DITHER0, DDP_COMPONENT_DSI0,
4444
MT8192_DISP_DITHER0_MOUT_EN, MT8192_DITHER0_MOUT_IN_DSI0,
4545
MT8192_DITHER0_MOUT_IN_DSI0
4646
}, {
@@ -52,7 +52,7 @@ static const struct mtk_mmsys_routes mmsys_mt8192_routing_table[] = {
5252
MT8192_DISP_AAL0_SEL_IN, MT8192_AAL0_SEL_IN_CCORR0,
5353
MT8192_AAL0_SEL_IN_CCORR0
5454
}, {
55-
DDP_COMPONENT_DITHER, DDP_COMPONENT_DSI0,
55+
DDP_COMPONENT_DITHER0, DDP_COMPONENT_DSI0,
5656
MT8192_DISP_DSI0_SEL_IN, MT8192_DSI0_SEL_IN_DITHER0,
5757
MT8192_DSI0_SEL_IN_DITHER0
5858
}, {

0 commit comments

Comments
 (0)