platform/adaptation/renesas_rcar/renesas_kernel.git
9 years agoMerge tag 'backport/v3.14.24-ltsi-rc1/sh-mtu2-to-v3.18-rc1' into backport/v3.14.24...
Simon Horman [Fri, 5 Dec 2014 01:59:01 +0000 (10:59 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/sh-mtu2-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

9 years agoMerge tag 'backport/v3.14.24-ltsi-rc1/sh-msiof-to-v3.18-rc1' into backport/v3.14...
Simon Horman [Fri, 5 Dec 2014 01:59:00 +0000 (10:59 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/sh-msiof-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

9 years agoMerge tag 'backport/v3.14.24-ltsi-rc1/sh-drivers-to-v3.18-rc1' into backport/v3.14...
Simon Horman [Fri, 5 Dec 2014 01:59:00 +0000 (10:59 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/sh-drivers-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

9 years agoMerge tag 'backport/v3.14.24-ltsi-rc1/sh-cmt-to-v3.18-rc1' into backport/v3.14.24...
Simon Horman [Fri, 5 Dec 2014 01:58:59 +0000 (10:58 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/sh-cmt-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

9 years agoMerge tag 'backport/v3.14.24-ltsi-rc1/rspi-to-v3.18-rc1' into backport/v3.14.24-ltsi...
Simon Horman [Fri, 5 Dec 2014 01:58:59 +0000 (10:58 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/rspi-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

9 years agoMerge tag 'backport/v3.14.24-ltsi-rc1/rcar-snd-to-v3.18-rc1' into backport/v3.14...
Simon Horman [Fri, 5 Dec 2014 01:58:58 +0000 (10:58 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/rcar-snd-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

9 years agoMerge tag 'backport/v3.14.24-ltsi-rc1/rcar-du-to-v3.18-rc1' into backport/v3.14.24...
Simon Horman [Fri, 5 Dec 2014 01:58:56 +0000 (10:58 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/rcar-du-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

Conflicts:
drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c

9 years agoMerge tag 'backport/v3.14.24-ltsi-rc1/of-20141105' into backport/v3.14.24-ltsi-rc1...
Simon Horman [Fri, 5 Dec 2014 01:58:51 +0000 (10:58 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/of-20141105' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

9 years agoMerge tag 'backport/v3.14.24-ltsi-rc1/pinctrl-to-v3.18-rc1' into backport/v3.14.24...
Simon Horman [Fri, 5 Dec 2014 01:58:51 +0000 (10:58 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/pinctrl-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

9 years agoMerge tag 'backport/v3.14.24-ltsi-rc1/mach-shmobile-to-v3.18-rc1' into backport/v3...
Simon Horman [Fri, 5 Dec 2014 01:58:50 +0000 (10:58 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/mach-shmobile-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

9 years agoMerge tag 'backport/v3.14.24-ltsi-rc1/i2c-rcar-to-v3.18-rc1' into backport/v3.14...
Simon Horman [Fri, 5 Dec 2014 01:58:50 +0000 (10:58 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/i2c-rcar-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

9 years agoMerge tag 'backport/v3.14.24-ltsi-rc1/da9210-to-v3.18-rc1' into backport/v3.14.24...
Simon Horman [Fri, 5 Dec 2014 01:58:49 +0000 (10:58 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/da9210-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

9 years agoMerge tag 'backport/v3.14.24-ltsi-rc1/cpg-to-v3.18-rc1' into backport/v3.14.24-ltsi...
Simon Horman [Fri, 5 Dec 2014 01:58:49 +0000 (10:58 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/cpg-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

9 years agodrm/rcar-du: Add OF support
Laurent Pinchart [Tue, 21 Jan 2014 14:57:26 +0000 (15:57 +0100)]
drm/rcar-du: Add OF support

Implement support for the R-Car DU DT bindings in the rcar-du DRM
driver.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
(cherry picked from commit 96c026911890ceacee238da00a0b140ad634cc43)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agodrm/rcar-du: Use struct videomode in platform data
Laurent Pinchart [Tue, 26 Aug 2014 22:42:56 +0000 (00:42 +0200)]
drm/rcar-du: Use struct videomode in platform data

In preparation for DT support where panel timings will be described by a
DRM-agnostic video mode, replace the struct drm_mode_modeinfo instance
in the panel platform data with a struct videomode.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
(cherry picked from commit 1d46fea7d091f9dc2d4fd3fcb9f0117ca288f9a5)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agodrm/rcar-du: Update copyright notice
Laurent Pinchart [Thu, 6 Feb 2014 17:13:52 +0000 (18:13 +0100)]
drm/rcar-du: Update copyright notice

The "Renesas Corporation" listed in the copyright notice doesn't exist.
Replace it with "Renesas Electronics Corporation" and update the
copyright years.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
(cherry picked from commit 36d50464e05f498fa4024270e091b306af5de898)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agospi: rspi: Add support for new R-Car Gen2 SoCs
Geert Uytterhoeven [Thu, 28 Aug 2014 08:10:19 +0000 (10:10 +0200)]
spi: rspi: Add support for new R-Car Gen2 SoCs

Add support for QSPI in:
  - r8a7792 (R-Car V2H)
  - r8a7793 (R-Car M2-N)
  - r8a7794 (R-Car E2)

r8a7791 is now called "R-Car M2-W".

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit 6089af775a4b4ea5237648de650dda548cb841c2)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
Documentation/devicetree/bindings/spi/spi-rspi.txt

9 years agospi: rspi: Add DT support to DMA setup
Geert Uytterhoeven [Wed, 6 Aug 2014 12:59:02 +0000 (14:59 +0200)]
spi: rspi: Add DT support to DMA setup

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit e825b8dd2b363e9134006fb141825518a11b2bf4)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
Documentation/devicetree/bindings/spi/spi-rspi.txt

9 years agospi: rspi: Configure DMA slave bus width to 8 bit
Geert Uytterhoeven [Wed, 6 Aug 2014 12:59:01 +0000 (14:59 +0200)]
spi: rspi: Configure DMA slave bus width to 8 bit

The new Renesas R-Car Gen2 DMA Controller driver (rcar-dmac) requires
explicit configuration of the DMA slave bus width.
Hardcode the DMA transfer size to 1 byte for both directions, as that's
the only supported configuration (16-bit DMA support was removed in
commit 9c5de2c1754c2bb3c69c4d7bf0d0edc0a61d8232 ("spi: rspi: Remove
unused 16-bit DMA support")).

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit a30b95a7d81cfc3442beb5a9635f22b19c97bbfc)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agospi: rspi: Use devm_kasprintf()
Geert Uytterhoeven [Wed, 6 Aug 2014 12:59:00 +0000 (14:59 +0200)]
spi: rspi: Use devm_kasprintf()

Use the devm_kasprintf() helper function instead of open coding
error-prone buffer handling and string formatting.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit 43937455c9bf294cffc2f25c4a4d0a1b9bbd88e6)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agospi: rspi: Remove unneeded semicolon
Geert Uytterhoeven [Wed, 6 Aug 2014 12:58:59 +0000 (14:58 +0200)]
spi: rspi: Remove unneeded semicolon

Introduced by commit 426ef76dd8a394a0e04d096941cd9acb49539a3e ("spi:
rspi: Add DT support").

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit d64b472678e17ef9afb251577f4f544793483fa9)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agodevres: Improve devm_kasprintf()/kvasprintf() support
Geert Uytterhoeven [Wed, 20 Aug 2014 13:26:35 +0000 (15:26 +0200)]
devres: Improve devm_kasprintf()/kvasprintf() support

  - Add devm_kasprintf()/kvasprintf(), introduced by commit
    75f2a4ead5d5890ada9c2663a70fb58613c0d9f2 ("devres: Add
    devm_kasprintf and devm_kvasprintf API"), to
    Documentation/driver-model/devres.txt,
  - Improve kernel doc: the string is not an existing formatted string,
    but is formatted into the newly-allocated buffer,
  - Add a __printf() annotation to devm_kasprintf(), so the compiler
    will verify the format string argument types.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit bef59c5024be687ef4f228915af9961307a779ab)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
Documentation/driver-model/devres.txt
drivers/base/devres.c

9 years agodevres: Add devm_kasprintf and devm_kvasprintf API
Himangi Saraogi [Wed, 16 Jul 2014 20:57:52 +0000 (02:27 +0530)]
devres: Add devm_kasprintf and devm_kvasprintf API

devm_kasprintf() and devm_kvasprintf() are the managed counterparts
for kasprintf() and kvasprintf().

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 75f2a4ead5d5890ada9c2663a70fb58613c0d9f2)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
drivers/base/devres.c

9 years agoclocksource: sh_mtu2: Document r7s72100 binding
Simon Horman [Wed, 27 Aug 2014 04:36:51 +0000 (13:36 +0900)]
clocksource: sh_mtu2: Document r7s72100 binding

In general Renesas hardware is not documented to the extent
where the relationship between IP blocks on different SoCs can be assumed
although they may appear to operate the same way. Furthermore the
documentation typically does not specify a version for individual
IP blocks. For these reasons a convention of using the SoC name in place
of a version and providing SoC-specific compat strings has been adopted.

Although not universally liked this convention is used in the bindings
for a number of drivers for Renesas hardware. The purpose of this patch is
to update the Renesas R-Car Multi-Function Timer Pulse Unit 2 (MTU2) driver
to follow this convention.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
* I plan to follow up with a patch patch to use the new binding in the
  dtsi files for the r7s72100 SoC.

v2
* Suggestions by Mark Rutland and Sergei Shtylyov
  - Compatible strings should be "one or more" not "one" of those listed
  - Describe the generic binding as covering any MTU2 device
  - Re-order compat strings from most to least specific

v3
* Suggested by Laurent Pinchart
  - Reword compat documentation for consistency with a more extensive
    CMT change

(cherry picked from commit ffd24a543afe4c693d5c611ecfa01cc48e97f97d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agospi: sh-msiof: Add support for new R-Car Gen2 SoCs
Geert Uytterhoeven [Thu, 28 Aug 2014 08:11:03 +0000 (10:11 +0200)]
spi: sh-msiof: Add support for new R-Car Gen2 SoCs

Add support for MSIOF in:
  - r8a7792 (R-Car V2H)
  - r8a7793 (R-Car M2-N)
  - r8a7794 (R-Car E2)

r8a7791 is now called "R-Car M2-W".

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit e221cc99bee4494a99aa8d8525cd7776092ced05)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agospi: sh-msiof: Return early in sh_msiof_dma_once() where possible
Geert Uytterhoeven [Thu, 7 Aug 2014 12:07:42 +0000 (14:07 +0200)]
spi: sh-msiof: Return early in sh_msiof_dma_once() where possible

Reported-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit a5e7c719fe257214aeda3dadb502a4cf58209a61)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agospi: sh-msiof: Add DT support to DMA setup
Geert Uytterhoeven [Wed, 6 Aug 2014 12:59:05 +0000 (14:59 +0200)]
spi: sh-msiof: Add DT support to DMA setup

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit a6be4de6a24cbef6209e3a0fcddaee9e312a1f63)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agospi: sh-msiof: Configure DMA slave bus width
Geert Uytterhoeven [Wed, 6 Aug 2014 12:59:04 +0000 (14:59 +0200)]
spi: sh-msiof: Configure DMA slave bus width

The new Renesas R-Car Gen2 DMA Controller driver (rcar-dmac) requires
explicit configuration of the DMA slave bus width.
Hardcode the DMA transfer size to 4 bytes, as MSIOF DMA is limited to
32-bit words.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit 52fba2b85d30075490db023642632032371505c2)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agodrivers: sh: Leave disabling of unused PM domains to genpd
Ulf Hansson [Wed, 3 Sep 2014 10:52:29 +0000 (12:52 +0200)]
drivers: sh: Leave disabling of unused PM domains to genpd

Since genpd at late init, will try to disable unused PM domains we
don't need to do it from here as well.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit f1bf45c70ffdcf048d046da4ad4611315f1a15bf)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoclocksource: sh_cmt: Document SoC specific bindings
Simon Horman [Wed, 27 Aug 2014 04:36:51 +0000 (13:36 +0900)]
clocksource: sh_cmt: Document SoC specific bindings

In general Renesas hardware is not documented to the extent
where the relationship between IP blocks on different SoCs can be assumed
although they may appear to operate the same way. Furthermore the
documentation typically does not specify a version for individual
IP blocks. For these reasons a convention of using the SoC name in place
of a version and providing SoC-specific compat strings has been adopted.

Although not universally liked this convention is used in the bindings for
a number of drivers for Renesas hardware. The purpose of this patch is to
update the Renesas R-Car Compare Match Timer (CMT) driver to follow this
convention.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
* I plan to follow up with patches to use these new bindings in the
  dtsi files for the affected SoCs.

v2
* Reorder compat entries so more-specific entries and their fallbacks
  are grouped with the fallback entry coming last.
* Explicitly document fallback

v3
* Avoid circular dependency in documentation of fallback
  behaviour of renesas,cmt-48-gen2
* Use consistent case for SoC names in compat string descriptions

(cherry picked from commit 01fe3aaa3abd3379788173e0017a6299b5b438db)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoASoC: rsnd: delete unneeded test before of_node_put
Julia Lawall [Fri, 8 Aug 2014 10:07:49 +0000 (12:07 +0200)]
ASoC: rsnd: delete unneeded test before of_node_put

Of_node_put supports NULL as its argument, so the initial test is not
necessary.

Suggested by Uwe Kleine-König.

The semantic patch that fixes this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression e;
@@

-if (e)
   of_node_put(e);
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit a493b6a637e9d8e828d7ed4be4bdf24dfd1f9250)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years ago[media] of: move common endpoint parsing to drivers/of
Philipp Zabel [Fri, 14 Feb 2014 10:53:56 +0000 (11:53 +0100)]
[media] of: move common endpoint parsing to drivers/of

This patch adds a new struct of_endpoint which is then embedded in struct
v4l2_of_endpoint and contains the endpoint properties that are not V4L2
(or even media) specific: the port number, endpoint id, local device tree
node and remote endpoint phandle. of_graph_parse_endpoint parses those
properties and is used by v4l2_of_parse_endpoint, which just adds the
V4L2 MBUS information to the containing v4l2_of_endpoint structure.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
(cherry picked from commit f2a575f67695dcba9062acd666ae5aab2380b95c)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agopinctrl: generic: Fix PIN_CONFIG_DRIVE_OPEN_SOURCE source/drain doc mismatch
Geert Uytterhoeven [Wed, 3 Sep 2014 18:01:55 +0000 (20:01 +0200)]
pinctrl: generic: Fix PIN_CONFIG_DRIVE_OPEN_SOURCE source/drain doc mismatch

PIN_CONFIG_DRIVE_OPEN_SOURCE enables open source, not open drain.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
(cherry picked from commit 0d37899363b0e5486f8800231b7edd75e8b60942)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoDocumentation: update .gitignore files
Peter Foley [Thu, 25 Sep 2014 18:23:37 +0000 (11:23 -0700)]
Documentation: update .gitignore files

Add some missing files to .gitignore.
Push Documentation/.gitignore down into subdirectories.

Signed-off-by: Peter Foley <pefoley2@pefoley.com>
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
(cherry picked from commit c5e2a7e01269cd9839fef8a5c5ac258277b3b08f)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoDocumentation: make functions static to avoid prototype warnings
Peter Foley [Thu, 25 Sep 2014 18:23:15 +0000 (11:23 -0700)]
Documentation: make functions static to avoid prototype warnings

Signed-off-by: Peter Foley <pefoley2@pefoley.com>
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
(cherry picked from commit 0421fc837c822e86c76884a30a9155e512a5a66a)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7740 legacy: Fix copied bug in comment
Geert Uytterhoeven [Tue, 16 Sep 2014 19:58:03 +0000 (21:58 +0200)]
ARM: shmobile: r8a7740 legacy: Fix copied bug in comment

The corresponding bug in pm-sh7372.c was fixed in commit
70fe7b24672a988f ("ARM: shmobile: Do not access sh7372 A4S domain
internals directly").

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 8237f9e5c38098aeb8570a77bacd0fe0ebc61dfa)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7794: Reserve memory as other R-Car Gen2 SoCs
Magnus Damm [Mon, 15 Sep 2014 13:35:36 +0000 (22:35 +0900)]
ARM: shmobile: r8a7794: Reserve memory as other R-Car Gen2 SoCs

Other R-Car Gen2 SoCs such as r8a7790 and r8a7791 reserve
the top 256 MiB of memory for use with CMA. Adjust the
board-less r8a7794 code to do the same.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 299e14734c22994e69c913e66ab1f4bb56423f5d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a73a4 dtsi: Add SoC-specific irqc compatible property
Geert Uytterhoeven [Mon, 15 Sep 2014 10:21:17 +0000 (12:21 +0200)]
ARM: shmobile: r8a73a4 dtsi: Add SoC-specific irqc compatible property

The interrupt controller used the generic compatible property only.
Add the SoC-specific one, to make it future proof.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 34abee398119acaed0b1fb4318eca5b364cf74e2)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agodrm/rcar-du: Use struct videomode in platform data
Laurent Pinchart [Tue, 26 Aug 2014 22:42:56 +0000 (00:42 +0200)]
drm/rcar-du: Use struct videomode in platform data

In preparation for DT support where panel timings will be described by a
DRM-agnostic video mode, replace the struct drm_mode_modeinfo instance
in the panel platform data with a struct videomode.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
(cherry picked from commit 1d46fea7d091f9dc2d4fd3fcb9f0117ca288f9a5)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7794: Remove unnecessary #ifdef CONFIG_USE_OF
Simon Horman [Wed, 10 Sep 2014 00:43:31 +0000 (09:43 +0900)]
ARM: shmobile: r8a7794: Remove unnecessary #ifdef CONFIG_USE_OF

The r8a7794 support is always compiled using ARCH_MULTIPLATFORM which
selects USE_OF. So #ifdef CONFIG_USE_OF is unnecessary.

Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 1370078db37de2aa5e906ae2b5dbbb6ba289adb4)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Enable r8a7794 SoC in shmobile_defconfig
Simon Horman [Wed, 10 Sep 2014 00:44:47 +0000 (09:44 +0900)]
ARM: shmobile: Enable r8a7794 SoC in shmobile_defconfig

Support for the r8a7794 was recently added.
Enable it in the shmobile_defconfig to increase build coverage.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 7d984c95723725d26f3961c1655c20256f0affdf)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: remove MMC_CAP2_NO_MULTI_READ from lager
Kuninori Morimoto [Tue, 9 Sep 2014 06:46:32 +0000 (23:46 -0700)]
ARM: shmobile: remove MMC_CAP2_NO_MULTI_READ from lager

sh_mobile_sdhi cares multiblock read bug.
remove MMC_CAP2_NO_MULTI_READ flag from board code

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit 9674e9545382153d6a78bb97915ba8e64c1fdf9f)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: remove MMC_CAP2_NO_MULTI_READ from koelsch
Kuninori Morimoto [Tue, 9 Sep 2014 06:46:10 +0000 (23:46 -0700)]
ARM: shmobile: remove MMC_CAP2_NO_MULTI_READ from koelsch

sh_mobile_sdhi cares multiblock read bug.
remove MMC_CAP2_NO_MULTI_READ flag from board code

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit b9409687a8dad8b7207f05c62b9c87d2a766473b)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: kzm9g-reference: Enable CMT1 in device tree
Ulrich Hecht [Mon, 8 Sep 2014 00:57:08 +0000 (09:57 +0900)]
ARM: shmobile: kzm9g-reference: Enable CMT1 in device tree

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 48a0d1e07d99ecfd1e5922dd22986d5813f17207)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: sh73a0: Add CMT1 device to DT
Ulrich Hecht [Mon, 8 Sep 2014 00:57:06 +0000 (09:57 +0900)]
ARM: shmobile: sh73a0: Add CMT1 device to DT

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 6a5336a77c2caa9b0f8b3aa5c70310291ce2679d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7740: Use SoC-specific 48-bit CMT compat string
Simon Horman [Mon, 8 Sep 2014 00:27:44 +0000 (09:27 +0900)]
ARM: shmobile: r8a7740: Use SoC-specific 48-bit CMT compat string

In general Renesas hardware is not documented to the extent
where the relationship between IP blocks on different SoCs can be assumed
although they may appear to operate the same way. Furthermore the
documentation typically does not specify a version for individual
IP blocks. For these reasons a convention of using the SoC name in place
of a version and providing SoC-specific compat strings has been adopted.

Although not universally liked this convention is used in the bindings for
a number of drivers for Renesas hardware. The purpose of this patch is to
make use of the SoC-specific CMT compat string for the r8a7740 48-bit CMT
clock source.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit a2ffcf87f5ae83dcd02f5b87bf477ce7e474601e)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7779: Use SoC-specific TMU compat string
Simon Horman [Mon, 8 Sep 2014 00:27:48 +0000 (09:27 +0900)]
ARM: shmobile: r8a7779: Use SoC-specific TMU compat string

In general Renesas hardware is not documented to the extent
where the relationship between IP blocks on different SoCs can be assumed
although they may appear to operate the same way. Furthermore the
documentation typically does not specify a version for individual
IP blocks. For these reasons a convention of using the SoC name in place
of a version and providing SoC-specific compat strings has been adopted.

Although not universally liked this convention is used in the bindings for
a number of drivers for Renesas hardware. The purpose of this patch is to
make use of the SoC-specific CMT compat string for the r8a7779 TMU
clock source.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit a51b7b38182918d54813b572d6c28d43082d94ff)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7791: Use SoC-specific 48-bit CMT compat string
Simon Horman [Mon, 8 Sep 2014 00:27:46 +0000 (09:27 +0900)]
ARM: shmobile: r8a7791: Use SoC-specific 48-bit CMT compat string

In general Renesas hardware is not documented to the extent
where the relationship between IP blocks on different SoCs can be assumed
although they may appear to operate the same way. Furthermore the
documentation typically does not specify a version for individual
IP blocks. For these reasons a convention of using the SoC name in place
of a version and providing SoC-specific compat strings has been adopted.

Although not universally liked this convention is used in the bindings for
a number of drivers for Renesas hardware. The purpose of this patch is to
make use of the SoC-specific CMT compat string for the r8a7791 48-bit CMT
clock source.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 4217f323206c50f4a035338c9a09bd24e5bb263a)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r7s72100: Use SoC-specific MTU2 compat string
Simon Horman [Mon, 8 Sep 2014 00:27:47 +0000 (09:27 +0900)]
ARM: shmobile: r7s72100: Use SoC-specific MTU2 compat string

In general Renesas hardware is not documented to the extent
where the relationship between IP blocks on different SoCs can be assumed
although they may appear to operate the same way. Furthermore the
documentation typically does not specify a version for individual
IP blocks. For these reasons a convention of using the SoC name in place
of a version and providing SoC-specific compat strings has been adopted.

Although not universally liked this convention is used in the bindings for
a number of drivers for Renesas hardware. The purpose of this patch is to
make use of the SoC-specific CMT compat string for the r7s72100 MTU2
clock source.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit f401ce481082de6327d12a8dc5528d2f7a4a4445)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7790: Use SoC-specific 48-bit CMT compat string
Simon Horman [Mon, 8 Sep 2014 00:27:45 +0000 (09:27 +0900)]
ARM: shmobile: r8a7790: Use SoC-specific 48-bit CMT compat string

In general Renesas hardware is not documented to the extent
where the relationship between IP blocks on different SoCs can be assumed
although they may appear to operate the same way. Furthermore the
documentation typically does not specify a version for individual
IP blocks. For these reasons a convention of using the SoC name in place
of a version and providing SoC-specific compat strings has been adopted.

Although not universally liked this convention is used in the bindings for
a number of drivers for Renesas hardware. The purpose of this patch is to
make use of the SoC-specific CMT compat string for the r8a7790 48-bit CMT
clock source.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 37757030b0f9f107cd428ae7dcb34a778a8e5d57)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Initial Alt board device tree
Ulrich Hecht [Fri, 5 Sep 2014 10:23:49 +0000 (12:23 +0200)]
ARM: shmobile: Initial Alt board device tree

Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
[uli: reduced to minimum, added cmt, enabled scif2, split off from SoC]
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit a742795be9ceae2853ca71f216193f29da151da8)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Initial r8a7794 SoC device tree
Ulrich Hecht [Fri, 5 Sep 2014 10:23:48 +0000 (12:23 +0200)]
ARM: shmobile: Initial r8a7794 SoC device tree

Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
[uli: reduced to minimum, added cmt, enabled scif2, split off board part]
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 0dce5454d5c258582a7da5590332d9e085886bf7)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: armadillo800eva legacy: Use rmobile_add_devices_to_domains()
Geert Uytterhoeven [Fri, 29 Aug 2014 13:26:21 +0000 (15:26 +0200)]
ARM: shmobile: armadillo800eva legacy: Use rmobile_add_devices_to_domains()

Use a table and the rmobile_add_devices_to_domains() helper function to
add all platform devices to their power domains at once, which is more
size-efficient than calling rmobile_add_device_to_domain() explicitly
for all devices individually.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 834720dbf03819a8b2d0ba5fbe01d008267f9da6)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7740: Clean up pm domain table
Geert Uytterhoeven [Fri, 29 Aug 2014 13:26:22 +0000 (15:26 +0200)]
ARM: shmobile: r8a7740: Clean up pm domain table

  - Sort pm domains by bit_shift value,
  - Combine closing and opening curly braces on a single line, as the
    table will grow much bigger soon.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 753490991fd5036fa4f31de7bc5dd7131ed44cc2)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7740: Use rmobile_add_devices_to_domains()
Geert Uytterhoeven [Fri, 29 Aug 2014 13:26:20 +0000 (15:26 +0200)]
ARM: shmobile: r8a7740: Use rmobile_add_devices_to_domains()

Use a table and the rmobile_add_devices_to_domains() helper function to
add all platform devices to their power domains at once, which is more
size-efficient than calling rmobile_add_device_to_domain() explicitly
for all devices individually.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit c839f93bf8468f4380056d0638e3cba0488bb190)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: sh7372: Make domain_devices[] static __initdata
Geert Uytterhoeven [Fri, 29 Aug 2014 13:26:19 +0000 (15:26 +0200)]
ARM: shmobile: sh7372: Make domain_devices[] static __initdata

Make the domain_devices[] array static and __initdata, to reduce kernel
size:
  - Making it static gets rid of the code to copy the data to the stack,
  - Marking it __initdata allows more init memory to be freed.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 9eda01b2f665d8bf29f6ac93e3db403290e0f3cf)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: mackerel: Make domain_devices[] static __initdata
Geert Uytterhoeven [Fri, 29 Aug 2014 13:26:18 +0000 (15:26 +0200)]
ARM: shmobile: mackerel: Make domain_devices[] static __initdata

Make the domain_devices[] array static and __initdata, to reduce kernel
size:
  - Making it static gets rid of the code to copy the data to the stack,
  - Marking it __initdata allows more init memory to be freed.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit d6dc6ed8540ab8802c6ba31b4292204dd3cb0fee)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Drop dev_irq_safe from R-mobile genpd config
Ulf Hansson [Wed, 3 Sep 2014 10:52:21 +0000 (12:52 +0200)]
ARM: shmobile: Drop dev_irq_safe from R-mobile genpd config

The dev_irq_safe configuration is redundant, genpd don't have any
special treatmeant for handling it. Let's remove it.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit cec89297da88ae9e8df0e3b7ea2e7e464b038cc9)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Drop dev_irq_safe from r8a7779 genpd config
Ulf Hansson [Wed, 3 Sep 2014 10:52:20 +0000 (12:52 +0200)]
ARM: shmobile: Drop dev_irq_safe from r8a7779 genpd config

The dev_irq_safe configuration is redundant, genpd don't have any
special treatmeant for handling it. Let's remove it.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit 698616548528615052ccdff2f621f1fde3bd9a50)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Initial r8a7794 SoC support
Ulrich Hecht [Thu, 4 Sep 2014 14:02:28 +0000 (16:02 +0200)]
ARM: shmobile: Initial r8a7794 SoC support

Initial support for the r8a7794 SoC, based on work by Hisashi Nakamura.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 5923abb205e05773e0bb16c7ca4c0b41dbeec40e)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
arch/arm/mach-shmobile/Makefile

