Commit 6275a9be authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v3.13/dt-fixes-for-merge-window' of... 

Merge tag 'omap-for-v3.13/dt-fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

From Tony Lindgren:
Few device tree changes that fix boot time warnings and
make panda display work with recent u-boot.

* tag 'omap-for-v3.13/dt-fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: dts: omap4-panda: add DPI pinmuxing
  ARM: dts: AM33xx: Add RNG node
  ARM: dts: AM33XX: Add hwspinlock node
  ARM: dts: OMAP5: Add hwspinlock node
  ARM: dts: OMAP4: Add hwspinlock node

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 331d7d6a 0352bd1f

Documentation/devicetree/bindings/hwrng/omap_rng.txt

0 → 100644
+22 −0
Original line number Original line Diff line number Diff line 
OMAP SoC HWRNG Module



Required properties:



- compatible : Should contain entries for this and backward compatible

  RNG versions:

  - "ti,omap2-rng" for OMAP2.

  - "ti,omap4-rng" for OMAP4, OMAP5 and AM33XX.

  Note that these two versions are incompatible.

- ti,hwmods: Name of the hwmod associated with the RNG module

- reg : Offset and length of the register set for the module

- interrupts : the interrupt number for the RNG module.

		Only used for "ti,omap4-rng".



Example:

/* AM335x */

rng: rng@48310000 {

	compatible = "ti,omap4-rng";

	ti,hwmods = "rng";

	reg = <0x48310000 0x2000>;

	interrupts = <111>;

};

arch/arm/boot/dts/am33xx.dtsi

+13 −0
Original line number Original line Diff line number Diff line
@@ -288,6 +288,12 @@ 
			status = "disabled";

			status = "disabled";

		};

		};





		hwspinlock: spinlock@480ca000 {

			compatible = "ti,omap4-hwspinlock";

			reg = <0x480ca000 0x1000>;

			ti,hwmods = "spinlock";

		};



		wdt2: wdt@44e35000 {

		wdt2: wdt@44e35000 {

			compatible = "ti,omap3-wdt";

			compatible = "ti,omap3-wdt";

			ti,hwmods = "wd_timer2";

			ti,hwmods = "wd_timer2";
@@ -773,5 +779,12 @@ 
				<&edma 11>;

				<&edma 11>;

			dma-names = "tx", "rx";

			dma-names = "tx", "rx";

		};

		};



		rng: rng@48310000 {

			compatible = "ti,omap4-rng";

			ti,hwmods = "rng";

			reg = <0x48310000 0x2000>;

			interrupts = <111>;

		};

	};

	};

};
 
};

arch/arm/boot/dts/omap4-panda-common.dtsi

+43 −0
Original line number Original line Diff line number Diff line
@@ -112,6 +112,8 @@ 
			&twl6040_pins

			&twl6040_pins

			&mcpdm_pins

			&mcpdm_pins

			&mcbsp1_pins

			&mcbsp1_pins

			&dss_dpi_pins

			&tfp410_pins

			&dss_hdmi_pins

			&dss_hdmi_pins

			&tpd12s015_pins

			&tpd12s015_pins

			&hsusbb1_pins

			&hsusbb1_pins
