Skip to content

Commit

Permalink
Merge branches 'clk-kunit', 'clk-mediatek', 'clk-cleanup' and 'clk-bi…
Browse files Browse the repository at this point in the history
…ndings' into clk-next

 - KUnit tests for clk registration and fixed rate basic clk type

* clk-kunit:
  clk: Add KUnit tests for clks registered with struct clk_parent_data
  clk: Add KUnit tests for clk fixed rate basic type
  clk: Add test managed clk provider/consumer APIs
  platform: Add test managed platform_device/driver APIs
  of: Add a KUnit test for overlays and test managed APIs
  dt-bindings: vendor-prefixes: Add "test" vendor for KUnit and friends
  of: Add test managed wrappers for of_overlay_apply()/of_node_put()
  of/platform: Allow overlays to create platform devices from the root node

* clk-mediatek:
  dt-bindings: clock: mediatek: Convert MediaTek clock syscons to schema
  dt-bindings: Move Mediatek clock controllers to "clock" directory
  dt-bindings: clock: mediatek,apmixedsys: Fix "mediatek,mt6779-apmixed" compatible
  clk: mediatek: reset: Remove unused mtk_register_reset_controller()
  clk: mediatek: reset: Return regmap's error code

* clk-cleanup:
  clk: starfive: Use pm_runtime_resume_and_get to fix pm_runtime_get_sync() usage
  clk: ti: dra7-atl: Fix leak of of_nodes
  clk:davinci: make use of dev_err_cast_probe()
  clk: bcm: bcm53573: fix OF node leak in init
  clk: lmk04832: Use devm_clk_get_enabled() helpers
  clk: visconti: Switch to use kmemdup_array()
  clk: mmp: Switch to use kmemdup_array()
  clk: hisilicon: Remove unnecessary local variable
  clk: use clk_core_unlink_consumer() helper
  clk: Use of_property_present()
  clk: at91: Use of_property_count_u32_elems() to get property length
  da8xx-cfgchip.c: replace of_node_put with __free improves cleanup

* clk-bindings:
  dt-bindings: clock: st,stm32mp1-rcc: add top-level constraints
  dt-bindings: clock: cirrus,lochnagar: add top-level constraints
  dt-bindings: clock: baikal,bt1-ccu-div: add top-level constraints
  dt-bindings: clock: nxp,lpc3220-usb-clk: Convert bindings to dtschema
  dt-bindings: clock: nxp,lpc3220-clk: Convert bindings to DT schema
  • Loading branch information
bebarino committed Sep 21, 2024
4 parents 274aff8 + cd86437 + 55c312c + 4844ab3 commit a2b8802
Show file tree
Hide file tree
Showing 44 changed files with 241 additions and 539 deletions.
24 changes: 0 additions & 24 deletions Documentation/devicetree/bindings/arm/mediatek/mediatek,bdpsys.txt

This file was deleted.

24 changes: 0 additions & 24 deletions Documentation/devicetree/bindings/arm/mediatek/mediatek,camsys.txt

This file was deleted.

30 changes: 0 additions & 30 deletions Documentation/devicetree/bindings/arm/mediatek/mediatek,imgsys.txt

This file was deleted.

22 changes: 0 additions & 22 deletions Documentation/devicetree/bindings/arm/mediatek/mediatek,ipesys.txt

This file was deleted.

43 changes: 0 additions & 43 deletions Documentation/devicetree/bindings/arm/mediatek/mediatek,ipu.txt

This file was deleted.

This file was deleted.

23 changes: 0 additions & 23 deletions Documentation/devicetree/bindings/arm/mediatek/mediatek,mcucfg.txt

This file was deleted.

25 changes: 0 additions & 25 deletions Documentation/devicetree/bindings/arm/mediatek/mediatek,mfgcfg.txt

This file was deleted.

28 changes: 0 additions & 28 deletions Documentation/devicetree/bindings/arm/mediatek/mediatek,mipi0a.txt

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,13 @@ properties:
"#reset-cells":
const: 1

clocks: true
clocks:
minItems: 3
maxItems: 4

clock-names: true
clock-names:
minItems: 3
maxItems: 4

additionalProperties: false

Expand Down
6 changes: 3 additions & 3 deletions Documentation/devicetree/bindings/clock/cirrus,lochnagar.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ properties:
minItems: 1
maxItems: 19

clocks: true
assigned-clocks: true
assigned-clock-parents: true
clocks:
minItems: 1
maxItems: 19

additionalProperties: false

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ properties:
- mediatek,mt2701-apmixedsys
- mediatek,mt2712-apmixedsys
- mediatek,mt6765-apmixedsys
- mediatek,mt6779-apmixedsys
- mediatek,mt6779-apmixed
- mediatek,mt6795-apmixedsys
- mediatek,mt7629-apmixedsys
- mediatek,mt8167-apmixedsys
Expand Down
Loading

0 comments on commit a2b8802

Please sign in to comment.