Commit 15f4b11b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'nomadik-dt-2' of... 

Merge tag 'nomadik-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt

From Linus Walleij:

Nomadik DT and clock work:
- Lee Jones' pinctrl compat ontology patches
- A real clock driver for the Nomadik, 100% DT-based
- Device tree changes for the Nomadik clocks

* tag 'nomadik-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik

:
  ARM: nomadik: add the new clocks to the device tree
  clk: nomadik: implement the Nomadik clocks properly
  pinctrl/nomadik: Standardise Pinctrl compat string for Nomadik based platforms
  ARM: nomadik: Standardise Nomadik STN8815 based Pinctrl compat string in the DTS

Conflicts:
	arch/arm/boot/dts/ste-nomadik-s8815.dts

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents dc61cd9e c641d4df

Documentation/devicetree/bindings/clock/st,nomadik.txt

0 → 100644
+104 −0
Original line number Diff line number Diff line 
ST Microelectronics Nomadik SRC System Reset and Control



This binding uses the common clock binding:

Documentation/devicetree/bindings/clock/clock-bindings.txt



The Nomadik SRC controller is responsible of controlling chrystals,

PLLs and clock gates.



Required properties for the SRC node:

- compatible: must be "stericsson,nomadik-src"

- reg: must contain the SRC register base and size



Optional properties for the SRC node:

- disable-sxtalo: if present this will disable the SXTALO

  i.e. the driver output for the slow 32kHz chrystal, if the

  board has its own circuitry for providing this oscillator

- disable-mxtal: if present this will disable the MXTALO,

  i.e. the driver output for the main (~19.2 MHz) chrystal,

  if the board has its own circuitry for providing this

  osciallator





PLL nodes: these nodes represent the two PLLs on the system,

which should both have the main chrystal, represented as a

fixed frequency clock, as parent.



Required properties for the two PLL nodes:

- compatible: must be "st,nomadik-pll-clock"

- clock-cells: must be 0

- clock-id: must be 1 or 2 for PLL1 and PLL2 respectively

- clocks: this clock will have main chrystal as parent





HCLK nodes: these represent the clock gates on individual

lines from the HCLK clock tree and the gate for individual

lines from the PCLK clock tree.



Requires properties for the HCLK nodes:

- compatible: must be "st,nomadik-hclk-clock"

- clock-cells: must be 0

- clock-id: must be the clock ID from 0 to 63 according to

  this table:



	0:  HCLKDMA0

	1:  HCLKSMC

	2:  HCLKSDRAM

	3:  HCLKDMA1

	4:  HCLKCLCD

	5:  PCLKIRDA

	6:  PCLKSSP

	7:  PCLKUART0

	8:  PCLKSDI

	9:  PCLKI2C0

	10: PCLKI2C1

	11: PCLKUART1

	12: PCLMSP0

	13: HCLKUSB

	14: HCLKDIF

	15: HCLKSAA

	16: HCLKSVA

	17: PCLKHSI

	18: PCLKXTI

	19: PCLKUART2

	20: PCLKMSP1

	21: PCLKMSP2

	22: PCLKOWM

	23: HCLKHPI

	24: PCLKSKE

	25: PCLKHSEM

	26: HCLK3D

	27: HCLKHASH

	28: HCLKCRYP

	29: PCLKMSHC

	30: HCLKUSBM

	31: HCLKRNG

	(32, 33, 34, 35 RESERVED)

	36: CLDCLK

	37: IRDACLK

	38: SSPICLK

	39: UART0CLK

	40: SDICLK

	41: I2C0CLK

	42: I2C1CLK

	43: UART1CLK

	44: MSPCLK0

	45: USBCLK

	46: DIFCLK

	47: IPI2CCLK

	48: IPBMCCLK

	49: HSICLKRX

	50: HSICLKTX

	51: UART2CLK

	52: MSPCLK1

	53: MSPCLK2

	54: OWMCLK

	(55 RESERVED)

	56: SKECLK

	(57 RESERVED)

	58: 3DCLK

	59: PCLKMSP3

	60: MSPCLK3

	61: MSHCCLK

	62: USBMCLK

	63: RNGCCLK

arch/arm/boot/dts/ste-nomadik-s8815.dts

