]> git.karo-electronics.de Git - linux-beck.git/log
linux-beck.git
10 years agoMerge branch '3.15/dss-dt-dts' into 3.15/fbdev
Tomi Valkeinen [Thu, 20 Mar 2014 06:18:27 +0000 (08:18 +0200)]
Merge branch '3.15/dss-dt-dts' into 3.15/fbdev

OMAP DSS related .dts changes

10 years agoMerge branch '3.15/dss-dt' into 3.15/fbdev
Tomi Valkeinen [Thu, 20 Mar 2014 06:09:19 +0000 (08:09 +0200)]
Merge branch '3.15/dss-dt' into 3.15/fbdev

Merge OMAP DSS DT support

10 years agoVideo: atmel: avoid the id of fix screen info is overwritten
Bo Shen [Wed, 19 Mar 2014 07:47:55 +0000 (15:47 +0800)]
Video: atmel: avoid the id of fix screen info is overwritten

Correct passing parameter sequence, which will avoid the id of
fix screen info is overwritten.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
10 years agoDoc/DT: Add DT binding documentation for tpd12s015 encoder
Tomi Valkeinen [Tue, 21 Jan 2014 09:17:09 +0000 (11:17 +0200)]
Doc/DT: Add DT binding documentation for tpd12s015 encoder

Add DT binding documentation for tpd12s015 encoder

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
10 years agoDoc/DT: Add DT binding documentation for TFP410 encoder
Tomi Valkeinen [Tue, 21 Jan 2014 09:17:09 +0000 (11:17 +0200)]
Doc/DT: Add DT binding documentation for TFP410 encoder

Add DT binding documentation for TFP410 encoder

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
10 years agoDoc/DT: Add DT binding documentation for Sony acx565akm panel
Tomi Valkeinen [Tue, 21 Jan 2014 09:17:09 +0000 (11:17 +0200)]
Doc/DT: Add DT binding documentation for Sony acx565akm panel

Add DT binding documentation for Sony acx565akm panel

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Sebastian Reichel <sre@debian.org>
Reviewed-by: Archit Taneja <archit@ti.com>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
10 years agoDoc/DT: Add DT binding documentation for MIPI DSI CM Panel
Tomi Valkeinen [Tue, 21 Jan 2014 09:17:08 +0000 (11:17 +0200)]
Doc/DT: Add DT binding documentation for MIPI DSI CM Panel

Add DT binding documentation for MIPI DSI Command Mode Panel.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
10 years agoDoc/DT: Add DT binding documentation for HDMI Connector
Tomi Valkeinen [Tue, 21 Jan 2014 09:17:08 +0000 (11:17 +0200)]
Doc/DT: Add DT binding documentation for HDMI Connector

Add DT binding documentation for HDMI Connector.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
10 years agoDoc/DT: Add DT binding documentation for DVI Connector
Tomi Valkeinen [Tue, 21 Jan 2014 09:17:08 +0000 (11:17 +0200)]
Doc/DT: Add DT binding documentation for DVI Connector

Add DT binding documentation for DVI Connector.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
10 years agoDoc/DT: Add DT binding documentation for Analog TV Connector
Tomi Valkeinen [Tue, 21 Jan 2014 09:17:08 +0000 (11:17 +0200)]
Doc/DT: Add DT binding documentation for Analog TV Connector

Add DT binding documentation for Analog TV Connector.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
10 years agoARM: omap3-n900.dts: add display information
Tomi Valkeinen [Tue, 17 Dec 2013 07:33:33 +0000 (09:33 +0200)]
ARM: omap3-n900.dts: add display information

Add DT data for OMAP3 N900 board. The board has the following displays:

lcd: LCD panel connected to OMAP's SDI output
tv: analog svideo

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Tested-by: Sebastian Reichel <sre@debian.org>
Acked-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: omap3-igep0020.dts: add display information
Javier Martinez Canillas [Fri, 6 Dec 2013 01:53:38 +0000 (02:53 +0100)]
ARM: omap3-igep0020.dts: add display information

Add DT data for OMAP3 IGEPv2 board. The board has the following displays:

dvi: uses TFP410 encoder to convert DPI to DVI

Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: omap3-beagle-xm.dts: add display information
Tomi Valkeinen [Fri, 20 Sep 2013 07:43:51 +0000 (10:43 +0300)]
ARM: omap3-beagle-xm.dts: add display information

Add DT data for OMAP3 Beagle-xM board. The board has the following displays:

dvi: uses TFP410 encoder to convert DPI to DVI
tv: analog svideo

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: omap3-beagle.dts: add display information
Tomi Valkeinen [Fri, 22 Mar 2013 08:48:36 +0000 (10:48 +0200)]
ARM: omap3-beagle.dts: add display information

Add DT data for OMAP3 Beagle board. The board has the following displays:

dvi: uses TFP410 encoder to convert DPI to DVI
tv: analog svideo

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: omap4-sdp.dts: add display information
Tomi Valkeinen [Mon, 20 Aug 2012 14:07:31 +0000 (17:07 +0300)]
ARM: omap4-sdp.dts: add display information

Add DT data for OMAP4 SDP board. The board has the following displays:

lcd0: a command mode DSI panel connected to OMAP DSI1 encoder
lcd1: a command mode DSI panel connected to OMAP DSI2 encoder
hdmi: OMAP HDMI output with TPD12S015 ESD/level shifter

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
10 years agoDoc/DT: Add DT binding documentation for OMAP DSS
Tomi Valkeinen [Tue, 21 Jan 2014 09:12:12 +0000 (11:12 +0200)]
Doc/DT: Add DT binding documentation for OMAP DSS

