Commit f2855eec authored Dec 21, 2022 by Linus Torvalds

Merge tag 'mailbox-v6.2' of git://git.linaro.org/landing-teams/working/fujitsu/integration

Pull mailbox updates from Jassi Brar:

 - qcom: enable sc8280xp, sm8550 and sm4250 support

 - ti: default to ARCH_K3 for msg manager

 - mediatek:
    - add mt8188 and mt8186 support
    - request irq only after got ready

 - zynq-ipi: fix error handling after device_register

 - mpfs: check sys-con status

 - rockchip: simplify by using device_get_match_data

* tag 'mailbox-v6.2' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
  dt-bindings: mailbox: qcom-ipcc: Add compatible for SM8550
  mailbox: mtk-cmdq: Do not request irq until we are ready
  mailbox: zynq-ipi: fix error handling while device_register() fails
  mailbox: mtk-cmdq-mailbox: Use platform data directly instead of copying
  mailbox: arm_mhuv2: Fix return value check in mhuv2_probe()
  dt-bindings: mailbox: mediatek,gce-mailbox: add mt8188 compatible name
  dt-bindings: mailbox: add GCE header file for mt8188
  mailbox: mpfs: read the system controller's status
  mailbox: mtk-cmdq: add MT8186 support
  mailbox: mtk-cmdq: add gce ddr enable support flow
  mailbox: mtk-cmdq: add gce software ddr enable private data
  mailbox: mtk-cmdq: Use GCE_CTRL_BY_SW definition instead of number
  mailbox: rockchip: Use device_get_match_data() to simplify the code
  dt-bindings: mailbox: qcom-ipcc: Add sc8280xp compatible
  mailbox: config: ti-msgmgr: Default set to ARCH_K3 for TI msg manager
  mailbox: qcom-apcs-ipc: Add SM4250 APCS IPC support
  dt-bindings: mailbox: qcom: Add SM4250 APCS compatible

parents ec34c2b4 53c60d10

Documentation/devicetree/bindings/mailbox/mediatek,gce-mailbox.yaml

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@ properties:
	- mediatek,mt8173-gce		- mediatek,mt8173-gce
	- mediatek,mt8183-gce		- mediatek,mt8183-gce
	- mediatek,mt8186-gce		- mediatek,mt8186-gce
			- mediatek,mt8188-gce
	- mediatek,mt8192-gce		- mediatek,mt8192-gce
	- mediatek,mt8195-gce		- mediatek,mt8195-gce

Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,7 @@ properties:
	- qcom,sc8180x-apss-shared		- qcom,sc8180x-apss-shared
	- qcom,sdm660-apcs-hmss-global		- qcom,sdm660-apcs-hmss-global
	- qcom,sdm845-apss-shared		- qcom,sdm845-apss-shared
			- qcom,sm4250-apcs-hmss-global
	- qcom,sm6125-apcs-hmss-global		- qcom,sm6125-apcs-hmss-global
	- qcom,sm6115-apcs-hmss-global		- qcom,sm6115-apcs-hmss-global
	- qcom,sm8150-apss-shared		- qcom,sm8150-apss-shared

Documentation/devicetree/bindings/mailbox/qcom-ipcc.yaml

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -24,12 +24,14 @@ properties:
	compatible:		compatible:
	items:		items:
	- enum:		- enum:
			- qcom,sc7280-ipcc
			- qcom,sc8280xp-ipcc
	- qcom,sm6350-ipcc		- qcom,sm6350-ipcc
	- qcom,sm6375-ipcc		- qcom,sm6375-ipcc
	- qcom,sm8250-ipcc		- qcom,sm8250-ipcc
	- qcom,sm8350-ipcc		- qcom,sm8350-ipcc
	- qcom,sm8450-ipcc		- qcom,sm8450-ipcc
	- qcom,sc7280-ipcc		- qcom,sm8550-ipcc
	- const: qcom,ipcc		- const: qcom,ipcc

	reg:		reg:

drivers/mailbox/Kconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -136,6 +136,7 @@ config STI_MBOX
	config TI_MESSAGE_MANAGER		config TI_MESSAGE_MANAGER
	tristate "Texas Instruments Message Manager Driver"		tristate "Texas Instruments Message Manager Driver"
	depends on ARCH_KEYSTONE \|\| ARCH_K3		depends on ARCH_KEYSTONE \|\| ARCH_K3
			default ARCH_K3
	help		help
	An implementation of Message Manager slave driver for Keystone		An implementation of Message Manager slave driver for Keystone
	and K3 architecture SoCs from Texas Instruments. Message Manager		and K3 architecture SoCs from Texas Instruments. Message Manager

drivers/mailbox/arm_mhuv2.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1062,8 +1062,8 @@ static int mhuv2_probe(struct amba_device adev, const struct amba_id id)
	int ret = -EINVAL;		int ret = -EINVAL;

	reg = devm_of_iomap(dev, dev->of_node, 0, NULL);		reg = devm_of_iomap(dev, dev->of_node, 0, NULL);
	if (!reg)		if (IS_ERR(reg))
	return -ENOMEM;		return PTR_ERR(reg);

	mhu = devm_kzalloc(dev, sizeof(*mhu), GFP_KERNEL);		mhu = devm_kzalloc(dev, sizeof(*mhu), GFP_KERNEL);
	if (!mhu)		if (!mhu)