pandora-kernel.git
11 years agoMerge tag 'mfd-omap-v3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee...
Tony Lindgren [Wed, 28 May 2014 18:02:01 +0000 (11:02 -0700)]
Merge tag 'mfd-omap-v3.16-1' of git://git./linux/kernel/git/lee/mfd into omap-for-v3.16/tmp-merge-2014-05-19

Second immutable branch between MFD and OMAP due for the v3.16 merge window.

11 years agoMerge tag 'omap-for-v3.16/dt-part3' into omap-for-v3.16/tmp-merge-2014-05-19
Tony Lindgren [Wed, 28 May 2014 18:00:14 +0000 (11:00 -0700)]
Merge tag 'omap-for-v3.16/dt-part3' into omap-for-v3.16/tmp-merge-2014-05-19

Most likely the last pull request from me for omap changes for
v3.16 that's dts fixes for clocks and enabling few features
that were still being discussed earlier:

- A bunch of omap clock related dts fixes queued by Tero Kristo.

- Enable parallel nand on am437x that was not merged earlier as
  I requested more information about the muxing for it. And
  we need to also enable ecc hardware support for am43xx.

- Enable the modem support for n900 that was dropped earlier
  because we had to fix the related hwmod entry first with patch
  ARM: OMAP2+: Fix ssi hwmod entry to allow idling.

- And finally, add the omap2 clock dts files. These will allow
  us to enable the dt clocks and drop the legacy clocks for omap2
  with a follow-up patch once the related clock driver binding
  changes are merged.

11 years agoMerge branch 'for-v3.16/clk-dt' of https://github.com/t-kristo/linux-pm into omap... omap-for-v3.16/dt-part3
Tony Lindgren [Wed, 28 May 2014 17:14:48 +0000 (10:14 -0700)]
Merge branch 'for-v3.16/clk-dt' of https://github.com/t-kristo/linux-pm into omap-for-v3.16/dt-v2

11 years agoARM: dts: omap2 clock data
Tero Kristo [Fri, 21 Feb 2014 15:05:02 +0000 (17:05 +0200)]
ARM: dts: omap2 clock data

This patch creates a unique node for each clock in the OMAP2 power,
reset and clock manager (PRCM).

Signed-off-by: Tero Kristo <t-kristo@ti.com>
11 years agomfd: twl4030-power: Add a configuration to turn off oscillator during off-idle
Tony Lindgren [Wed, 14 May 2014 01:34:09 +0000 (18:34 -0700)]
mfd: twl4030-power: Add a configuration to turn off oscillator during off-idle

Some oscillators can be turned off during off-idle saving few
a little bit power at the cost of the oscillator start up
latency.

If you board can do this, you can now enable it by using the
ti,twl4030-power-idle-osc-off compatible flag.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
11 years agomfd: twl4030-power: Add support for board specific configuration
Tony Lindgren [Tue, 20 May 2014 18:17:54 +0000 (11:17 -0700)]
mfd: twl4030-power: Add support for board specific configuration

With the recommended twl4030 configuration added, we can now add
board specific changes as modifications to the recommended
configuration.

Note that the data is private to this driver, and the data must
always have a NULL resource in the sentinel.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
11 years agomfd: twl4030-power: Add recommended idle configuration
Tony Lindgren [Tue, 20 May 2014 18:17:54 +0000 (11:17 -0700)]
mfd: twl4030-power: Add recommended idle configuration

These settings are based on the "Recommended Sleep Sequences for
the Zoom Platform".

The settings assume most of the regulators are under control of
Linux, and twl4030 only cuts off VDD1 and VDD2 during off-idle as
Linux cannot do it.

For any board specific changes to these, let's patch them in as
changes to the generic data in the follow-up patches. This keeps
the board specific changes small.

Note that this does not consider the twl5030 errata 27 and 28.
That can be added later on after it has been tested. For more
information about errata 27 and 28.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
11 years agomfd: twl4030-power: Add generic reset configuration
Tony Lindgren [Tue, 20 May 2014 18:17:54 +0000 (11:17 -0700)]
mfd: twl4030-power: Add generic reset configuration

The twl4030 PMIC needs to be configured properly for things like
warm reset and deeper idle states so the PMIC manages the regulators
properly based on the hardware triggers from the SoC. Earlier
we have configured twl4030 using platform data, but we want to
do it for device tree based booting also.

In some cases configuring twl4030 is needed for things to work.
For example, when rebooting an OMAP3530 at 125 MHz, it hangs.
With this patch, TWL4030 will be reset when a warm reset occures,
and OMAP3530 does not hang on reboot.

Let's add device tree support and configure things for warm reset
as the default when compatible = "ti,twl4030-power". More
complicated configurations can be added to the driver based on
other compatible flags.

Note we now also make the pdata const like it should be.
This allows use it for match->data with the device tree
related functions.

Based on earlier patch by Matthias Brugger <matthias.bgg@gmail.com>
and Lesly A M <leslyam@ti.com>.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
11 years agomfd: twl4030-power: Fix some defines for SW_EVENTS
Tony Lindgren [Tue, 20 May 2014 18:17:53 +0000 (11:17 -0700)]
mfd: twl4030-power: Fix some defines for SW_EVENTS

We have these bits partially defined in two different
places, so let's fix them up and add defines for the
missing bits. These bits are the same for P1_SW_EVENTS,
P2_SW_EVENTS and P3_SW_EVENTS.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
11 years agomfd: twl4030-power: Fix hang on reboot if sleep configuration was loaded earlier
Tony Lindgren [Wed, 14 May 2014 01:34:04 +0000 (18:34 -0700)]
mfd: twl4030-power: Fix hang on reboot if sleep configuration was loaded earlier

Looks like we can still hit the issue of wrong load order of
twl4030 configuration. If we have a sleep configuration loaded,
and do a warm reset, the device can hang while initializing the
wakeup12 sequence. We do have a warning message about wrong order
of twl4030 configuration, but in this case it does not help as
the sleep configuration was loaded during the previous boot and
the state of twl4030 is maintained throughout the warm reset.

Fix the issue by clearing any existing sleep configuration
before we load the warm reset configuration.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
11 years agoARM: dts: am437x-gp-evm: add support for parallel NAND flash
Pekon Gupta [Mon, 19 May 2014 09:15:46 +0000 (14:45 +0530)]
ARM: dts: am437x-gp-evm: add support for parallel NAND flash

Adds pinmux and DT node for Micron (MT29F4G08AB) x8 NAND device present on
am437x-gp-evm board.
(1) As NAND Flash data lines are muxed with eMMC, Thus at a given time either
    eMMC or NAND can be enabled. Selection between eMMC and NAND is controlled:
    (a) By dynamically driving following GPIO pin from software
        SPI2_CS0(GPIO) == 0 NAND is selected (default)
        SPI2_CS0(GPIO) == 1 eMMC is selected
    (b) By statically using Jumper (J89) on the board

(2) As NAND device connnected to this board has page-size=4K and oob-size=224,
    So ROM code expects boot-loaders to be flashed in BCH16 ECC scheme for
    NAND boot.

Signed-off-by: Pekon Gupta <pekon@ti.com>
Reviewed-by: Javier Martinez Canillas <javier@dowhile0.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: OMAP2+: gpmc: enable BCH_HW ecc-scheme for AM43xx platforms
Pekon Gupta [Mon, 19 May 2014 11:22:36 +0000 (16:52 +0530)]
ARM: OMAP2+: gpmc: enable BCH_HW ecc-scheme for AM43xx platforms