Add device tree bindings for OMAP Display Subsystem for the following
SoCs: OMAP2, OMAP3, OMAP4.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
10 years agoOMAPDSS: acx565akm: Add DT support
Sebastian Reichel [Fri, 13 Dec 2013 18:17:28 +0000 (19:17 +0100)]
OMAPDSS: acx565akm: Add DT support

Add DT support for panel-sony-acx565akm

Signed-off-by: Sebastian Reichel <sre@debian.org>
[tomi.valkeinen@ti.com: some modifications]
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
10 years agoOMAPDSS: connector-analog-tv: Add DT support
Tomi Valkeinen [Wed, 29 May 2013 12:34:06 +0000 (15:34 +0300)]
OMAPDSS: connector-analog-tv: Add DT support

Add DT support for connector-analog-tv.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
10 years agoOMAPDSS: hdmi-connector: Add DT support
Tomi Valkeinen [Tue, 30 Jul 2013 07:37:34 +0000 (10:37 +0300)]
OMAPDSS: hdmi-connector: Add DT support

Add DT support for hdmi-connector.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
10 years agoOMAPDSS: encoder-tpd12s015: Add DT support
Tomi Valkeinen [Tue, 30 Jul 2013 07:37:17 +0000 (10:37 +0300)]
OMAPDSS: encoder-tpd12s015: Add DT support

Add DT support for encoder-tpd12s015.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
10 years agoOMAPDSS: connector-dvi: Add DT support
Tomi Valkeinen [Tue, 30 Jul 2013 07:36:29 +0000 (10:36 +0300)]
OMAPDSS: connector-dvi: Add DT support

Add DT support for connector-dvi.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
10 years agoOMAPDSS: encoder-tfp410: Add DT support
Tomi Valkeinen [Tue, 30 Jul 2013 07:35:30 +0000 (10:35 +0300)]
OMAPDSS: encoder-tfp410: Add DT support

Add DT support for encoder-tfp410.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
10 years agoOMAPDSS: panel-dsi-cm: Add DT support
Tomi Valkeinen [Tue, 30 Jul 2013 07:34:16 +0000 (10:34 +0300)]
OMAPDSS: panel-dsi-cm: Add DT support

Add DT support for panel-dsi-cm.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
10 years agoOMAPDSS: Add DT support to DSI
Tomi Valkeinen [Tue, 21 Aug 2012 12:35:42 +0000 (15:35 +0300)]
OMAPDSS: Add DT support to DSI

Add the code to make the DSI driver work with device tree on OMAP3 and
OMAP4.

A minor hack is needed at the moment in the DSI driver: the DSS driver
needs to know the ID number of a DSI device, as clocks are routed in
different ways to the DSI devices. At the moment we don't have any
proper way to manage this, so this patchs adds a simple lookup table
that is used to deduce the ID from the DSI device's base address.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
10 years agoOMAPDSS: Add DT support to VENC
Tomi Valkeinen [Mon, 16 Dec 2013 13:14:15 +0000 (15:14 +0200)]
OMAPDSS: Add DT support to VENC

Add DT support to VENC.

In contrast to non-DT version, the DT version gets the invert-polarity
and connector type via venc's endpoint, not from the connector.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
10 years agoOMAPDSS: Add DT support to HDMI
Tomi Valkeinen [Mon, 16 Dec 2013 13:14:04 +0000 (15:14 +0200)]
OMAPDSS: Add DT support to HDMI

Add DT support to HDMI driver. The only thing needed for DT support here
is the of_match_table.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
10 years agoOMAPDSS: Add DT support to DISPC
Tomi Valkeinen [Tue, 17 Dec 2013 09:54:02 +0000 (11:54 +0200)]
OMAPDSS: Add DT support to DISPC

Add DT support to DISPC. Only thing needed here is the of_match_table.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
10 years agoOMAPDSS: Add DT support to DSS
Tomi Valkeinen [Mon, 16 Dec 2013 13:13:24 +0000 (15:13 +0200)]
OMAPDSS: Add DT support to DSS

Add DT support for DSS. Contrary to the non-DT version, the DSS in DT
mode contains DPI and SDI outputs, which better reflects the hardware.
The non-DT code will be removed after all boards have been converted to
DT, so there's no need to change the non-DT code to act the same way.

The code for DPI and SDI needs to be refined later to make it possible
to add multiple DPI ports. For now, handling just a single DPI port is
enough for all the boards.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
10 years agoOMAPDSS: Improve regulator names for DT
Tomi Valkeinen [Thu, 2 Jan 2014 10:54:31 +0000 (12:54 +0200)]
OMAPDSS: Improve regulator names for DT

The regulator names used for DSS components are somewhat ugly for DT
use. As we're just adding DT support, it's simple to change the
regulator names.

This patch makes the DSS driver get the regulators with somewhat cleaner
names when bootin with DT. For example, this allows us to define HDMI's
VDDA regulator in the DT data as:

vdda-supply = <...>;

instead of

vdda_hdmi_dac-supply = <...>;

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
10 years agoOMAPDSS: add of helpers
Tomi Valkeinen [Tue, 3 Dec 2013 14:57:40 +0000 (16:57 +0200)]
OMAPDSS: add of helpers

Add helpers to get ports and endpoints from DT data.

These helpers parse v4l2 style ports and endpoints, but compared to the
v4l2 helpers, these allow iterating ports and endpoints separately.

This is a temporary solution until we get generic code to parse the
ports and endpoints.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
10 years agoOMAPFB: search for default display with DT alias
Tomi Valkeinen [Tue, 6 Aug 2013 06:50:52 +0000 (09:50 +0300)]
OMAPFB: search for default display with DT alias

