05 Jan, 2012
2 commits
-
Conflicts:
arch/arm/mach-exynos/cpu.cThe changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c. -
Hook these platforms restart code into the new restart hook rather
than using arch_reset().Acked-by: Tony Lindgren
Signed-off-by: Russell King
22 Nov, 2011
1 commit
-
…l/git/maz/arm-platforms into devel-stable
Conflicts:
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/include/mach/omap4-common.h
arch/arm/plat-omap/include/plat/irqs.hThe changes to omap4-common.h were moved to arch/arm/mach-omap2/common.h
and the other trivial conflicts resolved. The now empty ifdef in irqs.h
was also eliminated.
18 Nov, 2011
1 commit
-
As suggested by Russell King - ARM Linux ,
there's no need to keep local prototypes in non-local headers.Add mach-omap1/common.h and mach-omap2/common.h and move the
local prototypes there from plat/common.h and mach/omap4-common.h.Signed-off-by: Tony Lindgren
Signed-off-by: Russell King
16 Nov, 2011
1 commit
-
Convert the omap2plus platforms to be using CONFIG_MULTI_IRQ_HANDLER.
Each machine is modified to provide either omap2_intc_handle_irq(),
omap3_intc_handle_irq() or gic_handle_irq().This allows for a major cleanup, removing the MULTI_OMAP setup
from the interrupt path.Tested on both Panda and IGEPv2 (single kernel image)
Tested-by: Tony Lindgren
Signed-off-by: Marc Zyngier
01 Nov, 2011
1 commit
-
Omap cleanups conflicted with omap2_dss work in a nontrivial
way, this is the most logical fixup.Conflicts:
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-apollon.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/board-rx51.cSigned-off-by: Arnd Bergmann
09 Oct, 2011
1 commit
30 Sep, 2011
1 commit
-
board-omap3touchbook.c adds an LCD device, but the kernel doesn't
contain a driver for the device. So let's remove the unneeded LCD
device.Cc: Gregoire Gentil
Acked-by: Tony Lindgren
Signed-off-by: Tomi Valkeinen
27 Sep, 2011
1 commit
-
With SoC specific timers, board specific init_irq is
no longer needed. Earlier this was still needed to
initialize the gptimer12 on Beagle based boards.Also convert board-h4.c to use omap2_init_irq accidentally
did not get converted earlier.Signed-off-by: Tony Lindgren
24 Aug, 2011
2 commits
-
Introduce them for each omap variant and just make them all call
omap2_init_common_infrastructure for now. Do this for each board-*.c
file except for board-generic and board-omap3beagle as they use
the same machine ID for multiple SoCs.No functional changes.
Signed-off-by: Tony Lindgren
-
There's no need to call omap2_init_common_devices from init_early.
It no longer does anything else except reprogram the memory timings
for some boards, so it's better to do it later so we have a chance
to get console messages if something goes wrong.Move it to happen after omap_serial_init gets called. And while
patching it anyways, rename it to omap_sdrc_init as suggested by
Benoit Cousson .Signed-off-by: Tony Lindgren
22 Aug, 2011
1 commit
-
Signed-off-by: Nicolas Pitre
Acked-by: Tony Lindgren
Acked-by: Arnd Bergmann
04 Jul, 2011
2 commits
-
Some regulator config can be moved out from board files,
since they are close to identical.Signed-off-by: Peter Ujfalusi
Acked-by: Tony Lindgren -
Reduce the amount of duplicated code by moving the common
configuration for twl4030/5030/tpsxx to the twl-common file.
Use the omap3_pmic_get_config function from board files to
properly configure the PMIC with the common fields.Signed-off-by: Peter Ujfalusi
Acked-by: Tony Lindgren
29 Jun, 2011
1 commit
28 Jun, 2011
1 commit
-
This is no longer needed as we now just set the desired
.timer in MACHINE_START. We can now also remove timer-gp.h.Signed-off-by: Tony Lindgren
Reviewed-by: Kevin Hilman
20 Jun, 2011
1 commit
-
This is needed for the following patches so we can initialize the
rest of the hardware timers later on.As with the init_irq calls, there's no need to do cpu_is_omap calls
during the timer init as we only care about the major omap generation.
This means that we can initialize the sys_timer with the .timer
entries alone.Note that for now we just set stubs for the various sys_timer entries
that will get populated in a later patch. The following patches will
also remove the omap_dm_timer_init calls and change the init for the
rest of the hardware timers to happen with an arch_initcall.Signed-off-by: Tony Lindgren
Reviewed-by: Kevin Hilman
16 Jun, 2011
1 commit
-
This allows us to remove cpu_is_omap calls from init_irq functions.
There should not be any need for cpu_is_omap calls as at this point.
During the timer init we only care about SoC generation, and not about
subrevisions.The main reason for the patch is that we want to initialize only
minimal omap specific code from the init_early call.Signed-off-by: Tony Lindgren
Reviewed-by: Kevin Hilman
14 Jun, 2011
2 commits
-
CC: Mark Brown
CC: Mike Rapoport
CC: Nishant Kamat
CC: Steve Sakoman
CC: Felipe Balbi
Signed-off-by: Oleg Drokin
Acked-by: Felipe Balbi
Signed-off-by: Tony Lindgren -
to use REGULATOR_SUPPLY arrays.
CC: Mark Brown
CC: Mike Rapoport
CC: Nishant Kamat
CC: Steve Sakoman
CC: Felipe Balbi
CC: Santosh Shilimkar
CC: peter.barada@logicpd.com
Signed-off-by: Oleg Drokin
Acked-by: Felipe Balbi
Signed-off-by: Tony Lindgren
01 Jun, 2011
1 commit
-
Several boards defining mtd partitions also defined NAND_BLOCK_SIZE as
SZ_128K. Move the define to common-board-devices.hThis removes multiple defines of NAND_BLOCK_SIZE.
Signed-off-by: Igor Grinberg
[tony@atomide.com: updated comments]
Signed-off-by: Tony Lindgren
12 May, 2011
1 commit
-
use gpio_request_() instead of multiple gpiolib calls,
remove unneeded variables, etc.Signed-off-by: Igor Grinberg
Signed-off-by: Tony Lindgren
09 May, 2011
1 commit
-
Most boards use exactly the same configuration for musb initialization.
Create a default that can be shared amount different boards.Signed-off-by: Mike Rapoport
Acked-by: Felipe Balbi
Signed-off-by: Tony Lindgren
03 May, 2011
3 commits
-
and reduce amount of copy/paste
Signed-off-by: Mike Rapoport
CC: Oleg Drokin
Signed-off-by: Tony Lindgren -
Introduce omap_pmic_init that registers i2c bus and PMIC device on that
bus and add omap2/3/4 wrappers for common cases.Signed-off-by: Mike Rapoport
Signed-off-by: Tony Lindgren -
Add common-board-devices.c that will contain the code for peripheral
devices initializatoin shared between multiple boards.
Start small with touchscreen initialization.Signed-off-by: Mike Rapoport
Signed-off-by: Tony Lindgren
18 Mar, 2011
1 commit
-
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (258 commits)
omap: zoom: host should not pull up wl1271's irq line
arm: plat-omap: iommu: fix request_mem_region() error path
OMAP2+: Common CPU DIE ID reading code reads wrong registers for OMAP4430
omap4: mux: Remove duplicate mux modes
omap: iovmm: don't check 'da' to set IOVMF_DA_FIXED flag
omap: iovmm: disallow mapping NULL address when IOVMF_DA_ANON is set
omap2+: mux: Fix compile when CONFIG_OMAP_MUX is not selected
omap4: board-omap4panda: Initialise the serial pads
omap3: board-3430sdp: Initialise the serial pads
omap4: board-4430sdp: Initialise the serial pads
omap2+: mux: Add macro for configuring static with omap_hwmod_mux_init
omap2+: mux: Remove the use of IDLE flag
omap2+: Add separate list for dynamic pads to mux
perf: add OMAP support for the new power events
OMAP4: Add IVA OPP enteries.
OMAP4: Update Voltage Rail Values for MPU, IVA and CORE
OMAP4: Enable 800 MHz and 1 GHz MPU-OPP
OMAP3+: OPP: Replace voltage values with Macros
OMAP3: wdtimer: Fix CORE idle transition
Watchdog: omap_wdt: add fine grain runtime-pm
...Fix up various conflicts in
- arch/arm/mach-omap2/board-omap3evm.c
- arch/arm/mach-omap2/clock3xxx_data.c
- arch/arm/mach-omap2/usb-musb.c
- arch/arm/plat-omap/include/plat/usb.h
- drivers/usb/musb/musb_core.h
03 Mar, 2011
1 commit
-
twl4030_codec_audio and twl4030_codec_vibra_data has unused field.
In order to remove it, corresponding settings needs to be removed
from board files.Signed-off-by: Ilkka Koskinen
Acked-by: Peter Ujfalusi
Acked-by: Mark Brown
Signed-off-by: Tony Lindgren
01 Mar, 2011
2 commits
-
The usbhs intialization is invoked by all omap3 and omap4
variant board files.Signed-off-by: Keshava Munegowda
Signed-off-by: Felipe Balbi -
Create the ehci and ohci specific platform data structures.
The port enum values are made common for both ehci and ohci.Signed-off-by: Keshava Munegowda
Signed-off-by: Felipe Balbi
26 Feb, 2011
2 commits
-
We should only call init_common_infrastructure and
init_common_devices from init_early.Signed-off-by: Tony Lindgren
-
init_early hook runs too early for omap3_mux_init(), so the board
won't boot. Moved to init_machine, then it works just fine.Signed-off-by: Radek Pilar
Signed-off-by: Tony Lindgren
15 Feb, 2011
1 commit
-
Move non-mapping and non-irq initialization code out of .map_io and
.init_irq respectively into the new init_early hook.Signed-off-by: Russell King
Signed-off-by: Tony Lindgren
22 Dec, 2010
1 commit
-
Split omap2_init_common_hw() into two functions. The first,
omap2_init_common_infrastructure(), initializes the hwmod code and
data, the OMAP PM code, and the clock code and data. The second,
omap2_init_common_devices(), handles any other early device
initialization that, for whatever reason, has not been or cannot be
moved to initcalls or early platform devices.This patch is required for the hwmod postsetup patch, which allows
board files to change the state that hwmods should be placed into at
the conclusion of the hwmod _setup() function. For example, for a
board whose creators wish to ensure watchdog coverage across the
entire kernel boot process, code to change the watchdog's postsetup
state will be added in the board-*.c file between the
omap2_init_common_infrastructure() and omap2_init_common_devices() function
calls.Signed-off-by: Paul Walmsley
Cc: Tony Lindgren
11 Dec, 2010
1 commit
08 Dec, 2010
1 commit
-
Implement GPIO as a platform device.
GPIO APIs are used in machine_init functions. Hence it is
required to complete GPIO probe before board_init. Therefore
GPIO device register and driver register are implemented as
postcore_initcalls.omap_gpio_init() does nothing now and this function would be
removed in the next patch as it's usage is spread across most
of the board files.Inorder to convert GPIO as platform device, modifications are
required in clockxxxx_data.c file for OMAP1 so that device names
can be used to obtain clock instead of getting clocks by
name/NULL ptr.Use runtime pm APIs (pm_runtime_put*/pm_runtime_get*) for enabling
or disabling the clocks, modify sysconfig settings and remove usage
of clock FW APIs.
Note 1: Converting GPIO driver to use runtime PM APIs is not done as a
separate patch because GPIO clock names are different for various OMAPs
and are different for some of the banks in the same CPU. This would need
usage of cpu_is checks and bank id checks while using clock FW APIs in
the gpio driver. Hence while making GPIO a platform driver framework,
PM runtime APIs are used directly.Note 2: While implementing GPIO as a platform device, pm runtime APIs
are used as mentioned above and modification is not done in gpio's
prepare for idle/ resume after idle functions. This would be done
in the next patch series and GPIO driver would be made to use dev_pm_ops
instead of sysdev_class in that series only.Due to the above, the GPIO driver implicitly relies on
CM_AUTOIDLE = 1 on its iclk for power management to work, since the
driver never disables its iclk.
This would be taken care in the next patch series (see Note 3 below).Refer to
http://www.mail-archive.com/linux-omap@vger.kernel.org/msg39112.html
for more details.Note 3: only pm_runtime_get_sync is called in gpio's probe() and
pm_runtime_put* is never called. This is to make the implementation
similar to the existing GPIO code. Another patch series would be sent
to correct this.In OMAP3 and OMAP4 gpio's debounce clocks are optional clocks. They
are enabled/ disabled whenever required using clock framework APIsTODO:
1. Cleanup the GPIO driver. Use function pointers and register
offest pointers instead of using hardcoded values
2. Remove all cpu_is_ checks and OMAP specific macros
3. Remove usage of gpio_bank array so that only
instance specific information is used in driver code
4. Rename 'method'/ avoid it's usage
5. Fix the non-wakeup gpios handling for OMAP2430, OMAP3 & OMAP4
6. Modify gpio's prepare for idle/ resume after idle functions
to use runtime pm implentation.Signed-off-by: Charulatha V
Signed-off-by: Rajendra Nayak
Reviewed-by: Basak, Partha
Acked-by: Kevin Hilman
[tony@atomide.com: updated for bank specific revision and updated boards]
Signed-off-by: Tony Lindgren
03 Dec, 2010
1 commit
-
If CONFIG_OMAP_MUX is not enabled, we can define board_mux in the header
file instead of forcing every single board to define it.Signed-off-by: Aaro Koskinen
[tony@atomide.com: updated for combined board-zoom files]
Signed-off-by: Tony Lindgren
26 Oct, 2010
1 commit
-
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (163 commits)
omap: complete removal of machine_desc.io_pg_offst and .phys_io
omap: UART: fix wakeup registers for OMAP24xx UART2
omap: Fix spotty MMC voltages
ASoC: OMAP4: MCPDM: Remove unnecessary include of plat/control.h
serial: omap-serial: fix signess error
OMAP3: DMA: Errata i541: sDMA FIFO draining does not finish
omap: dma: Fix buffering disable bit setting for omap24xx
omap: serial: Fix the boot-up crash/reboot without CONFIG_PM
OMAP3: PM: fix scratchpad memory accesses for off-mode
omap4: pandaboard: enable the ehci port on pandaboard
omap4: pandaboard: Fix the init if CONFIG_MMC_OMAP_HS is not set
omap4: pandaboard: remove unused hsmmc definition
OMAP: McBSP: Remove null omap44xx ops comment
OMAP: McBSP: Swap CLKS source definition
OMAP: McBSP: Fix CLKR and FSR signal muxing
OMAP2+: clock: reduce the amount of standard debugging while disabling unused clocks
OMAP: control: move plat-omap/control.h to mach-omap2/control.h
OMAP: split plat-omap/common.c
OMAP: McBSP: implement functional clock switching via clock framework
OMAP: McBSP: implement McBSP CLKR and FSR signal muxing via mach-omap2/mcbsp.c
...Fixed up trivial conflicts in arch/arm/mach-omap2/
{board-zoom-peripherals.c,devices.c} as per Tony
20 Oct, 2010
1 commit
-
Since we're now using addruart to establish the debug mapping, we can
remove the io_pg_offst and phys_io members of struct machine_desc.The various declarations were removed using the following script:
grep -rl MACHINE_START arch/arm | xargs \
sed -i '/MACHINE_START/,/MACHINE_END/ { /\.\(phys_io\|io_pg_offst\)/d }'[ Initial patch was from Jeremy Kerr, example script from Russell King ]
Signed-off-by: Nicolas Pitre
Acked-by: Eric Miao
09 Oct, 2010
1 commit
-
This patch fixes sparse warnings due non declarations of static functions.
arch/arm/mach-omap2/timer-gp.c:115:12: warning: symbol 'omap2_gp_clockevent_set_gptimer' was not declared. Should it be static?
arch/arm/mach-omap2/powerdomain.c:993:5: warning: symbol 'pwrdm_set_lowpwrstchange' was not declared. Should it be static?
arch/arm/mach-omap2/board-flash.c:141:8: warning: symbol 'board_nand_init' was not declared. Should it be static?
arch/arm/mach-omap2/board-n8x0.c:416:6: warning: symbol 'n8x0_mmc_slot1_cover_handler' was not declared. Should it be static?
arch/arm/mach-omap2/board-n8x0.c:544:13: warning: symbol 'n8x0_mmc_init' was not declared. Should it be static?
arch/arm/mach-omap2/board-rx51-peripherals.c:902:13: warning: symbol 'rx51_peripherals_init' was not declared. Should it be static?
arch/arm/mach-omap2/board-rx51-video.c:107:13: warning: symbol 'rx51_video_mem_init' was not declared. Should it be static?
arch/arm/mach-omap2/board-zoom-debugboard.c:155:12: warning: symbol 'zoom_debugboard_init' was not declared. Should it be static?
arch/arm/mach-omap2/board-zoom-peripherals.c:280:13: warning: symbol 'zoom_peripherals_init' was not declared. Should it be static?
arch/arm/mach-omap2/board-igep0020.c:110:13: warning: symbol 'igep2_flash_init' was not declared. Should it be static?
arch/arm/mach-omap2/board-am3517evm.c:109:6: warning: symbol 'am3517_evm_ethernet_init' was not declared. Should it be static?
drivers/mtd/onenand/omap2.c:577:5: warning: symbol 'omap2_onenand_rephase' was not declared. Should it be static?Signed-off-by: Manjunath Kondaiah G
Cc: linux-arm-kernel@lists.infradead.org
Cc: Nishanth Menon
Signed-off-by: Tony Lindgren