Configure pinmux as required for WiFi.
Enable the SDHCI1 controller for a02 and a04 board, which is connected to the
WiFi module.
For now, always enable the regulator that provides power to the Wifi module.
Signed-off-by: Wei Ni <wni@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Configure pinmux as required for WiFi.
Enable the SDHCI1 controller, which is connectted to the WiFi module.
Signed-off-by: Wei Ni <wni@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Enable the SDHCI1 controller. This is connected to the WiFi module.
Signed-off-by: Wei Ni <wni@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Setup the clock parents for the two display controllers and HDMI.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Add the OF_DEV_AUXDATA table entries required to associate the proper
names with host1x and its children. In turn, this allows the devices to
find the required clocks.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Extend the pll_d frequency table with a few entries to support common
HDMI and LVDS display modes and setup the clock parents for the two
display controllers and HDMI.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Add the OF_DEV_AUXDATA table entries required to associate the proper
names with host1x and its children. In turn, this allows the devices to
find the required clocks.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
The LOCKSTATUS register for memory-mapped coresight devices indicates
whether or not the device in question implements hardware locking. If
not, locking is not present (i.e. LSR.SLI == 0) and LAR is write-ignore,
so software doesn't actually need to check the status register at all.
This patch removes the broken LSR checks.
Cc: Ming Lei <ming.lei@canonical.com>
Reported-by: Mike Williams <michael.williams@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
This patch adds speedo-based process identification support for Tegra30.
Signed-off-by: Danny Huang <dahuang@nvidia.com>
[swarren s/Tegra3/Tegra30/ in log print,
s/T30/Tegra30/ in commit description]
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Detect CPU and core process ID by checking speedo corner tables.
This can provide a more accurate process ID.
Signed-off-by: Danny Huang <dahuang@nvidia.com>
[swarren s/Tegra2/Tegra20/ in log print]
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Change the spare fuse base from a definition to a variable.
It provides flexibilty to read spare fuse on different chip.
Signed-off-by: Danny Huang <dahuang@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
This resolves a nontrivial conflict where the omap_prcm_restart
is removed in one branch but another use is added in another
branch.
Conflicts:
arch/arm/mach-omap2/cm33xx.c
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/prm_common.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Several fixes for the OMAP DMTIMER driver including ...
1. Adding workaround for OMAP3+ errata i103/i767
2. Fixing posted mode support
3. Spurious interrupts when using match interrupt
4. HWMOD fixes for timers
5. Unnecessary restoration of read-only registers
6. Adds function for disabling timer interrupts
7. Fixing timer1 reset for OMAP1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAABAgAGBQJQosWdAAoJEBvUPslcq6VzZ/YP/2VaVPE9qimeBT6J0b52KE74
uNtR9dyBAO/xFjhUAZBfDud9R2sM/SZl98CNBmUZ2/PoFAgreeiU8SxNk9DqilS7
B+3XxLz/YR7rcxBb7irHSGh+zt1CBZBI61f33iWBA+58jH7YYitZx9FGVB7C8Zk7
eLFVtMwGtyZwXqr0ZPzJJUWeZSXJ5AwUvKDrdoVmqltO1MPEroSxN4LDVWWaGGgT
ehV0e+DEVL+RpdoOHBvbphqwLKTeO0PR2LNrex5ocb2EQ34ugKkfNkrFxXGQM2Lw
qLIyfgspi/eWjDgW4cL+T8uLZw0UXJsvTHNAhRypl0voLjDW46UNzWWuOsOGJJH1
wD3H2qtGihewaU1umIGLKVuX+QfrohrnRMfT8J1hMCD6iQTRaSgeiEuO28+ARcrV
TuSEdBAc0mMkR62ahQa/PEov/MlvHhNsfBwnTidDfejGjdNvNCpIpJj5rjluTbnk
nNSndIV3QsoI+fOdlxwFIpzPLqGlpyJvrf9hlnm3RZm5tCPU4Xw34ATcJ8YY0zu6
WdveMEZdRiw9EO00Qh8KiN4EImrfrwMHl1WXSX0PHVXD+kSdcJZTOGaYGQaDy+L+
3n814KGmNwWM88pqm18nHkzvRgWflC2V/Rx895uVz2O1oK/pKVL7+rPuhfSs1w8w
0ySj7w7xsM2CsfSasu9l
=xPPb
-----END PGP SIGNATURE-----
Merge tag 'omap-for-v3.8/timer-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers
From Tony Lindgren <tony@atomide.com>:
Timer fixes for omaps via Jon Hunter <jon-hunter@ti.com>:
Several fixes for the OMAP DMTIMER driver including ...
1. Adding workaround for OMAP3+ errata i103/i767
2. Fixing posted mode support
3. Spurious interrupts when using match interrupt
4. HWMOD fixes for timers
5. Unnecessary restoration of read-only registers
6. Adds function for disabling timer interrupts
7. Fixing timer1 reset for OMAP1
* tag 'omap-for-v3.8/timer-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP: Remove __omap_dm_timer_set_source function
ARM: OMAP: Remove unnecessary call to clk_get()
ARM: OMAP: Add dmtimer interrupt disable function
ARM: OMAP: Fix spurious interrupts when using timer match feature
ARM: OMAP: Don't restore DMTIMER interrupt status register
ARM: OMAP: Don't restore of DMTIMER TISTAT register
ARM: OMAP: Fix dmtimer reset for timer1
ARM: OMAP2+: Don't use __omap_dm_timer_reset()
ARM: OMAP2/3: Define HWMOD software reset status for DMTIMERs
ARM: OMAP3: Correct HWMOD DMTIMER SYSC register declarations
ARM: OMAP: Fix timer posted mode support
ARM: OMAP3+: Implement timer workaround for errata i103 and i767
ARM: OMAP: Add DMTIMER definitions for posted mode
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Add support for full-chip retention in suspend for OMAP4 SoCs
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAABAgAGBQJQpEXcAAoJEBvUPslcq6Vz4LkP/3iLA6IUl+Y/wBDUINm8hRjJ
8vBNkWRdkppcDaVv42lrYGMKj7zBZJ8nhtBN6lP8Nyv75tVTzMHKKvVuHFy4gtWe
n5+oR+xYKm7PqpKT6xbYNucYbqjywMYKdoZpJ80mL3fpUdRKJAPeciwYGTFwOMI+
hKEgj4gFgWok2fCF6KAgqbbaYXRGZSGErd7q38bsKrYRkPJfH0fHhNf4EYGEfr63
hagNb+ARIRNPeOdfMUCLn91YefOgJtLHJpO2vTvhTMHmhm6FsuHGaZsAd5Uz5+Wo
WXII8Ja2kQCWgs+ZUJFFsbAgNWCtuG7IcbWmU3srOtSyNfIFaBB9/EkO42z3qLO+
Q1O+M7TmkN8elxBwx3UYrnWzIBQbXPgMY9l1NaeBXo0BiiLAIsFTYluMnYtPX63x
8niaP+LEoiYwvpchCM6RjycfIlG+dse4SW+rPyik9HnQ/0aKr8fHyiS/oXqvlsds
ULqm6i/GxG6KBqLG0VrqvwcPPAZdhpNKzcbL/QJhULpKqxbv4VKCaQBhTslRCAJB
uN1hD8+nkrO3rjWEHELHiiJcDR1YL1XmnNiJnrZ4zQZ/SY4o7E098fiOk0kcnSNI
KNUhL/i5ZpamqsBdq2LRPLxgtab9D+kw4W2DFc3WuSHfJmq0gq0S0QxQB++Y1Wba
NFW4ruEsp0EcAzZgWTUv
=yWQr
-----END PGP SIGNATURE-----
Merge tag 'omap-for-v3.8/pm-part2-v3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/pm
From Tony Lindgren <tony@atomide.com>:
PM changes via Kevin Hilman <khilman@deeprootsystems.com>:
Add support for full-chip retention in suspend for OMAP4 SoCs
* tag 'omap-for-v3.8/pm-part2-v3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: voltage: fixup oscillator handling when CONFIG_PM=n
ARM: OMAP4: USB: power down MUSB PHY during boot
ARM: OMAP4: suspend: Program all domains to retention
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
and clean up related improvment to the SoC detection.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAABAgAGBQJQo/tPAAoJEBvUPslcq6Vzbe4QAK1skGe8pLpsR8Kd8vKMw/nz
dJLo3X3RVdZZvOGeClh9eYg3/tSGjH/vG2HVCPJ/IDY1VSBA4zzZCVClhiPVY50V
00ppjPA/BimoynKbm9iVy7Xl0KQ+stuJOkaRvCDHdOlanRD34dggFXiwRVNNCZ20
yvZ6e8yqC9LegcsmcSnxj1evHHcNC7XoNfJIDsXgn3p6u1N3R17+O9lBxfiTOdkQ
Q9KV6UftN6ym7WIkCa/ECz9j0AJovj6Sz/6Ni+xmQ6C/4c2vP5zTe2bMsVBUuT3d
5v7mnMwxic0TKQSIdX7QpwprSPjv8l2QMVjPi5o/HT+46u2Ng+fIXhCCLwJIXpqR
oqV2MI1jUdfrM6/HZ0WiOPdF9otP0VsFvJTxvH5yPVFCGW+7RyXfdUTB26EFDBXA
NtA+4k9EUThkTOmjbeDn08TjJOrIHAHFb4bRRdnE7gj1DlPVTkrB3kzTNQorFBjB
IbNfb/x46zBr+w44f5IYb6m9t5w7IG2+961Jw+xaPXN53Vx7TJN71dzBkH5zJirI
wJ2bkxpq95XX1UO7OSaWhvZRgZDHfYoGlzKGDkhfZOrDRxeKJwotSpe+3wPRiKfh
95H+OjOBJqQNZbJ9JKbG/DmdL5SFWALuMjx6nJoYJcUNYMgmblspGzNvUxX141uA
XZRE1f4QTfKuF5Uc1r7x
=ah3t
-----END PGP SIGNATURE-----
Merge tag 'omap-for-v3.8/cleanup-fixes-part2-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
From Tony Lindgren <tony@atomide.com>:
One build fix for recent clean up when CONFIG_PM is not set
and clean up related improvment to the SoC detection.
* tag 'omap-for-v3.8/cleanup-fixes-part2-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP4: ID: Improve features detection and check
ARM: OMAP: Fix compile for OMAP_PM_NOOP if PM is not selected
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This simple patch enables dynamic changes of the DT tree on runtime
to be visible to the device-tree proc interface.
Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
for the -rc cycle.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAABAgAGBQJQpEMTAAoJEBvUPslcq6VzJLcQALvQiDYUSKlOIJsu2PjvqXbj
4+PVtY/XxcS79FJLBTBnFZwRRjA+fv6nPni+y4F3pAojNdRM79Op0nKzA0S/VHTH
SKpMYC6TLJNsTfTOhLxgoCllkiUhnX/B/a9FHH0fLtOv9rr6WFF5oX7NE+mEfY2F
NI83PgMxOxjRJxe3isHkqJw6hSL4P6VbGkZuIyhBldCIJY7ajWwiIbU+GKyI9rCo
hkaM70Nkr6i1Y0xHQE6niO0iBo805iSjAT6B7aS++bh9eVI1zwI/ksdSL8o2oUCX
ou/YenaQQiOrgO/rUJLExeeaCyajqJIwvc70wUHVXm/tqizvMn6Hz9kldOJTMgmR
QuWnq6pcyARKKZ8hkIATvb+nnoP4B1OHjYFNbXHXL3AQKcWR9N1XP1eUl7rlMDw7
DuGANnyeQaYxa+PsTSy0cceuMa02QsJtjOTcWygAMRdtTUK5uguwuDf3f7Xx8xy4
2lr9/IUiRj4VCzGVVsSk5bRt6TUFfFHCZp9pd6j5xVKh4NzZAaI63CGlinUxzXrQ
SodI84ykHp8sTtHdw4+yZrGSy0RM2MT3OZVRqIKtwQJ1553RXD6/0WYPlBLS2+RB
ZFCP29zauhezG7QhehfZx+TpbNo5/9RSAsAECcPmPRX4mSAB8Fm36rzDQANleZ3/
8CIuvutBGiAmwNKZd/PN
=3xqk
-----END PGP SIGNATURE-----
Merge tag 'omap-for-v3.8/fixes-non-critical-v4-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical
From Tony Lindgren <tony@atomide.com>:
Non critical omap fixes that were not considered urgent
for the -rc cycle.
* tag 'omap-for-v3.8/fixes-non-critical-v4-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (645 commits)
ARM: OMAP4: PM: fix errata handling when CONFIG_PM=n
ARM: OMAP4: retrigger localtimers after re-enabling gic
ARM: OMAP4460: Workaround for ROM bug because of CA9 r2pX GIC control register change.
ARM: OMAP4: PM: add errata support
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
These changes provide a generic gpmc timing calculation method,
migrates existing peripherals that makes use of custom gpmc timing
calculation method to use the new generic one.
The generic timing routine has been tested with onenand, smsc911x,
and tusb6010 devices connected to GPMC in addition to simulating
other devices support in the mainline kernel.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAABAgAGBQJQoYrBAAoJEBvUPslcq6Vz+DAQANq9ikx9uUyim1RuEHS3sr0X
jm3z/gJflv2hfmPqroIwg+DTTYlTLau8cgm72roKHQO0Rp56efBsgRXH/fGARvqh
pnu7Z8WqtAXa64cgzx46hztvPb0b8ugnAdbe1C8kv+Zzl39FJeNzmWyfpC0UCugP
5edkx8NVd8y0TjFPfhLweUa2Wz9xpXFRfITm0Yk/pVmEPDtn5598Iv5d7Wu0v2+Q
r08pYmlhJTy5FvydZSg2Q0Ikp0Ipo7mpqhUtc2wmIJTXhQikMnLcS1C5xZ3y9jEF
tYy/0+43mIyQXnTdUjuI3liO3TgSWbV3VapYkWFDOFJn95qAXTn9ws078RHkfIy+
j6GA8G6qzQeUA6oK21GzVsnb2/UCfGNDBxUX1YtTi36iqyx9c7t59U7cjtG5AELe
wiT20ed2RbnUsghsbzCYVeWgzK1y/o6Kk9dBVyv3/7U5D2r5MwC6IUeMCB8qO6Tf
JkGaycu88qhtVw8uX9sogF0OjUjYU6/08cpdRTVZxQo4Z7kZ8bru/YOi6zLSBaNj
dtYPIyReHc5w7UnGhgXbCO98sl3XbAFVI7A+oqxLYG/Ki44UilnfhlKa3Os5Q3l7
XhvLocCky11igWY/clj8Dl/7+G/Gusw61jjANxLM9XQGMqIXfrOGSaCmsUUeBnKV
QMz+/jOuD4QdJDQxNZXu
=Bh8e
-----END PGP SIGNATURE-----
Merge tag 'omap-for-v3.8/gpmc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers
From Tony Lindgren <tony@atomide.com>:
omap GPMC (General Purpose Memory Controller) updates via Afzal Mohammed <afzal@ti.com>:
These changes provide a generic gpmc timing calculation method,
migrates existing peripherals that makes use of custom gpmc timing
calculation method to use the new generic one.
The generic timing routine has been tested with onenand, smsc911x,
and tusb6010 devices connected to GPMC in addition to simulating
other devices support in the mainline kernel.
* tag 'omap-for-v3.8/gpmc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: tusb6010: generic timing calculation
ARM: OMAP2+: smc91x: generic timing calculation
ARM: OMAP2+: onenand: generic timing calculation
ARM: OMAP2+: gpmc: generic timing calculation
ARM: OMAP2+: gpmc: handle additional timings
ARM: OMAP2+: nand: remove redundant rounding
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
display support with device tree until the bindings
are ready.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAABAgAGBQJQoYVDAAoJEBvUPslcq6VzHngP/iEErRfcECB35+jalgh6r8cS
AP1GUePv0dCTjBt38mzD/7R6gunV/7Cqw74cmnJtP+gKsexDtvi+XDKaSs+y+Ieq
ED4uXgF+NDyi4PhrUhsX8JIo/+K3lgsayXeqy9adfozfnElPZDCk5YlkiK0zXGoo
Ot91ypxLXKiZT8jbYPxlrMcLFK6VhHIyyg1sRe28m2aPr42+mrLQyWI6TsiEObBI
PqPU9nQsugNxMtj/2ZMFITsuwJ6xlxHAn10K+QzBWc1TP2Ca6Fhtd9iRIyU5QE77
b54dDPAiAZhuxnA1ilI9LDAx/EnDt1pTu8rBAS2VgKQC3UJvL/iXxck7pWH8ot71
HWwDzoHC47MRDCmbeAIjMYD9FnkTXSC7ZVjEzBFWzM7STZBSXFcm/brsygpU9LBY
bVpqIB7xTWaHlgaqApwt4EGKCBYj6fUzHQJYoz+DUmwqkq3lHy62hRe9RXJBTXpv
q/zfrScNstsP84O+uJuL1O7zBNaosW9ev4kyAqXkyYSPQn47xmPV2/POrAB/Hu+T
TYctvFkIVJfGlGroJRCfLuv/2Ix7jbwR9rhBuxlV9F6fX5obDOVBSbaYQFUQ53EU
/ZntYhsAhtKkI56ATXzWx55bJ5Q6F1G8I+jJXSPqdu9dg5zaI6Iaw86In5qG86WP
Cy4bAEwEKX/ldEVmxR0I
=XnzE
-----END PGP SIGNATURE-----
Merge tag 'omap-for-v3.8/board-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards
From Tony Lindgren <tony@atomide.com>:
Board updates for omaps mostly to deal with enabling
display support with device tree until the bindings
are ready.
* tag 'omap-for-v3.8/board-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP1: use BUG_ON where possible
OMAP: board-generic: enable DSS for panda & sdp boards
OMAP: omap4sdp: move display init from board file to dss-common.c
OMAP: panda: move display init from board file to dss-common.c
ARM: OMAP2+: Nokia N9/N900/N950 -- mention product names
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
- Minor pr_warn() cleanup for OMAP2+ Voltage Processor (VP)
- OMAP: SmartReflex: pass device-independent data via platform_data
- OMAP voltage layer updates towards supporting auto-retention/auto-off
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAABAgAGBQJQoYMwAAoJEBvUPslcq6VzXegP/i6Ap4/lqE87nLoFYxsDtXBX
AtjfhCU/J3h5XQX+njzksoToCqcetaDE00O4BsMA3JZxfulYsdEW3K05Tc/jvghk
UlFrc+GpXSwlgXRnHnOqDKgJv1XXtTdLj4+R3enivPUzv34QZDnZildb5lKB9neK
gAJ1Jb4m+BcIbWV09QsrG/LMWrlRbZcyQFS61bRU3tuFK/NVT7sR0sgWymkwvPKf
B7gsrtr4GIAwALE2WJ5RiUcVtPkcGgC2EBTr/tjCbWB7g8AjPSxucGaS90m9QRXy
NJ1SjJtP5ovP9fyRRQWGpjTbAgsg+CLmxz3TJd4lWhJkTWQd+EzxVT6EBfPzsl0w
TzikhBdixNrkDvYfjM9qx0TRY5wZjZ5GYtpqqVLDbzIBejPUltBWLTn8JidvyIxm
l7R/kgF5xAJziKCYU2wClUwPkWUnl9FWrW6RTzENhLiBve6xYmoYeg6CoeLqBK1O
yhCZTTLI+blw0BDLUasDEJA8XkjfD8VnCfXVPfE3f0e+tlzb06du6Qwu4z5CJeBk
JSwZBSmQ7xIeEeMnW7QISPVmc2j1/Nmydljaiv4WoJ7R7ocDZmvK9KpIUUa+DHPD
OiNdC/nan2VSvDBiTk3IYJ4Q/ebJ4sEI3bu0jdgvaYg2F43uAPVrMQZ0WNfmoQ+D
GurAY261iKIuUJsOnbu6
=NuB3
-----END PGP SIGNATURE-----
Merge tag 'omap-for-v3.8/pm-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/pm
From Tony Lindgren <tony@atomide.com>:
PM updates for omaps via Kevin Hilman <khilman@deeprootsystems.com>:
- Minor pr_warn() cleanup for OMAP2+ Voltage Processor (VP)
- OMAP: SmartReflex: pass device-independent data via platform_data
- OMAP voltage layer updates towards supporting auto-retention/auto-off
* tag 'omap-for-v3.8/pm-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP4: OPP: add OMAP4460 definitions
ARM: OMAP4: TWL: enable high speed mode for PMIC communication
ARM: OMAP4: VC: setup I2C parameters based on board data
ARM: OMAP4: vc: fix channel configuration
ARM: OMAP3+: voltage: remove unused volt_setup_time parameter
ARM: OMAP: TWL: change the vddmin / vddmax voltages to spec
ARM: OMAP3+: voltage: use oscillator data to calculate setup times
ARM: OMAP3+: vp: use new vp_params for calculating vddmin and vddmax
ARM: OMAP: add support for oscillator setup
ARM: OMAP4: VC: calculate ramp times
ARM: OMAP4: voltage: add support for VOLTSETUP_x_OFF register
ARM: OMAP3: VC: calculate ramp times
ARM: OMAP3+: voltage: introduce omap vc / vp params for voltagedomains
ARM: OMAP: voltage: renamed vp_vddmin and vp_vddmax fields
ARM: OMAP3+: PM: VP: use uV for max and min voltage limits
ARM: OMAP2+: PM: VP: minor pr_warn updates
ARM: OMAP: SmartReflex: pass device dependent data via platform data
ARM: OMAP: hwmod: align the SmartReflex fck names
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
various .dts files, and timer related changes to allow
configuring the timer via device tree.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAABAgAGBQJQoYD5AAoJEBvUPslcq6VzHtAP/1mzXjyRJX9NDh3S7ueO4njz
guCeaTIBjYwXBSASpfhWLOgFWLE4YGpAZstp+ZLHkzh8EN/yV5ZkodoJo3wYnwma
V3qkj9oLONqCTkuXr3Gxhl/xLR4Q/WfJItIw0Ok4v12n1NRMoeKvQIpYznO+klAk
i6ztZNfr+v6+EbFcjUW4kxXKjssW2MySAEW1/x1vQSdffMnIvioVjthD16lER+A3
fHkhSSmHkUH9UdZiclzuZd3N+/J8YX8Q2yUWI8wHeVuCgnn3QFRZ3p9ngCd6a5lm
jIbzazJq5gJjidBkSPef6CeNt6nbj0MmtPePxniMeW/cLdbQcibzhAlW5KWZ71+Q
rD1WlcR5jrUdzSIG3UjvhGRFN0LcegVJvMgqM5h5IYbZETLA/Gcp2gszyYKovU3B
tHEXEmwhSciM5PC/x2o1cZGqdf2sCl5i+5esI+sbJxI4GjtLkJiFNoBgjrek9anu
dTqIK1/AlKIQGbDPAmAJXjKKM8hq+3r/PWzRUipXxORlArT1uRI8SzvR76mISAwL
kCSKPCwwbY3DDozTwSFPynZpFgkZHI0rW00poBNpG7ev18IFUJinSHeY1Jqssgfb
1XguV4Txc1IrlICk+bi+Y7bogoeWjXl3cIvWkdAkZKWF75Irh4zZSRyI5+DWN8Bi
stnGo1JUqE1K7j4HEIHi
=59qq
-----END PGP SIGNATURE-----
Merge tag 'omap-for-v3.8/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
From Tony Lindgren <tony@atomide.com>:
Device tree related changes for omaps updating the
various .dts files, and timer related changes to allow
configuring the timer via device tree.
* tag 'omap-for-v3.8/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (48 commits)
usb: musb: dsps: dt binding - add resources, example
ARM: dts: omap4-sdp: Add pinmux configuration for HDMI
ARM: dts: omap4-panda: Add pinmux configuration for HDMI
ARM: dts: Makefile: Add the am335x-evmsk target in dtbs list
ARM: dts: AM33XX: Add usbss node
ARM: dts: AM33XX: Add push-buttons device tree data to am335x-evmsk
ARM: dts: AM33XX: Add pinmux configuration for gpio-keys to EVMSK
ARM: dts: AM33XX: Add user-leds device tree data to am335x-evmsk
ARM: dts: AM33XX: Add pinmux configuration for gpio-leds to EVMSK
ARM: dts: AM33XX: Add user-leds device tree data to am335x-bone
ARM: dts: AM33XX: Add pinmux configuration for user-leds to BONE
ARM: dts: AM33XX: Add volume-keys device tree data to am335x-evm
ARM: dts: AM33XX: Add pinmux configuration for volume-keys to EVM
ARM: dts: AM33XX: Add matrix keypad device tree data to am335x-evm
ARM: dts: AM33XX: Add pinmux configuration for matrix keypad to EVM
ARM: dts: omap5-evm: LPDDR2 memory device details for EVM
ARM: dts: omap5: EMIF device tree data for OMAP5 boards
ARM: dts: omap5-evm: Fix size of memory defined for EVM
ARM: OMAP2+: Add device-tree support for 32kHz counter
ARM: OMAP: Add DT support for timer driver
...
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Second set of OMAP PRCM cleanups for 3.8.
These patches remove the use of omap_prcm_get_reset_sources() from the
OMAP watchdog driver, and remove mach-omap2/prcm.c and
plat-omap/include/plat/prcm.h.
Basic test logs for this branch on top of Tony's cleanup-prcm branch
at commit 7fc54fd308 are here:
http://www.pwsan.com/omap/testlogs/prcm_cleanup_b_3.8/20121108151646/
However, cleanup-prcm at 7fc54fd3 does not include some fixes
that are needed for a successful test. With several reverts,
fixes, and workarounds applied, the following test logs were
obtained:
http://www.pwsan.com/omap/testlogs/TEST_prcm_cleanup_b_3.8/20121108151930/
which indicate that the series tests cleanly.
This second pull request updates one of the patches which broke
with rmk's allnoconfigs, and also updates the tag description to
indicate that 7fc54fd3 is building cleanly here.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAABAgAGBQJQoY0GAAoJEBvUPslcq6Vza0MQAI0idVoOclIHCC63tpc58YWA
BpD5OLg4yRu0RUFS1CI/Fq5d+9PfYUspgaWja3TTgUy0EHRDVUUFRaxJdpWdl2NF
gX7BCuhnQenznTbCE80nEmxvsh7U/dfvs+JYUK2PriypU61f1+TnSu9ZxTRvDJOx
vbo1cfsioVcLfnBPSDSQVJ1fufbafklpeQkDNeRI8UDsCVeXwnxhNsXB3utoJMf0
5gaDaCdRBoimkLnAaLi41OnHYC7IbNCnl/VX0i/xffROsINfL7LDkBPfUOnR5vle
jTCV49UEB/P5ekk2cvKKj8IOQZdimiCppWMLit6DObX7LbltTKuXx6T0PclgxQ14
hhav5O+f8NYA4yDAY/xxPlTvShMr8rQcYV6pg1G1OgD+dcq7cbbWNJAvbUJ03hH8
dqZ+ypLYkazb3Mm5XtpFr47gkoaFnCQbgZLXpjJ8+L01aGNrF2L6aE789So1N81+
X1s0ENjRxzDLNcqwxqhcoph0YQe7GlyiviYb7ev25MTSC3/TjrupTViZbKocZmLt
Ad9m4SOktbHthAw0jdA48vOmPiSvmYzFiqzMhz/ryeNbyyV6rRxe5w4JUjPzHPxc
U7NraSGIAzpqM3EKEp7Rb0yOfh6sGzML/FH9bS25+Rv37yKW0huc6ENIRgatZpY2
blLzsxaKfQgLeqKT82mj
=tS2z
-----END PGP SIGNATURE-----
Merge tag 'omap-for-v3.8/cleanup-prcm-part2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
From Tony Lindgren <tony@atomide.com>:
More PRCM cleanups via Paul Walmsley <paul@pwsan.com>:
Second set of OMAP PRCM cleanups for 3.8.
These patches remove the use of omap_prcm_get_reset_sources() from the
OMAP watchdog driver, and remove mach-omap2/prcm.c and
plat-omap/include/plat/prcm.h.
Basic test logs for this branch on top of Tony's cleanup-prcm branch
at commit 7fc54fd308 are here:
http://www.pwsan.com/omap/testlogs/prcm_cleanup_b_3.8/20121108151646/
However, cleanup-prcm at 7fc54fd3 does not include some fixes
that are needed for a successful test. With several reverts,
fixes, and workarounds applied, the following test logs were
obtained:
http://www.pwsan.com/omap/testlogs/TEST_prcm_cleanup_b_3.8/20121108151930/
which indicate that the series tests cleanly.
This second pull request updates one of the patches which broke
with rmk's allnoconfigs, and also updates the tag description to
indicate that 7fc54fd3 is building cleanly here.
* tag 'omap-for-v3.8/cleanup-prcm-part2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (27 commits)
ARM: OMAP2: Fix compillation error in cm_common
ARM: OMAP2+: PRCM: remove obsolete prcm.[ch]
ARM: OMAP2+: hwmod: call to _omap4_disable_module() should use the SoC-specific call
ARM: OMAP2+: PRCM: consolidate PRCM-related timeout macros
ARM: OMAP2+: PRCM: split and relocate the PRM/CM globals setup
ARM: OMAP2+: PRCM: remove omap2_cm_wait_idlest()
ARM: OMAP2+: CM/clock: convert _omap2_module_wait_ready() to use SoC-independent CM functions
ARM: OMAP2xxx: APLL/CM: convert to use omap2_cm_wait_module_ready()
ARM: OMAP2+: board files: use SoC-specific system restart functions
ARM: OMAP2+: PRCM: create SoC-specific chip restart functions
ARM: OMAP2xxx: clock: move virt_prcm_set code into clkt2xxx_virt_prcm_set.c
ARM: OMAP2xxx: clock: remove global 'dclk' variable
ARM: OMAP2/3: PRM: add SoC reset functions (using the CORE DPLL method)
ARM: OMAP2+: common: remove mach-omap2/common.c globals and map_common_io code
ARM: OMAP2+: PRCM: remove omap_prcm_get_reset_sources()
watchdog: OMAP: use standard GETBOOTSTATUS interface; use platform_data fn ptr
ARM: OMAP2+: WDT: move init; add read_reset_sources pdata function pointer
ARM: OMAP1: CGRM: fix omap1_get_reset_sources() return type
ARM: OMAP2+: PRM: create PRM reset source API for the watchdog timer driver
ARM: OMAP1: create read_reset_sources() function (for initial use by watchdog)
...
Conflicts:
arch/arm/mach-omap2/cm33xx.c
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/prm_common.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
support for omaps.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAABAgAGBQJQoYuiAAoJEBvUPslcq6VzJywP/RVE6bsCCTcMFUGCOqXncG+1
ydAeXHQMUNT6gULiun72hcmIHzZr5p7tLlba+mpVinnn+iLD2eXEktTZ3WOWOzf5
5APnmTluaL3ovJRnBtgKEErxoxgappUw+hvYfx0hFLpR+Ge2pgDSVlR8W1k6aYSJ
ViP/fyc2XGPxOxOVXIXlho3ySsGEKYHQrQWjLJ8xQ27Sx0WNI1FF/qPhPB5lHlt2
2v9np3jHCeZHPt5mTWgwYM1KN2zDeshmEFqRfEL9I2eLPaFeX6WXto9jSz/GPunL
7cHwp0pQok4t/ybalxsuIw5muCig5htpxXwFkBLjiIfIGYVSqOt0R78L2m9mTy/a
/d1F1pK9eKpBJbR4IffWHMxtH9mNkIR/2CQU9mxHVkraWU3aSPQdFWdRTvEjUM9Y
bXunUlWgyNsJRt8AALdBrCthTcSViqIxQujCOoqfBdqwR/BThsal/ntpbkCvpkAa
lESgLdNd2kj7cLMOQ2dnGWjCyCLrksqB2z89zCyuw+6dbaVYtSk7UiXucl/jkGmP
C0LsRN4N5SYViOxT4iOfpVaFToCf3BPjicT488ssTBjMoM1iwzpfRRKIni87nvHU
aaWvdjaHBB+wUEETywDIe5AbE1yfrN8z9hd6am2khVj77af+CACpxh23gnf2/85k
RfTOv5SOSg1eEN4U8x02
=MNUq
-----END PGP SIGNATURE-----
Merge tag 'omap-for-v3.8/cleanup-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
From: Tony Lindgren <tony@atomide.com>:
Minor fixes to the clean-up done for ARM common multi-platform
support for omaps.
* tag 'omap-for-v3.8/cleanup-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: remove duplicated include from board-overo.c
ARM: OMAP: debug-leds: Use resource_size instead of hard coded macro
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Due to a clash between refactoring and due to loss of a header
file that remained in my working tree the Nomadik stopped
compiling after switching to the FSMC driver. This patch fixes
it up.
Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Do not use the platform_data to pass resource and be smart in the drivers.
Just pass it via resource
Switch to devm_request_and_ioremap at the sametime
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-By: Vipin Kumar <vipin.kumar@st.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
The Nomadik NAND driver is really just a subset of the existing
FSMC driver, so let's switch over to using that driver instead,
since it handles more variants of this chip. The callbacks for
setting up the chip is doing stuff now handled by the FSMC
driver.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Alessandro Rubini <rubini@unipv.it>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
This patch adds device tree properties for ST-Ericsson DB8500 thermal driver,
also adds the platform data to support the old fashion.
Signed-off-by: hongbo.zhang <hongbo.zhang@linaro.com>
Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
PXA95x isn't widely used. And it adds the effort on supporting
multiple platform. So remove it.
The assumption is that nobody will miss this support. If you are
reading this text because you actually require pxa95x support on
a new kernel, we can work out a way to revert this patch or add
support to the mmp platform.
Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Recent pin changes produce this warning:
arch/arm/mach-ux500/board-mop500-pins.c:73:22:
error: 'out_hi_wkup_pdis' defined but not used
[-Werror=unused-variable]
Fix this by deleting the offending definition.
Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Add CPSW and MDIO related device tree data for AM33XX.
Also enable them into board/evm dts files by providing
respective phy-id.
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Cc: Benoit Cousson <b-cousson@ti.com>
Acked-by: Peter Korsgaard <jacmet@sunsite.dk>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Enable CPSW support in defconfig which is present in AM33xx SoC
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This patch adds hwmod entry for davinci MDIO module,
creating parent<->child relationship between CPSW and MDIO module.
This Parent-child relation is required in order to use common resources
like, clock, but still maintaining the logical separation between them.
CPGMAC SubSystem consist of various sub-modules, like, mdio, cpdma,
cpsw, etc... These sub-modules are also used in some of Davinci
family of devices, so separate and independent platform devices &
drivers for CPSW and MDIO is implemented.
In case of AM33XX, the resources are shared and common register
bit-field is provided to control module/clock enable/disable,
makes it difficult to handle common resources from both drivers.
So the solution is, create parent<->child relationship between
CPGMAC & MDIO modules.
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Acked-by: Peter Korsgaard <jacmet@sunsite.dk>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Rename the prom_*_property routines of the generic OF code to of_*_property.
This brings them in line with the naming used by the rest of the OF code.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Acked-by: Geoff Levand <geoff@infradead.org>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit 908b75e8 (ARM: OMAP: add support for oscillator setup) added a new
API for oscillator setup, but is broken when CONFIG_PM=n.
The new functions have dummy definitions when CONFIG_PM=n, but also have
full implementations available, which conflict.
To fix, wrap the PM implmentations in #ifdef CONFIG_PM.
Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit c9621844 (ARM: OMAP4: PM: add errata support) introduced errata
handling for OMAP4, but was broken when CONFIG_PM=n.
When CONFIG_PM=n, pm44xx.c is not compiled, yet that is where pm44xx_errata
is defined. However, these errata are needed for the SMP boot/hotplug case
also, and are primarily used in omap-smp.c.
Move the definition of pm44xx_errata to omap-smp.c so that it's available
even in the CONFIG_PM=n case.
Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This patch implements ARM linux patch 6395/1 for Tegra. See commit
1a8e41c "ARM: 6395/1: VExpress: Set bit 22 in the PL310 (cache
controller) AuxCtlr register" for details.
Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
[swarren: added commit subject for referenced patch]
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Replaces several flags bearing the same meaning. There is no need
to set flags due to different omap types here, it can be checked
in appropriate places as well.
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: Nishanth Menon <nm@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Commit 6e740f9a8 (ARM: OMAP: Move omap-pm-noop.c local to mach-omap2)
moved omap-pm-noop to be local to mach-omap2. However, the makefile
entry got placed within ifeq ($(CONFIG_PM),y) which was not the
case earlier.
Fix the issue by moving it out of the ifeq ($(CONFIG_PM),y) in
the makefile as these stubs are needed also when PM is not set.
Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Tony Lindgren <tony@atomide.com>
The commit [i2c: omap: use revision check for OMAP_I2C_FLAG_APPLY_ERRATA_I207]
uses the revision id instead of the flag. So the flag can be safely removed.
Reviewed-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Instead of listing explicitly all boards in the .dt_compat field of
the DT_MACHINE_START structure for Armada 370/XP, use instead a
compatible string that is common to all boards using the Armada
370/XP.
This allows to add new boards by just using a different Device Tree,
without having to modify the source code of the kernel.
Note that the name of the array containing the compatible string is
also renamed, to reflect the fact that it no longer contains the list
of all boards.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
All the Device Tree files for Armada 370 and XP SoCs and boards use
the "armada-370-xp" common compatible string, except
armada-370-xp.dtsi which was specifying "armada_370_xp".
Fix this inconsistency by making armada-370-xp.dtsi declare a
compatible string of "armada-370-xp" like everyone else.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
This platform, available from Globalscale has an Armada 370. For now,
only the serial port is supported. Support for network, USB and other
peripherals will be added as drivers for them become available for
Armada 370 in mainline.
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
This is 3.8 material.
Changes from original version posted by Gregory:
* Renamed .dts file to armada-370-mirabox.dts
* Change compatible string to 'globalscale,mirabox'
* Remove compatible string from armada-370-xp.c
* Removed references to MBX0001
This platform, available in Japan from PlatHome, has a dual-core
Armada XP, the MV78260. For now, only the two serial ports and the
three front LEDs are supported. Support for SMP, network, SATA, USB
and other peripherals will be added as drivers for them become
available for Armada XP in mainline.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
This is 3.8 material.
Changes since v2:
* Renamed the .dts file to armada-xp-openblocks-ax3-4.dts
* Removed the compatible string from armada-370-xp.c (which now only
lists the common SoC compatible string)
Changes since v1:
* Renamed the board to OpenBlocks AX3-4, since there is a variant
called AX3-2 which has less RAM, and no mini PCIe port. Requested
by Andrew Lunn.
* Fix the amount of memory to 3 GB. In fact, the board has 1 GB
soldered, and 2 GB in a SODIMM slot (which is therefore
removable). But as the board is delivered as is, we'll assume it
has 3 GB of memory by default.