Improve the search for the default display in two ways:
* compare the given display name to the display's alias
* if no display name is given, look for "display0" DT alias

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
10 years agoOMAPFB: clean up default display search
Tomi Valkeinen [Tue, 30 Jul 2013 07:59:16 +0000 (10:59 +0300)]
OMAPFB: clean up default display search

Separate the code for finding the default display into a function for
clarity and to make it easier to extend it in the future.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
10 years agoOMAPDSS: get dssdev->alias from DT alias
Tomi Valkeinen [Tue, 6 Aug 2013 06:50:22 +0000 (09:50 +0300)]
OMAPDSS: get dssdev->alias from DT alias

We currently create a "displayX" style alias name for all displays,
using a number that is incremented for each registered display. With the
new DSS device model there is no clear order in which the displays are
registered, and thus the numbering is somewhat random.

This patch improves the behavior for DT case so that if the displays
have been assigned DT aliases, those aliases will be used as DSS
aliases.

This means that "display0" is always the one specified in the DT alias,
and thus display0 can be used as default display in case the user didn't
specify a default display.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
10 years agoOMAPDSS: add 'label' support for DT
Tomi Valkeinen [Tue, 6 Aug 2013 06:41:32 +0000 (09:41 +0300)]
OMAPDSS: add 'label' support for DT

Add support to get the label (i.e. a "nickname") for a display from the
DT data. If there is no label defined, use the display's alias (e.g.
'display0') as a name.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
10 years agoARM: OMAP2+: DT 'compatible' tweak for displays
Tomi Valkeinen [Thu, 19 Dec 2013 10:34:19 +0000 (12:34 +0200)]
ARM: OMAP2+: DT 'compatible' tweak for displays

As there is no common panel framework in the kernel, we have OMAP
specific panel drivers. However, the DT data should be generic. This
brings the issue that some other platform could use the same panels, and
would need to create a driver with the same 'compatible' string as the
OMAP driver.

In the long run, we have to get a common panel framework. For the time
being, this patch solves the issue:

At early boot time, we go through the DT nodes looking for the panels
the kernel supports for OMAP. For each found node, the 'compatible'
string is prepended with "omapdss,", i.e. "sony,acx565akm" becomes
"omapdss,sony,acx565akm". The OMAP display drivers all have "omapdss,"
at the beginning of their compatible field.

This allows us to have generic DT data, but OMAP specific display
drivers.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: OMAP2+: add omapdss_init_of()
Tomi Valkeinen [Mon, 18 Mar 2013 13:50:25 +0000 (15:50 +0200)]
ARM: OMAP2+: add omapdss_init_of()

The OMAP display architecture requires a bunch of platform devices which
are not created via .dts (for now). We also need to pass a few function
pointers and the DSS hardware version from the arch code to omapdss
driver.

This patch adds omapdss_init_of() function, called from board-generic at
init time, which handles those tasks.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: omap4-panda.dts: add display information
Tomi Valkeinen [Mon, 20 Aug 2012 14:07:23 +0000 (17:07 +0300)]
ARM: omap4-panda.dts: add display information

Add DT data for OMAP4 Pandaboard. The board has the following displays:

dvi: uses TFP410 encoder to convert DPI to DVI
hdmi: OMAP HDMI output with TPD12S015 ESD/level shifter

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: omap4.dtsi: add omapdss information
Tomi Valkeinen [Tue, 21 Aug 2012 12:34:50 +0000 (15:34 +0300)]
ARM: omap4.dtsi: add omapdss information

Add DT data for OMAP4 display subsystem, which contains the following
blocks:

dss - the wrapper/glue for the display modules
dispc - display controller
dsi - MIPI DSI encoder (two independent modules)
rfbi - MIPI DBI encoder
venc - analog TV encoder
hdmi - HDMI encoder

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: omap3.dtsi: add omapdss information
Tomi Valkeinen [Tue, 19 Mar 2013 09:38:13 +0000 (11:38 +0200)]
ARM: omap3.dtsi: add omapdss information

Add DT data for OMAP3 display subsystem, which contains the following
blocks:

dss - the wrapper/glue for the display modules
dispc - display controller
dsi - MIPI DSI encoder
rfbi - MIPI DBI encoder
venc - analog TV encoder

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: omap2.dtsi: add omapdss information
Tomi Valkeinen [Wed, 18 Dec 2013 08:22:07 +0000 (10:22 +0200)]
ARM: omap2.dtsi: add omapdss information

Add DT data for OMAP2 display subsystem, which contains the following
blocks:

dss - the wrapper/glue for the display modules
dispc - display controller
rfbi - MIPI DBI encoder
venc - analog TV encoder

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: dts: set 'ti,set-rate-parent' for dpll4_m4 path
Tomi Valkeinen [Thu, 13 Feb 2014 09:15:06 +0000 (11:15 +0200)]
ARM: dts: set 'ti,set-rate-parent' for dpll4_m4 path

Set 'ti,set-rate-parent' property for clocks in the dpll4_m4 clock
path, which is used for DSS functional clock. This fixes DSS driver's
clock rate configuration, which needs the rate to be propagated properly
to the divider node (dpll4_m4_ck).

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Tested-by: Christoph Fritz <chf.fritz@googlemail.com>
Tested-by: Marek Belisko <marek@goldelico.com>
Acked-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: dts: use ti,fixed-factor-clock for dpll4_m4x2_mul_ck
Tomi Valkeinen [Thu, 13 Feb 2014 09:14:58 +0000 (11:14 +0200)]
ARM: dts: use ti,fixed-factor-clock for dpll4_m4x2_mul_ck