@@ -143,6 +145,47 @@ 
		>;

		>;

	};

	};





	dss_dpi_pins: pinmux_dss_dpi_pins {

		pinctrl-single,pins = <

			0x122 (PIN_OUTPUT | MUX_MODE5)	/* dispc2_data23 */

			0x124 (PIN_OUTPUT | MUX_MODE5) 	/* dispc2_data22 */

			0x126 (PIN_OUTPUT | MUX_MODE5)	/* dispc2_data21 */

			0x128 (PIN_OUTPUT | MUX_MODE5)	/* dispc2_data20 */

			0x12a (PIN_OUTPUT | MUX_MODE5)	/* dispc2_data19 */

			0x12c (PIN_OUTPUT | MUX_MODE5)	/* dispc2_data18 */

			0x12e (PIN_OUTPUT | MUX_MODE5)	/* dispc2_data15 */

			0x130 (PIN_OUTPUT | MUX_MODE5)	/* dispc2_data14 */

			0x132 (PIN_OUTPUT | MUX_MODE5)	/* dispc2_data13 */

			0x134 (PIN_OUTPUT | MUX_MODE5)	/* dispc2_data12 */

			0x136 (PIN_OUTPUT | MUX_MODE5)	/* dispc2_data11 */



			0x174 (PIN_OUTPUT | MUX_MODE5)	/* dispc2_data10 */

			0x176 (PIN_OUTPUT | MUX_MODE5)	/* dispc2_data9 */

			0x178 (PIN_OUTPUT | MUX_MODE5)	/* dispc2_data16 */

			0x17a (PIN_OUTPUT | MUX_MODE5)	/* dispc2_data17 */

			0x17c (PIN_OUTPUT | MUX_MODE5)	/* dispc2_hsync */

			0x17e (PIN_OUTPUT | MUX_MODE5)	/* dispc2_pclk */

			0x180 (PIN_OUTPUT | MUX_MODE5)	/* dispc2_vsync */

			0x182 (PIN_OUTPUT | MUX_MODE5)	/* dispc2_de */

			0x184 (PIN_OUTPUT | MUX_MODE5)	/* dispc2_data8 */

			0x186 (PIN_OUTPUT | MUX_MODE5)	/* dispc2_data7 */

			0x188 (PIN_OUTPUT | MUX_MODE5)	/* dispc2_data6 */

			0x18a (PIN_OUTPUT | MUX_MODE5)	/* dispc2_data5 */

			0x18c (PIN_OUTPUT | MUX_MODE5)	/* dispc2_data4 */

			0x18e (PIN_OUTPUT | MUX_MODE5)	/* dispc2_data3 */



			0x190 (PIN_OUTPUT | MUX_MODE5)	/* dispc2_data2 */

			0x192 (PIN_OUTPUT | MUX_MODE5)	/* dispc2_data1 */

			0x194 (PIN_OUTPUT | MUX_MODE5)	/* dispc2_data0 */

		>;

	};



	tfp410_pins: pinmux_tfp410_pins {

		pinctrl-single,pins = <

			0x144 (PIN_OUTPUT | MUX_MODE3)	/* gpio_0 */

		>;

	};



	dss_hdmi_pins: pinmux_dss_hdmi_pins {

	dss_hdmi_pins: pinmux_dss_hdmi_pins {

		pinctrl-single,pins = <

		pinctrl-single,pins = <

			0x5a (PIN_INPUT_PULLUP | MUX_MODE0)	/* hdmi_cec.hdmi_cec */

			0x5a (PIN_INPUT_PULLUP | MUX_MODE0)	/* hdmi_cec.hdmi_cec */

arch/arm/boot/dts/omap4.dtsi

+6 −0
Original line number Original line Diff line number Diff line
@@ -257,6 +257,12 @@ 
			clock-frequency = <48000000>;

			clock-frequency = <48000000>;

		};

		};





		hwspinlock: spinlock@4a0f6000 {

			compatible = "ti,omap4-hwspinlock";

			reg = <0x4a0f6000 0x1000>;

			ti,hwmods = "spinlock";

		};



		i2c1: i2c@48070000 {

		i2c1: i2c@48070000 {

			compatible = "ti,omap4-i2c";

			compatible = "ti,omap4-i2c";

			reg = <0x48070000 0x100>;

			reg = <0x48070000 0x100>;

arch/arm/boot/dts/omap5.dtsi

+6 −0
Original line number Original line Diff line number Diff line
@@ -287,6 +287,12 @@ 
			ti,hwmods = "i2c5";

			ti,hwmods = "i2c5";

		};

		};





		hwspinlock: spinlock@4a0f6000 {

			compatible = "ti,omap4-hwspinlock";

			reg = <0x4a0f6000 0x1000>;

			ti,hwmods = "spinlock";

		};



		mcspi1: spi@48098000 {

		mcspi1: spi@48098000 {

			compatible = "ti,omap4-mcspi";

			compatible = "ti,omap4-mcspi";

			reg = <0x48098000 0x200>;

			reg = <0x48098000 0x200>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE