Skip to content

Commit c011dd5

Browse files
committed
Merge tag 'arm-soc-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull 32-bit ARM SoC updates from Arnd Bergmann: "These updates are for platform specific code in arch/arm/, mostly fixing minor issues. The at91 platform gains support for better power management on the lan966 platform and new firmware on the sama5 platform. The mediatek soc drivers in turn are enabled for the new mt8195 SoC" * tag 'arm-soc-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (34 commits) ARM: at91: debug: add lan966 support ARM: at91: pm: add support for sama5d2 secure suspend ARM: at91: add code to handle secure calls ARM: at91: Kconfig: implement PIT64B selection ARM: at91: pm: add quirks for pm ARM: at91: pm: use kernel documentation style ARM: at91: pm: introduce macros for pm mode replacement ARM: at91: pm: keep documentation inline with structure members orion5x: fix typos in comments ARM: hisi: Add missing of_node_put after of_find_compatible_node ARM: shmobile: rcar-gen2: Drop comma after OF match table sentinel ARM: shmobile: Drop commas after dt_compat sentinels soc: mediatek: mutex: remove mt8195 MOD0 and SOF0 definition MAINTAINERS: Add Broadcom BCMBCA entry arm: bcmbca: add arch bcmbca machine entry MAINTAINERS: Broadcom internal lists aren't maintainers 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 ...
2 parents 3378323 + 426ecc5 commit c011dd5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1281
-187
lines changed

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

MAINTAINERS

Lines changed: 47 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3753,9 +3753,23 @@ F: drivers/net/dsa/bcm_sf2*
37533753
F: include/linux/dsa/brcm.h
37543754
F: include/linux/platform_data/b53.h
37553755

3756+
BROADCOM BCMBCA ARM ARCHITECTURE
3757+
M: William Zhang <[email protected]>
3758+
M: Anand Gore <[email protected]>
3759+
M: Kursad Oney <[email protected]>
3760+
R: Broadcom internal kernel review list <[email protected]>
3761+
L: [email protected] (moderated for non-subscribers)
3762+
S: Maintained
3763+
T: git git://github.com/broadcom/stblinux.git
3764+
F: Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
3765+
F: arch/arm/boot/dts/bcm47622.dtsi
3766+
F: arch/arm/boot/dts/bcm947622.dts
3767+
N: bcmbca
3768+
N: bcm[9]?47622
3769+
37563770
BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
37573771
M: Nicolas Saenz Julienne <[email protected]>
3758-
R: Broadcom Kernel Team <[email protected]>
3772+
R: Broadcom internal kernel review list <[email protected]>
37593773
L: [email protected] (moderated for non-subscribers)
37603774
L: [email protected] (moderated for non-subscribers)
37613775
S: Maintained
@@ -3765,12 +3779,13 @@ F: drivers/pci/controller/pcie-brcmstb.c
37653779
F: drivers/staging/vc04_services
37663780
N: bcm2711
37673781
N: bcm283*
3782+
N: raspberrypi
37683783

