openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Few device tree changes that fix boot time warnings and 

make panda display work with recent u-boot.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJScC4gAAoJEBvUPslcq6Vz8AcP/220RS7XQfFIbV7rvv+jOm0j
 MKnhBiUTO5H7YIbow440MH+oD4CbwCKuI/APZMQfiFTBUE95EPBQOy4KgKWDxVkp
 rMmg3zlcr0Eowz/6/h9tCgt7N8rk0NCv+UP0VEiGoSpFTFRy2ir3F9gAuvQOu9gz
 zGjiXDfgZAnjFZMsMYm5nIj5E0lqyhgPfbzRAq1e5k1YcBxSbYZHbbSA44kSZOTu
 gUSOb2gTzOjVs/ZxHIQzxhoQo/iT7q+sthpm5rozP9yiN49jlu2nhChdfV4A7mXi
 zpoSKb9VnJqjmoJj6obnDiguKMX8SqcMhJ1t7jXgVQwgTG653shPVHwrbBQqKqN1
 lbQziKNF8J7u88XGZcesWL1xgng7tNOWfUnjw9gQmpbXXlJtbnuhNiipiL27rjNb
 /g5gmTu8CMp73SxuIWsdbHLNo0YGOnHuqfeqtTrpJ26tqiZPHsNM8kydTyCEIWMV
 EaEon5BQ9MJVk8FjU5I8H+LMvNawNl0b3TJscwao2zLlZo/AWGFmx0BCmLnkKVq8
 oiJcIDaHgPpWhgktM2ua2+Kk6v44vBtRvgF6dFJuDJLgfG1ILTDSILbwFup5E/c6
 dQdXeqdLfwwoSI7Zox/pC7coybm9rzsGg0mqVA9ycUWioUSD7gEf+/1zapgwJYgx
 Xt6TQ1jcy44SPDJvAjt7
 =MMCL
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2013-10-29 16:11:03 -07:00
parent 331d7d6afe 0352bd1f04
commit 6275a9be78
5 changed files with 90 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Documentation/devicetree/bindings/hwrng/omap_rng.txt Normal file
View File

@ -0,0 +1,22 @@
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>;
};

13
arch/arm/boot/dts/am33xx.dtsi
View File

@ -288,6 +288,12 @@ mmc3: mmc@47810000 {
status = "disabled";
};
hwspinlock: spinlock@480ca000 {
compatible = "ti,omap4-hwspinlock";
reg = <0x480ca000 0x1000>;
ti,hwmods = "spinlock";
};
wdt2: wdt@44e35000 {
compatible = "ti,omap3-wdt";
ti,hwmods = "wd_timer2";
@ -773,5 +779,12 @@ mcasp1: mcasp@4803C000 {
<&edma 11>;
dma-names = "tx", "rx";
};
rng: rng@48310000 {
compatible = "ti,omap4-rng";
ti,hwmods = "rng";
reg = <0x48310000 0x2000>;
interrupts = <111>;
};
};
};

43
arch/arm/boot/dts/omap4-panda-common.dtsi
View File

@ -112,6 +112,8 @@ &omap4_pmx_core {
&twl6040_pins
&mcpdm_pins
&mcbsp1_pins
&dss_dpi_pins
&tfp410_pins
&dss_hdmi_pins
&tpd12s015_pins
&hsusbb1_pins
@ -143,6 +145,47 @@ mcbsp1_pins: pinmux_mcbsp1_pins {
>;
};
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 {
pinctrl-single,pins = <
0x5a (PIN_INPUT_PULLUP | MUX_MODE0) /* hdmi_cec.hdmi_cec */

6
arch/arm/boot/dts/omap4.dtsi
View File

@ -257,6 +257,12 @@ uart4: serial@4806e000 {
clock-frequency = <48000000>;
};
hwspinlock: spinlock@4a0f6000 {
compatible = "ti,omap4-hwspinlock";
reg = <0x4a0f6000 0x1000>;
ti,hwmods = "spinlock";
};
i2c1: i2c@48070000 {
compatible = "ti,omap4-i2c";
reg = <0x48070000 0x100>;

6
arch/arm/boot/dts/omap5.dtsi
View File

@ -287,6 +287,12 @@ i2c5: i2c@4807c000 {
ti,hwmods = "i2c5";
};
hwspinlock: spinlock@4a0f6000 {
compatible = "ti,omap4-hwspinlock";
reg = <0x4a0f6000 0x1000>;
ti,hwmods = "spinlock";
};
mcspi1: spi@48098000 {
compatible = "ti,omap4-mcspi";
reg = <0x48098000 0x200>;