Fixes: commit 0611c41934ab35ce84dea34ab291897ad3cbc7be
ARM: OMAP2+: gpmc: update gpmc_hwecc_bch_capable() for new platforms and ECC schemes

Though the commit log of above commit mentions AM43xx platforms, but code change
missed AM43xx. This patch adds AM43xx to list of those SoC which have built-in
ELM hardware engine, so that BCH ecc-schemes with hardware error-correction can
be enabled on AM43xx devices.

Reported-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Pekon Gupta <pekon@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: dts: omap3 a83x: fix duplicate usb pin config
Christoph Fritz [Thu, 22 May 2014 23:06:26 +0000 (01:06 +0200)]
ARM: dts: omap3 a83x: fix duplicate usb pin config

Node usbhshost is supporting pinctrl, so the deprecated
quirk call can be removed.

Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: dts: omap3: set mcbsp2 status
Christoph Fritz [Thu, 22 May 2014 23:06:24 +0000 (01:06 +0200)]
ARM: dts: omap3: set mcbsp2 status

This patch fixes audio support for omap3-lilly-a83x.

Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: dts: omap3-n900: Add modem support
Sebastian Reichel [Sat, 10 May 2014 16:37:50 +0000 (18:37 +0200)]
ARM: dts: omap3-n900: Add modem support

Add modem device tree data to Nokia N900's DTS file.

Signed-off-by: Sebastian Reichel <sre@kernel.org>
Reviewed-by: Pavel Machek <pavel@ucw.cz>
Tested-By: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: dts: omap3-n900: Add SSI support
Sebastian Reichel [Sat, 10 May 2014 16:37:49 +0000 (18:37 +0200)]
ARM: dts: omap3-n900: Add SSI support

Add SSI device tree data for OMAP3 and Nokia N900.

Signed-off-by: Sebastian Reichel <sre@kernel.org>
Reviewed-by: Pavel Machek <pavel@ucw.cz>
Tested-By: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: OMAP2+: Fix ssi hwmod entry to allow idling
Tony Lindgren [Wed, 21 May 2014 19:31:35 +0000 (12:31 -0700)]
ARM: OMAP2+: Fix ssi hwmod entry to allow idling

The current entry prevents system from idling if
the hwmod is defined in the .dts file so let's
change the idlemodes.

Note that we probably don't have SYSC_HAS_EMUFREE
or SYSS_HAS_RESET_STATUS either. If we do, those
can be added later on.

Acked-by: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: dts: AM4372: clk: efuse based crystal frequency detect
Afzal Mohammed [Wed, 14 May 2014 11:36:37 +0000 (17:06 +0530)]
ARM: dts: AM4372: clk: efuse based crystal frequency detect

Currently oscillator frequency is determined based on sysboot settings,
it may not be the case always. To determine it properly, efuse settings
also has to be read. CONTROL_STATUS register holds this information.
Bit 31: if 0, frequency to be determined based on sysboot
if 1, frequency to be determined based on efuse
Bit 29,30 - for efuse detection of frequency
Bit 22,23 - for sysboot detection of frequency

Add clock nodes (mux) to determine oscillator frequency as above.

Signed-off-by: Afzal Mohammed <afzal@ti.com>
Acked-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Tero Kristo <t-kristo@ti.com>
11 years agoARM: dts: am43xx-clocks.dtsi: add ti, set-rate-parent to display clock path
Tomi Valkeinen [Wed, 21 May 2014 12:16:11 +0000 (15:16 +0300)]
ARM: dts: am43xx-clocks.dtsi: add ti, set-rate-parent to display clock path

We need set-rate-parent flags for the display's clock path so that the
DSS driver can change the clock rate of the PLL.

This patchs adds the ti,set-rate-parent flag to disp_clk and
dpll_disp_m2_ck clock nodes.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Tero Kristo <t-kristo@ti.com>
11 years agoARM: dts: omap5-clocks.dtsi: add ti, set-rate-parent to dss_dss_clk
Tomi Valkeinen [Wed, 21 May 2014 12:16:10 +0000 (15:16 +0300)]
ARM: dts: omap5-clocks.dtsi: add ti, set-rate-parent to dss_dss_clk

Add ti,set-rate-parent to dss_dss_clk so that the DSS driver can
set the rate.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Tero Kristo <t-kristo@ti.com>
11 years agoARM: dts: omap4: add twd clock to DT
Gilles Chanteperdrix [Mon, 7 Apr 2014 20:05:39 +0000 (22:05 +0200)]
ARM: dts: omap4: add twd clock to DT

Booting Linux 3.14 on Pandaboard currently gets the following
message displayed:

smp_twd: clock not found -2

Define "mpu_periphclk" as the twd clock in omap4 dts to avoid this.

Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
Acked-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tero Kristo <t-kristo@ti.com>
11 years agoARM: dts: omap54xx-clocks: Correct abe_iclk clock node
Peter Ujfalusi [Wed, 30 Apr 2014 11:41:36 +0000 (14:41 +0300)]
ARM: dts: omap54xx-clocks: Correct abe_iclk clock node

abe_iclk's parent is aess_fclk and not abe_clk.
Also correct the parameters for clock rate calculation as used for OMAP4
since in PRCM level there's no difference between the two platform
regarding to AESS/ABE clocking.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tero Kristo <t-kristo@ti.com>
11 years agoARM: dts: omap54xx-clocks: remove the autoidle properties for clock nodes
Peter Ujfalusi [Wed, 30 Apr 2014 11:41:35 +0000 (14:41 +0300)]
ARM: dts: omap54xx-clocks: remove the autoidle properties for clock nodes

In OMAP5 bit 8 in PRCM registers are not defined (Reserved) unlike their
counterpart in OMAP4.
It is better to not write to these bits.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tero Kristo <t-kristo@ti.com>
11 years agoARM: dts: am43x-clock: add tbclk data for ehrpwm
Poddar, Sourav [Tue, 29 Apr 2014 14:15:46 +0000 (19:45 +0530)]
ARM: dts: am43x-clock: add tbclk data for ehrpwm

We need "tbclk" clock data for the functioning of ehrpwm
module. Hence, populating the required clock information
in clock dts file.

Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Acked-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tero Kristo <t-kristo@ti.com>
11 years agoARM: dts: am33xx-clock: Fix ehrpwm tbclk data
Poddar, Sourav [Tue, 29 Apr 2014 08:34:20 +0000 (14:04 +0530)]
ARM: dts: am33xx-clock: Fix ehrpwm tbclk data

tbclk does not need to be a composite clock, we can simply
use gate clock for this purpose.

Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Acked-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tero Kristo <t-kristo@ti.com>
11 years agoMerge tag 'omap-for-v3.16/dt-part2-v2' into omap-for-v3.16/tmp-merge-2014-05-19
Tony Lindgren [Tue, 20 May 2014 00:24:45 +0000 (17:24 -0700)]
Merge tag 'omap-for-v3.16/dt-part2-v2' into omap-for-v3.16/tmp-merge-2014-05-19

Device tree related changes for omaps.

Conflicts:
include/dt-bindings/pinctrl/omap.h

11 years agoARM: dts: Enable mcpdm and mcbsp1 on DuoVero omap-for-v3.16/dt-part2-v2
Joachim Eastwood [Sat, 17 May 2014 12:07:00 +0000 (14:07 +0200)]
ARM: dts: Enable mcpdm and mcbsp1 on DuoVero