37693784
BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
37703785
M: Florian Fainelli <[email protected]>
37713786
M: Ray Jui <[email protected]>
37723787
M: Scott Branden <[email protected]>
3773-
R: Broadcom Kernel Team <[email protected]>
3788+
R: Broadcom internal kernel review list <[email protected]>
37743789
S: Maintained
37753790
T: git git://github.com/broadcom/mach-bcm
37763791
F: arch/arm/mach-bcm/
@@ -3790,7 +3805,7 @@ F: arch/mips/include/asm/mach-bcm47xx/*
37903805

37913806
BROADCOM BCM4908 ETHERNET DRIVER
37923807
M: Rafał Miłecki <[email protected]>
3793-
R: Broadcom Kernel Team <[email protected]>
3808+
R: Broadcom internal kernel review list <[email protected]>
37943809
37953810
S: Maintained
37963811
F: Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml
@@ -3799,7 +3814,7 @@ F: drivers/net/ethernet/broadcom/unimac.h
37993814

38003815
BROADCOM BCM4908 PINMUX DRIVER
38013816
M: Rafał Miłecki <[email protected]>
3802-
R: Broadcom Kernel Team <[email protected]>
3817+
R: Broadcom internal kernel review list <[email protected]>
38033818
38043819
S: Maintained
38053820
F: Documentation/devicetree/bindings/pinctrl/brcm,bcm4908-pinctrl.yaml
@@ -3809,7 +3824,7 @@ BROADCOM BCM5301X ARM ARCHITECTURE
38093824
M: Florian Fainelli <[email protected]>
38103825
M: Hauke Mehrtens <[email protected]>
38113826
M: Rafał Miłecki <[email protected]>
3812-
R: Broadcom Kernel Team <[email protected]>
3827+
R: Broadcom internal kernel review list <[email protected]>
38133828
L: [email protected] (moderated for non-subscribers)
38143829
S: Maintained
38153830
F: arch/arm/boot/dts/bcm470*
@@ -3820,15 +3835,15 @@ F: arch/arm/mach-bcm/bcm_5301x.c
38203835
BROADCOM BCM53573 ARM ARCHITECTURE
38213836
M: Florian Fainelli <[email protected]>
38223837
M: Rafał Miłecki <[email protected]>
3823-
R: Broadcom Kernel Team <[email protected]>
3838+
R: Broadcom internal kernel review list <[email protected]>
38243839
L: [email protected] (moderated for non-subscribers)
38253840
S: Maintained
38263841
F: arch/arm/boot/dts/bcm47189*
38273842
F: arch/arm/boot/dts/bcm53573*
38283843

38293844
BROADCOM BCM63XX ARM ARCHITECTURE
38303845
M: Florian Fainelli <[email protected]>
3831-
R: Broadcom Kernel Team <[email protected]>
3846+
R: Broadcom internal kernel review list <[email protected]>
38323847
L: [email protected] (moderated for non-subscribers)
38333848
S: Maintained
38343849
T: git git://github.com/broadcom/stblinux.git
@@ -3842,7 +3857,7 @@ F: drivers/usb/gadget/udc/bcm63xx_udc.*
38423857

38433858
BROADCOM BCM7XXX ARM ARCHITECTURE
38443859
M: Florian Fainelli <[email protected]>
3845-
R: Broadcom Kernel Team <[email protected]>
3860+
R: Broadcom internal kernel review list <[email protected]>
38463861
L: [email protected] (moderated for non-subscribers)
38473862
S: Maintained
38483863
T: git git://github.com/broadcom/stblinux.git
@@ -3860,21 +3875,21 @@ N: bcm7120
38603875
BROADCOM BDC DRIVER
38613876
M: Al Cooper <[email protected]>
38623877
3863-
R: Broadcom Kernel Team <[email protected]>
3878+
R: Broadcom internal kernel review list <[email protected]>
38643879
S: Maintained
38653880
F: Documentation/devicetree/bindings/usb/brcm,bdc.yaml
38663881
F: drivers/usb/gadget/udc/bdc/
38673882

38683883
BROADCOM BMIPS CPUFREQ DRIVER
38693884
M: Markus Mayer <[email protected]>
3870-
R: Broadcom Kernel Team <[email protected]>
3885+
R: Broadcom internal kernel review list <[email protected]>
38713886
38723887
S: Maintained
38733888
F: drivers/cpufreq/bmips-cpufreq.c
38743889

38753890
BROADCOM BMIPS MIPS ARCHITECTURE
38763891
M: Florian Fainelli <[email protected]>
3877-
R: Broadcom Kernel Team <[email protected]>
3892+
R: Broadcom internal kernel review list <[email protected]>
38783893
38793894
S: Maintained
38803895
T: git git://github.com/broadcom/stblinux.git
@@ -3942,53 +3957,53 @@ F: drivers/net/wireless/broadcom/brcm80211/
39423957
BROADCOM BRCMSTB GPIO DRIVER
39433958
M: Doug Berger <[email protected]>
39443959
M: Florian Fainelli <[email protected]>
3945-
R: Broadcom Kernel Team <[email protected]>
3960+
R: Broadcom internal kernel review list <[email protected]>
39463961
S: Supported
39473962
F: Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.yaml
39483963
F: drivers/gpio/gpio-brcmstb.c
39493964

39503965
BROADCOM BRCMSTB I2C DRIVER
39513966
M: Kamal Dasu <[email protected]>
3952-
R: Broadcom Kernel Team <[email protected]>
3967+
R: Broadcom internal kernel review list <[email protected]>
39533968
39543969
S: Supported
39553970
F: Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml
39563971
F: drivers/i2c/busses/i2c-brcmstb.c
39573972

39583973
BROADCOM BRCMSTB UART DRIVER
39593974
M: Al Cooper <[email protected]>
3960-
R: Broadcom Kernel Team <[email protected]>
3975+
R: Broadcom internal kernel review list <[email protected]>
39613976
39623977
S: Maintained
39633978
F: Documentation/devicetree/bindings/serial/brcm,bcm7271-uart.yaml
39643979
F: drivers/tty/serial/8250/8250_bcm7271.c
39653980

39663981
BROADCOM BRCMSTB USB EHCI DRIVER
39673982
M: Al Cooper <[email protected]>
3968-
R: Broadcom Kernel Team <[email protected]>
3983+
R: Broadcom internal kernel review list <[email protected]>
39693984
39703985
S: Maintained
39713986
F: Documentation/devicetree/bindings/usb/brcm,bcm7445-ehci.yaml
39723987
F: drivers/usb/host/ehci-brcm.*
39733988

39743989
BROADCOM BRCMSTB USB PIN MAP DRIVER
39753990
M: Al Cooper <[email protected]>
3976-
R: Broadcom Kernel Team <[email protected]>
3991+
R: Broadcom internal kernel review list <[email protected]>
39773992
39783993
S: Maintained
39793994
F: Documentation/devicetree/bindings/usb/brcm,usb-pinmap.yaml
39803995
F: drivers/usb/misc/brcmstb-usb-pinmap.c
39813996

39823997
BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
39833998
M: Al Cooper <[email protected]>
3984-
R: Broadcom Kernel Team <[email protected]>
3999+
R: Broadcom internal kernel review list <[email protected]>
39854000
39864001
S: Maintained
39874002
F: drivers/phy/broadcom/phy-brcm-usb*
39884003

39894004
BROADCOM ETHERNET PHY DRIVERS
39904005
M: Florian Fainelli <[email protected]>
3991-
R: Broadcom Kernel Team <[email protected]>
4006+
R: Broadcom internal kernel review list <[email protected]>
39924007
39934008
S: Supported
39944009
F: Documentation/devicetree/bindings/net/broadcom-bcm87xx.txt
@@ -3999,7 +4014,7 @@ F: include/linux/brcmphy.h
39994014
BROADCOM GENET ETHERNET DRIVER
40004015
M: Doug Berger <[email protected]>
40014016
M: Florian Fainelli <[email protected]>
4002-
R: Broadcom Kernel Team <[email protected]>
4017+
R: Broadcom internal kernel review list <[email protected]>
40034018
40044019
S: Supported
40054020
F: Documentation/devicetree/bindings/net/brcm,bcmgenet.yaml
@@ -4013,7 +4028,7 @@ F: include/linux/platform_data/mdio-bcm-unimac.h
40134028
BROADCOM IPROC ARM ARCHITECTURE
40144029
M: Ray Jui <[email protected]>
40154030
M: Scott Branden <[email protected]>
4016-
R: Broadcom Kernel Team <[email protected]>
4031+
R: Broadcom internal kernel review list <[email protected]>
40174032
L: [email protected] (moderated for non-subscribers)
40184033
S: Maintained
40194034
T: git git://github.com/broadcom/stblinux.git
@@ -4041,7 +4056,7 @@ N: stingray
40414056

40424057
BROADCOM IPROC GBIT ETHERNET DRIVER
40434058
M: Rafał Miłecki <[email protected]>
4044-
R: Broadcom Kernel Team <[email protected]>
4059+
R: Broadcom internal kernel review list <[email protected]>
40454060
40464061
S: Maintained
40474062
F: Documentation/devicetree/bindings/net/brcm,amac.yaml
@@ -4050,7 +4065,7 @@ F: drivers/net/ethernet/broadcom/unimac.h
40504065

40514066
BROADCOM KONA GPIO DRIVER
40524067
M: Ray Jui <[email protected]>
4053-
R: Broadcom Kernel Team <[email protected]>
4068+
R: Broadcom internal kernel review list <[email protected]>
40544069
S: Supported
40554070
F: Documentation/devicetree/bindings/gpio/brcm,kona-gpio.txt
40564071
F: drivers/gpio/gpio-bcm-kona.c
@@ -4083,7 +4098,7 @@ F: drivers/firmware/broadcom/*
40834098
BROADCOM PMB (POWER MANAGEMENT BUS) DRIVER
40844099
M: Rafał Miłecki <[email protected]>
40854100
M: Florian Fainelli <[email protected]>
4086-
R: Broadcom Kernel Team <[email protected]>
4101+
R: Broadcom internal kernel review list <[email protected]>
40874102
40884103
S: Maintained
40894104
T: git git://github.com/broadcom/stblinux.git
@@ -4099,7 +4114,7 @@ F: include/linux/bcma/
40994114

41004115
BROADCOM SPI DRIVER
41014116
M: Kamal Dasu <[email protected]>
4102-
R: Broadcom Kernel Team <[email protected]>
4117+
R: Broadcom internal kernel review list <[email protected]>
41034118
S: Maintained
41044119
F: Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.yaml
41054120
F: drivers/spi/spi-bcm-qspi.*
@@ -4108,23 +4123,23 @@ F: drivers/spi/spi-iproc-qspi.c
41084123

41094124
BROADCOM STB AVS CPUFREQ DRIVER
41104125
M: Markus Mayer <[email protected]>
4111-
R: Broadcom Kernel Team <[email protected]>
4126+
R: Broadcom internal kernel review list <[email protected]>
41124127
41134128
S: Maintained
41144129
F: Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt
41154130
F: drivers/cpufreq/brcmstb*
41164131

41174132
BROADCOM STB AVS TMON DRIVER
41184133
M: Markus Mayer <[email protected]>
4119-
R: Broadcom Kernel Team <[email protected]>
4134+
R: Broadcom internal kernel review list <[email protected]>
41204135
41214136
S: Maintained
41224137
F: Documentation/devicetree/bindings/thermal/brcm,avs-tmon.yaml
41234138
F: drivers/thermal/broadcom/brcmstb*
41244139

41254140
BROADCOM STB DPFE DRIVER
41264141
M: Markus Mayer <[email protected]>
4127-
R: Broadcom Kernel Team <[email protected]>
4142+
R: Broadcom internal kernel review list <[email protected]>
41284143
L: [email protected] (moderated for non-subscribers)
41294144
S: Maintained
41304145
F: Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.yaml
@@ -4133,7 +4148,7 @@ F: drivers/memory/brcmstb_dpfe.c
41334148
BROADCOM STB NAND FLASH DRIVER
41344149
M: Brian Norris <[email protected]>
41354150
M: Kamal Dasu <[email protected]>
4136-
R: Broadcom Kernel Team <[email protected]>
4151+
R: Broadcom internal kernel review list <[email protected]>
41374152
41384153
S: Maintained
41394154
F: drivers/mtd/nand/raw/brcmnand/
@@ -4143,15 +4158,15 @@ BROADCOM STB PCIE DRIVER
41434158
M: Jim Quinlan <[email protected]>
41444159
M: Nicolas Saenz Julienne <[email protected]>
41454160
M: Florian Fainelli <[email protected]>
4146-
R: Broadcom Kernel Team <[email protected]>
4161+
R: Broadcom internal kernel review list <[email protected]>
41474162
41484163
S: Maintained
41494164
F: Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
41504165
F: drivers/pci/controller/pcie-brcmstb.c
41514166

41524167
BROADCOM SYSTEMPORT ETHERNET DRIVER
41534168
M: Florian Fainelli <[email protected]>
4154-
R: Broadcom Kernel Team <[email protected]>
4169+
R: Broadcom internal kernel review list <[email protected]>
41554170
41564171
S: Supported
41574172
F: drivers/net/ethernet/broadcom/bcmsysport.*
@@ -4168,7 +4183,7 @@ F: drivers/net/ethernet/broadcom/tg3.*
41684183

41694184
BROADCOM VK DRIVER
41704185
M: Scott Branden <[email protected]>
4171-
R: Broadcom Kernel Team <[email protected]>
4186+
R: Broadcom internal kernel review list <[email protected]>
41724187
S: Supported
41734188
F: drivers/misc/bcm-vk/
41744189
F: include/uapi/linux/misc/bcm_vk.h
@@ -17775,7 +17790,7 @@ K: \bTIF_SECCOMP\b
1777517790

1777617791
SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) Broadcom BRCMSTB DRIVER
1777717792
M: Al Cooper <[email protected]>
17778-
R: Broadcom Kernel Team <[email protected]>
17793+
R: Broadcom internal kernel review list <[email protected]>
1777917794
1778017795
S: Maintained
1778117796
F: drivers/mmc/host/sdhci-brcmstb*

0 commit comments

Comments
 (0)