9 years agoARM: shmobile: support Cortex-A7 in shmobile_init_delay()
Ulrich Hecht [Thu, 4 Sep 2014 14:02:27 +0000 (16:02 +0200)]
ARM: shmobile: support Cortex-A7 in shmobile_init_delay()

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 0dc50fd3dc4a70d0d317103188c129d378125643)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: armadillo800eva reference: Remove DTS
Magnus Damm [Thu, 28 Aug 2014 03:35:27 +0000 (12:35 +0900)]
ARM: shmobile: armadillo800eva reference: Remove DTS

The r8a7740 Armadillo800EVA DTS can now be used both for
DT Multiplatform and the legacy case. Because of that
remove the r8a7740 Armadillo800EVA DT reference DTS file.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 968d1af17b01b5eb343e17f64281561e1e169bb6)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: armadillo800eva reference: Remove C board code
Magnus Damm [Thu, 28 Aug 2014 03:35:18 +0000 (12:35 +0900)]
ARM: shmobile: armadillo800eva reference: Remove C board code

Now when the r8a7740 generic multiplatform case has the same
features as the DT reference board code then get rid of the
Armadillo800EVA DT reference C board code. DT Reference code
in the future shall make use of the r8a7740 Multiplatform
support code with the generic SoC machine vector.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 52031d41be060e9a7f6d113728109aed4758f7ae)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
arch/arm/mach-shmobile/board-armadillo800eva-reference.c

9 years agoARM: shmobile: lager: correct memory map
Simon Horman [Wed, 3 Sep 2014 00:49:01 +0000 (09:49 +0900)]
ARM: shmobile: lager: correct memory map

The base address of the second memory region on the lager
board is 0x140000000. Update the tag used in the dts file accordingly.

This is a documentation fix and should have no run-time affect.

This problem was introduced when the second memory region
was added to the lager dts file by 62bc32a2573c4219
("ARM: shmobile: Include all 4 GiB of memory on Lager)"
in v3.14.

Reported-by: NAOYA SHIIBA <naoya.shiiba.nx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 126f998e4ae8bc45cd72c7e62c53767c007fc319)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: kzm9g-reference dts: Use tabs for indentation
Geert Uytterhoeven [Thu, 28 Aug 2014 08:21:56 +0000 (10:21 +0200)]
ARM: shmobile: kzm9g-reference dts: Use tabs for indentation

Checkpatch says:

ERROR: code indent should use tabs where possible

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 40c488df84f9fbf4b84b4baed6e2cec4a2d946ed)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7779 dtsi: Use tabs for indentation
Geert Uytterhoeven [Thu, 28 Aug 2014 08:21:55 +0000 (10:21 +0200)]
ARM: shmobile: r8a7779 dtsi: Use tabs for indentation

