]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
9 years agoMerge branch 'omap-for-v4.1/prcm-cleanup' into for-next
Tony Lindgren [Wed, 1 Apr 2015 19:29:39 +0000 (12:29 -0700)]
Merge branch 'omap-for-v4.1/prcm-cleanup' into for-next

9 years agoMerge branch '4.0-rc1-prcm-cleanup-v6' of https://github.com/t-kristo/linux-pm into...
Tony Lindgren [Wed, 1 Apr 2015 19:24:29 +0000 (12:24 -0700)]
Merge branch '4.0-rc1-prcm-cleanup-v6' of https://github.com/t-kristo/linux-pm into omap-for-v4.1/prcm-cleanup

Conflicts:
arch/arm/boot/dts/dra7.dtsi

9 years agoARM: OMAP4+: control: add support for initializing control module via DT
Tero Kristo [Thu, 12 Feb 2015 09:47:04 +0000 (11:47 +0200)]
ARM: OMAP4+: control: add support for initializing control module via DT

OMAP4, OMAP5 and DRA7 now parse DT entries for control module address spaces,
and set up syscon mappings appropriately. Low level IO init is updated to
remove the legacy control module mappings for these devices also.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoARM: dts: dra7: add minimal l4 bus layout with control module support
Tero Kristo [Thu, 12 Feb 2015 09:37:13 +0000 (11:37 +0200)]
ARM: dts: dra7: add minimal l4 bus layout with control module support

This patch creates the l4_cfg and l4_wkup interconnects for DRA7, and
moves some of the generic peripherals under it. System control module
support is added to the device tree also, and the existing SCM related
functionality is moved under it.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoARM: dts: omap5: add minimal l4 bus layout with control module support
Tero Kristo [Thu, 12 Feb 2015 09:35:29 +0000 (11:35 +0200)]
ARM: dts: omap5: add minimal l4 bus layout with control module support

This patch creates the l4_cfg and l4_wkup interconnects for OMAP5, and
moves some of the generic peripherals under it. System control module
support is added to the device tree also, and the existing SCM related
functionality is moved under it.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoARM: OMAP4+: control: remove support for legacy pad read/write
Tero Kristo [Fri, 20 Feb 2015 08:08:52 +0000 (10:08 +0200)]
ARM: OMAP4+: control: remove support for legacy pad read/write

omap4_ctrl_pad_readl/writel are no longer used by anybody, so remove
these. Syscon / pinctrl should be used to access the padconf area
instead.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoARM: OMAP4: display: convert display to use syscon for dsi muxing
Tero Kristo [Thu, 19 Feb 2015 10:42:59 +0000 (12:42 +0200)]
ARM: OMAP4: display: convert display to use syscon for dsi muxing

The legacy control module APIs will be gone, thus convert the display
driver to use syscon. This change should eventually be moved to
display driver from the board directory.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
9 years agoARM: dts: omap4: add minimal l4 bus layout with control module support
Tero Kristo [Thu, 12 Feb 2015 09:32:14 +0000 (11:32 +0200)]
ARM: dts: omap4: add minimal l4 bus layout with control module support

This patch creates the l4_cfg and l4_wkup interconnects for OMAP4, and
moves some of the generic peripherals under it. System control module
support is added to the device tree also, and the existing SCM related
functionality is moved under it.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Reported-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: am4372: add minimal l4 bus layout with control module support
Tero Kristo [Thu, 12 Feb 2015 08:25:40 +0000 (10:25 +0200)]
ARM: dts: am4372: add minimal l4 bus layout with control module support

This patch creates an l4_wkup interconnect for AM43xx, and moves some of
the generic peripherals under it. System control module nodes are moved
under this new interconnect also, and the SCM clock layout is changed
to use the renamed SCM nodea as the clock provider.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoARM: dts: am43xx-epos-evm: fix pinmux node layout
Tero Kristo [Wed, 25 Feb 2015 13:03:57 +0000 (15:03 +0200)]
ARM: dts: am43xx-epos-evm: fix pinmux node layout

Pinmux node should be a reference to the base one, not a complete re-write
of it. Having the node like this also prevents modifying the node layout
in the base am4372.dtsi file, which is needed for control module changes.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoARM: dts: am33xx: add minimal l4 bus layout with control module support
Tero Kristo [Fri, 20 Mar 2015 11:08:29 +0000 (13:08 +0200)]
ARM: dts: am33xx: add minimal l4 bus layout with control module support

This patch creates an l4_wkup interconnect for AM33xx, and moves some of
the generic peripherals under it. System control module nodes are moved
under this new interconnect also, and the SCM clock layout is changed
to use the renamed SCM node as the clock provider.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoARM: dts: omap3: add minimal l4 bus layout with control module support
Tero Kristo [Tue, 24 Feb 2015 14:22:45 +0000 (16:22 +0200)]
ARM: dts: omap3: add minimal l4 bus layout with control module support

This patch creates an l4_core interconnect for OMAP3, and moves some
of the generic peripherals under it. System control module nodes are
moved under this new interconnect also, and the SCM clock layout
is changed to use the renamed SCM node as the clock provider.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Reported-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: omap24xx: add minimal l4 bus layout with control module support
Tero Kristo [Thu, 12 Feb 2015 08:38:16 +0000 (10:38 +0200)]
ARM: dts: omap24xx: add minimal l4 bus layout with control module support

This patch creates an l4 / l4-wkup interconnects for omap2420 / omap2430
SoCs, and moves some of the generic peripherals under it. System control
module nodes are moved under this new interconnect also, and the SCM
clock layout is changed to use the new SCM node as the clock provider.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoARM: OMAP2+: control: add syscon support for register accesses
Tero Kristo [Thu, 12 Feb 2015 09:24:11 +0000 (11:24 +0200)]
ARM: OMAP2+: control: add syscon support for register accesses

Control module driver needs to support syscon for register accesses, as
the DT hierarchy for control module driver is going to be changed. All
the control module related features will be moved under control module
node, including clocks, pinctrl, and generic configuration register
access. Temporary iomap is still provided very early in the boot for
access while syscon is not yet ready.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoARM: OMAP2+: id: cache omap_type value
Tero Kristo [Mon, 9 Feb 2015 14:17:38 +0000 (16:17 +0200)]
ARM: OMAP2+: id: cache omap_type value

There is no need to read the register with every invocation of the function,
as the value is constant. Thus, cache the value in a static variable.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoARM: OMAP2+: control: remove API for getting control module base address
Tero Kristo [Fri, 6 Feb 2015 14:20:13 +0000 (16:20 +0200)]
ARM: OMAP2+: control: remove API for getting control module base address

This shall not be used anymore, as control module driver is converted
into using regmap.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoARM: OMAP2+: clock: add low-level support for regmap
Tero Kristo [Fri, 6 Feb 2015 14:00:32 +0000 (16:00 +0200)]
ARM: OMAP2+: clock: add low-level support for regmap

