Commit 12ef3933 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branch 'clk-bcm' into clk-next

 - Make defines for bcm63xx-gate clks to use in DT
 - Support gate clks on BCM6318 SoCs
 - Add HDMI clks for BCM2711 SoCs
 - Support BCM2711 SoC firmware clks

* clk-bcm: (42 commits)
  clk: bcm: dvp: Add missing module informations
  clk: bcm: rpi: Remove the quirks for the CPU clock
  clk: bcm2835: Don't cache the PLLB rate
  clk: bcm2835: Allow custom CCF flags for the PLLs
  Revert "clk: bcm2835: remove pllb"
  clk: bcm: rpi: Give firmware clocks a name
  clk: bcm: rpi: Discover the firmware clocks
  clk: bcm: rpi: Add an enum for the firmware clocks
  clk: bcm: rpi: Add DT provider for the clocks
  clk: bcm: rpi: Make the PLLB registration function return a clk_hw
  clk: bcm: rpi: Split pllb clock hooks
  clk: bcm: rpi: Rename is_prepared function
  clk: bcm: rpi: Pass the clocks data to the firmware function
  clk: bcm: rpi: Add clock id to data
  clk: bcm: rpi: Create a data structure for the clocks
  clk: bcm: rpi: Use CCF boundaries instead of rolling our own
  clk: bcm: rpi: Make sure the clkdev lookup is removed
  clk: bcm: rpi: Switch to clk_hw_register_clkdev
  clk: bcm: rpi: Remove pllb_arm_lookup global pointer
  clk: bcm: rpi: Make sure pllb_arm is removed
  ...
parents 7aae3c16 eb46f547
Loading
Loading
Loading
Loading
+0 −14
Original line number Diff line number Diff line
Raspberry Pi VideoCore firmware driver

Required properties:

- compatible:		Should be "raspberrypi,bcm2835-firmware"
- mboxes:		Phandle to the firmware device's Mailbox.
			  (See: ../mailbox/mailbox.txt for more information)

Example:

firmware {
	compatible = "raspberrypi,bcm2835-firmware";
	mboxes = <&mailbox>;
};
+59 −0
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0
%YAML 1.2
---
$id: http://devicetree.org/schemas/arm/bcm/raspberrypi,bcm2835-firmware.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Raspberry Pi VideoCore firmware driver

maintainers:
  - Eric Anholt <eric@anholt.net>
  - Stefan Wahren <wahrenst@gmx.net>

properties:
  compatible:
    items:
      - const: raspberrypi,bcm2835-firmware
      - const: simple-bus

  mboxes:
    $ref: '/schemas/types.yaml#/definitions/phandle'
    description: |
      Phandle to the firmware device's Mailbox.
      (See: ../mailbox/mailbox.txt for more information)

  clocks:
    type: object

    properties:
      compatible:
        const: raspberrypi,firmware-clocks

      "#clock-cells":
        const: 1
        description: >
          The argument is the ID of the clocks contained by the
          firmware messages.

    required:
      - compatible
      - "#clock-cells"

    additionalProperties: false

required:
  - compatible
  - mboxes

examples:
  - |
    firmware {
        compatible = "raspberrypi,bcm2835-firmware", "simple-bus";
        mboxes = <&mailbox>;

        firmware_clocks: clocks {
            compatible = "raspberrypi,firmware-clocks";
            #clock-cells = <1>;
        };
    };
...
+47 −0
Original line number Diff line number Diff line
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/clock/brcm,bcm2711-dvp.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Broadcom BCM2711 HDMI DVP Device Tree Bindings

maintainers:
  - Maxime Ripard <mripard@kernel.org>

properties:
  "#clock-cells":
    const: 1

  "#reset-cells":
    const: 1

  compatible:
    const: brcm,brcm2711-dvp

  reg:
    maxItems: 1

  clocks:
    maxItems: 1

required:
  - "#clock-cells"
  - "#reset-cells"
  - compatible
  - reg
  - clocks

additionalProperties: false

examples:
  - |
    dvp: clock@7ef00000 {
        compatible = "brcm,brcm2711-dvp";
        reg = <0x7ef00000 0x10>;
        clocks = <&clk_108MHz>;
        #clock-cells = <1>;
        #reset-cells = <1>;
    };

...
+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ Gated Clock Controller Bindings for MIPS based BCM63XX SoCs
Required properties:
- compatible: must be one of:
	 "brcm,bcm3368-clocks"
	 "brcm,bcm6318-clocks"
	 "brcm,bcm6318-ubus-clocks"
	 "brcm,bcm6328-clocks"
	 "brcm,bcm6358-clocks"
	 "brcm,bcm6362-clocks"
+11 −0
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0-only

config CLK_BCM2711_DVP
	tristate "Broadcom BCM2711 DVP support"
	depends on ARCH_BCM2835 ||COMPILE_TEST
	depends on COMMON_CLK
	default ARCH_BCM2835
	select RESET_SIMPLE
	help
	  Enable common clock framework support for the Broadcom BCM2711
	  DVP Controller.

config CLK_BCM2835
	bool "Broadcom BCM2835 clock support"
	depends on ARCH_BCM2835 || ARCH_BRCMSTB || COMPILE_TEST
Loading