Commit 7f2ff7b6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mailbox-v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox 

Pull mailbox updates from Jassi Brar:
 "Core:
   - misc rejig of header includes
   - minor const fixes

  Misc:
   - constify amba_id table

  pcc:
   - cleanup and refactoring of shmem and irq handling

  qcom:
   - add MSM8226 compatible

  fsl,mu:
   - add i.MX94 compatible

  mediatek:
   - remove cl in struct cmdq_pkt

  tegra:
   - define dimensioning masks in SoC data"

* tag 'mailbox-v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox: (25 commits)
  mailbox: Remove unneeded semicolon
  mailbox: pcc: Refactor and simplify check_and_ack()
  mailbox: pcc: Always map the shared memory communication address
  mailbox: pcc: Refactor error handling in irq handler into separate function
  mailbox: pcc: Use acpi_os_ioremap() instead of ioremap()
  mailbox: pcc: Return early if no GAS register from pcc_mbox_cmd_complete_check
  mailbox: pcc: Drop unnecessary endianness conversion of pcc_hdr.flags
  mailbox: pcc: Always clear the platform ack interrupt first
  mailbox: pcc: Fix the possible race in updation of chan_in_use flag
  dt-bindings: mailbox: qcom: add compatible for MSM8226 SoC
  dt-bindings: mailbox: fsl,mu: Add i.MX94 compatible
  MAINTAINERS: add mailbox API's tree type and location
  mailbox: remove unused header files
  mailbox: explicitly include <linux/bits.h>
  mailbox: sort headers alphabetically
  mailbox: don't protect of_parse_phandle_with_args with con_mutex
  mailbox: use error ret code of of_parse_phandle_with_args()
  mailbox: arm_mhuv2: Constify amba_id table
  mailbox: arm_mhu_db: Constify amba_id table
  mailbox: arm_mhu: Constify amba_id table
  ...
parents 91481c4a 1ec12fd3

Documentation/devicetree/bindings/mailbox/fsl,mu.yaml

+6 −1
Original line number Diff line number Diff line
@@ -54,6 +54,10 @@ properties: 
              - fsl,imx8qm-mu

              - fsl,imx8qxp-mu

          - const: fsl,imx6sx-mu

      - items:

          - enum:

              - fsl,imx94-mu

          - const: fsl,imx95-mu



  reg:

    maxItems: 1
@@ -142,6 +146,7 @@ allOf: 
      not:

        properties:

          compatible:

            contains:

              const: fsl,imx95-mu

    then:

      patternProperties:

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

+4 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ properties: 
          - mediatek,mt8188-gce

          - mediatek,mt8192-gce

          - mediatek,mt8195-gce

          - mediatek,mt8196-gce

      - items:

          - const: mediatek,mt6795-gce

          - const: mediatek,mt8173-gce
@@ -49,6 +50,9 @@ properties: 
    items:

      - const: gce



  iommus:

    maxItems: 1



required:

  - compatible

  - "#mbox-cells"

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

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ properties: 
          - const: qcom,ipq6018-apcs-apps-global

      - items:

          - enum:

              - qcom,msm8226-apcs-kpss-global

              - qcom,qcs404-apcs-apps-global

          - const: qcom,msm8916-apcs-kpss-global

          - const: syscon

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -14090,6 +14090,7 @@ MAILBOX API 
M:	Jassi Brar <jassisinghbrar@gmail.com>

L:	linux-kernel@vger.kernel.org

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git for-next

F:	Documentation/devicetree/bindings/mailbox/

F:	drivers/mailbox/

F:	include/dt-bindings/mailbox/

drivers/mailbox/arm_mhu.c

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static int mhu_probe(struct amba_device *adev, const struct amba_id *id) 
	return 0;

}



static struct amba_id mhu_ids[] = {

static const struct amba_id mhu_ids[] = {

	{

		.id	= 0x1bb098,

		.mask	= 0xffffff,