linux.git/arch/arm/boot, branch v3.12-rc2

Merge tag 'omap-for-v3.12/fixes-dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

2013-09-18T21:01:39+00:00

From Tony Lindgren, OMAP DT fixes for 3.12-rc1:

OMAP device tree changes that are needed to fix regressions and avoid
electrical issues on beaglebone black.

Via Benoit Cousson :

Fix BBB LDO voltage to avoid HDMI destruction
Fix OMAP5 wrong attribute
Fix typo in beagle xM strings
Fix missing pinmux and regulator for OMAP4 wifi
Fix missing pinmux for igep headset

* tag 'omap-for-v3.12/fixes-dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: igep00x0: Add pinmux configuration for MCBSP2
  ARM: dts: Fix muxing and regulator for wl12xx on the SDIO bus for blaze
  ARM: dts: Fix muxing and regulator for wl12xx on the SDIO bus for pandaboard
  ARM: dts: OMAP5: fix ocp2scp DTS data
  ARM: dts: OMAP5: fix reg property size
  ARM: dts: am335x-bone*: add DT for BeagleBone Black
  ARM: dts: omap3-beagle-xm: fix string error in compatible property

Signed-off-by: Olof Johansson

ARM: dts: igep00x0: Add pinmux configuration for MCBSP2

2013-09-18T12:31:58+00:00

Add pinmux configuration for MCBSP2 connected to the TDM interface.
With this configuration the Headset modules works as expected.

Signed-off-by: Enric Balletbo i Serra 
Acked-by: Javier Martinez Canillas 
Signed-off-by: Benoit Cousson

ARM: dts: Fix muxing and regulator for wl12xx on the SDIO bus for blaze

2013-09-18T09:14:42+00:00

Commit 76787b3b (ARM: OMAP2+: Remove board-4430sdp.c)
removed legacy booting in favor of device tree based booting
for 4430sdp. That caused the WLAN to stop working as the
related .dts entries fell through the cracks.

I don't have the "1283 PG 2.21 connectivity device" on my 4430sdp,
but the earlier version of this patch was tested by Luciano
Coelho. This version has left out the input logic for MMC CLK
line compared to the earlier version as that is not bidirectional,
and should be safe to do.

Cc: Rajendra Nayak 
Cc: Luciano Coelho 
Cc: Ruslan Bilovol 
Signed-off-by: Tony Lindgren 
Signed-off-by: Benoit Cousson

ARM: dts: Fix muxing and regulator for wl12xx on the SDIO bus for pandaboard

2013-09-18T09:11:39+00:00

Commit b42b9181 (ARM: OMAP2+: Remove board-omap4panda.c)
removed legacy booting in favor of device tree based booting
for pandaboard. That caused the WLAN to stop working as the
related .dts entries fell through the cracks.

The legacy muxing was setting pulls for GPIO 48 and 49, so let's
keep that behaviour for now to avoid further regressions for
BT and FM. Also input logic was enabled for MMC CLK line, but
I've verified that the input logic we don't need enabled for
CLK line as it's not bidirectional.

Also, we want to use non-removable instead of ti,non-removable
as the ti,non-removable also sets no_regulator_off_init which
is really not what we want as then wl12xx won't get powered
up and down which is needed for resetting it.

Note that looks like the WLAN interface fails to come up after
a warm reset, but that most likely was also happening with
the legacy booting and needs a separate fix.

Cc: Paolo Pisati 
Cc: Rajendra Nayak 
Cc: Luciano Coelho 
Signed-off-by: Tony Lindgren 
Signed-off-by: Benoit Cousson

ARM: dts: OMAP5: fix ocp2scp DTS data

2013-09-17T12:57:04+00:00

Fix the DTS data for ocp2scp node by adding the
missing reg property.

Signed-off-by: Felipe Balbi 
Signed-off-by: Kishon Vijay Abraham I 
Signed-off-by: Benoit Cousson

ARM: dts: OMAP5: fix reg property size

2013-09-17T12:56:47+00:00

USB3 block has a 64KiB space, another 64KiB is
used for the wrapper.

Without this change, resource_size() will get
confused and driver won't probe because size
will be negative.

Signed-off-by: Felipe Balbi 
Signed-off-by: Kishon Vijay Abraham I 
Signed-off-by: Benoit Cousson

ARM: dts: am335x-bone*: add DT for BeagleBone Black

2013-09-17T12:56:22+00:00

The BeagleBone Black is basically a regular BeagleBone with eMMC and
HDMI added, so create a common dtsi both can use.

IMPORTANT: booting the existing am335x-bone.dts will blow up the HDMI
transceiver after a dozen boots with an uSD card inserted because LDO
will be at 3.3V instead of 1.8.

MMC support for AM335x still isn't in, so only the LDO change has been
added.

Signed-off-by: Koen Kooi 
Tested-by: Tom Rini 
Tested-by: Matt Porter 
Acked-by: Kevin Hilman 
Tested-by: Kevin Hilman 
Tested-by: Joel Fernandes 
Signed-off-by: Benoit Cousson

ARM: dts: omap3-beagle-xm: fix string error in compatible property

2013-09-17T12:20:57+00:00

The beagle and beagle-xm entries were inside the same double quote.
Split them to have two distinct entries.

Signed-off-by: Robert Nelson 
Signed-off-by: Benoit Cousson

ARM: dts: imx6q: fix the wrong offset of the Pad Mux register

2013-09-17T02:04:25+00:00

The patch "0b7a76a ARM: dts: imx6q{dl}: add DTE pads for uart"
adds the DTE pads for uart. For PAD_EIM_D29, the offset of the
Pad Mux register should be 0x0c8, not 0x0c4.

This patch fixes it.

Signed-off-by: Huang Shijie 
Signed-off-by: Shawn Guo

ARM: imx51.dtsi: fix PATA device clock

2013-09-17T02:04:24+00:00

Commit 718a350 (ARM: i.MX51: Add PATA support) adds pata support to the
imx51.dtsi file and is using clock 161. The problem is that the right
clock is 172, according to commit 5d530bb (ARM: i.MX5: Add PATA and SRTC
clocks).  Using the clock 172 makes things work again (and kills a nasty
system freeze).

Tested-by: Steev Klimaszewski 
Signed-off-by: Arnaud Patard 
Signed-off-by: Shawn Guo