Checkpatch says:

ERROR: code indent should use tabs where possible

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 99e544c782ba03855b9b6762b73915565065dbf8)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7740: Add restart callback
Magnus Damm [Thu, 28 Aug 2014 03:35:09 +0000 (12:35 +0900)]
ARM: shmobile: r8a7740: Add restart callback

Port the r8a7740 restart handling from the Armadillo code
to the r8a7740 generic multiplatform case.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 1174c712afa2779fad54b86b3569f40fab78c0c2)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: armadillo800eva: Sync DTS
Magnus Damm [Thu, 28 Aug 2014 03:34:51 +0000 (12:34 +0900)]
ARM: shmobile: armadillo800eva: Sync DTS

Take the contents from the Armadillo800EVA DT reference DTS
and add them to the "regular" Armadillo800EVA DTS. This is
preparation for removal of the DT reference DTS. So the goal
is to have a single DTS for this Armadillo board.

The SoC "r8a7740" is added to compatible string but the board
is left as-is (excluding the reference suffix).

The kernel command line is left as-is, earlyprintk is used in
case of legacy and for multiplatform we can simply ignore it
for now.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 25aa7ba3fdfbfcb48e13c1b7d008bd9e2ca9fa82)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7740: Multiplatform support
Magnus Damm [Mon, 25 Aug 2014 03:36:53 +0000 (12:36 +0900)]
ARM: shmobile: r8a7740: Multiplatform support