We need to use set-rate-parent for dpll4_m4 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: Tomi Valkeinen <tomi.valkeinen@ti.com>
Tested-by: Christoph Fritz <chf.fritz@googlemail.com>
Tested-by: Marek Belisko <marek@goldelico.com>
Acked-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: dts: fix DPLL4 x2 clkouts on 3630
Tomi Valkeinen [Thu, 13 Feb 2014 08:58:32 +0000 (10:58 +0200)]
ARM: dts: fix DPLL4 x2 clkouts on 3630

OMAP3630 DPLL4 is different than on OMAP3430, in that it doesn't have
the x2 multiplier for its outputs. This is not currently reflected in
the clock DT data.

Fix the issue by setting the clock multiplier to 1 (instead of 2) for the
DPLL4 output clocks.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Tested-by: Christoph Fritz <chf.fritz@googlemail.com>
Tested-by: Marek Belisko <marek@goldelico.com>
Acked-by: Tero Kristo <t-kristo@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: dts: fix omap3 dss clock handle names
Tomi Valkeinen [Wed, 12 Feb 2014 13:45:57 +0000 (15:45 +0200)]
ARM: dts: fix omap3 dss clock handle names

The DSS fclk and iclk handles are named differently on OMAP3430 ES1 than
on later OMAP revisions. The ES1 has handles 'dss1_alwon_fck_3430es1'
and 'dss_ick_3430es1', whereas later revisions have similar names but
ending with 'es2'.

This means we don't have one clock handle to which we could refer to
when defining the DSS clocks.

However, as the namespaces are separate for ES1 and ES2+ OMAPs, we can
just rename the handles to 'dss1_alwon_fck' and 'dss_ick' for both ES1
and ES2+, removing the issue.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Tested-by: Christoph Fritz <chf.fritz@googlemail.com>
Tested-by: Marek Belisko <marek@goldelico.com>
Acked-by: Tero Kristo <t-kristo@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
10 years agovideo: imxfb: Add DT default contrast control register property.
Denis Carikli [Fri, 14 Mar 2014 10:55:52 +0000 (11:55 +0100)]
video: imxfb: Add DT default contrast control register property.

Signed-off-by: Denis Carikli <denis@eukrea.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Grant Likely <grant.likely@linaro.org>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
10 years agoARM: dts: Add MMC2/SDIO/WLAN support for cm-t3530
Stefan Roese [Wed, 12 Mar 2014 10:49:12 +0000 (11:49 +0100)]
ARM: dts: Add MMC2/SDIO/WLAN support for cm-t3530

Add support for the MMC2/SDIO WiFi Libertas (Marvell) module available
on the CM-T3530 SOM.

Cc: Dmitry Lifshitz <lifshitz@compulab.co.il>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Stefan Roese <sr@denx.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: dts: am335x-evmsk: enable DMA controller for USB
Yegor Yefremov [Mon, 10 Mar 2014 15:26:57 +0000 (16:26 +0100)]
ARM: dts: am335x-evmsk: enable DMA controller for USB

Enable DMA controller for USB

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: dts: OMAP5: Add IOMMU nodes
Suman Anna [Thu, 6 Mar 2014 00:24:19 +0000 (18:24 -0600)]
ARM: dts: OMAP5: Add IOMMU nodes

The IOMMU DT nodes have been added for the DSP and IPU
subsystems. The MMUs in OMAP5 are identical to those in
OMAP4, including the bus error back capability on IPU.

Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: dts: OMAP4: Add IOMMU nodes
Florian Vaussard [Thu, 6 Mar 2014 00:24:18 +0000 (18:24 -0600)]
ARM: dts: OMAP4: Add IOMMU nodes

Add the IOMMU nodes for the DSP and IPU subsystems. The MMU
within the IPU sub-system also supports a bus error back
capability, not available on the DSP MMU.

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
[s-anna@ti.com: IPU bus error back addition]
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: dts: OMAP3: Add IVA IOMMU node
Florian Vaussard [Thu, 6 Mar 2014 00:24:17 +0000 (18:24 -0600)]
ARM: dts: OMAP3: Add IVA IOMMU node

Add the DT node for the IOMMU within the DSP subsystem. The entry
is disabled to keep in line with the hwmod usage as intended by
the deprecated CONFIG_OMAP_IOMMU_IVA2 flag.

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
[s-anna@ti.com: split the entry and disable the node]
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: dts: OMAP3: Update ISP IOMMU node
Florian Vaussard [Thu, 6 Mar 2014 00:24:16 +0000 (18:24 -0600)]
ARM: dts: OMAP3: Update ISP IOMMU node

Update the IOMMU node for the camera subsystem as per the
OMAP IOMMU bindings.

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
[s-anna@ti.com: corrected interrupt number]
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: OMAP2+: extend iommu pdata-quirks to OMAP5
Suman Anna [Thu, 6 Mar 2014 00:24:15 +0000 (18:24 -0600)]
ARM: OMAP2+: extend iommu pdata-quirks to OMAP5

OMAP5 has the same iommus as OMAP4, so extend the OMAP4
iommu pdata quirks for OMAP5 as well.

Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: OMAP5: hwmod data: add mmu data for ipu & dsp
Suman Anna [Thu, 6 Mar 2014 00:24:14 +0000 (18:24 -0600)]
ARM: OMAP5: hwmod data: add mmu data for ipu & dsp

A new MMU hwmod class and data structures are created
to represent the MMUs within the IPU and DSP processor
subsystems in OMAP5. The MMUs in OMAP5 are identical to
those in OMAP4.

Cc: Benoit Cousson <bcousson@baylibre.com>
Signed-off-by: Suman Anna <s-anna@ti.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: OMAP2+: use pdata quirks for iommu reset lines
Suman Anna [Thu, 6 Mar 2014 00:24:13 +0000 (18:24 -0600)]
ARM: OMAP2+: use pdata quirks for iommu reset lines