+6 −0
Original line number Diff line number Diff line
@@ -22,6 +22,12 @@ 
		};

	};



	src@101e0000 {

		/* These chrystal drivers are not used on this board */

		disable-sxtalo;

		disable-mxtalo;

	};



	pinctrl {

		/* Hog CD pins */

		pinctrl-names = "default";

arch/arm/boot/dts/ste-nomadik-stn8815.dtsi

+465 −38
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 
	};



	pinctrl {

		compatible = "stericsson,nmk-pinctrl-stn8815";

		compatible = "stericsson,stn8815-pinctrl";

		/* Pin configurations */

		uart0 {

			uart0_default_mux: uart0_mux {
@@ -168,15 +168,19 @@ 
	src: src@101e0000 {

		compatible = "stericsson,nomadik-src";

		reg = <0x101e0000 0x1000>;

		clocks {

		disable-sxtalo;

		disable-mxtalo;



		/*

			 * Dummy clock for primecells

		 * MXTAL "Main Chrystal" is a chrystal oscillator @19.2 MHz

		 * that is parent of TIMCLK, PLL1 and PLL2

		 */

			pclk: pclk@0 {

		mxtal: mxtal@19.2M {

			#clock-cells = <0>;

			compatible = "fixed-clock";

				clock-frequency = <0>;

			clock-frequency = <19200000>;

		};



		/*

		 * The 2.4 MHz TIMCLK reference clock is active at

		 * boot time, this is actually the MXTALCLK @19.2 MHz
@@ -184,21 +188,444 @@ 
		 * watchdog. See page 105 ff.

		 */

		timclk: timclk@2.4M {

			#clock-cells = <0>;

			compatible = "fixed-factor-clock";

			clock-div = <8>;

			clock-mult = <1>;

			clocks = <&mxtal>;

		};



		/* PLL1 is locked to MXTALI and variable from 20.4 to 334 MHz */

		pll1: pll1@0 {

			#clock-cells = <0>;

			compatible = "st,nomadik-pll-clock";

			pll-id = <1>;

			clocks = <&mxtal>;

		};



		/* HCLK divides the PLL1 with 1,2,3 or 4 */

		hclk: hclk@0 {

			#clock-cells = <0>;

			compatible = "st,nomadik-hclk-clock";

			clocks = <&pll1>;

		};

		/* The PCLK domain uses HCLK right off */

		pclk: pclk@0 {

			#clock-cells = <0>;

			compatible = "fixed-factor-clock";

			clock-div = <1>;

			clock-mult = <1>;

			clocks = <&hclk>;

		};



		/* PLL2 is usually 864 MHz and divided into a few fixed rates */

		pll2: pll2@0 {

			#clock-cells = <0>;

			compatible = "st,nomadik-pll-clock";

			pll-id = <2>;

			clocks = <&mxtal>;

		};

		clk216: clk216@216M {

			#clock-cells = <0>;

			compatible = "fixed-factor-clock";

			clock-div = <4>;

			clock-mult = <1>;

			clocks = <&pll2>;

		};

		clk108: clk108@108M {

			#clock-cells = <0>;

			compatible = "fixed-factor-clock";

			clock-div = <2>;

			clock-mult = <1>;

			clocks = <&clk216>;

		};

		clk72: clk72@72M {

			#clock-cells = <0>;

			compatible = "fixed-factor-clock";

			/* The data sheet does not say how this is derived */

			clock-div = <12>;

			clock-mult = <1>;

			clocks = <&pll2>;

		};

		clk48: clk48@48M {

			#clock-cells = <0>;

			compatible = "fixed-factor-clock";

			/* The data sheet does not say how this is derived */

			clock-div = <18>;

			clock-mult = <1>;

			clocks = <&pll2>;

		};

		clk27: clk27@27M {

			#clock-cells = <0>;

			compatible = "fixed-factor-clock";

			clock-div = <4>;

			clock-mult = <1>;

			clocks = <&clk108>;

		};



		/* This apparently exists as well */

		ulpiclk: ulpiclk@60M {

			#clock-cells = <0>;

			compatible = "fixed-clock";

				clock-frequency = <2400000>;

			clock-frequency = <60000000>;

		};



		/*

			 * At boot time, PLL2 is set to generate a set of

			 * fixed clocks, one of them is CLK48, the 48 MHz

			 * clock, routed to the UART, MMC/SD, I2C, IrDA,

			 * USB and SSP blocks.

		 * IP AMBA bus clocks, driving the bus side of the

		 * peripheral clocking, clock gates.

		 */

			clk48: clk48@48M {



		hclkdma0: hclkdma0@48M {

			#clock-cells = <0>;

				compatible = "fixed-clock";

				clock-frequency = <48000000>;

			compatible = "st,nomadik-src-clock";

			clock-id = <0>;

			clocks = <&hclk>;

		};

		hclksmc: hclksmc@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <1>;

			clocks = <&hclk>;

		};

		hclksdram: hclksdram@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <2>;

			clocks = <&hclk>;

		};

		hclkdma1: hclkdma1@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <3>;

			clocks = <&hclk>;

		};

		hclkclcd: hclkclcd@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <4>;

			clocks = <&hclk>;

		};

		pclkirda: pclkirda@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <5>;

			clocks = <&pclk>;

		};

		pclkssp: pclkssp@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <6>;

			clocks = <&pclk>;

		};

		pclkuart0: pclkuart0@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <7>;

			clocks = <&pclk>;

		};

		pclksdi: pclksdi@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <8>;

			clocks = <&pclk>;

		};

		pclki2c0: pclki2c0@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <9>;

			clocks = <&pclk>;

		};

		pclki2c1: pclki2c1@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <10>;

			clocks = <&pclk>;

		};

		pclkuart1: pclkuart1@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <11>;

			clocks = <&pclk>;

		};

		pclkmsp0: pclkmsp0@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <12>;

			clocks = <&pclk>;

		};

		hclkusb: hclkusb@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <13>;

			clocks = <&hclk>;

		};

		hclkdif: hclkdif@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <14>;

			clocks = <&hclk>;

		};

		hclksaa: hclksaa@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <15>;

			clocks = <&hclk>;

		};

		hclksva: hclksva@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <16>;

			clocks = <&hclk>;

		};

		pclkhsi: pclkhsi@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <17>;

			clocks = <&pclk>;

		};

		pclkxti: pclkxti@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <18>;

			clocks = <&pclk>;

		};

		pclkuart2: pclkuart2@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <19>;

			clocks = <&pclk>;

		};

		pclkmsp1: pclkmsp1@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <20>;

			clocks = <&pclk>;

		};

		pclkmsp2: pclkmsp2@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <21>;

			clocks = <&pclk>;

		};

		pclkowm: pclkowm@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <22>;

			clocks = <&pclk>;

		};

		hclkhpi: hclkhpi@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <23>;

			clocks = <&hclk>;

		};

		pclkske: pclkske@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <24>;

			clocks = <&pclk>;

		};

		pclkhsem: pclkhsem@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <25>;

			clocks = <&pclk>;

		};

		hclk3d: hclk3d@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <26>;

			clocks = <&hclk>;

		};

		hclkhash: hclkhash@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <27>;

			clocks = <&hclk>;

		};

		hclkcryp: hclkcryp@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <28>;

			clocks = <&hclk>;

		};

		pclkmshc: pclkmshc@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <29>;

			clocks = <&pclk>;

		};

		hclkusbm: hclkusbm@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <30>;

			clocks = <&hclk>;

		};

		hclkrng: hclkrng@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <31>;

			clocks = <&hclk>;

		};



		/* IP kernel clocks */

		clcdclk: clcdclk@0 {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <36>;

			clocks = <&clk72 &clk48>;

		};

		irdaclk: irdaclk@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <37>;

			clocks = <&clk48>;

		};

		sspiclk: sspiclk@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <38>;

			clocks = <&clk48>;

		};

		uart0clk: uart0clk@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <39>;

			clocks = <&clk48>;

		};

		sdiclk: sdiclk@48M {

			/* Also called MCCLK in some documents */

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <40>;

			clocks = <&clk48>;

		};

		i2c0clk: i2c0clk@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <41>;

			clocks = <&clk48>;

		};

		i2c1clk: i2c1clk@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <42>;

			clocks = <&clk48>;

		};

		uart1clk: uart1clk@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <43>;

			clocks = <&clk48>;

		};

		mspclk0: mspclk0@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <44>;

			clocks = <&clk48>;

		};

		usbclk: usbclk@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <45>;

			clocks = <&clk48>; /* 48 MHz not ULPI */

		};

		difclk: difclk@72M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <46>;

			clocks = <&clk72>;

		};

		ipi2cclk: ipi2cclk@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <47>;

			clocks = <&clk48>; /* Guess */

		};

		ipbmcclk: ipbmcclk@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <48>;

			clocks = <&clk48>; /* Guess */

		};

		hsiclkrx: hsiclkrx@216M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <49>;

			clocks = <&clk216>;

		};

		hsiclktx: hsiclktx@108M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <50>;

			clocks = <&clk108>;

		};

		uart2clk: uart2clk@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <51>;

			clocks = <&clk48>;

		};

		mspclk1: mspclk1@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <52>;

			clocks = <&clk48>;

		};

		mspclk2: mspclk2@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <53>;

			clocks = <&clk48>;

		};

		owmclk: owmclk@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <54>;

			clocks = <&clk48>; /* Guess */

		};

		skeclk: skeclk@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <56>;

			clocks = <&clk48>; /* Guess */

		};

		x3dclk: x3dclk@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <58>;

			clocks = <&clk48>; /* Guess */

		};

		pclkmsp3: pclkmsp3@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <59>;

			clocks = <&pclk>;

		};

		mspclk3: mspclk3@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <60>;

			clocks = <&clk48>;

		};

		mshcclk: mshcclk@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <61>;

			clocks = <&clk48>; /* Guess */

		};

		usbmclk: usbmclk@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <62>;

			/* Stated as "48 MHz not ULPI clock" */

			clocks = <&clk48>;

		};

		rngcclk: rngcclk@48M {

			#clock-cells = <0>;

			compatible = "st,nomadik-src-clock";

			clock-id = <63>;

			clocks = <&clk48>; /* Guess */

		};

	};