Enable r8a7740 Multiplatform support for the generic r8a7740
machine vector. No board support is enabled, and the board
code for Armadillo 800 EVA DT Reference is left by itself.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit c41215b781efbfa22ffc9dc474c2981c130c153d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7791 is now called "R-Car M2-W"
Geert Uytterhoeven [Thu, 28 Aug 2014 08:28:09 +0000 (10:28 +0200)]
ARM: shmobile: r8a7791 is now called "R-Car M2-W"

As per recent revisions of the datasheet.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 13298fbbdb3f6a0ef55419dc048e064c7a7b0ef8)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Consolidate Legacy SH_CLK_CPG Kconfig
Magnus Damm [Mon, 25 Aug 2014 03:45:50 +0000 (12:45 +0900)]
ARM: shmobile: Consolidate Legacy SH_CLK_CPG Kconfig

Consolidate SH_CLK_CPG under ARCH_SHMOBILE_LEGACY so it can
be shared by the legacy ARM mach-shmobile support code.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 0cdc23df6e4014a6dafe351da436dcc453f203b1)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
arch/arm/mach-shmobile/Kconfig

9 years agoARM: shmobile: Consolidate Legacy CPU_V7 Kconfig
Magnus Damm [Mon, 25 Aug 2014 03:45:41 +0000 (12:45 +0900)]
ARM: shmobile: Consolidate Legacy CPU_V7 Kconfig