Since commit 7adb0933b18debef3 (ARM: dts: omap4: Set all audio related
IP's status to disabled as default) all audio related device are
disabled by default. Most boards were updated to enable devices
explicitly, but DuoVero was missed.

mcpdm is used for twl6040 and mcbsp1 is used for BlueTooth audio.

Cc: florian.vaussard@epfl.ch
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: dts: Convert DuoVero Parlor to use IOPAD macro
Joachim Eastwood [Sat, 17 May 2014 12:06:59 +0000 (14:06 +0200)]
ARM: dts: Convert DuoVero Parlor to use IOPAD macro

Conversion done by following awk script.
/0x[0-9a-f]{1,3} \(PIN/ {
offset = sprintf("OMAP4_IOPAD(0x%03x, ", strtonum($1) + 64)
sub(/0x[0-9a-f]{1,3} \(/, offset, $0)
print $0
next
}
{ print $0 }

Cc: florian.vaussard@epfl.ch
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: dts: am43xx: fix starting offset of NAND.filesystem MTD partition
Pekon Gupta [Mon, 19 May 2014 09:15:48 +0000 (14:45 +0530)]
ARM: dts: am43xx: fix starting offset of NAND.filesystem MTD partition

MTD NAND partition for file-system should start at offset=0xA00000

Signed-off-by: Pekon Gupta <pekon@ti.com>
Reviewed-by: Javier Martinez Canillas <javier@dowhile0.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: dts: dra7: add support for parallel NAND flash
Minal Shah [Mon, 19 May 2014 09:15:47 +0000 (14:45 +0530)]
ARM: dts: dra7: add support for parallel NAND flash

DRA7xx platform has in-build GPMC and ELM h/w engines which can be used
for accessing externel NAND flash device. This patch:
- adds generic DT binding in dra7.dtsi for enabling GPMC and ELM h/w engines
- adds DT binding for Micron NAND Flash (MT29F2G16AADWP) present on dra7-evm
*Important*
On DRA7 EVM, GPMC_WPN and NAND_BOOTn are controlled by DIP switch
So following board settings are required for NAND device detection:
SW5.9 (GPMC_WPN) = LOW
SW5.1 (NAND_BOOTn) = HIGH

Signed-off-by: Minal Shah <minalkshah@gmail.com>
Signed-off-by: Pekon Gupta <pekon@ti.com>
Reviewed-by: Javier Martinez Canillas <javier@dowhile0.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: dts: am437x-gp-evm: Add ethernet support for GP EVM
Mugunthan V N [Tue, 13 May 2014 08:44:31 +0000 (14:14 +0530)]
ARM: dts: am437x-gp-evm: Add ethernet support for GP EVM

Add CPSW ethernet support for AM437x GP EVM which has one slave pinned out

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: dts: am4372: Add cpsw phy sel dt node
Mugunthan V N [Tue, 13 May 2014 08:44:30 +0000 (14:14 +0530)]
ARM: dts: am4372: Add cpsw phy sel dt node

Add cpsw phy sel device tree node for selecting phy mode in control module

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: OMAP2+: Use pdata quirks for wl12xx on VAR-STK/DVK-OM44
Joachim Eastwood [Mon, 12 May 2014 18:32:03 +0000 (20:32 +0200)]
ARM: OMAP2+: Use pdata quirks for wl12xx on VAR-STK/DVK-OM44

Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: dts: Add VAR-SOM-OM44 WLAN nodes
Joachim Eastwood [Mon, 12 May 2014 18:32:02 +0000 (20:32 +0200)]
ARM: dts: Add VAR-SOM-OM44 WLAN nodes

Both the VAR-STK-OM44 and VAR-DVK-OM44 boards comes with the
WLAN/BT version of the system on module VAR-SOM-OM44.

Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: dts: Add support for OMAP4 VAR-DVK-OM44
Joachim Eastwood [Mon, 12 May 2014 18:32:01 +0000 (20:32 +0200)]
ARM: dts: Add support for OMAP4 VAR-DVK-OM44

Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: dts: Add support for OMAP4 Variscite OM44 family
Joachim Eastwood [Mon, 12 May 2014 18:32:00 +0000 (20:32 +0200)]
ARM: dts: Add support for OMAP4 Variscite OM44 family

Add support for VAR-SOM-OM44[1] SODIMM system on module from
Variscite. SoM features a OMAP4460, 1GB RAM, Gigabit Ethernet
(LAN7500) and optional WLAN/BT.

Also add support for VAR-STK-OM44 development board from
Variscite. This kit features a VAR-SOM-OM44 and the carrier board
VAR-OM44CustomBoard[2]. The VAR-STK-OM44 is the same as
VAR-DVK-OM44 but without the LCD display.

omap4-var-stk-om44.dts replace the old and very limited
omap4-var-som.dts.

[1] http://www.variscite.com/products/system-on-module-som/cortex-a9/var-som-om44-cpu-ti-omap-4-omap4460
[2] http://www.variscite.com/products/single-board-computers/var-om44customboard

Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: dts: Change IOPAD macro's for OMAP4/5
Joachim Eastwood [Mon, 12 May 2014 18:16:27 +0000 (20:16 +0200)]
ARM: dts: Change IOPAD macro's for OMAP4/5

The OMAP4/5 TRMs primarily list address offsets from the padconf
physical address (which is not driver base address) and not
always the absolute physical address for padconf registers like
some other OMAP TRMs. So create a new macro to use this offset
and to avoid confusion between different OMAP parts.

For more information, see the tables in TRM for named something like
"Device Core Control Module Pad Configuration Register Fields"
and "Device Wake-Up Control Module Pad Configuration Register Fields"

Note that we now also have to update cm-t54 for the fixed up
offsets.

Signed-off-by: Joachim Eastwood <manabian@gmail.com>
[tony@atomide.com: updated comments, updated cm-t54]
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoMerge tag 'omap-for-v3.16/board-signed' into omap-for-v3.16/tmp-merge-2014-05-19
Tony Lindgren [Mon, 19 May 2014 22:59:07 +0000 (15:59 -0700)]
Merge tag 'omap-for-v3.16/board-signed' into omap-for-v3.16/tmp-merge-2014-05-19

Board related changes for omaps.

11 years agoMerge tag 'omap-for-v3.16/prcm-signed' into omap-for-v3.16/tmp-merge-2014-05-19
Tony Lindgren [Mon, 19 May 2014 22:59:00 +0000 (15:59 -0700)]
Merge tag 'omap-for-v3.16/prcm-signed' into omap-for-v3.16/tmp-merge-2014-05-19

PRCM changes for omaps. I ended up merging these with the
big endian changes because of the merge conflicts for read
and write operations. Via Paul Walmsley <paul@pwsan.com>:

Some OMAP PRCM cleanup patches.  These help prepare to convert the PRCM
code into drivers.

Basic build, boot, and PM test results are available here:

http://www.pwsan.com/omap/testlogs/prcm-cleanup-v3.16/20140515213244/

11 years agoMerge tag 'omap-for-v3.16/soc-signed' into omap-for-v3.16/tmp-merge-2014-05-19
Tony Lindgren [Mon, 19 May 2014 22:58:54 +0000 (15:58 -0700)]
Merge tag 'omap-for-v3.16/soc-signed' into omap-for-v3.16/tmp-merge-2014-05-19

SoC related changes for omaps.

11 years agoMerge tag 'omap-for-v3.15/fixes-v3-signed' into omap-for-v3.16/tmp-merge-2014-05-19
Tony Lindgren [Mon, 19 May 2014 22:58:48 +0000 (15:58 -0700)]
Merge tag 'omap-for-v3.15/fixes-v3-signed' into omap-for-v3.16/tmp-merge-2014-05-19

Regression fixes for omaps for NAND, DMA, cpu_idle and audio.
Also a minor one line fix for audio clock on 54xx.

11 years agoARM: DRA752: add detection of SoC information omap-for-v3.16/soc-signed
Nishanth Menon [Mon, 19 May 2014 15:27:11 +0000 (10:27 -0500)]
ARM: DRA752: add detection of SoC information

Currently the files in /sys/devices/soc0/ show no information about
DRA7. Few userspace programs do depend on this information to make SoC
specific support. So update logic to detect the relevant information and
provide to userspace.

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: OMAP2+: Remove suspend_set_ops from common pm late init
Dave Gerlach [Mon, 12 May 2014 18:33:21 +0000 (13:33 -0500)]
ARM: OMAP2+: Remove suspend_set_ops from common pm late init

In omap2_common_pm_late_init suspend_set_ops was called to set common
suspend handling functions for all omap platforms. This created two
problems. First, these suspend ops were being set for all platforms,
regardless of whether or not suspend support has been integrated so in
the case of AM33XX, suspend to mem was presented as available but
failed every time. Second, some platforms will need to define a
completely separate set of suspend ops, such as AM33XX, due to
differences from previous omap platforms so there is no need to
always set the common omap ops.

This patch moves the suspend_set_ops call from omap2_common_pm_late_init
into a separate function that then gets called in the omap*_pm_init
functions for each platform.

Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoMerge tag 'omap-for-v3.16/dt-signed' into omap-for-v3.16/tmp-merge-2014-05-19
Tony Lindgren [Mon, 19 May 2014 20:31:48 +0000 (13:31 -0700)]
Merge tag 'omap-for-v3.16/dt-signed' into omap-for-v3.16/tmp-merge-2014-05-19

Device tree related changes for omaps for v3.16 merge window.

Conflicts:
arch/arm/boot/dts/omap3-n900.dts

11 years agoMerge tag 'omap-for-v3.16/be-signed' into omap-for-v3.16/tmp-merge-2014-05-19
Tony Lindgren [Mon, 19 May 2014 20:31:30 +0000 (13:31 -0700)]
Merge tag 'omap-for-v3.16/be-signed' into omap-for-v3.16/tmp-merge-2014-05-19

Trivial big endian changes for omaps to replace __raw_read/write
with relaxed versions. Note that further changes are still needed
to enable big endian support at least for the assembly code. The
assembly changes are still being discussed.

11 years agoMerge tag 'omap-for-v3.16/l3-noc-signed' into omap-for-v3.16/tmp-merge-2014-05-19
Tony Lindgren [Mon, 19 May 2014 20:31:20 +0000 (13:31 -0700)]
Merge tag 'omap-for-v3.16/l3-noc-signed' into omap-for-v3.16/tmp-merge-2014-05-19

Improvments to omap l3-noc bus driver for v3.16 merge window
to add support for am347x and dra7.

11 years agoMerge tag 'omap-for-v3.16/pm-signed' into omap-for-v3.16/tmp-merge-2014-05-19
Tony Lindgren [Mon, 19 May 2014 20:31:13 +0000 (13:31 -0700)]
Merge tag 'omap-for-v3.16/pm-signed' into omap-for-v3.16/tmp-merge-2014-05-19

PM related fixes for omap3 that were discovered during omap3
conversion to device tree. This series sets up the PMIC signaling
in a way where we can test for PM regressions easily by
looking at state of the the sys_clkreq and sys_off_mode pins.

Note that this series alone does not make omap3 PM to cut
off core voltage during off-idle, changes to twl4030-power.c
configurations are still needed. Those will be posted
separately.

11 years agoMerge tag 'omap-for-v3.16/fixes-not-urgent-signed' into omap-for-v3.16/tmp-merge...
Tony Lindgren [Mon, 19 May 2014 20:31:05 +0000 (13:31 -0700)]
Merge tag 'omap-for-v3.16/fixes-not-urgent-signed' into omap-for-v3.16/tmp-merge-2014-05-19

Non urgent omap fixes for v3.16 merge window.

11 years agoARM: OMAP4: Fix the boot regression with CPU_IDLE enabled omap-for-v3.15/fixes-v3-signed
Santosh Shilimkar [Mon, 12 May 2014 21:37:59 +0000 (17:37 -0400)]
ARM: OMAP4: Fix the boot regression with CPU_IDLE enabled

On OMAP4 panda board, there have been several bug reports about boot
hang and lock-ups with CPU_IDLE enabled. The root cause of the issue
is missing interrupts while in idle state. Commit cb7094e8 {cpuidle / omap4 :
use CPUIDLE_FLAG_TIMER_STOP flag} moved the broadcast notifiers to common
code for right reasons but on OMAP4 which suffers from a nasty ROM code
bug with GIC, commit ff999b8a {ARM: OMAP4460: Workaround for ROM bug ..},
we loose interrupts which leads to issues like lock-up, hangs etc.

Patch reverts commit cb7094 {cpuidle / omap4 : use CPUIDLE_FLAG_TIMER_STOP
flag} and 54769d6 {cpuidle: OMAP4: remove timer broadcast initialization} to
avoid the issue. With this change, OMAP4 panda boards, the mentioned
issues are getting fixed. We no longer loose interrupts which was the cause
of the regression.

Fixes: cb7094e8 (cpuidle / omap4 : use CPUIDLE_FLAG_TIMER_STOP flag)
Fixes: ff999b8a (cpuidle: OMAP4: remove timer broadcast initialization)
Cc: stable@vger.kernel.org # v3.9+
Cc: Roger Quadros <rogerq@ti.com>
Cc: Kevin Hilman <khilman@linaro.org>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Reported-tested-by: Roger Quadros <rogerq@ti.com>
Reported-tested-by: Kevin Hilman <khilman@linaro.org>
Tested-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoMerge tag 'for-v3.16/prcm-cleanup-a' of git://git.kernel.org/pub/scm/linux/kernel... omap-for-v3.16/prcm-signed
Tony Lindgren [Fri, 16 May 2014 22:26:22 +0000 (15:26 -0700)]
Merge tag 'for-v3.16/prcm-cleanup-a' of git://git./linux/kernel/git/pjw/omap-pending into omap-for-v3.16/prcm

Some OMAP PRCM cleanup patches.  These help prepare to convert the PRCM
code into drivers.

Basic build, boot, and PM test results are available here:

http://www.pwsan.com/omap/testlogs/prcm-cleanup-v3.16/20140515213244/

Conflicts:
arch/arm/mach-omap2/cm3xxx.c
arch/arm/mach-omap2/cm44xx.c

Also fixed up new section mismatch warnings.

11 years agoARM: OMAP2+: Fix DMA hang after off-idle
Tony Lindgren [Fri, 16 May 2014 21:05:35 +0000 (14:05 -0700)]
ARM: OMAP2+: Fix DMA hang after off-idle

Commit 6ddeb6d84459 (dmaengine: omap-dma: move IRQ handling to omap-dma)
added support for handling interrupts in the omap dmaengine driver
instead of the legacy driver. Because of different handling for
interrupts this however caused omap3 to hang eventually after hitting
off-idle.

Any of the virtual 32 DMA channels can be assigned to any of the
four DMA interrupts. So commit 6ddeb6d84459 made the omap dmaengine
driver to use the second DMA interrupt while keeping the legacy code
still using the first DMA interrupt.

This means we need to save and restore both IRQENABLE_L1 in addition
to IRQENABLE_L0. As there is a chance that the DSP might be using
IRQENABLE_L2 or IRQENABLE_L3 lines, let's not touch those until
this has been confirmed. Let's just add a comment to the code for
now.

Fixes: 6ddeb6d84459 (dmaengine: omap-dma: move IRQ handling to omap-dma)
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: OMAP2+: nand: Fix NAND on OMAP2 and OMAP3 boards
Roger Quadros [Fri, 16 May 2014 21:45:40 +0000 (14:45 -0700)]
ARM: OMAP2+: nand: Fix NAND on OMAP2 and OMAP3 boards

Commit c66d039197e4 broke NAND for non-DT boot on all OMAP2 and OMAP3
boards using board_nand_init(). Following error is seen at boot

[    0.154998]  (null): Unsupported NAND ECC scheme selected

For OMAP2 and OMAP3 platforms, the ecc_opt parameter in platform data
must be set to OMAP_ECC_HAM1_CODE_HW to work properly.

Tested on omap3-beagle c4.

Fixes: c66d039197e4 (mtd: nand: omap: combine different flavours of 1-bit hamming ecc schemes)
Cc: stable@vger.kernel.org # v3.12+
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoMerge tag 'for-v3.15-rc/omap-fixes-b' of git://git.kernel.org/pub/scm/linux/kernel...
Tony Lindgren [Fri, 16 May 2014 21:43:40 +0000 (14:43 -0700)]
Merge tag 'for-v3.15-rc/omap-fixes-b' of git://git./linux/kernel/git/pjw/omap-pending into omap-for-v3.15/fixes-v3

Two small OMAP fixes for v3.15-rc.  One fixes "slow motion" or
"choppy" audio playback on OMAP5.  The other applies an OMAP3630 fix
for clock rate setting for camera to other OMAP3 chips.

Basic build, boot, and PM test results are available here:

http://www.pwsan.com/omap/testlogs/prcm-fixes-b-v3.15-rc/20140514112639/

11 years agoMerge tag 'for-v3.16/hwmod-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw...
Tony Lindgren [Fri, 16 May 2014 21:19:05 +0000 (14:19 -0700)]
Merge tag 'for-v3.16/hwmod-a' of git://git./linux/kernel/git/pjw/omap-pending into omap-for-v3.16/soc

First (and possibly last) set of hwmod data changes for v3.16.  This
set should clean up some obsolete OMAP4 hwmod data, and add OMAP5 DSS
support.

Basic build, boot, and PM logs are available here:

http://www.pwsan.com/omap/testlogs/hwmod-a-v3.16/20140515210013/

11 years agoARM: OMAP: replace checks for CONFIG_USB_GADGET_OMAP omap-for-v3.16/board-signed
Paul Bolle [Fri, 16 May 2014 10:00:57 +0000 (12:00 +0200)]
ARM: OMAP: replace checks for CONFIG_USB_GADGET_OMAP

Commit 193ab2a60700 ("usb: gadget: allow multiple gadgets to be built")
apparently required that checks for CONFIG_USB_GADGET_OMAP would be
replaced with checks for CONFIG_USB_OMAP. Do so now for the remaining
checks for CONFIG_USB_GADGET_OMAP, even though these checks have
basically been broken since v3.1.

And, since we're touching this code, use the IS_ENABLED() macro, so
things will now (hopefully) also work if USB_OMAP is modular.

Fixes: 193ab2a60700 ("usb: gadget: allow multiple gadgets to be built")
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: OMAP: AM3517EVM: remove check for CONFIG_PANEL_SHARP_LQ043T1DG01
Paul Bolle [Thu, 15 May 2014 19:54:52 +0000 (21:54 +0200)]
ARM: OMAP: AM3517EVM: remove check for CONFIG_PANEL_SHARP_LQ043T1DG01

The Kconfig symbol PANEL_SHARP_LQ043T1DG01 was removed in v2.6.38. The
check for CONFIG_PANEL_SHARP_LQ043T1DG01 and its MODULE variant has
evaluated to false ever since. Remove that check.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: OMAP: SX1: remove check for CONFIG_SX1_OLD_FLASH
Paul Bolle [Thu, 15 May 2014 19:41:42 +0000 (21:41 +0200)]
ARM: OMAP: SX1: remove check for CONFIG_SX1_OLD_FLASH

A check for CONFIG_SX1_OLD_FLASH was added in v2.6.24. But the related
Kconfig symbol was never part of the tree. So we can remove some dead
code.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: OMAP: remove some dead code
Paul Bolle [Thu, 15 May 2014 19:16:21 +0000 (21:16 +0200)]
ARM: OMAP: remove some dead code

A check for CONFIG_CBUS_TAHVO_USB was added in v2.6.17. The related
Kconfig symbol has never been part of the tree. Remove that check.

Replace the while (...) loop with a simple if (...) statement, while
we're at it.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Acked-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: OMAP: omap3stalker: remove two Kconfig macros
Paul Bolle [Thu, 15 May 2014 18:37:45 +0000 (20:37 +0200)]
ARM: OMAP: omap3stalker: remove two Kconfig macros

Checks for CONFIG_OMAP2_VENC_OUT_TYPE_SVIDEO and
CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE were added in v2.6.35. But the
related Kconfig symbols have never been added to the tree. Remove these
checks.

Initialize connector_type to OMAP_DSS_VENC_TYPE_COMPOSITE explicitly.
That's what's happening currently: OMAP_DSS_VENC_TYPE_COMPOSITE equals
zero and connector_type remains zero since both checks currently fail.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: dts: set 'ti,set-rate-parent' for dpll4_m5 path
Laurent Pinchart [Mon, 21 Apr 2014 10:41:47 +0000 (12:41 +0200)]
ARM: dts: set 'ti,set-rate-parent' for dpll4_m5 path

Set 'ti,set-rate-parent' property for the dpll4_m5x2_mul_ck clock, which
is used for the ISP functional clock. This fixes the OMAP3 ISP driver's
clock rate configuration, which needs the rate to be propagated properly
to the divider node (dpll4_m5_ck).

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Tero Kristo <t-kristo@ti.com>
11 years agoARM: dts: use ti,fixed-factor-clock for dpll4_m5x2_mul_ck
Laurent Pinchart [Mon, 21 Apr 2014 10:41:46 +0000 (12:41 +0200)]
ARM: dts: use ti,fixed-factor-clock for dpll4_m5x2_mul_ck

We need to use set-rate-parent for dpll4_m5 clock path, so use the
ti,fixed-factor-clock version which supports set-rate-parent property.

The set-rate-parent flag itself is set in the following patch, this one
just changes the clock driver to ti,fixed-factor-clock without any other
changes.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Tero Kristo <t-kristo@ti.com>
11 years agoARM: dts: am43xx-clocks: use ti, fixed-factor-clock for dpll_per_clkdcoldo
Dave Gerlach [Fri, 28 Mar 2014 20:54:31 +0000 (15:54 -0500)]
ARM: dts: am43xx-clocks: use ti, fixed-factor-clock for dpll_per_clkdcoldo

Use the ti,fixed-factor-clock version so that autoidle for
dpll_per_clkdcoldo is properly controlled after power management code
is introduced. Without this the clock may be held active even when
it is gated.

Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
Signed-off-by: Tero Kristo <t-kristo@ti.com>
11 years agoARM: OMAP4: PRCM: remove references to cm-regbits-44xx.h from PRCM core files
Tero Kristo [Mon, 31 Mar 2014 15:15:52 +0000 (18:15 +0300)]
ARM: OMAP4: PRCM: remove references to cm-regbits-44xx.h from PRCM core files

Done in preparation to make PRCM a standalone driver.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
11 years agoARM: OMAP3/4: PRM: add support of late_init call to prm_ll_ops
Tero Kristo [Mon, 31 Mar 2014 15:15:45 +0000 (18:15 +0300)]
ARM: OMAP3/4: PRM: add support of late_init call to prm_ll_ops

SoC specific late_init call is now registered during PRM init, and will
be called automatically by PRM core. This helps to get rid of some
redundant initcalls and cpu_is_X checks from the PRM code.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
11 years agoARM: OMAP3/OMAP4: PRM: add prm_features flags and add IO wakeup under it
Tero Kristo [Mon, 31 Mar 2014 15:15:44 +0000 (18:15 +0300)]
ARM: OMAP3/OMAP4: PRM: add prm_features flags and add IO wakeup under it

prm_features flag will contain SoC specific feature enabler flags. Initially
IO wakeup is added under this. Helps to get rid of runtime cpu_is_X checks.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
11 years agoARM: OMAP3/4: PRM: provide io chain reconfig function through irq setup
Tero Kristo [Mon, 31 Mar 2014 15:15:43 +0000 (18:15 +0300)]
ARM: OMAP3/4: PRM: provide io chain reconfig function through irq setup

This helps to make the PRM registration modular, and also gets rid of a
cpu type check done later.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
11 years agoARM: OMAP2+: PRM: remove unnecessary cpu_is_XXX calls from prm_init / exit
Tero Kristo [Mon, 12 May 2014 01:54:58 +0000 (19:54 -0600)]
ARM: OMAP2+: PRM: remove unnecessary cpu_is_XXX calls from prm_init / exit

Done in preparation to make PRM its own driver, as the cpu_is_XXX calls are
not available outside mach-omap2 folder.

The init functions are called only from cpu specific init chain, and thus
don't need to double check against cpu type.

The exit calls check against the data provided during init-time registration
and thus don't need cpu check either.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
[paul@pwsan.com: updated to apply]
Signed-off-by: Paul Walmsley <paul@pwsan.com>
11 years agoARM: OMAP2+: PRCM: cleanup some header includes
Tero Kristo [Mon, 12 May 2014 01:41:50 +0000 (19:41 -0600)]
ARM: OMAP2+: PRCM: cleanup some header includes

Some of the includes are totally unnecessary, remove some others in
preparation to make the PRCM its own driver.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
[paul@pwsan.com: updated to apply; fixed build error on OMAP2xxx-only configs]
Signed-off-by: Paul Walmsley <paul@pwsan.com>
11 years agoARM: OMAP4: CM: use cm_base* in register address calculations
Tero Kristo [Mon, 31 Mar 2014 15:15:40 +0000 (18:15 +0300)]
ARM: OMAP4: CM: use cm_base* in register address calculations

OMAP44XX_CM*_REGADDR macros should be avoided, instead use the cm_base*
iomaps.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
11 years agoARM: OMAP2/3: CM: remove some external dependencies
Tero Kristo [Tue, 4 Mar 2014 16:19:03 +0000 (18:19 +0200)]
ARM: OMAP2/3: CM: remove some external dependencies

Done in preparation to move the CM driver to its own driver folder.
These drivers will not have access to functionality under mach-omap2 anymore.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
11 years agoARM: OMAP2+: prcm: add omap_test_timeout to prcm-common.h
Tero Kristo [Tue, 4 Mar 2014 16:19:02 +0000 (18:19 +0200)]
ARM: OMAP2+: prcm: add omap_test_timeout to prcm-common.h

Done in preparation to move cm/prm to drivers. These will still use
omap_test_timeout, but will not have access to common.h header under
mach-omap2 anymore.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
11 years agoARM: dts: AM33XX: fix ethernet and mdio default state
Johan Hovold [Thu, 8 May 2014 08:57:36 +0000 (10:57 +0200)]
ARM: dts: AM33XX: fix ethernet and mdio default state

Make sure ethernet and mdio nodes are disabled by default and enable
them explicitly only on boards that actually use them.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: dts: am4372: Add hdq device tree data
Sourav Poddar [Thu, 8 May 2014 06:00:07 +0000 (11:30 +0530)]
ARM: dts: am4372: Add hdq device tree data

Add device tree nodes and pinmux for hdq/1wire on
am43x epos evm.

Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: omap2+: skip device build from platform code for dt
Sourav Poddar [Thu, 8 May 2014 06:00:06 +0000 (11:30 +0530)]
ARM: omap2+: skip device build from platform code for dt

For SOCs with dt enabled, device should be build through device tree.
Prevent device build call from platform code, if device tree is
enabled.

Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agodts: dra7-evm: add USB support
Roger Quadros [Wed, 14 May 2014 07:58:13 +0000 (10:58 +0300)]
dts: dra7-evm: add USB support

Add USB pinmux information and USB modes
for the USB controllers.

CC: Benoît Cousson <bcousson@baylibre.com>
Reviewed-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: dts: dra7: Add USB related nodes
Roger Quadros [Mon, 5 May 2014 09:54:45 +0000 (12:54 +0300)]
ARM: dts: dra7: Add USB related nodes

Add nodes for the Super Speed USB controllers, omap-control-usb,
USB2 PHY and USB3 PHY devices.

Remove ocp2scp1 address space from hwmod data as it is
now provided via device tree.

CC: Benoît Cousson <bcousson@baylibre.com>
Reviewed-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: dts: dra7-clock: Add "l3init_960m_gfclk" clock gate
Roger Quadros [Mon, 5 May 2014 09:54:43 +0000 (12:54 +0300)]
ARM: dts: dra7-clock: Add "l3init_960m_gfclk" clock gate

This clock gate description is missing in the older Reference manuals.
It is present on the SoC to provide 960MHz reference clock to the
internal USB PHYs.

Reference: DRA75x_DRA74x_ES1.1_NDA_TRM_vO.pdf, pg. 900,
Table 3-812. CM_COREAON_L3INIT_60M_GFCLK_CLKCTRL

Use l3init_960m_gfclk as parent of usb_otg_ss1_refclk960m and
usb_otg_ss2_refclk960m.

CC: Benoît Cousson <bcousson@baylibre.com>
Acked-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: dts: omap4+: Add clocks to USB2 PHY node
Roger Quadros [Mon, 5 May 2014 09:54:42 +0000 (12:54 +0300)]
ARM: dts: omap4+: Add clocks to USB2 PHY node

The USB2 PHY driver expects named clocks for wakeup clock
and reference clock. Provide this information for USB2 PHY
nodes in OMAP4 and OMAP5 SoC DTS.

CC: Benoît Cousson <bcousson@baylibre.com>
Reviewed-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: dts: dra7: add OCP2SCP3 and SATA nodes
Balaji T K [Wed, 7 May 2014 11:58:58 +0000 (14:58 +0300)]
ARM: dts: dra7: add OCP2SCP3 and SATA nodes

Add nodes for OCP2SCP3 bus, SATA controller and SATA PHY.

[Roger Q] Clean up. Updated IRQ for interrupt crossbar.

CC: Benoit Cousson <bcousson@baylibre.com>
Signed-off-by: Balaji T K <balajitk@ti.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: dts: omap5: add sata node
Balaji T K [Wed, 23 Apr 2014 17:35:33 +0000 (20:35 +0300)]
ARM: dts: omap5: add sata node

Add support for sata.

[Roger Q] Clean up.

CC: Benoit Cousson <bcousson@baylibre.com>
CC: Tony Lindgren <tony@atomide.com>
Signed-off-by: Balaji T K <balajitk@ti.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: OMAP2+: hwmod: OMAP5 DSS hwmod data
Archit Taneja [Wed, 14 May 2014 18:26:10 +0000 (12:26 -0600)]
ARM: OMAP2+: hwmod: OMAP5 DSS hwmod data

Add hwmod data for dss core, dispc dsi1, dsi2, rfbi and hdmi. It's more
or less similar to omap4 hwmod data.

Signed-off-by: Archit Taneja <archit@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
11 years agoARM: omap4: hwmod_data: Clean up audio related structures (remove/merge them)
Peter Ujfalusi [Wed, 14 May 2014 18:26:10 +0000 (12:26 -0600)]
ARM: omap4: hwmod_data: Clean up audio related structures (remove/merge them)

All audio related omap_hwmod_ocp_if *_dma can be removed from the data since
we can just add the user flag to the non dma structure.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
11 years agoARM: omap5: hwmod_data: Correct IDLEMODE for McPDM
Peter Ujfalusi [Fri, 9 May 2014 08:10:05 +0000 (11:10 +0300)]
ARM: omap5: hwmod_data: Correct IDLEMODE for McPDM

McPDM need to be configured to NO_IDLE mode when it is in used otherwise
vital clocks will be gated which results 'slow motion' audio playback.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: <stable@kernel.org>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
11 years agoARM: OMAP2+: Add support for RNG on DT booted N900
Sebastian Reichel [Mon, 7 Apr 2014 12:28:46 +0000 (14:28 +0200)]
ARM: OMAP2+: Add support for RNG on DT booted N900

Add support for OMAP3 ROM Random Number Generator via
pdata-quirks.

Signed-off-by: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: dts: am335x-evm: fix comments for lcd pins
Wolfram Sang [Fri, 9 May 2014 15:15:50 +0000 (17:15 +0200)]
ARM: dts: am335x-evm: fix comments for lcd pins

In the comments, LCD pins 16-23 were numbered in the wrong order.
Fix this and use proper pinmux constants for all entries while we
are at it.

Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Cc: Benoit Parrot <bparrot@ti.com>
Tested-by: Darren Etheridge <detheridge@ti.com>
[tony@atomide.com: updated description]
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: OMAP3: CM: remove a few OMAP34XX_CM_REGADDR defines
Tero Kristo [Tue, 4 Mar 2014 16:19:01 +0000 (18:19 +0200)]
ARM: OMAP3: CM: remove a few OMAP34XX_CM_REGADDR defines

Remove a few OMAP34XX_CM_REGADDR defines and replace these with offset
based register accesses instead.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
11 years agoLinux 3.15-rc5
Linus Torvalds [Fri, 9 May 2014 20:10:52 +0000 (13:10 -0700)]
Linux 3.15-rc5

11 years agoMerge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Fri, 9 May 2014 19:24:20 +0000 (12:24 -0700)]
Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 fixes from Peter Anvin:
 "A somewhat unpleasantly large collection of small fixes.  The big ones
  are the __visible tree sweep and a fix for 'earlyprintk=efi,keep'.  It
  was using __init functions with predictably suboptimal results.

  Another key fix is a build fix which would produce output that simply
  would not decompress correctly in some configuration, due to the
  existing Makefiles picking up an unfortunate local label and mistaking
  it for the global symbol _end.

  Additional fixes include the handling of 64-bit numbers when setting
  the vdso data page (a latent bug which became manifest when i386
  started exporting a vdso with time functions), a fix to the new MSR
  manipulation accessors which would cause features to not get properly
  unblocked, a build fix for 32-bit userland, and a few new platform
  quirks"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, vdso, time: Cast tv_nsec to u64 for proper shifting in update_vsyscall()
  x86: Fix typo in MSR_IA32_MISC_ENABLE_LIMIT_CPUID macro
  x86: Fix typo preventing msr_set/clear_bit from having an effect
  x86/intel: Add quirk to disable HPET for the Baytrail platform
  x86/hpet: Make boot_hpet_disable extern
  x86-64, build: Fix stack protector Makefile breakage with 32-bit userland
  x86/reboot: Add reboot quirk for Certec BPC600
  asmlinkage: Add explicit __visible to drivers/*, lib/*, kernel/*
  asmlinkage, x86: Add explicit __visible to arch/x86/*
  asmlinkage: Revert "lto: Make asmlinkage __visible"
  x86, build: Don't get confused by local symbols
  x86/efi: earlyprintk=efi,keep fix

11 years agox86, vdso, time: Cast tv_nsec to u64 for proper shifting in update_vsyscall()
Boris Ostrovsky [Fri, 9 May 2014 15:11:27 +0000 (11:11 -0400)]
x86, vdso, time: Cast tv_nsec to u64 for proper shifting in update_vsyscall()

With tk->wall_to_monotonic.tv_nsec being a 32-bit value on 32-bit
systems, (tk->wall_to_monotonic.tv_nsec << tk->shift) in update_vsyscall()
may lose upper bits or, worse, add them since compiler will do this:
(u64)(tk->wall_to_monotonic.tv_nsec << tk->shift)
instead of
((u64)tk->wall_to_monotonic.tv_nsec << tk->shift)

So if, for example, tv_nsec is 0x800000 and shift is 8 we will end up
with 0xffffffff80000000 instead of 0x80000000. And then we are stuck in
the subsequent 'while' loop.

We need an explicit cast.

Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Link: http://lkml.kernel.org/r/1399648287-15178-1-git-send-email-boris.ostrovsky@oracle.com
Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: <stable@vger.kernel.org> # v3.14
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
11 years agox86: Fix typo in MSR_IA32_MISC_ENABLE_LIMIT_CPUID macro
Andres Freund [Fri, 9 May 2014 01:29:17 +0000 (03:29 +0200)]
x86: Fix typo in MSR_IA32_MISC_ENABLE_LIMIT_CPUID macro

The spuriously added semicolon didn't have any effect because the
macro isn't currently in use.

c0a639ad0bc6b178b46996bd1f821a04643e2bde

Signed-off-by: Andres Freund <andres@anarazel.de>
Link: http://lkml.kernel.org/r/1399598957-7011-3-git-send-email-andres@anarazel.de
Cc: Borislav Petkov <bp@suse.de>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
11 years agox86: Fix typo preventing msr_set/clear_bit from having an effect
Andres Freund [Fri, 9 May 2014 01:29:16 +0000 (03:29 +0200)]
x86: Fix typo preventing msr_set/clear_bit from having an effect

Due to a typo the msr accessor function introduced in
22085a66c2fab6cf9b9393c056a3600a6b4735de didn't have any lasting
effects because they accidentally wrote the old value back.

After c0a639ad0bc6b178b46996bd1f821a04643e2bde this at the very least
this causes cpuid limits not to be lifted on some cpus leading to
missing capabilities for those.

Signed-off-by: Andres Freund <andres@anarazel.de>
Link: http://lkml.kernel.org/r/1399598957-7011-2-git-send-email-andres@anarazel.de
Cc: Borislav Petkov <bp@suse.de>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
11 years agoMerge tag 'xfs-for-linus-3.15-rc5' of git://oss.sgi.com/xfs/xfs
Linus Torvalds [Fri, 9 May 2014 02:20:45 +0000 (19:20 -0700)]
Merge tag 'xfs-for-linus-3.15-rc5' of git://oss.sgi.com/xfs/xfs

Pull xfs fixes from Dave Chinner:
 "The main fix is adding support for default ACLs on O_TMPFILE opened
  inodes to bring XFS into line with other filesystems.  Metadata CRCs
  are now also considered well enough tested to be fully supported, so
  we're removing the shouty warnings issued at mount time for
  filesystems with that format.  And there's transaction block
  reservation overrun fix.

  Summary:
   - fix a remote attribute size calculation bug that leads to a
     transaction overrun
   - add default ACLs to O_TMPFILE files
   - Remove the EXPERIMENTAL tag from filesystems with metadata CRC
     support"

* tag 'xfs-for-linus-3.15-rc5' of git://oss.sgi.com/xfs/xfs:
  xfs: remote attribute overwrite causes transaction overrun
  xfs: initialize default acls for ->tmpfile()
  xfs: fully support v5 format filesystems

11 years agoMerge tag 'trace-fixes-v3.15-rc4-v2' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Thu, 8 May 2014 21:17:13 +0000 (14:17 -0700)]
Merge tag 'trace-fixes-v3.15-rc4-v2' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing fixes from Steven Rostedt:
 "This contains two fixes.

  The first is a long standing bug that causes bogus data to show up in
  the refcnt field of the module_refcnt tracepoint.  It was introduced
  by a merge conflict resolution back in 2.6.35-rc days.

  The result should be 'refcnt = incs - decs', but instead it did
  'refcnt = incs + decs'.

  The second fix is to a bug that was introduced in this merge window
  that allowed for a tracepoint funcs pointer to be used after it was
  freed.  Moving the location of where the probes are released solved
  the problem"

* tag 'trace-fixes-v3.15-rc4-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracepoint: Fix use of tracepoint funcs after rcu free
  trace: module: Maintain a valid user count

11 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Linus Torvalds [Thu, 8 May 2014 21:06:45 +0000 (14:06 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

Pull input subsystem fixes from Dmitry Torokhov:
 "Just a few fixups to various drivers"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: elantech - fix touchpad initialization on Gigabyte U2442
  Input: tca8418 - fix loading this driver as a module from a device tree
  Input: bma150 - extend chip detection for bma180
  Input: atkbd - fix keyboard not working on some LG laptops
  Input: synaptics - add min/max quirk for ThinkPad Edge E431

11 years agoMerge tag 'sound-3.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
Linus Torvalds [Thu, 8 May 2014 20:51:53 +0000 (13:51 -0700)]
Merge tag 'sound-3.15-rc5' of git://git./linux/kernel/git/tiwai/sound

Pull sound fixes from Takashi Iwai:
 "A bunch of small fixes for USB-audio and HD-audio, where most of them
  are for regressions: USB-audio PM fixes, ratelimit annoyance fix, HDMI
  offline state fix, and a couple of device-specific quirks"

* tag 'sound-3.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - hdmi: Set converter channel count even without sink
  ALSA: usb-audio: work around corrupted TEAC UD-H01 feedback data
  ALSA: usb-audio: Fix deadlocks at resuming
  ALSA: usb-audio: Save mixer status only once at suspend
  ALSA: usb-audio: Prevent printk ratelimiting from spamming kernel log while DEBUG not defined
  ALSA: hda - add headset mic detect quirk for a Dell laptop

11 years agoMerge tag 'mfd-mmc-fixes-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Thu, 8 May 2014 19:41:14 +0000 (12:41 -0700)]
Merge tag 'mfd-mmc-fixes-3.15-rc4' of git://git./linux/kernel/git/lee/mfd

Pull mmc/rtsx revert from Lee Jones.

* tag 'mfd-mmc-fixes-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
  mmc: rtsx: Revert "mmc: rtsx: add support for pre_req and post_req"

11 years agoMerge branch 'pull/l3noc/dts-fixes' of https://github.com/nmenon/linux-2.6-playground... omap-for-v3.16/fixes-not-urgent-signed
Tony Lindgren [Thu, 8 May 2014 15:02:57 +0000 (08:02 -0700)]
Merge branch 'pull/l3noc/dts-fixes' of https://github.com/nmenon/linux-2.6-playground into omap-for-v3.16/fixes-not-urgent

11 years agoARM: OMAP: debug-leds: raw read and write endian fix omap-for-v3.16/be-signed
Victor Kamensky [Tue, 15 Apr 2014 17:37:49 +0000 (20:37 +0300)]
ARM: OMAP: debug-leds: raw read and write endian fix

All OMAP IP blocks expect LE data, but CPU may operate in BE mode.
Need to use endian neutral functions to read/write h/w registers.
I.e instead of __raw_read[lw] and __raw_write[lw] functions code
need to use read[lw]_relaxed and write[lw]_relaxed functions.
If the first simply reads/writes register, the second will byteswap
it if host operates in BE mode.

Changes are trivial sed like replacement of __raw_xxx functions
with xxx_relaxed variant.

Signed-off-by: Victor Kamensky <victor.kamensky@linaro.org>
Signed-off-by: Taras Kondratiuk <taras.kondratiuk@linaro.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: OMAP: counter-32k: raw read and write endian fix
Victor Kamensky [Tue, 15 Apr 2014 17:37:48 +0000 (20:37 +0300)]
ARM: OMAP: counter-32k: raw read and write endian fix

All OMAP IP blocks expect LE data, but CPU may operate in BE mode.
Need to use endian neutral functions to read/write h/w registers.
I.e instead of __raw_read[lw] and __raw_write[lw] functions code
need to use read[lw]_relaxed and write[lw]_relaxed functions.
If the first simply reads/writes register, the second will byteswap
it if host operates in BE mode.

Changes are trivial sed like replacement of __raw_xxx functions
with xxx_relaxed variant.

Signed-off-by: Victor Kamensky <victor.kamensky@linaro.org>
Signed-off-by: Taras Kondratiuk <taras.kondratiuk@linaro.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
11 years agoARM: OMAP: dmtimer: raw read and write endian fix
Victor Kamensky [Tue, 15 Apr 2014 17:37:47 +0000 (20:37 +0300)]
ARM: OMAP: dmtimer: raw read and write endian fix

All OMAP IP blocks expect LE data, but CPU may operate in BE mode.
Need to use endian neutral functions to read/write h/w registers.
I.e instead of __raw_read[lw] and __raw_write[lw] functions code
need to use read[lw]_relaxed and write[lw]_relaxed functions.
If the first simply reads/writes register, the second will byteswap
it if host operates in BE mode.

Changes are trivial sed like replacement of __raw_xxx functions
with xxx_relaxed variant.

Signed-off-by: Victor Kamensky <victor.kamensky@linaro.org>
Signed-off-by: Taras Kondratiuk <taras.kondratiuk@linaro.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>