Commit d7d458cb authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branches 'clk-bcm-module-license', 'clk-boston-leak' and 'clk-mtk-mt7629' into clk-next 

 - Mediatek MT7629 SoC clk controllers

* clk-bcm-module-license:
  clk: bcm2835: make license text and module license match

* clk-boston-leak:
  clk: boston: unregister clks on failure in clk_boston_setup()
  clk: boston: fix possible memory leak in clk_boston_setup()

* clk-mtk-mt7629:
  clk: mediatek: fix the PCIe MAC clock parent
  clk: mediatek: Drop more __init markings for driver probe
  clk: mediatek: Drop __init from mtk_clk_register_cpumuxes()
  dt-bindings: arm: mediatek: document clk bindings for MT7629
  clk: mediatek: add clock support for MT7629 SoC
parents 819ed0ad 8b627f61 d4292518

Documentation/devicetree/bindings/arm/mediatek/mediatek,apmixedsys.txt

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ Required Properties: 
	- "mediatek,mt6797-apmixedsys"

	- "mediatek,mt7622-apmixedsys"

	- "mediatek,mt7623-apmixedsys", "mediatek,mt2701-apmixedsys"

	- "mediatek,mt7629-apmixedsys"

	- "mediatek,mt8135-apmixedsys"

	- "mediatek,mt8173-apmixedsys"

- #clock-cells: Must be 1

Documentation/devicetree/bindings/arm/mediatek/mediatek,ethsys.txt

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Required Properties: 
	- "mediatek,mt2701-ethsys", "syscon"

	- "mediatek,mt7622-ethsys", "syscon"

	- "mediatek,mt7623-ethsys", "mediatek,mt2701-ethsys", "syscon"

	- "mediatek,mt7629-ethsys", "syscon"

- #clock-cells: Must be 1

- #reset-cells: Must be 1

Documentation/devicetree/bindings/arm/mediatek/mediatek,infracfg.txt

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ Required Properties: 
	- "mediatek,mt6797-infracfg", "syscon"

	- "mediatek,mt7622-infracfg", "syscon"

	- "mediatek,mt7623-infracfg", "mediatek,mt2701-infracfg", "syscon"

	- "mediatek,mt7629-infracfg", "syscon"

	- "mediatek,mt8135-infracfg", "syscon"

	- "mediatek,mt8173-infracfg", "syscon"

- #clock-cells: Must be 1

Documentation/devicetree/bindings/arm/mediatek/mediatek,pciesys.txt

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Required Properties: 


- compatible: Should be:

	- "mediatek,mt7622-pciesys", "syscon"

	- "mediatek,mt7629-pciesys", "syscon"

- #clock-cells: Must be 1

- #reset-cells: Must be 1

Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.txt

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ Required Properties: 
	- "mediatek,mt2712-pericfg", "syscon"

	- "mediatek,mt7622-pericfg", "syscon"

	- "mediatek,mt7623-pericfg", "mediatek,mt2701-pericfg", "syscon"

	- "mediatek,mt7629-pericfg", "syscon"

	- "mediatek,mt8135-pericfg", "syscon"

	- "mediatek,mt8173-pericfg", "syscon"

- #clock-cells: Must be 1

CRA Git | Maintained and supported by SUSTech CRA and CCSE