@@ -212,7 +639,7 @@ 
			<0x41000000 0x2000>,	/* NAND Base ADDR */

			<0x40800000 0x2000>;	/* NAND Base CMD */

		reg-names = "fsmc_regs", "nand_data", "nand_addr", "nand_cmd";

		clocks = <&pclk>;

		clocks = <&hclksmc>;

		status = "okay";



		partition@0 {
@@ -334,7 +761,7 @@ 
			reg = <0x101fd000 0x1000>;

			interrupt-parent = <&vica>;

			interrupts = <12>;

			clocks = <&clk48>, <&pclk>;

			clocks = <&uart0clk>, <&pclkuart0>;

			clock-names = "uartclk", "apb_pclk";

			pinctrl-names = "default";

			pinctrl-0 = <&uart0_default_mux>;
@@ -345,7 +772,7 @@ 
			reg = <0x101fb000 0x1000>;

			interrupt-parent = <&vica>;

			interrupts = <17>;

			clocks = <&clk48>, <&pclk>;

			clocks = <&uart1clk>, <&pclkuart1>;

			clock-names = "uartclk", "apb_pclk";

			pinctrl-names = "default";

			pinctrl-0 = <&uart1_default_mux>;
@@ -356,7 +783,7 @@ 
			reg = <0x101f2000 0x1000>;

			interrupt-parent = <&vica>;

			interrupts = <28>;

			clocks = <&clk48>, <&pclk>;

			clocks = <&uart2clk>, <&pclkuart2>;

			clock-names = "uartclk", "apb_pclk";

			status = "disabled";

		};