Consolidate CPU_V7 under ARCH_SHMOBILE_LEGACY so it can
be shared by the legacy ARM mach-shmobile support code.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 0ed82bc9895daad86966d53e561330929774f92d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Only select PM_RMOBILE for legacy case
Magnus Damm [Mon, 25 Aug 2014 03:36:44 +0000 (12:36 +0900)]
ARM: shmobile: Only select PM_RMOBILE for legacy case

Adjust the ARM mach-shmobile Kconfig bits to only
select PM_RMOBILE in case of legacy. This allows us
to enable partial multiplatform support for various
SoCs before Power Domains DT bindings are finalized.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 46bff9db49d7995f824add28122e2a694d54d6de)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Cleanup pm-rmobile.o build using Kconfig
Magnus Damm [Mon, 25 Aug 2014 03:04:01 +0000 (12:04 +0900)]
ARM: shmobile: Cleanup pm-rmobile.o build using Kconfig

Add a CONFIG_PM_RMOBILE entry and enable it for R-Mobile
SoCs in case CONFIG_PM is set. Consolidate Makefile power
management objects and get rid of #ifdefs in the C code.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit abebbc4a026d8cdceb9f65c497b3db445c8ff5e7)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Cleanup pm-rcar.o build using Kconfig
Magnus Damm [Mon, 25 Aug 2014 03:03:52 +0000 (12:03 +0900)]
ARM: shmobile: Cleanup pm-rcar.o build using Kconfig