The OMAP iommu driver performs the reset management for the
iommu instances in processor sub-systems using the omap_device
API which are currently supplied as platform data ops. Use pdata
quirks to maintain the functionality as the OMAP iommu driver
gets converted to use DT nodes, until the reset portions are
decoupled from omap_hwmod/omap_device into a separate reset
driver.

This patch adds the pdata quirks for the reset management of
iommus within the DSP (OMAP3 & OMAP4) and IPU subsystems (OMAP4).

Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: OMAP2+: change the ISP device archdata MMU name for DT
Suman Anna [Thu, 6 Mar 2014 00:24:12 +0000 (18:24 -0600)]
ARM: OMAP2+: change the ISP device archdata MMU name for DT

The IOMMU DT adaptation support uses the device name instead
of an iommu object name. Fixup the ISP device archdata MMU
name at runtime if using DT-boot. This allows the OMAP3 camera
to be functional in both legacy and DT boots. The iommu object
names should eventually vanish when all the IOMMU users have
been converted to DT nodes.

Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: OMAP3: fix iva mmu programming issues
Suman Anna [Thu, 6 Mar 2014 00:24:11 +0000 (18:24 -0600)]
ARM: OMAP3: fix iva mmu programming issues

The IVA MMU is not functional when used through the hwmod and
omap_device layers. Add fixes to clockdomain and hwmod data
to have it functional. The hwmod changes are needed to enable
the clock, and the SWSUP change is needed to wakeup the domain
because the power domain is programmed to be in RET, and there
is no automatic power domain switching to ON.

Signed-off-by: Suman Anna <s-anna@ti.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: OMAP3: remove deprecated CONFIG_OMAP_IOMMU_IVA2
Florian Vaussard [Thu, 6 Mar 2014 00:24:10 +0000 (18:24 -0600)]
ARM: OMAP3: remove deprecated CONFIG_OMAP_IOMMU_IVA2

CONFIG_OMAP_IOMMU_IVA2 was defined originally to avoid conflicting
usage by tidspbridge and other iommu users. The same can be achieved
by marking the DT node disabled, so remove this obsolete flag and
the corresponding hwmod data can be enabled.

Cc: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
[s-anna@ti.com: revise commit log]
Signed-off-by: Suman Anna <s-anna@ti.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agovideo: atmel_lcdfb: ensure the hardware is initialized with the correct mode
Antoine Ténart [Fri, 7 Mar 2014 16:20:54 +0000 (17:20 +0100)]
video: atmel_lcdfb: ensure the hardware is initialized with the correct mode

If no driver takeover the atmel_lcdfb, the lcd won't be in a working state
since atmel_lcdfb_set_par() will never be called. Enabling a driver which does,
like fbcon, will call the function and put atmel_lcdfb in a working state.

Fixes: b985172b328a (video: atmel_lcdfb: add device tree suport)
Signed-off-by: Antoine Ténart <antoine.tenart@free-electrons.com>
Reported-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
10 years agofbdev: vesafb: add dev->remove() callback
David Herrmann [Thu, 23 Jan 2014 14:14:56 +0000 (15:14 +0100)]
fbdev: vesafb: add dev->remove() callback

If x86-sysfb platform-devices are removed from a system, we should
properly unload vesafb. Otherwise, we end up releasing the parent while
our vesa framebuffer is still running. This currently works just fine, but
will cause problems on handover to real hw. So add the ->remove() callback
and unregister vesafb.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
10 years agofbdev: efifb: add dev->remove() callback
David Herrmann [Thu, 23 Jan 2014 14:14:55 +0000 (15:14 +0100)]
fbdev: efifb: add dev->remove() callback

If x86-sysfb platform-devices are removed from a system, we should
properly unload efifb. Otherwise, we end up releasing the parent while our
efi framebuffer is still running. This currently works just fine, but will
cause problems on handover to real hw. So add the ->remove() callback and
unregister efifb.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
10 years agovideo: pxa3xx-gcu: switch to devres functions
Daniel Mack [Wed, 5 Mar 2014 16:12:49 +0000 (17:12 +0100)]
video: pxa3xx-gcu: switch to devres functions

Switch to devres allocators to clean up the error unwinding paths.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
10 years agovideo: pxa3xx-gcu: provide an empty .open call
Daniel Mack [Wed, 5 Mar 2014 16:12:48 +0000 (17:12 +0100)]
video: pxa3xx-gcu: provide an empty .open call

This is necessary in order to make the core set file->private_data to
miscdev in use. We need that information later to dereference the
container of the device, so we can get access to our private struct from
other callbacks.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
10 years agovideo: pxa3xx-gcu: pass around struct device *
Daniel Mack [Wed, 5 Mar 2014 16:12:47 +0000 (17:12 +0100)]
video: pxa3xx-gcu: pass around struct device *

Instead of passing around struct platform_device, use struct device.
That saves one level of dereference. Also, call platform devices pdev,
and provide a shortcut for &pdev->dev.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
10 years agovideo: pxa3xx-gcu: rename some symbols
Daniel Mack [Wed, 5 Mar 2014 16:12:46 +0000 (17:12 +0100)]
video: pxa3xx-gcu: rename some symbols

Prefix some functions with more specific names. While at it, kill some
stray newlines and other coding style related minor things.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
10 years agosisfb: fix 1280x720 resolution support
Dan Carpenter [Fri, 7 Mar 2014 11:18:53 +0000 (14:18 +0300)]
sisfb: fix 1280x720 resolution support