Some of the TI clock providers will be converted to use syscon, thus
low-level regmap support is needed for the clock drivers also. This
patch adds this support, which can be enabled for individual drivers
in later patches.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoARM: OMAP4+: PRM: get rid of cpu_is_omap44xx calls from interrupt init
Tero Kristo [Mon, 8 Sep 2014 08:44:10 +0000 (11:44 +0300)]
ARM: OMAP4+: PRM: get rid of cpu_is_omap44xx calls from interrupt init

The compatible DT node is now passed with the prm init, so there is no
need to do node matching here again. Added a new flag to the init data
also, to detect default IRQ support for OMAP4. Also, any booting omap4
DT setup always has a PRM node, so there is no need to check against
the special case where it would be missing.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoARM: OMAP4+: PRM: setup prm_features from the PRM init time flags
Tero Kristo [Fri, 21 Nov 2014 12:45:29 +0000 (14:45 +0200)]
ARM: OMAP4+: PRM: setup prm_features from the PRM init time flags

Currently some cpu_is_X checks are used to setup prm_features, however
the same can be accomplished by just passing these flags from the PRM
init data. This is done in preparation to make PRM a separate driver.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoARM: OMAP2+: CM: move SoC specific init calls within a generic API
Tero Kristo [Fri, 21 Nov 2014 13:51:37 +0000 (15:51 +0200)]
ARM: OMAP2+: CM: move SoC specific init calls within a generic API

This gets rid of need for some exported driver APIs, and simplifies the
initialization of the CM driver. Done in preparation to make CM a
separate driver. The init data is now also passed to the SoC specific
implementations, allowing future expansion to add feature flags etc.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoARM: OMAP4+: PRM: determine prm_device_inst based on DT compatibility
Tero Kristo [Mon, 8 Sep 2014 08:29:43 +0000 (11:29 +0300)]
ARM: OMAP4+: PRM: determine prm_device_inst based on DT compatibility

PRM device instance offset is now provided through the prm_init_data.
This gets rid of some cpu_is_X / soc_is_X calls from PRM core code,
preparing for PRM to be its own separate driver.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoARM: OMAP2+: PRM: move SoC specific init calls within a generic API
Tero Kristo [Thu, 20 Nov 2014 13:02:59 +0000 (15:02 +0200)]
ARM: OMAP2+: PRM: move SoC specific init calls within a generic API

This gets rid of need for some exported driver APIs, and simplifies the
initialization of the PRM driver. Done in preparation to make PRM a
separate driver. The init data is now also passed to the SoC specific
implementations, allowing future expansion to add feature flags etc.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoMerge tag 'v4.1-soc' into for-next
Tony Lindgren [Fri, 27 Mar 2015 22:14:43 +0000 (15:14 -0700)]
Merge tag 'v4.1-soc' into for-next

SoC related changes for omaps. Mostly hwmod related changes via
Paul Walmsley <paul@pwsan.com>:

OMAP hwmod data changes for AM43xx and DRA7xx for v4.1

Add support for the AM43xx HDQ/1-wire driver and fix the GPTIMER data
for DRA7xx.

Note that I do not have AM43xx nor DRA7xx boards, and cannot test these
patches on those platforms.

Basic build, boot, and PM test logs are available at:

http://www.pwsan.com/omap/testlogs/omap-hwmod-a-for-v4.1/20150324185246/

9 years agoMerge tag 'omap-for-v4.1/fixes-0' into for-next
Tony Lindgren [Fri, 27 Mar 2015 22:14:37 +0000 (15:14 -0700)]
Merge tag 'omap-for-v4.1/fixes-0' into for-next

Fixes for omaps that were not considered urgent enough for the -rc cycle.

This is mostly to enable errata 798181 and thermal support for dra7,
configure ocp2scp for am437x, remove dead code for OMAP4_ERRATA_I688
and fix build warnings for omap1510 only config.

9 years agoARM: DRA7: Enable Cortex A15 errata 798181
Praneeth Bajjuri [Wed, 25 Mar 2015 23:25:09 +0000 (18:25 -0500)]
ARM: DRA7: Enable Cortex A15 errata 798181

ARM errata 798181 is applicable for OMAP5/DRA7 based devices. So enable
the same in the build.

DRA7xx is based on Cortex-A15 r2p2 revision.

ARM Errata extract and workaround information is as below.

On Cortex-A15 (r0p0..r3p2) the TLBI*IS/DSB operations are not
adequately shooting down all use of the old entries. The
ARM_ERRATA_798181 option enables the Linux kernel workaround
for this erratum which sends an IPI to the CPUs that are running
the same ASID as the one being invalidated.

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Acked-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoMerge tag 'for-v4.1/omap-hwmod-a' of git://git.kernel.org/pub/scm/linux/kernel/git...
Tony Lindgren [Fri, 27 Mar 2015 17:42:16 +0000 (10:42 -0700)]
Merge tag 'for-v4.1/omap-hwmod-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v4.1/soc

OMAP hwmod data changes for AM43xx and DRA7xx for v4.1

Add support for the AM43xx HDQ/1-wire driver and fix the GPTIMER data
for DRA7xx.

Note that I do not have AM43xx nor DRA7xx boards, and cannot test these
patches on those platforms.

Basic build, boot, and PM test logs are available at:

http://www.pwsan.com/omap/testlogs/omap-hwmod-a-for-v4.1/20150324185246/

9 years agoARM: OMAP2+: control: determine control module base address from DT
Tero Kristo [Thu, 13 Nov 2014 17:17:34 +0000 (19:17 +0200)]
ARM: OMAP2+: control: determine control module base address from DT

There is no need to provide the control module base address through a
low-level API from the low-level IO init, as this information is
available through DT. This patch adds a new API to initialize the
control module though, but mostly makes the old API obsolete. The
old API can be completely removed once OMAP3 is made DT only.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoARM: OMAP2+: PRM: determine PRM base address from device tree
Tero Kristo [Tue, 11 Nov 2014 15:17:18 +0000 (17:17 +0200)]
ARM: OMAP2+: PRM: determine PRM base address from device tree

There is no need to provide the PRM base address through a low-level API
from the low-level IO init, as this information is available through DT.
Re-routed the parsing function to be called from the PRM drivers also to
simplify the implementation under io.c.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoARM: OMAP2+: CM: determine CM base address from device tree
Tero Kristo [Tue, 11 Nov 2014 14:51:52 +0000 (16:51 +0200)]
ARM: OMAP2+: CM: determine CM base address from device tree

There is no need to provide the CM base address through a low-level API
from the low-level IO init, as this information is available through DT.
Re-routed the parsing function to be called from the CM drivers also to
simplify the implementation under io.c.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoARM: OMAP2+: PRCM: split PRCM module init to their own driver files
Tero Kristo [Wed, 12 Mar 2014 16:33:45 +0000 (18:33 +0200)]
ARM: OMAP2+: PRCM: split PRCM module init to their own driver files

