Commit 4e85952f authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'clk-microchip-fixes-6.1' of... 

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

Pull Microchip clk driver fixes from Claudiu Beznea:

 - fix the clock ID for USB device port on AT91 RM9200 SoCs; along with it the
   device tree references to this clocks were fixed in this patch to ease the
   backporting and to avoid USB driver probe failure.

* tag 'clk-microchip-fixes-6.1' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: at91: rm9200: fix usb device clock id
parents 0d51d0db 57976762

arch/arm/boot/dts/at91rm9200.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ 
				compatible = "atmel,at91rm9200-udc";

				reg = <0xfffb0000 0x4000>;

				interrupts = <11 IRQ_TYPE_LEVEL_HIGH 2>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 11>, <&pmc PMC_TYPE_SYSTEM 2>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 11>, <&pmc PMC_TYPE_SYSTEM 1>;

				clock-names = "pclk", "hclk";

				status = "disabled";

			};

drivers/clk/at91/at91rm9200.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static const struct clk_pll_characteristics rm9200_pll_characteristics = { 
};



static const struct sck at91rm9200_systemck[] = {

	{ .n = "udpck", .p = "usbck",    .id = 2 },

	{ .n = "udpck", .p = "usbck",    .id = 1 },

	{ .n = "uhpck", .p = "usbck",    .id = 4 },

	{ .n = "pck0",  .p = "prog0",    .id = 8 },

	{ .n = "pck1",  .p = "prog1",    .id = 9 },