Commit 765ea12f authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'clk-microchip-6.14' of... 

Merge tag 'clk-microchip-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into clk-microchip

Pull Microchip clk driver updates from Claudiu Beznea:

 - Support for the SAMA7D65 SoC
 - Clock IDs for for the slow clock controller

* tag 'clk-microchip-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  clk: at91: sama7d65: add sama7d65 pmc driver
  dt-bindings: clock: Add SAMA7D65 PMC compatible string
  dt-bindings: clocks: atmel,at91sam9x5-sckc: add sama7d65
  clk: at91: sckc: Use SCKC_{TD, MD}_SLCK IDs for clk32k clocks
  dt-bindings: clk: at91: Add clock IDs for the slow clock controller
parents 40384c84 9a497710

Documentation/devicetree/bindings/clock/atmel,at91rm9200-pmc.yaml

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ properties: 
              - atmel,sama5d4-pmc

              - microchip,sam9x60-pmc

              - microchip,sam9x7-pmc

              - microchip,sama7d65-pmc

              - microchip,sama7g5-pmc

          - const: syscon
@@ -90,6 +91,7 @@ allOf: 
            enum:

              - microchip,sam9x60-pmc

              - microchip,sam9x7-pmc

              - microchip,sama7d65-pmc

              - microchip,sama7g5-pmc

    then:

      properties:

Documentation/devicetree/bindings/clock/atmel,at91sam9x5-sckc.yaml

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ properties: 
      - items:

          - enum:

              - microchip,sam9x7-sckc

              - microchip,sama7d65-sckc

              - microchip,sama7g5-sckc

          - const: microchip,sam9x60-sckc

drivers/clk/at91/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -24,4 +24,5 @@ obj-$(CONFIG_SOC_SAM9X7) += sam9x7.o 
obj-$(CONFIG_SOC_SAMA5D3) += sama5d3.o dt-compat.o

obj-$(CONFIG_SOC_SAMA5D4) += sama5d4.o dt-compat.o

obj-$(CONFIG_SOC_SAMA5D2) += sama5d2.o dt-compat.o

obj-$(CONFIG_SOC_SAMA7D65) += sama7d65.o

obj-$(CONFIG_SOC_SAMA7G5) += sama7g5.o

drivers/clk/at91/clk-master.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


#define PMC_MCR_CSS_SHIFT	(16)



#define MASTER_MAX_ID		4

#define MASTER_MAX_ID		9



#define to_clk_master(hw) container_of(hw, struct clk_master, hw)

drivers/clk/at91/clk-sam9x60-pll.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#define UPLL_DIV		2

#define PLL_MUL_MAX		(FIELD_GET(PMC_PLL_CTRL1_MUL_MSK, UINT_MAX) + 1)



#define PLL_MAX_ID		7

#define PLL_MAX_ID		9



struct sam9x60_pll_core {

	struct regmap *regmap;