Splits the clock related provider module inits under their own driver files.
Previously this was done for all modules under the common PRM driver.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoARM: OMAP2+: clock: move clock provider infrastructure to clock driver
Tero Kristo [Wed, 22 Oct 2014 12:15:36 +0000 (15:15 +0300)]
ARM: OMAP2+: clock: move clock provider infrastructure to clock driver

Splits the clock provider init out of the PRM driver and moves it to
clock driver. This is needed so that once the PRCM drivers are separated,
they can logically just access the clock driver not needing to go through
common PRM code. This would be wrong in the case of control module for
example.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoMerge branch 'omap-for-v4.1/fixes-not-urgent' into for-next
Tony Lindgren [Thu, 26 Mar 2015 19:12:36 +0000 (12:12 -0700)]
Merge branch 'omap-for-v4.1/fixes-not-urgent' into for-next

9 years agoMerge tag 'omap-for-v4.1/wl12xx-dt' into for-next
Tony Lindgren [Thu, 26 Mar 2015 19:12:28 +0000 (12:12 -0700)]
Merge tag 'omap-for-v4.1/wl12xx-dt' into for-next

Wireless and omap changes to make wl12xx driver to use device tree
data instead of platform data from Eliad Peller <eliad@wizery.com>:

- Add device-tree support to the wlcore (wl12xx/wl18xx) driver.

- Update the current users to use the bindings instead of pdata-quirks.

- Finally, remove the deprecated wl12xx_platform_data struct

Note that da850 board file code that still uses the platform data,
but we have da850.dtsi that can be used instead. So it was decided
that we should try to remove the wl12xx support from the da850
board file as suggested by Sekhar Nori <nsekhar@ti.com>. As it's
the last patch in the series, the last patch can be simply reverted
if needed.

As this series touches quite a bit of arch code, it was suggested
by Kalle Valo <kvalo@codeaurora.org> that the whole series should
be merged via the arm-soc tree.

9 years agoARM: dts: am57xx-beagle-x15: Add thermal map to include fan and tmp102
Nishanth Menon [Mon, 23 Mar 2015 19:39:39 +0000 (14:39 -0500)]
ARM: dts: am57xx-beagle-x15: Add thermal map to include fan and tmp102

BeagleBoard-X15 has capability for a fan and has an onboard TMP102
temperature sensor as well. This allows us to create a new thermal
zone (called, un-imaginatively "board"), and allows us to use some
active cooling as temperatures start edge upward in the system by
creating a new alert temperature (emperically 50C) for cpu.

NOTE: Fan is NOT mounted by default on the platform, in such a case,
all we end up doing is switch on a regulator and leak very minimal
current.

Signed-off-by: Nishanth Menon <nm@ti.com>
Acked-by: Eduardo Valentin <edubezval@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: DRA7: Add bandgap and related thermal nodes
Keerthy [Mon, 23 Mar 2015 19:39:38 +0000 (14:39 -0500)]
ARM: dts: DRA7: Add bandgap and related thermal nodes

Add bandgap and related thermal nodes. The patch adds 5 thermal
sensors. Only one cooling device for mpu as of now. The sensors are
the exact same on both dra72 and dra7. Introduce CPU, GPU, core nodes
for the moment as they are direct reuse of OMAP5 entities.

NOTE: OMAP4 has a finer counter granularity, which allows for a delay
of 1000ms in the thermal zone polling intervals. DRA7 have different
counter mechanism, which allows at maximum a 500ms timer. Adjust the
cpu thermal zone accordingly for DRA7.

Signed-off-by: Keerthy <j-keerthy@ti.com>
[t-kristo@ti.com: few reuse from OMAP5 entities]
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoMerge branch 'omap-for-v4.1/ocp2scp' into omap-for-v4.1/fixes-not-urgent
Tony Lindgren [Thu, 26 Mar 2015 17:48:49 +0000 (10:48 -0700)]
Merge branch 'omap-for-v4.1/ocp2scp' into omap-for-v4.1/fixes-not-urgent

9 years agobus: ocp2scp: SYNC2 value should be changed to 0x6
Kishon Vijay Abraham I [Tue, 17 Mar 2015 11:24:51 +0000 (16:54 +0530)]
bus: ocp2scp: SYNC2 value should be changed to 0x6

As per the TRMs of AM572x, OMAP4430, OMAP4460, OMAP543x, the value of
SYNC2 must be set to 0x6 in order to ensure correct operation.

So modified the SYNC2 value of OCP2SCP TIMING register to 0x6 in all the
platforms that use OCP2SCP driver except AM437x. Also introduced a new
compatible property since we don't want to modify the OCP2SCP TIMING
register for AM437x.

