Skip to content

Commit aaeb1b6

Browse files
committed
Merge tag 'v6.4-next-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into soc/drivers
PMIC wrapper - support companion device - add support for MT6795 SPMI: - add support for MT8186 SVS: - change gpu node name to match binding * tag 'v6.4-next-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux: soc: mediatek: remove DDP_DOMPONENT_DITHER from enum soc: mediatek: SVS: Fix MT8192 GPU node name soc: mediatek: mtk-mutex: Remove unnecessary .owner dt-bindings: phy: mediatek,dsi-phy: Add compatible for MT6795 Helio X10 dt-bindings: pwm: Add compatible for MediaTek MT6795 dt-bindings: spmi: spmi-mtk-pmif: Document mediatek,mt8195-spmi as fallback of mediatek,mt8186-spmi soc: mediatek: pwrap: Add support for MT6795 Helio X10 soc: mediatek: mtk-pmic-wrap: Add support for MT6331 w/ MT6332 companion soc: mediatek: mtk-pmic-wrap: Add support for companion PMICs soc: mediatek: pwrap: Add kerneldoc for struct pwrap_slv_type soc: mediatek: pwrap: Move PMIC read test sequence in function dt-bindings: soc: mediatek: pwrap: Add compatible for MT6795 Helio X10 Link: https://lore.kernel.org/r/1ed1e5ae-6305-e63a-84a0-3c43f69c8f8b@gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents a08000d + 21d4631 commit aaeb1b6

8 files changed

Lines changed: 285 additions & 35 deletions

File tree

Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ properties:
2424
- enum:
2525
- mediatek,mt7623-mipi-tx
2626
- const: mediatek,mt2701-mipi-tx
27+
- items:
28+
- enum:
29+
- mediatek,mt6795-mipi-tx
30+
- const: mediatek,mt8173-mipi-tx
2731
- items:
2832
- enum:
2933
- mediatek,mt8365-mipi-tx

Documentation/devicetree/bindings/pwm/mediatek,pwm-disp.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ properties:
2222
- mediatek,mt8173-disp-pwm
2323
- mediatek,mt8183-disp-pwm
2424
- items:
25-
- const: mediatek,mt8167-disp-pwm
25+
- enum:
26+
- mediatek,mt6795-disp-pwm
27+
- mediatek,mt8167-disp-pwm
2628
- const: mediatek,mt8173-disp-pwm
2729
- items:
2830
- enum:

Documentation/devicetree/bindings/soc/mediatek/mediatek,pwrap.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ properties:
3333
- mediatek,mt2701-pwrap
3434
- mediatek,mt6765-pwrap
3535
- mediatek,mt6779-pwrap
36+
- mediatek,mt6795-pwrap
3637
- mediatek,mt6797-pwrap
3738
- mediatek,mt6873-pwrap
3839
- mediatek,mt7622-pwrap

Documentation/devicetree/bindings/spmi/mtk,spmi-mtk-pmif.yaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,14 @@ allOf:
1818

1919
properties:
2020
compatible:
21-
enum:
22-
- mediatek,mt6873-spmi
23-
- mediatek,mt8195-spmi
21+
oneOf:
22+
- enum:
23+
- mediatek,mt6873-spmi
24+
- mediatek,mt8195-spmi
25+
- items:
26+
- enum:
27+
- mediatek,mt8186-spmi
28+
- const: mediatek,mt8195-spmi
2429

2530
reg:
2631
maxItems: 2

drivers/soc/mediatek/mtk-mutex.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1051,7 +1051,6 @@ static struct platform_driver mtk_mutex_driver = {
10511051
.probe = mtk_mutex_probe,
10521052
.driver = {
10531053
.name = "mediatek-mutex",
1054-
.owner = THIS_MODULE,
10551054
.of_match_table = mutex_driver_dt_match,
10561055
},
10571056
};

0 commit comments

Comments
 (0)