tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Olof Johansson 6275a9be 331d7d6a

+90
+22
Documentation/devicetree/bindings/hwrng/omap_rng.txt
··· 1 + OMAP SoC HWRNG Module 2 + 3 + Required properties: 4 + 5 + - compatible : Should contain entries for this and backward compatible 6 + RNG versions: 7 + - "ti,omap2-rng" for OMAP2. 8 + - "ti,omap4-rng" for OMAP4, OMAP5 and AM33XX. 9 + Note that these two versions are incompatible. 10 + - ti,hwmods: Name of the hwmod associated with the RNG module 11 + - reg : Offset and length of the register set for the module 12 + - interrupts : the interrupt number for the RNG module. 13 + Only used for "ti,omap4-rng". 14 + 15 + Example: 16 + /* AM335x */ 17 + rng: rng@48310000 { 18 + compatible = "ti,omap4-rng"; 19 + ti,hwmods = "rng"; 20 + reg = <0x48310000 0x2000>; 21 + interrupts = <111>; 22 + };
+13
arch/arm/boot/dts/am33xx.dtsi
··· 288 288 status = "disabled"; 289 289 }; 290 290 291 + hwspinlock: spinlock@480ca000 { 292 + compatible = "ti,omap4-hwspinlock"; 293 + reg = <0x480ca000 0x1000>; 294 + ti,hwmods = "spinlock"; 295 + }; 296 + 291 297 wdt2: wdt@44e35000 { 292 298 compatible = "ti,omap3-wdt"; 293 299 ti,hwmods = "wd_timer2"; ··· 778 772 dmas = <&edma 10>, 779 773 <&edma 11>; 780 774 dma-names = "tx", "rx"; 775 + }; 776 + 777 + rng: rng@48310000 { 778 + compatible = "ti,omap4-rng"; 779 + ti,hwmods = "rng"; 780 + reg = <0x48310000 0x2000>; 781 + interrupts = <111>; 781 782 }; 782 783 }; 783 784 };
+43
arch/arm/boot/dts/omap4-panda-common.dtsi
··· 112 112 &twl6040_pins 113 113 &mcpdm_pins 114 114 &mcbsp1_pins 115 + &dss_dpi_pins 116 + &tfp410_pins 115 117 &dss_hdmi_pins 116 118 &tpd12s015_pins 117 119 &hsusbb1_pins ··· 142 140 0xc0 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abe_mcbsp1_dr.abe_mcbsp1_dr */ 143 141 0xc2 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* abe_mcbsp1_dx.abe_mcbsp1_dx */ 144 142 0xc4 (PIN_INPUT | MUX_MODE0) /* abe_mcbsp1_fsx.abe_mcbsp1_fsx */ 143 + >; 144 + }; 145 + 146 + dss_dpi_pins: pinmux_dss_dpi_pins { 147 + pinctrl-single,pins = < 148 + 0x122 (PIN_OUTPUT | MUX_MODE5) /* dispc2_data23 */ 149 + 0x124 (PIN_OUTPUT | MUX_MODE5) /* dispc2_data22 */ 150 + 0x126 (PIN_OUTPUT | MUX_MODE5) /* dispc2_data21 */ 151 + 0x128 (PIN_OUTPUT | MUX_MODE5) /* dispc2_data20 */ 152 + 0x12a (PIN_OUTPUT | MUX_MODE5) /* dispc2_data19 */ 153 + 0x12c (PIN_OUTPUT | MUX_MODE5) /* dispc2_data18 */ 154 + 0x12e (PIN_OUTPUT | MUX_MODE5) /* dispc2_data15 */ 155 + 0x130 (PIN_OUTPUT | MUX_MODE5) /* dispc2_data14 */ 156 + 0x132 (PIN_OUTPUT | MUX_MODE5) /* dispc2_data13 */ 157 + 0x134 (PIN_OUTPUT | MUX_MODE5) /* dispc2_data12 */ 158 + 0x136 (PIN_OUTPUT | MUX_MODE5) /* dispc2_data11 */ 159 + 160 + 0x174 (PIN_OUTPUT | MUX_MODE5) /* dispc2_data10 */ 161 + 0x176 (PIN_OUTPUT | MUX_MODE5) /* dispc2_data9 */ 162 + 0x178 (PIN_OUTPUT | MUX_MODE5) /* dispc2_data16 */ 163 + 0x17a (PIN_OUTPUT | MUX_MODE5) /* dispc2_data17 */ 164 + 0x17c (PIN_OUTPUT | MUX_MODE5) /* dispc2_hsync */ 165 + 0x17e (PIN_OUTPUT | MUX_MODE5) /* dispc2_pclk */ 166 + 0x180 (PIN_OUTPUT | MUX_MODE5) /* dispc2_vsync */ 167 + 0x182 (PIN_OUTPUT | MUX_MODE5) /* dispc2_de */ 168 + 0x184 (PIN_OUTPUT | MUX_MODE5) /* dispc2_data8 */ 169 + 0x186 (PIN_OUTPUT | MUX_MODE5) /* dispc2_data7 */ 170 + 0x188 (PIN_OUTPUT | MUX_MODE5) /* dispc2_data6 */ 171 + 0x18a (PIN_OUTPUT | MUX_MODE5) /* dispc2_data5 */ 172 + 0x18c (PIN_OUTPUT | MUX_MODE5) /* dispc2_data4 */ 173 + 0x18e (PIN_OUTPUT | MUX_MODE5) /* dispc2_data3 */ 174 + 175 + 0x190 (PIN_OUTPUT | MUX_MODE5) /* dispc2_data2 */ 176 + 0x192 (PIN_OUTPUT | MUX_MODE5) /* dispc2_data1 */ 177 + 0x194 (PIN_OUTPUT | MUX_MODE5) /* dispc2_data0 */ 178 + >; 179 + }; 180 + 181 + tfp410_pins: pinmux_tfp410_pins { 182 + pinctrl-single,pins = < 183 + 0x144 (PIN_OUTPUT | MUX_MODE3) /* gpio_0 */ 145 184 >; 146 185 }; 147 186
+6
arch/arm/boot/dts/omap4.dtsi
··· 257 257 clock-frequency = <48000000>; 258 258 }; 259 259 260 + hwspinlock: spinlock@4a0f6000 { 261 + compatible = "ti,omap4-hwspinlock"; 262 + reg = <0x4a0f6000 0x1000>; 263 + ti,hwmods = "spinlock"; 264 + }; 265 + 260 266 i2c1: i2c@48070000 { 261 267 compatible = "ti,omap4-i2c"; 262 268 reg = <0x48070000 0x100>;
+6
arch/arm/boot/dts/omap5.dtsi
··· 287 287 ti,hwmods = "i2c5"; 288 288 }; 289 289 290 + hwspinlock: spinlock@4a0f6000 { 291 + compatible = "ti,omap4-hwspinlock"; 292 + reg = <0x4a0f6000 0x1000>; 293 + ti,hwmods = "spinlock"; 294 + }; 295 + 290 296 mcspi1: spi@48098000 { 291 297 compatible = "ti,omap4-mcspi"; 292 298 reg = <0x48098000 0x200>;