Add a CONFIG_PM_RCAR entry and enable it for R-Car
Generation 1 or 2 in case CONFIG_PM or CONFIG_SMP
is set. Consolidate power management objects and
get rid of #ifdefs in the C code.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 1a950ca536dd5c40167ef58951e738ae430fa96d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Introduce a Kconfig entry for R-Car Gen2
Magnus Damm [Mon, 25 Aug 2014 03:03:43 +0000 (12:03 +0900)]
ARM: shmobile: Introduce a Kconfig entry for R-Car Gen2

Add a Kconfig entry for R-Car Generation 2 SoCs that
enables CMT timer and the IRQC interrupt driver.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 0d91843346049d3131c2f75ff21d6b405cb68741)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
arch/arm/mach-shmobile/Kconfig

9 years agoARM: shmobile: Introduce a Kconfig entry for R-Car Gen1
Magnus Damm [Mon, 25 Aug 2014 03:03:34 +0000 (12:03 +0900)]
ARM: shmobile: Introduce a Kconfig entry for R-Car Gen1

Add a Kconfig entry for R-Car Generation 1 SoCs that
enables TMU timer and the INTC IRQPIN driver.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 57cc67d1422ebee313a62ff7b30981d945728094)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Introduce a Kconfig entry for R-Mobile
Magnus Damm [Mon, 25 Aug 2014 03:03:25 +0000 (12:03 +0900)]
ARM: shmobile: Introduce a Kconfig entry for R-Mobile

Add a Kconfig entry for R-Mobile SoCs that enables
both CMT and TMU timers. Interrupt controller varies
with SoC version so it is excluded.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 5784b195e4c88374764d0961977e03f55f3618cb)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
arch/arm/mach-shmobile/Kconfig

9 years agoARM: shmobile: Enable Armadillo 800 EVA board in multiplatform defconfig
Geert Uytterhoeven [Thu, 28 Aug 2014 12:40:22 +0000 (14:40 +0200)]
ARM: shmobile: Enable Armadillo 800 EVA board in multiplatform defconfig

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit de46e95cdb8671e2b0728923b8113654779c3ba8)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a73a4 dtsi: Add SoC-specific thermal compatible property
Geert Uytterhoeven [Thu, 28 Aug 2014 08:20:39 +0000 (10:20 +0200)]
ARM: shmobile: r8a73a4 dtsi: Add SoC-specific thermal compatible property

The thermal node used the generic compatible property only.
Add the SoC-specific one, to make it future proof.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit a2cfaa7458e714aa00be98c630afaa1a4766e2ad)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7779 dtsi: Add SoC-specific thermal compatible property
Geert Uytterhoeven [Thu, 28 Aug 2014 08:20:40 +0000 (10:20 +0200)]
ARM: shmobile: r8a7779 dtsi: Add SoC-specific thermal compatible property

The thermal node used the generic compatible property only.
Add the SoC-specific one, to make it future proof.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 4d50e6dd7a019993504a419d0057051788e477f1)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agodevicetree: Dialog Semiconductor consolidate existing vendor prefixes to standardise...
Steve Twiss [Fri, 22 Aug 2014 14:26:55 +0000 (15:26 +0100)]
devicetree: Dialog Semiconductor consolidate existing vendor prefixes to standardise on 'dlg'

This patch series updates the device tree vendor prefix for
Dialog Semiconductor.

Various methods are currently used throughout the kernel: 'diasemi',
'dialog' and 'dlg'. Others have also been suggested.

This patch set aims to consolidate the usage of the vendor prefix to
use a common standard. The prefix 'dlg' is used.

Signed-off-by: Steve Twiss <stwiss.opensource@diasemi.com>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Lee Jones <lee.jones@linaro.org>
Acked-by: Shawn Guo <shawn.guo@freescale.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
(cherry picked from commit bd597f47ca4bf7a522a0298a95c7f9b2f0a75b9e)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
Documentation/devicetree/bindings/vendor-prefixes.txt
arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi

9 years agoARM: shmobile: r8a7740: Remove r8a7740_add_standard_devices_dt
Simon Horman [Tue, 12 Aug 2014 00:04:42 +0000 (09:04 +0900)]
ARM: shmobile: r8a7740: Remove r8a7740_add_standard_devices_dt

Now that r8a7740_add_standard_devices_dt() is simply a wrapper
for a call to of_platform_populate() remove it and call
of_platform_populate() directly.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 433306747791845677ba662435a9bbbafaa21df3)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: armadillo800eva-reference: Do not use r8a7740_add_standard_devices_dt()
Simon Horman [Tue, 12 Aug 2014 00:04:41 +0000 (09:04 +0900)]
ARM: shmobile: armadillo800eva-reference: Do not use r8a7740_add_standard_devices_dt()

Now that r8a7740_add_standard_devices_dt() is just a wrapper for
of_platform_populate() call the latter directly.

This is in preparation for removing r8a7740_add_standard_devices_dt().

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 5ebb4e849966e9cb3d5450773c86a1bf79e76f2d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: armadillo800eva-reference: Enable CMT1 in device tree
Simon Horman [Tue, 12 Aug 2014 00:04:39 +0000 (09:04 +0900)]
ARM: shmobile: armadillo800eva-reference: Enable CMT1 in device tree

Based on work by Magnus Damm

Cc: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 1145eaabcf1d108993b5c7bea3d86bbef7143135)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7740: Add CMT1 device to DT
Simon Horman [Tue, 12 Aug 2014 00:04:38 +0000 (09:04 +0900)]
ARM: shmobile: r8a7740: Add CMT1 device to DT

Add the CMT1 counters to the r8a7740 device tree and make it
disabled by default.

Based on work by Magnus Damm.