The sections in TRM where the above caution can be found is mentioned below.
AM572x TRM SPRUHZ6 (http://www.ti.com/lit/ug/spruhz6/spruhz6.pdf) under
section 26.3.2.2, table 26-26.

OMAP4430 TRM SWPU231AP (http://www.ti.com/lit/ug/swpu231ap/swpu231ap.pdf)
under section 23.12.6.2.2 , Table 23-1213.

OMAP4460 TRM SWPU235AB (http://www.ti.com/lit/ug/swpu235ab/swpu235ab.pdf)
under section 23.12.6.2.2, Table 23-1213.

OMAP543x TRM SWPU249 (http://www.ti.com/lit/pdf/swpu249)
under section 27.3.2.2, Table 27-27.

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: am4372: Add "ti,am437x-ocp2scp" as compatible string for OCP2SCP
Kishon Vijay Abraham I [Tue, 17 Mar 2015 11:24:50 +0000 (16:54 +0530)]
ARM: dts: am4372: Add "ti,am437x-ocp2scp" as compatible string for OCP2SCP

Added a new compatible string "ti,am437x-ocp2scp" for OCP2SCP module.
This is needed since except for the OCP2SCP used in AM437x, SYNC2 value
in OCP2SCP TIMING should be changed whereas the default value is sufficient
in AM437x.

Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: OMAP2+: remove superfluous NULL pointer check
Stefan Agner [Sun, 22 Mar 2015 00:00:18 +0000 (01:00 +0100)]
ARM: OMAP2+: remove superfluous NULL pointer check

The NULL pointer check for superset->muxnames will always evaluate
true since muxnames is an array within struct omap_mux. Remove the
superfluous check to avoid warnings when using LLVM/clang.

Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: OMAP2+: PRCM: add support for static clock memmap indices
Tero Kristo [Mon, 23 Feb 2015 13:57:32 +0000 (15:57 +0200)]
ARM: OMAP2+: PRCM: add support for static clock memmap indices

All clock provider related drivers will now register their iomaps
with a static index. This makes it easier to split up the individual
drivers to their own files in subsequent patches.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoDocumentation: DT: document PRCM compatible strings for dm81x SoCs
Tero Kristo [Wed, 25 Feb 2015 13:09:21 +0000 (15:09 +0200)]
Documentation: DT: document PRCM compatible strings for dm81x SoCs

These PRCM nodes were earlier added in patch 7800064ba5 ("ARM: dts: Add
basic dm816x device tree configuration"), but the documentation for
the same wasn't added. Fix this by adding the missing compatible strings
under the generic prcm.txt document.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoARM: OMAP4: PRM: move omap4xxx_prm_init earlier in init order
Tero Kristo [Wed, 19 Nov 2014 14:13:57 +0000 (16:13 +0200)]
ARM: OMAP4: PRM: move omap4xxx_prm_init earlier in init order

OMAP4 has different ordering of PRM and CM init calls in the early init.
Re-oder these accordingly for OMAP4 also. This is needed so that we
can do some optimizations in the following patches for the PRCM init.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoARM: OMAP4+: CM: move omap_cm_base_init under OMAP4 CM driver
Tero Kristo [Thu, 6 Nov 2014 12:39:40 +0000 (14:39 +0200)]
ARM: OMAP4+: CM: move omap_cm_base_init under OMAP4 CM driver

There is no need to call this separately from io.c, rather this can be
done commonly under the CM driver. Also, this patch makes the API static,
as it is no longer used outside the driver file.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoARM: OMAP4+: PRM: move omap_prm_base_init under OMAP4 PRM driver
Tero Kristo [Thu, 6 Nov 2014 12:34:32 +0000 (14:34 +0200)]
ARM: OMAP4+: PRM: move omap_prm_base_init under OMAP4 PRM driver

There is no need to call this separately from io.c, rather this can be
done commonly under the PRM driver.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoARM: OMAP3+: PRM: add common APIs for prm_vp_check/clear_txdone
Tero Kristo [Fri, 4 Apr 2014 12:52:01 +0000 (15:52 +0300)]
ARM: OMAP3+: PRM: add common APIs for prm_vp_check/clear_txdone

PRM driver now only exports a generic API for clearing / checking
VP txdone status.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoARM: OMAP2+: PRM: add generic API for clear_mod_irqs
Tero Kristo [Fri, 4 Apr 2014 09:31:51 +0000 (12:31 +0300)]
ARM: OMAP2+: PRM: add generic API for clear_mod_irqs

OMAP2/3 now use generic API for the prm_clear_mod_irqs, the SoC specific
implementation details are provided through prm_ll_data.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoARM: OMAP3: PRM: invert the wkst_mask for the prm_clear_mod_irqs
Tero Kristo [Fri, 4 Apr 2014 09:14:27 +0000 (12:14 +0300)]
ARM: OMAP3: PRM: invert the wkst_mask for the prm_clear_mod_irqs

This makes the API the same as used with OMAP2, and makes it possible
to implement a generic driver API for the functionality.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoARM: OMAP2+: PRCM: rename of_prcm_init to omap_prcm_init
Tero Kristo [Tue, 18 Nov 2014 12:59:36 +0000 (14:59 +0200)]
ARM: OMAP2+: PRCM: rename of_prcm_init to omap_prcm_init

This avoids conflicts in the global namespace, and is more descriptive
of the purpose anyway.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
9 years agoclk: ti: fix ti_clk_get_reg_addr error handling
Tero Kristo [Mon, 23 Feb 2015 19:06:08 +0000 (21:06 +0200)]
clk: ti: fix ti_clk_get_reg_addr error handling

There is a case where NULL can be a valid return value for
ti_clk_get_reg_addr, specifically the case where both the provider index
and register offsets are zero. In this case, the current error checking
against a NULL pointer will fail. Thus, change the API to return a
ERR_PTR value in an error case, and change all the users of this API to
check against IS_ERR instead.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Acked-by: Michael Turquette <mturquette@linaro.org>
9 years agoARM: DRA7: hwmod: Fix the hwmod class for GPTimer4
Suman Anna [Mon, 16 Mar 2015 20:54:54 +0000 (15:54 -0500)]
ARM: DRA7: hwmod: Fix the hwmod class for GPTimer4

GPTimer 4 is a regular timer and not a secure timer, so fix
the hwmod to use the correct hwmod class (even though there
are no differences in the class definition itself).

Signed-off-by: Suman Anna <s-anna@ti.com>
[paul@pwsan.com: dropped dra7xx_timer_secure_hwmod_class and
 dra7xx_timer_secure_sysc to avoid compiler warnings]
Signed-off-by: Paul Walmsley <paul@pwsan.com>
9 years agoARM: DRA7: hwmod: Add data for GPTimers 13 through 16
Suman Anna [Mon, 16 Mar 2015 20:54:53 +0000 (15:54 -0500)]
ARM: DRA7: hwmod: Add data for GPTimers 13 through 16

Add the hwmod data for GPTimers 13, 14, 15 and 16. All these
timers are present in the L4PER3 clock domain.

The corresponding DT nodes are already present but disabled.

Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
9 years agowlcore: remove wl12xx_platform_data
Eliad Peller [Wed, 18 Mar 2015 16:38:30 +0000 (18:38 +0200)]
wlcore: remove wl12xx_platform_data

Now that we have wlcore device-tree bindings in place
(for both wl12xx and wl18xx), remove the legacy
wl12xx_platform_data struct, and move its members
into the platform device data (that is passed to wlcore)

Davinci 850 is the only platform that still set
the platform data in the legacy way (and doesn't
have DT bindings), so remove the relevant
code/Kconfig option from the board file (as suggested
by Sekhar Nori)

Since no one currently uses wlcore_spi, simply remove its
platform data support (DT bindings will have to be added
if someone actually needs it)

Signed-off-by: Luciano Coelho <luca@coelho.fi>
Signed-off-by: Eliad Peller <eliad@wizery.com>
Tested-by: Nikita Kiryanov <nikita@compulab.co.il>
Acked-by: Kalle Valo <kvalo@codeaurora.org>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: add wl12xx/wl18xx bindings
Eliad Peller [Wed, 18 Mar 2015 16:38:29 +0000 (18:38 +0200)]
ARM: dts: add wl12xx/wl18xx bindings

Replace all the pdata-quirks for setting wl12xx/wl18xx
platform data with proper DT definitions.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Acked-by: Javier Martinez Canillas <javier@dowhile0.org>
Acked-by: Enric Balletbo i Serra <eballetbo@gmail.com>
Tested-by: Nikita Kiryanov <nikita@compulab.co.il>
Tested-by: Tony Lindgren <tony@atomide.com>
Acked-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agowlcore: add device-tree support
Eliad Peller [Wed, 18 Mar 2015 16:38:28 +0000 (18:38 +0200)]
wlcore: add device-tree support

When running with device-tree, we no longer have a board file
that can set up the platform data for wlcore.
Allow this data to be passed from DT.

Signed-off-by: Ido Yariv <ido@wizery.com>
Signed-off-by: Eliad Peller <eliad@wizery.com>
Tested-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com>
Tested-by: Nikita Kiryanov <nikita@compulab.co.il>
Acked-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agodt: bindings: add TI's wilink wireless device
Eliad Peller [Wed, 18 Mar 2015 16:38:27 +0000 (18:38 +0200)]
dt: bindings: add TI's wilink wireless device

Add device tree binding documentation for TI's wilink
(wl12xx and wl18xx) wlan chip.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Tested-by: Nikita Kiryanov <nikita@compulab.co.il>
Acked-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agowl12xx: use frequency instead of enumerations for pdata clocks
Luciano Coelho [Wed, 18 Mar 2015 16:38:26 +0000 (18:38 +0200)]
wl12xx: use frequency instead of enumerations for pdata clocks

Instead of defining an enumeration with the FW specific values for the
different clock rates, use the actual frequency instead.  Also add a
boolean to specify whether the clock is XTAL or not.

Change all board files to reflect this.

Signed-off-by: Luciano Coelho <luca@coelho.fi>
[Eliad - small fixes, update board file changes]
Signed-off-by: Eliad Peller <eliad@wizery.com>
Tested-by: Nikita Kiryanov <nikita@compulab.co.il>
Acked-by: Kalle Valo <kvalo@codeaurora.org>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agowlcore: set irq_trigger in board files instead of hiding behind a quirk
Luciano Coelho [Wed, 18 Mar 2015 16:38:25 +0000 (18:38 +0200)]
wlcore: set irq_trigger in board files instead of hiding behind a quirk

The platform_quirk element in the platform data was used
to change the way the IRQ is triggered.  When set,
the EDGE_IRQ quirk would change the irqflags used
and treat edge trigger differently from the rest.

Instead of hiding this irq flag setting behind the quirk,
have the board files set the irq_trigger explicitly.

This will allow us to use standard irq DT definitions
later on.

Signed-off-by: Luciano Coelho <luca@coelho.fi>
[Eliad - rebase, add irq_trigger field and pass it,
update board file changes]
Signed-off-by: Eliad Peller <eliad@wizery.com>
Tested-by: Nikita Kiryanov <nikita@compulab.co.il>
Acked-by: Kalle Valo <kvalo@codeaurora.org>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoMerge branch 'omap-for-v4.0/fixes' into for-next
Tony Lindgren [Wed, 18 Mar 2015 21:06:58 +0000 (14:06 -0700)]
Merge branch 'omap-for-v4.0/fixes' into for-next

9 years agoARM: dts: Fix gpio interrupts for dm816x
Tony Lindgren [Wed, 18 Mar 2015 20:41:34 +0000 (13:41 -0700)]
ARM: dts: Fix gpio interrupts for dm816x

Commit 7800064ba507 ("ARM: dts: Add basic dm816x device tree
configuration") added basic devices for dm816x, but I was not able
to test the GPIO interrupts earlier until I found some suitable pins
to test with. We can mux the MMC card detect and write protect pins
from SD_SDCD and SD_SDWP mode to use a normal GPIO interrupts that
are also suitable for the MMC subsystem.

This turned out several issues that need to be fixed:

- I set the GPIO type wrong to be compatible with omap3 instead
  of omap4. The GPIO controller on dm816x has EOI interrupt
  register like omap4 and am335x.

- I got the GPIO interrupt numbers wrong as each bank has two
  and we only use one. They need to be set up the same way as
  on am335x.

- The gpio banks are missing interrupt controller related
  properties.

With these changes the GPIO interrupts can be used with the
MMC card detect pin, so let's wire that up. Let's also mux all
the MMC lines for completeness while at it.

For the first GPIO bank I tested using GPMC lines temporarily
muxed to GPIOs on the dip switch 10.

Cc: Brian Hutchinson <b.hutchman@gmail.com>
Cc: Matthijs van Duin <matthijsvanduin@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: dra7: remove ti,hwmod property from pcie phy
Kishon Vijay Abraham I [Fri, 20 Feb 2015 08:51:14 +0000 (14:21 +0530)]
ARM: dts: dra7: remove ti,hwmod property from pcie phy

Now that we don't have hwmod entry for pcie PHY remove the
ti,hwmod property from PCIE PHY's. Otherwise we will get:

platform 4a094000.pciephy: Cannot lookup hwmod 'pcie1-phy'

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
[tony@atomide.com: updated comments]
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoMerge branch 'omap-for-v4.1/legacy' into for-next
Tony Lindgren [Tue, 17 Mar 2015 18:27:40 +0000 (11:27 -0700)]
Merge branch 'omap-for-v4.1/legacy' into for-next

9 years agoMerge branch 'omap-for-v4.1/dt-v2' into for-next
Tony Lindgren [Tue, 17 Mar 2015 18:27:34 +0000 (11:27 -0700)]
Merge branch 'omap-for-v4.1/dt-v2' into for-next

9 years agoMerge branch 'omap-for-v4.1/soc' into for-next
Tony Lindgren [Tue, 17 Mar 2015 18:27:27 +0000 (11:27 -0700)]
Merge branch 'omap-for-v4.1/soc' into for-next

9 years agoMerge branch 'omap-for-v4.1/defconfig' into for-next
Tony Lindgren [Tue, 17 Mar 2015 18:27:21 +0000 (11:27 -0700)]
Merge branch 'omap-for-v4.1/defconfig' into for-next

9 years agoMerge branch 'omap-for-v4.1/fixes-not-urgent' into for-next
Tony Lindgren [Tue, 17 Mar 2015 18:27:14 +0000 (11:27 -0700)]
Merge branch 'omap-for-v4.1/fixes-not-urgent' into for-next

9 years agoMerge branch 'omap-for-v4.0/fixes' into for-next
Tony Lindgren [Tue, 17 Mar 2015 18:25:33 +0000 (11:25 -0700)]
Merge branch 'omap-for-v4.0/fixes' into for-next

9 years agoARM: dts: dra7x-evm: beagle-x15: Fix USB Peripheral
Roger Quadros [Tue, 17 Mar 2015 09:43:51 +0000 (11:43 +0200)]
ARM: dts: dra7x-evm: beagle-x15: Fix USB Peripheral

Now that we have EXTCON_USB_GPIO queued for v4.1, revert
commit addfcde7c485 ("ARM: dts: dra7x-evm: beagle-x15: Fix USB Host")

On these EVMs, the USB cable state has to be determined via the
ID pin tied to a GPIO line. We use the gpio-usb-extcon driver
to read the ID pin and the extcon framework to forward
the USB cable state information to the USB driver so the
controller can be configured in the right mode (host/peripheral).

Gets USB peripheral mode to work on this EVM.

Reviewed-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
9 years agoARM: OMAP: dmtimer: disable pm runtime on remove
Suman Anna [Tue, 17 Mar 2015 01:14:03 +0000 (20:14 -0500)]
ARM: OMAP: dmtimer: disable pm runtime on remove

Disable the pm_runtime of the device upon remove. This is
added to balance the pm_runtime_enable() invoked in the probe.

Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: OMAP: dmtimer: check for pm_runtime_get_sync() failure
Suman Anna [Tue, 17 Mar 2015 01:14:02 +0000 (20:14 -0500)]
ARM: OMAP: dmtimer: check for pm_runtime_get_sync() failure

The current OMAP dmtimer probe does not check for the return
status of pm_runtime_get_sync() before initializing the timer
registers. Any timer with missing hwmod data would return a
failure here, and the access of registers without enabling the
clocks for the timer would trigger a l3_noc interrupt and a
kernel boot hang. Add proper checking so that the probe would
return a failure graciously without hanging the kernel boot.

Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: am57xx-beagle-x15: Do not include the atl header
Peter Ujfalusi [Thu, 26 Feb 2015 13:40:39 +0000 (15:40 +0200)]
ARM: dts: am57xx-beagle-x15: Do not include the atl header

AM57xx does not have ATL block integrated.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: DRA7: Remove ti,timer-dsp and ti,timer-pwm properties
Suman Anna [Mon, 16 Mar 2015 17:20:37 +0000 (12:20 -0500)]
ARM: dts: DRA7: Remove ti,timer-dsp and ti,timer-pwm properties

Remove the 'ti,timer-dsp' and 'ti,timer-pwm' properties from the timer
nodes that still have them. This seems to be copied from OMAP5, on
which only certain timers are capable of providing PWM functionality
or be able to interrupt the DSP. All the GPTimers On DRA7 are capable
of PWM and interrupting any core (due to the presence of Crossbar).

These properties were used by the driver to add capabilities to each
timer, and support requesting timers by capability. In the DT world,
we expect any users of timers to use phandles to the respective timer,
and use the omap_dm_timer_request_by_node() API. The API to request
using capabilities, omap_dm_timer_request_by_cap() API should be
deprecated eventually.

Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoDocumentation: omap-twl4030: Move ti,codec property to optional
Marek Belisko [Fri, 13 Mar 2015 20:40:37 +0000 (21:40 +0100)]
Documentation: omap-twl4030: Move ti,codec property to optional

ti,codec property is not used in omap-twl4030 driver in linux kernel but
we keep it as optional property, so that the existing dtbs do not
become noncompliant after the change on other OS.

Signed-off-by: Marek Belisko <marek@goldelico.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: omap3: Remove all references to ti,codec property
Marek Belisko [Fri, 13 Mar 2015 20:40:36 +0000 (21:40 +0100)]
ARM: dts: omap3: Remove all references to ti,codec property

ti,codec property is not used (parsed) in omap-twl4030 driver. The ti,twl4030-audio
which ti,codec points by phandle is mfd driver and device for ASoC codec is created
w/o DT compatible string. Removing all references in DT files.

Signed-off-by: Marek Belisko <marek@goldelico.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: OMAP2+: Remove legacy support for omap3 TouchBook
Tony Lindgren [Tue, 17 Mar 2015 00:07:26 +0000 (17:07 -0700)]
ARM: OMAP2+: Remove legacy support for omap3 TouchBook

We've been moving all omap2+ based systems to boot in device tree only
mode for a few years now. Only omap3 has legacy booting support
remaining. Most omap3 boards already have related arch/arm/boot/*.dts*
files for booting with device tree.

As it seems this board only has minimal support upstreamed for the
legacy booting and has not seen activity for on the mailing lists
for a few years, let's attempt to remove the related legacy board-*.c
file.

I do not have this board, but it seems getting the same level of
support with device tree based booting is mostly just configuring
the .dts file. And there is no need to upgrade the boot loader as
we can boot with appended DTB too. And most of the omap3 boards
seem to be related to omap3-evm, and omap3beagleboard that are
supported with device tree based booting.

If somebody is using this board actively with the mainline kernel,
please communicate this to the linux-omap mailing list so we can
get the board booting with device tree based support. I can help
some too getting the minimal device tree based booting going if
help is needed.

The reason for attempting to remove this board now is that I'd
rather get the remaining omap3 legacy booting support into a known
state where we at least have a .dts file being written for the
remaining legacy boards. That is because for the next few merge
cycles we can still revert this patch if absolutely necessary,
but I'd rather not get suprised by missing .dts files at the point
where we are ready to drop all remaining omap3 legacy booting
support later on.

Cc: Gregoire Gentil <gregoire@gentil.com>
Cc: Radek Pilar <mrkva@mrkva.eu>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: OMAP3: Remove legacy support for devkit8000
Tony Lindgren [Mon, 16 Mar 2015 23:56:58 +0000 (16:56 -0700)]
ARM: OMAP3: Remove legacy support for devkit8000

We've been moving all omap2+ based systems to boot in device tree only
mode for a few years now. Only omap3 has legacy booting support
remaining. Most omap3 boards already have related arch/arm/boot/*.dts*
files for booting with device tree.

As it seems this board only has minimal support upstreamed for the
legacy booting and has not seen activity for on the mailing lists
for a few years, let's attempt to remove the related legacy board-*.c
file.

I do not have this board, but it seems getting the same level of
support with device tree based booting is mostly just configuring
the .dts file. And there is no need to upgrade the boot loader as
we can boot with appended DTB too. And most of the omap3 boards
seem to be related to omap3-evm, and omap3beagleboard that are
supported with device tree based booting.

If somebody is using this board actively with the mainline kernel,
please communicate this to the linux-omap mailing list so we can
get the board booting with device tree based support. I can help
some too getting the minimal device tree based booting going if
help is needed.

The reason for attempting to remove this board now is that I'd
rather get the remaining omap3 legacy booting support into a known
state where we at least have a .dts file being written for the
remaining legacy boards. That is because for the next few merge
cycles we can still revert this patch if absolutely necessary,
but I'd rather not get suprised by missing .dts files at the point
where we are ready to drop all remaining omap3 legacy booting
support later on.

http://www.embest-tech.com/product/single-board-computers/index.html

Cc: Thomas Weber <thomas@tomweber.eu>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: OMAP3: Remove legacy support for EMA-Tech Stalker board
Tony Lindgren [Mon, 16 Mar 2015 23:56:58 +0000 (16:56 -0700)]
ARM: OMAP3: Remove legacy support for EMA-Tech Stalker board

We've been moving all omap2+ based systems to boot in device tree only
mode for a few years now. Only omap3 has legacy booting support
remaining. Most omap3 boards already have related arch/arm/boot/*.dts*
files for booting with device tree.

As it seems this board only has minimal support upstreamed for the
legacy booting and has not seen activity for on the mailing lists
for a few years, let's attempt to remove the related legacy board-*.c
file.

I do not have this board, but it seems getting the same level of
support with device tree based booting is mostly just configuring
the .dts file. And there is no need to upgrade the boot loader as
we can boot with appended DTB too. And most of the omap3 boards
seem to be related to omap3-evm, and omap3beagleboard that are
supported with device tree based booting.

If somebody is using this board actively with the mainline kernel,
please communicate this to the linux-omap mailing list so we can
get the board booting with device tree based support. I can help
some too getting the minimal device tree based booting going if
help is needed.

The reason for attempting to remove this board now is that I'd
rather get the remaining omap3 legacy booting support into a known
state where we at least have a .dts file being written for the
remaining legacy boards. That is because for the next few merge
cycles we can still revert this patch if absolutely necessary,
but I'd rather not get suprised by missing .dts files at the point
where we are ready to drop all remaining omap3 legacy booting
support later on.

Also looks like this board is no longer listed on ema-tech.com
product page at:

http://ema-tech.com/en/categories.html

Cc: Jason Lam <lzg@ema-tech.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: OMAP4: remove dead kconfig option OMAP4_ERRATA_I688
Stefan Hengelein [Wed, 25 Feb 2015 18:44:27 +0000 (19:44 +0100)]
ARM: OMAP4: remove dead kconfig option OMAP4_ERRATA_I688

The Kconfig-Option OMAP4_ERRATA_I688 is never visible due to a
contradiction in it's dependencies.
The option requires ARCH_MULTIPLATFORM to be 'disabled'. However, an
enclosing menu requires either ARCH_MULTI_V6 or ARCH_MULTI_V7 to be
enabled. These options inherit a dependency from an enclosing menu,
that requires ARCH_MULTIPLATFORM to be 'enabled'.
This is a contradiction and made this option also unavailable for
non-multiplatform configurations.

Since there are no selects on OMAP4_ERRATA_I688, which would ignore
dependencies, the code related to that option is dead and can be
removed.

This (logical) defect has been found with the undertaker tool.
(https://undertaker.cs.fau.de)

Signed-off-by: Stefan Hengelein <stefan.hengelein@fau.de>
Acked-by: Santosh Shilimkar <ssantosh@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: omap-device: add missed callback for suspend-to-disk
Grygorii Strashko [Wed, 25 Feb 2015 14:13:50 +0000 (16:13 +0200)]
ARM: omap-device: add missed callback for suspend-to-disk

Add missed callback needed for supporting suspend-to-disk (hibernation) mode.

Signed-off-by: Grygorii Strashko <Grygorii.Strashko@linaro.org>
Acked-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoMAINTAINERS: add OMAP defconfigs under OMAP SUPPORT
Felipe Balbi [Mon, 19 Jan 2015 22:13:53 +0000 (16:13 -0600)]
MAINTAINERS: add OMAP defconfigs under OMAP SUPPORT

omap2plus_defconfig and omap1_defconfig are also
part of the OMAP Support maintained, because of
that it's best to list them under OMAP SUPPORT on
MAINTAINERS so people know to Cc linux-omap when
patching them.

Reported-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: OMAP1: PM: fix some build warnings on 1510-only Kconfigs
Paul Walmsley [Fri, 6 Feb 2015 22:56:07 +0000 (15:56 -0700)]
ARM: OMAP1: PM: fix some build warnings on 1510-only Kconfigs

Building an OMAP1510-only Kconfig generates the following warnings:

arch/arm/mach-omap1/pm.c: In function ¡omap1_pm_idle¢:
arch/arm/mach-omap1/pm.c:123:2: warning: #warning Enable 32kHz OS timer in order to allow sleep states in idle [-Wcpp]
 #warning Enable 32kHz OS timer in order to allow sleep states in idle
  ^
arch/arm/mach-omap1/pm.c: At top level:
arch/arm/mach-omap1/pm.c:76:23: warning: ¡enable_dyn_sleep¢ defined but not used [-Wunused-variable]
 static unsigned short enable_dyn_sleep = 0;
                       ^

These are not so easy to fix in an obviously correct fashion, since I
don't have these devices up and running in my testbed.  So, use
arch/arm/plat-omap/Kconfig and the existing pm.c source as a guide,
and posit that deep power saving states are only supported on OMAP16xx
chips with kernels built with both CONFIG_OMAP_DM_TIMER=y and
CONFIG_OMAP_32K_TIMER=y.

While here, clean up a few printk()s and unnecessary #ifdefs.

This second version of the patch incorporates several suggestions from
Jon Hunter <jgchunter@gmail.com>.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Jon Hunter <jonathanh@nvidia.com>
Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Tuukka Tikkanen <tuukka.tikkanen@linaro.org>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: linux-omap@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Acked-by: Jon Hunter <jgchunter@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: OMAP2+: Fix socbus family info for AM33xx devices
Suman Anna [Wed, 11 Mar 2015 23:38:38 +0000 (18:38 -0500)]
ARM: OMAP2+: Fix socbus family info for AM33xx devices

The family information in the soc-bus data is currently
not classified properly for AM33xx devices, and a read
of /sys/bus/soc/devices/soc0/family currently shows
"Unknown". Fix the same.

Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: omap3-beagle: Add NAND device
Roger Quadros [Fri, 6 Mar 2015 15:10:05 +0000 (17:10 +0200)]
ARM: dts: omap3-beagle: Add NAND device

The beagle board contains a 16-bit NAND device connected to
chip select 0 of the GPMC controller.

Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: AM4372: update hdq compatible property
Vignesh R [Mon, 2 Mar 2015 10:49:34 +0000 (16:19 +0530)]
ARM: dts: AM4372: update hdq compatible property

This patch updates hdq node compatible property to "ti,am4372-hdq".

Signed-off-by: Vignesh R <vigneshr@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: omap3-pandora: add DM3730 1 GHz version
H. Nikolaus Schaller [Fri, 27 Feb 2015 21:26:39 +0000 (22:26 +0100)]
ARM: dts: omap3-pandora: add DM3730 1 GHz version

Added Pandora 1 GHz model which is based on Classic/Rebirth
with following changes:
- upgraded cpu to dm3730 runs on 1GHz
- 512 MiB DDR-333 SDRAM @ 200 MHz

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Tested-by: Grazvydas Ignotas <notasas@gmail.com>
Reviewed-by: Grazvydas Ignotas <notasas@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: omap3-pandora: add OMAP3530 600 MHz version
H. Nikolaus Schaller [Fri, 27 Feb 2015 21:26:38 +0000 (22:26 +0100)]
ARM: dts: omap3-pandora: add OMAP3530 600 MHz version

Added Pandora Rebirth model which is based on Pandora
Classic with 512 MiB DDR-333 SDRAM memory.

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Tested-by: Grazvydas Ignotas <notasas@gmail.com>
Reviewed-by: Grazvydas Ignotas <notasas@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: omap3-pandora: add common device tree
H. Nikolaus Schaller [Fri, 27 Feb 2015 21:26:37 +0000 (22:26 +0100)]
ARM: dts: omap3-pandora: add common device tree

This device tree allows to boot, supports the panel,
framebuffer, touch screen, as well as some more peripherals.
Since there is a OMAP3530 based 600 MHz variant and a DM3730 based
1 GHz variant we must include this common device tree code
in one of two CPU specific device trees.

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Signed-off-by: Marek Belisko <marek@goldelico.com>
Tested-by: Grazvydas Ignotas <notasas@gmail.com>
Reviewed-by: Grazvydas Ignotas <notasas@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: dra7xx-clocks: Add gate clock for CLKOUT2
Peter Ujfalusi [Thu, 26 Feb 2015 13:39:23 +0000 (15:39 +0200)]
ARM: dts: dra7xx-clocks: Add gate clock for CLKOUT2

To be able to control the gate for the clkout2 clock output.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Jyri Sarha <jsarha@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoDocumentation: DT: omap_serial: document missing properties and add an example
Matt Porter [Thu, 26 Feb 2015 15:38:45 +0000 (10:38 -0500)]
Documentation: DT: omap_serial: document missing properties and add an example

The omap_serial.txt binding documentation lacks a number of properties
that are used in DTS files for platforms incorporating this peripheral.
Fix this by documenting the missing required and optional fields and
add an example.

Signed-off-by: Matt Porter <mporter@konsulko.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: omap3: Add missing dmas for crypto
Pali Rohár [Thu, 26 Feb 2015 13:49:56 +0000 (14:49 +0100)]
ARM: dts: omap3: Add missing dmas for crypto

This patch adds missing dma DTS definitions for omap aes and sham drivers.
Without it kernel drivers do not work for device tree based booting
while it works for legacy booting on general purpose SoCs.

Note that further changes are still needed for high secure SoCs. But since
that never worked in legacy boot mode either, those will be sent separately.

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
[tony@atomide.com: updated comments]
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: am437x-idk: enable i2c2
Felipe Balbi [Thu, 19 Feb 2015 19:57:38 +0000 (13:57 -0600)]
ARM: dts: am437x-idk: enable i2c2

i2c2 goes to an expansion connector which we
want to use.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: am335x: Add Chiliboard DTS
Rostislav Lisovy [Mon, 9 Feb 2015 14:48:05 +0000 (15:48 +0100)]
ARM: dts: am335x: Add Chiliboard DTS

Chiliboard uses ChiliSOM as its base.

Hardware specification:
* ChiliSOM (am335x, PMIC, DRAM, NAND)
* Ethernet PHY (id 0)
* USB host (usb1)
* microSD slot
* 2x GPIO LED

Signed-off-by: Rostislav Lisovy <lisovy@jablotron.cz>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: am335x: Add DTS for ChiliSOM module
Rostislav Lisovy [Mon, 9 Feb 2015 14:48:04 +0000 (15:48 +0100)]
ARM: dts: am335x: Add DTS for ChiliSOM module

Since this is a SOM (System on Module) that will be part
of another embedded board (and can't really exist on its own)
define it as a "dtsi" that will be included in the Device tree
describing the whole system later on.

Hardware specification:
* AM335x SoC
* up to 512 MB RAM
* NAND Flash (8x interface, cs0)
* UART0
* PMIC
* I2C0 (for PMIC)
* 1x Ethernet MAC

Signed-off-by: Rostislav Lisovy <lisovy@jablotron.cz>
[tony@atomide.com: updated nand io size to be just 4]
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: Add vendor prefix for Grinn
Rostislav Lisovy [Mon, 9 Feb 2015 14:48:03 +0000 (15:48 +0100)]
ARM: dts: Add vendor prefix for Grinn

Grinn is a company located in Poland, Europe producing
System on Modules.
Webpage: http://www.grinn-global.com/

Signed-off-by: Rostislav Lisovy <lisovy@jablotron.cz>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: omap2plus_defconfig: Enable n900 modem as loadable modules
Tony Lindgren [Mon, 16 Mar 2015 19:48:44 +0000 (12:48 -0700)]
ARM: omap2plus_defconfig: Enable n900 modem as loadable modules

Enable n900 modem as loadable modules.

Acked-by: Acked-By: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: omap2plus_defconfig: Update bluetooth options
Tony Lindgren [Mon, 16 Mar 2015 19:46:59 +0000 (12:46 -0700)]
ARM: omap2plus_defconfig: Update bluetooth options

Many omaps have bluetooth, so let's make it available
as modules.

Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: omap2plus_defconfig: Enable leds-pwm
Tony Lindgren [Mon, 16 Mar 2015 19:44:49 +0000 (12:44 -0700)]
ARM: omap2plus_defconfig: Enable leds-pwm

This is used on many omap boards.

Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: omap1_defconfig: drop obsolete Kconfig symbols
Paul Walmsley [Sat, 7 Feb 2015 00:25:50 +0000 (00:25 +0000)]
ARM: omap1_defconfig: drop obsolete Kconfig symbols

scripts/checkkconfigsymbols.py indicates that omap1_defconfig
references the following obsolete Kconfig symbols:

CONFIG_BT_L2CAP
CONFIG_BT_SCO
CONFIG_DEBUG_ERRORS
CONFIG_EXPERIMENTAL
CONFIG_FB_OMAP_BOOTLOADER_INIT
CONFIG_LEDS_CPU
CONFIG_MACH_OMAP_HTCWIZARD
CONFIG_MTD_CHAR
CONFIG_MTD_DEBUG
CONFIG_MTD_DEBUG_VERBOSE
CONFIG_MTD_PARTITIONS
CONFIG_NET_ETHERNET
CONFIG_RCU_CPU_STALL_DETECTOR
CONFIG_SCSI_MULTI_LUN
CONFIG_USB_DEVICE_CLASS
CONFIG_VIDEO_OUTPUT_CONTROL

Drop them from omap1_defconfig.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Paul Bolle <pebolle@tiscali.nl>
Cc: Valentin Rothberg <valentinrothberg@gmail.com>
Cc: Stefan Hengelein <stefan.hengelein@fau.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Tony Lindgren <tony@atomide.com>
Cc: linux-kernel@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-omap@vger.kernel.org
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoarm: config: omap2plus_defconfig: switch over to LZMA compression
Felipe Balbi [Fri, 30 Jan 2015 17:18:56 +0000 (11:18 -0600)]
arm: config: omap2plus_defconfig: switch over to LZMA compression

LZMA compression makes about 33% smaller zImage
with just a slight extra decompression time.

Before this patch, zImage built with o2+_dc
is 4.5MiB and after it's about 3.3MiB.

Suggested-by: David Cohen <david.a.cohen@linux.intel.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: omap2plus_defconfig: Enable EXTCON_GPIO_USB
Roger Quadros [Mon, 26 Jan 2015 12:15:32 +0000 (14:15 +0200)]
ARM: omap2plus_defconfig: Enable EXTCON_GPIO_USB

This driver is needed for USB cable type detection on dra7-evm,
dra72-evm and am57xx-beagle-x15.

Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoLinux 4.0-rc4 v4.0-rc4
Linus Torvalds [Mon, 16 Mar 2015 00:38:20 +0000 (17:38 -0700)]
Linux 4.0-rc4