It uses the wrong mode index because there is no break statement.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
10 years agovideo: fbdev: uvesafb: Remove impossible code path in uvesafb_init_info
Wang YanQing [Wed, 5 Mar 2014 15:56:19 +0000 (23:56 +0800)]
video: fbdev: uvesafb: Remove impossible code path in uvesafb_init_info

Because uvesafb_vbe_init will fail when get zero avaiable modes,
and we have checked the return value of uvesafb_vbe_init_mode,
so it is impossible to pass NULL as mode into uvesafb_init_info.

[ This patch fix warning report by fengguang.wu@intel.com
  "drivers/video/fbdev/uvesafb.c:1509 uvesafb_init_info()
   error: we previously assumed 'mode' could be null" ]

Signed-off-by: Wang YanQing <udknight@gmail.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
10 years agovideo: fbdev: uvesafb: Remove redundant NULL check in uvesafb_remove
Wang YanQing [Wed, 5 Mar 2014 15:54:18 +0000 (23:54 +0800)]
video: fbdev: uvesafb: Remove redundant NULL check in uvesafb_remove

Because uvesafb_par is allocated as part of fb_info in uvesafb_probe,
so we don't need to do NULL check for both fb_info and uvesafb_par in
uvesafb_remove.

[ This patch also fix a warning report by fengguang.wu@intel.com
  "drivers/video/fbdev/uvesafb.c:1815 uvesafb_remove()
   warn: variable dereferenced before check 'par'" ]

Signed-off-by: Wang YanQing <udknight@gmail.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
10 years agoARM: dts: am335x-evmsk: enable dual_emac mode
Yegor Yefremov [Wed, 5 Mar 2014 07:29:19 +0000 (08:29 +0100)]
ARM: dts: am335x-evmsk: enable dual_emac mode

EVM board provides two Ethernet ports, this patch sets them into
dual_emac mode to provide two independent network interfaces.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: dts: DRA7: Add device nodes for ABB
Nishanth Menon [Mon, 3 Mar 2014 14:50:23 +0000 (20:20 +0530)]
ARM: dts: DRA7: Add device nodes for ABB

Add ABB device nodes for DRA7 family of devices. Data is based on
DRA7 Technical Reference Manual revision I (Sept 2013)

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: dts: OMAP4: Add device nodes for ABB
Andrii.Tseglytskyi [Mon, 3 Mar 2014 14:50:22 +0000 (20:20 +0530)]
ARM: dts: OMAP4: Add device nodes for ABB

Add ABB device nodes for OMAP443x family of devices. abb_iva is
populated, but disabled as it is not used on current OMAP443x family,
but the node is used on OMAP446x family. Data is based on OMAP443x
Technical Reference Manual revision AN (April 2013).

ABB device nodes for OMAP4460 device Data is based on OMAP4460
Technical Reference Manual revision Z (April 2013)

[nm@ti.com: co-developer]
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Andrii.Tseglytskyi <andrii.tseglytskyi@ti.com>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: dts: OMAP36xx: Add device node for ABB
Andrii.Tseglytskyi [Mon, 3 Mar 2014 14:50:21 +0000 (20:20 +0530)]
ARM: dts: OMAP36xx: Add device node for ABB

Add ABB device node for OMAP36xx family of devices. Data is based on
OMAP36XX Technical Reference Manual revision AB (Dec 2012).

[nm@ti.com: co-developer]
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Andrii.Tseglytskyi <andrii.tseglytskyi@ti.com>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: dts: am43x-epos-evm: add SD card hotplug support
Balaji T K [Mon, 3 Mar 2014 14:50:20 +0000 (20:20 +0530)]
ARM: dts: am43x-epos-evm: add SD card hotplug support

Add card detect gpio for SD card slot and include dt gpio header.

Signed-off-by: Balaji T K <balajitk@ti.com>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: dts: am335x-evm: add SD card hotplug support
Balaji T K [Mon, 3 Mar 2014 14:50:19 +0000 (20:20 +0530)]
ARM: dts: am335x-evm: add SD card hotplug support

Add card detect gpio for SD card slot

Signed-off-by: Balaji T K <balajitk@ti.com>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: dts: am437x gp-evm: add sd card dt nodes
Balaji T K [Mon, 3 Mar 2014 14:50:18 +0000 (20:20 +0530)]
ARM: dts: am437x gp-evm: add sd card dt nodes

enable sd card slot on am437x-gp-evm

Signed-off-by: Balaji T K <balajitk@ti.com>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: dts: omap5: added dt properties to adapt to the new phy framwork
Kishon Vijay Abraham I [Mon, 3 Mar 2014 11:38:15 +0000 (17:08 +0530)]
ARM: dts: omap5: added dt properties to adapt to the new phy framwork

Added device tree bindings for dwc3, usb2 and usb3 PHYs. The documentation
of these can be found at Documentation/devicetree/bindings/phy/phy-bindings.txt
and Documentation/devicetree/bindings/phy/ti-phy.txt.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agofbdev: FB_OPENCORES should depend on HAS_DMA
Geert Uytterhoeven [Fri, 21 Feb 2014 19:56:09 +0000 (20:56 +0100)]
fbdev: FB_OPENCORES should depend on HAS_DMA

If NO_DMA=y:

    drivers/built-in.o: In function `ocfb_remove':
    ocfb.c:(.text+0x27fee): undefined reference to `dma_free_coherent'
    drivers/built-in.o: In function `ocfb_probe':
    ocfb.c:(.text+0x28418): undefined reference to `dma_alloc_coherent'
    ocfb.c:(.text+0x284d2): undefined reference to `dma_free_coherent'

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
10 years agoOMAPDSS: convert pixel clock to common videomode style
Tomi Valkeinen [Wed, 10 Apr 2013 11:12:14 +0000 (14:12 +0300)]
OMAPDSS: convert pixel clock to common videomode style

omapdss has its own video-timings struct, but we want to move the common
videomode.

The first step is to change the omapdss's pixelclock unit from kHz to
Hz. Also, omapdss uses "pixel_clock" field name, whereas the common
videomode uses "pixelclock" field name. This patch changes the field
name also, as that makes it easy to spot any non-converted pixel_clock
uses.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
10 years agoARM: OMAP2+: Use pdata quirks for wl12xx on the AM335x EV-MSK
Imre Kaloz [Mon, 3 Mar 2014 09:02:56 +0000 (10:02 +0100)]
ARM: OMAP2+: Use pdata quirks for wl12xx on the AM335x EV-MSK

Enable the WiLink6 connected to mmc2.

Signed-off-by: Imre Kaloz <kaloz@openwrt.org
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: dts: Update echi-omap DT binding example usage
Roger Quadros [Thu, 27 Feb 2014 14:18:31 +0000 (16:18 +0200)]
ARM: dts: Update echi-omap DT binding example usage

Remove non-compatible id from examples.

CC: Alan Stern <stern@rowland.harvard.edu>
CC: Nishant Menon <nm@ti.com>
CC: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: dts: Get rid of incompatible ids for hci-omap USB host nodes
Roger Quadros [Thu, 27 Feb 2014 14:18:30 +0000 (16:18 +0200)]
ARM: dts: Get rid of incompatible ids for hci-omap USB host nodes

The OMAP EHCI and OHCI controllers are not compatible with drivers
other than "ti,ehci-omap" and "ti,ohci-omap3" respectively, so get
rid of the incompatible ids.

CC: Alan Stern <stern@rowland.harvard.edu>
CC: Nishant Menon <nm@ti.com>
CC: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: OMAP2+: Remove legacy_init_ehci_clk()
Roger Quadros [Thu, 27 Feb 2014 14:18:29 +0000 (16:18 +0200)]
ARM: OMAP2+: Remove legacy_init_ehci_clk()

The necessary clock phandle for the EHCI clock is now provided
via device tree so we no longer need this legacy method.

Update the omap4-panda and omap5-uevm board DTS to provide the
necessary EHCI PHY clock information.

Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: dts: Add support for OMAP4 Gumstix DuoVero/Parlor
Florian Vaussard [Mon, 24 Feb 2014 17:07:48 +0000 (18:07 +0100)]
ARM: dts: Add support for OMAP4 Gumstix DuoVero/Parlor

Gumstix DuoVero is an OMAP4430-based Computer On Module.
Parlor is one of the available expansion board.

Tested features:
- GPMC ethernet
- HSUSB2 and OTG
- Audio out
- WiFi and Bluetooth (w2cbw0015 SDIO module)
- LED and button

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoMerge tag 'for_3.15/dts_signed' of git://git.kernel.org/pub/scm/linux/kernel/git...
Tony Lindgren [Sun, 2 Mar 2014 22:22:03 +0000 (14:22 -0800)]
Merge tag 'for_3.15/dts_signed' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.15/dt

Add craneboard devices
Add more N900 devices
Add am43x-epos-evm and am437x-gp-evm devices
Add OMAP4 DMM devices

Conflicts:
arch/arm/boot/dts/am43x-epos-evm.dts
arch/arm/boot/dts/dra7.dtsi

10 years agoARM: dts: omap4+: Add DMM bindings
Archit Taneja [Tue, 17 Dec 2013 10:02:21 +0000 (15:32 +0530)]
ARM: dts: omap4+: Add DMM bindings

Add Dynamic Memory Manager (DMM) bindings for OMAP4 and OMAP5 and DRA7x devices.
DMM only requires address and irq information.

Add documentation for the DMM bindings.

Originally worked on by Andy Gross <andygro@gmail.com>

Cc: Andy Gross <andygro@gmail.com>
Signed-off-by: Archit Taneja <archit@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
10 years agoARM: dts: am43x-gp-evm: Add matrix gpio keys.
Sourav Poddar [Thu, 19 Dec 2013 12:33:41 +0000 (18:03 +0530)]
ARM: dts: am43x-gp-evm: Add matrix gpio keys.

Add gpio keys node for am43x gp evm.

Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
10 years agoARM: dts: am43xx: add support for parallel NAND flash
Pekon Gupta [Wed, 5 Feb 2014 13:28:34 +0000 (18:58 +0530)]
ARM: dts: am43xx: add support for parallel NAND flash

This patch:
 - enables GPMC h/w and ELM h/w engine for AM43xx devices (am4372.dtsi)
 - adds pinmux and DT node for Micron 4K-paged x8 NAND device (MT29F4G08AB)
   present on following boards:

   am43x-epos-evm:
On this board, NAND Flash control lines are muxed with QSPI, Thus only
        one of the two can be used at a time. Selection is controlled by:
        (a) dynamically driving following GPIO pin from software
            GPMC_A0(GPIO) == 0 NAND is selected (default)
            GPMC_A0(GPIO) == 1 eMMC is selected

Signed-off-by: Pekon Gupta <pekon@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: dts: AM33xx: updated default ECC scheme in nand-ecc-opt
Pekon Gupta [Wed, 5 Feb 2014 13:28:32 +0000 (18:58 +0530)]
ARM: dts: AM33xx: updated default ECC scheme in nand-ecc-opt

This patch updated MTD/NAND DT node binding to replace deprecated bindings
as per following commit.
    commit ac65caf514ec3e55e8d3d510ee37f80dd97418fe
    ARM: OMAP2+: cleaned-up DT support of various ECC schemes
    Also Refer: Documentation/devicetree/bindings/mtd/gpmc-nand.txt

Reviewed-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Pekon Gupta <pekon@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: dts: am335x-evm: NAND: update MTD partition table
Pekon Gupta [Wed, 5 Feb 2014 13:28:31 +0000 (18:58 +0530)]
ARM: dts: am335x-evm: NAND: update MTD partition table

This patch has following updates, specific to MTD/NAND DT
 - update MTD NAND partition table to keep compatibility between
   different boards and mainline u-boot.
 - prefix 'NAND.' in names of NAND device MTD partitions to differentiate them
   from other MTD device partitions (like NOR and QSPI)
               Partition_Name            Partition_Size
    /dev/mtd0  NAND.SPL                  1 block-size*
    /dev/mtd1  NAND.SPL.backup1          1 block-size*
    /dev/mtd2  NAND.SPL.backup2          1 block-size*
    /dev/mtd3  NAND.SPL.backup3          1 block-size*
    /dev/mtd5  NAND.u-boot-spl-os        2 block-size* [for falcon boot]
    /dev/mtd4  NAND.u-boot               1 MB
    /dev/mtd6  NAND.u-boot-env           1 block-size*
    /dev/mtd7  NAND.u-boot-env.backup1   1 block-size*
    /dev/mtd8  NAND.kernel               till 0xA00000
    /dev/mtd9  NAND.file-system          till end of device

* am335x-evm uses NAND device with block-size=128KiB

Signed-off-by: Pekon Gupta <pekon@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: OMAP2+: gpmc: update gpmc_hwecc_bch_capable() for new platforms and ECC schemes
Pekon Gupta [Wed, 5 Feb 2014 13:28:30 +0000 (18:58 +0530)]
ARM: OMAP2+: gpmc: update gpmc_hwecc_bch_capable() for new platforms and ECC schemes

This patch
 - refactors gpmc_hwecc_bch_capable()
 - add checks for new platforms like dra7xx, am43xx
 - add checks for OMAP3 SoC, w.r.t. new ECC schemes spawned in following commit:
    commit ac65caf514ec3e55e8d3d510ee37f80dd97418fe
    ARM: OMAP2+: cleaned-up DT support of various ECC schemes

Signed-off-by: Pekon Gupta <pekon@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: dts: omap3-gta04: Add bma180 accelerometer
NeilBrown [Sat, 1 Mar 2014 13:58:54 +0000 (14:58 +0100)]
ARM: dts: omap3-gta04: Add bma180 accelerometer

Add node for bma180 driver.

Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: dts: omap3-gta04: Enable mmc2 for wifi
NeilBrown [Sat, 1 Mar 2014 13:58:53 +0000 (14:58 +0100)]
ARM: dts: omap3-gta04: Enable mmc2 for wifi

This requires vaux4.

Reset line isn't used yet, so wifi isn't reliable.
But it does work once per boot.

Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Marek Belisko <marek@goldelico.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: dts: omap3-gta04: Add basic sound support
NeilBrown [Sat, 1 Mar 2014 13:58:52 +0000 (14:58 +0100)]
ARM: dts: omap3-gta04: Add basic sound support

This adds basic sound support for gta04 board.

Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Marek Belisko <marek@goldelico.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: dts: omap3-gta04: Add twl4030 charger
NeilBrown [Sat, 1 Mar 2014 13:58:51 +0000 (14:58 +0100)]
ARM: dts: omap3-gta04: Add twl4030 charger

Define twl4030 charger node used for charging.

Signed-off-by: Marek Belisko <marek@goldelico.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: dts: omap3-gta04: Add touchscreen properties
Marek Belisko [Sat, 1 Mar 2014 13:58:50 +0000 (14:58 +0100)]
ARM: dts: omap3-gta04: Add touchscreen properties

Gta04 using tcs2007 touchscreen. Add support for that.

Signed-off-by: Marek Belisko <marek@goldelico.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: dts: omap3-gta04: Add support for magnetometer
NeilBrown [Sat, 1 Mar 2014 13:58:49 +0000 (14:58 +0100)]
ARM: dts: omap3-gta04: Add support for magnetometer

Add magnetometer hmc5843 node.

Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Marek Belisko <marek@goldelico.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: dts: am437x-gp-evm: Enable gpio.
Sourav Poddar [Thu, 19 Dec 2013 12:33:40 +0000 (18:03 +0530)]
ARM: dts: am437x-gp-evm: Enable gpio.

Enable gpio3, gpio4, it will be used by gpio matrix keys. Also,
can be used by othe peripherals.

Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
10 years agoARM: dts: am437x-gp-evm: Add pwm backlight support.
Sourav Poddar [Thu, 19 Dec 2013 12:33:39 +0000 (18:03 +0530)]
ARM: dts: am437x-gp-evm: Add pwm backlight support.

Add pwm backlight support for gp evm.

Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
10 years agoARM: dts: am437x-gp-evm: Add gp dts.
Lokesh Vutla [Thu, 19 Dec 2013 12:33:38 +0000 (18:03 +0530)]
ARM: dts: am437x-gp-evm: Add gp dts.

AM437x GP EVM DTS with pinmux information to make I2C on
EVM usable.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Signed-off-by: Afzal Mohammed <afzal@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
10 years agoARM: dts: am43x-epos-evm: Add SPI data.
Sourav Poddar [Thu, 19 Dec 2013 12:33:37 +0000 (18:03 +0530)]
ARM: dts: am43x-epos-evm: Add SPI data.

Add SPI dts data.

Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
10 years agoARM: dts: am43x-epos-evm: Add I2C2 data.
Sourav Poddar [Thu, 19 Dec 2013 12:33:36 +0000 (18:03 +0530)]
ARM: dts: am43x-epos-evm: Add I2C2 data.

Add I2C2 dts data.

Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>