Cc: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit c10df265febc7e46a60b129756915ad1d4d13e27)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: armadillo800eva-reference: add clock overrides to DTS
Ulrich Hecht [Fri, 8 Aug 2014 14:23:12 +0000 (16:23 +0200)]
ARM: shmobile: armadillo800eva-reference: add clock overrides to DTS

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit ae2a8cdd5c52b4e205cc1e5abca31168fb20dadb)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7740: add MSTP clock assignments to DT
Ulrich Hecht [Fri, 8 Aug 2014 14:23:11 +0000 (16:23 +0200)]
ARM: shmobile: r8a7740: add MSTP clock assignments to DT

Assigns clocks to ether, i2c*, scif*, tpu, mmcif0, sdhi*, and fsi2.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 4a7ae2e27e18cbbdd83fb7783cd62abb4a62f33b)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7740: add SoC clocks to DTS
Ulrich Hecht [Fri, 8 Aug 2014 14:23:10 +0000 (16:23 +0200)]
ARM: shmobile: r8a7740: add SoC clocks to DTS

Declares the r8a7740 clocks supported by the legacy clock framework,
excluding those requiring extensions to the DIV6 driver.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit d9ffd583bf345e2ea79a8ab8044df3a979349af7)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: sh73a0 dtsi: Move interrupt-parent to the top
Geert Uytterhoeven [Wed, 20 Aug 2014 14:28:34 +0000 (16:28 +0200)]
ARM: shmobile: sh73a0 dtsi: Move interrupt-parent to the top

Add an "interrupt-parent = <&gic>;" at the top, which is inherited by
all child nodes, so the "interrupt-parent" properties can be removed
from the individual child nodes.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit f170b97c9ad0b8ba3e99f02cbadc7676383fee09)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7791 dtsi: Remove superfluous interrupt-parent
Geert Uytterhoeven [Wed, 20 Aug 2014 14:31:02 +0000 (16:31 +0200)]
ARM: shmobile: r8a7791 dtsi: Remove superfluous interrupt-parent

There's already an "interrupt-parent = <&gic>;" at the top, which is
inherited by all child nodes, so the "interrupt-parent" property in
the sound node can be removed.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 5fb1453c2ff02ce5e5298351ff774e19f8d9dbb3)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7790 dtsi: Remove superfluous interrupt-parent
Geert Uytterhoeven [Wed, 20 Aug 2014 14:28:32 +0000 (16:28 +0200)]
ARM: shmobile: r8a7790 dtsi: Remove superfluous interrupt-parent

There's already an "interrupt-parent = <&gic>;" at the top, which is
inherited by all child nodes, so the "interrupt-parent" property in
the sound node can be removed.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 980724eb5b56b43d0ff2c7a7f5cf6e5ba290d2e5)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7779 dtsi: Remove superfluous interrupt-parent
Geert Uytterhoeven [Wed, 20 Aug 2014 14:28:31 +0000 (16:28 +0200)]
ARM: shmobile: r8a7779 dtsi: Remove superfluous interrupt-parent

There's already an "interrupt-parent = <&gic>;" at the top, which is
inherited by all child nodes, so the "interrupt-parent" properties in
the serial nodes can be removed.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 6a7147f53f29887e627d84c0a562c8bb87691e9d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Move legacy INTC definitions from irqs.h to intc.h
Geert Uytterhoeven [Wed, 20 Aug 2014 13:39:23 +0000 (15:39 +0200)]
ARM: shmobile: Move legacy INTC definitions from irqs.h to intc.h

Move all definitions for legacy INTC from the common "irqs.h" to the
INTC-specific "intc.h".
Include "intc.h" in sh7372/sh73a0 CPU and board files where needed.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
[horms+renesas@verge.net.au: omitted whitespace change]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 86155b35d173317518458c6f9c0a3ea8c5324bed)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: ape6evm: Remove duplicate CPUFreq bits
Magnus Damm [Wed, 20 Aug 2014 13:10:15 +0000 (22:10 +0900)]
ARM: shmobile: ape6evm: Remove duplicate CPUFreq bits

The CPUFreq platform device is already registered by
shmobile_init_late(), so get rid of ape6evm specific bits.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 664b4c172209f076866419a5a4162e4fc9631807)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: sh73a0: Remove duplicate CPUFreq bits
Magnus Damm [Wed, 20 Aug 2014 13:07:07 +0000 (22:07 +0900)]
ARM: shmobile: sh73a0: Remove duplicate CPUFreq bits

The CPUFreq platform device is already registered by
shmobile_init_late(), so get rid of sh73a0 specific bits.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit aa0bdc303b0f8bc59fc0a0645560917810ba041b)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7740: clock register bits
Ulrich Hecht [Fri, 8 Aug 2014 14:23:09 +0000 (16:23 +0200)]
ARM: shmobile: r8a7740: clock register bits

Contains the header file with the clock pulse generator and MSTP bits.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit d6fb17ad7c9e0aa28ce0bc2e33790f9459677370)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: kzm9g: Use shmobile_init_delay()
Magnus Damm [Wed, 20 Aug 2014 13:03:30 +0000 (22:03 +0900)]
ARM: shmobile: kzm9g: Use shmobile_init_delay()

Adjust the KZM9G board support code to use shmobile_init_delay()
together with CPU Frequency settings from the DTS.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit fc35ca258c079411b64ed94e517eb04e7d89bc44)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: bockw: Use shmobile_init_delay()
Magnus Damm [Wed, 20 Aug 2014 13:03:21 +0000 (22:03 +0900)]
ARM: shmobile: bockw: Use shmobile_init_delay()

Adjust the BockW board support code to use shmobile_init_delay()
together with CPU Frequency settings from the DTS.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit ca609e666c47cceb64610ad703dda1bebafef605)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7778: Use shmobile_init_delay()
Magnus Damm [Wed, 20 Aug 2014 13:02:54 +0000 (22:02 +0900)]
ARM: shmobile: r8a7778: Use shmobile_init_delay()

Adjust the r8a7778 SoC support code to use shmobile_init_delay()
together with CPU Frequency settings from the DTS. Get rid of the
C code version.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 6fe950ebfd3a374c78ce66a335fce258648426a1)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>