@@ -364,7 +791,7 @@ 
		rng: rng@101b0000 {

			compatible = "arm,primecell";

			reg = <0x101b0000 0x1000>;

			clocks = <&clk48>, <&pclk>;

			clocks = <&rngcclk>, <&hclkrng>;

			clock-names = "rng", "apb_pclk";

		};
@@ -380,7 +807,7 @@ 
		mmcsd: sdi@101f6000 {

			compatible = "arm,pl18x", "arm,primecell";

			reg = <0x101f6000 0x1000>;

			clocks = <&clk48>, <&pclk>;

			clocks = <&sdiclk>, <&pclksdi>;

			clock-names = "mclk", "apb_pclk";

			interrupt-parent = <&vica>;

			interrupts = <22>;

drivers/clk/clk-nomadik.c

+548 −3

File changed.

Preview size limit exceeded, changes collapsed.

drivers/pinctrl/pinctrl-nomadik.c

+1 −1
Original line number Diff line number Diff line
@@ -2104,7 +2104,7 @@ static struct pinctrl_desc nmk_pinctrl_desc = { 


static const struct of_device_id nmk_pinctrl_match[] = {

	{

		.compatible = "stericsson,nmk-pinctrl-stn8815",

		.compatible = "stericsson,stn8815-pinctrl",

		.data = (void *)PINCTRL_NMK_STN8815,

	},

	{

CRA Git | Maintained and supported by SUSTech CRA and CCSE