fix build
Revert "OMAP3+: OPP: Remove unused _volt_to_opp() function"

This reverts commit 4f20761195c3afc06feac68d61fc6b1310891296.
OMAP: Support for Android RAM console

Android's RAMCONSOLE framework is handy framework which allows
saving the kernel printk messages to a buffer in RAM, so that
after a kernel panic they can be viewed in the next kernel
invocation, by accessing /proc/last_kmsg.

This obviously needs DDR to be in selfrefresh mode. Board files
which have relevant support need to enable CONFIG_OMAP_RAM_CONSOLE
and call omap_ram_console_init with relevant parameters for this
to function.

Change-Id: I2dd5ad55a0a3af5a5dcb9a9b8a797e1371af39bc
Signed-off-by: Huzefa Kankroliwala <huzefank@ti.com>
Signed-off-by: Akash Choudhari <akashc@ti.com>
Signed-off-by: Ameya Palande <ameya.palande@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>

Conflicts:
	arch/arm/mach-omap2/Makefile
ARM: OMAP: Fix ramconsole init.

Fix the issue when trying to register a platform device
before the platform device was initialized.

Postpone the device registration until the board file init.

Change-Id: I3920f9236fec957e4f63f39ff9aa3bae530af014
Signed-off-by: Dan Murphy <dmurphy@ti.com>
OMAP: ramconsole: fix offset by 1 error in recovery path

memblock_add in recovery path of omap_ram_console_register takes
size parameter which is end - start + 1 instead of just end - start.

Change-Id: Iceb88c41538e497611d94dc49e2fc2fff8ee4d30
Signed-off-by: Nishanth Menon <nm@ti.com>
OMAP: ramconsole: make omap_ram_console_register device_initcall

Commit: 65b0b50251c8aa66d5e1da712e3183c74b08c615
(ARM: OMAP: Fix ramconsole init) fixes the symptom of not having
platform_device root device available at reserve. However,
there is no need for omap_ram_console_register to be invoked
by board files as we can do the registration internal to ram_console
logic itself as part of device_initcall.

We use a flag to ensure that we register the device only if the board
file has updated relevant parameters.

Change-Id: I1a0c622612007b0a0ce3249cf71a1dfed9401e24
Signed-off-by: Nishanth Menon <nm@ti.com>
fix board-tuna
Revert "OMAP4: otg: phy: remove uggly mdelay(300)"

This reverts commit 0be577992ab60ac9b4ff62617a216899ba847ba6.
Revert "OMAP4: otg: phy: fix charger detection"

This reverts commit db438451f94e5b4e4c83ea3ff07e7cac3e6e5157.
Revert "usb: omap4: add HSIC support"

This reverts commit 22f161dd2a49852c38e951bb01dc09fdb03db65d.
fix build
Revert "ion: Switch map/unmap dma api to sg_tables"

This reverts commit 6ed0954d163e60099ee1f1ba5e85c842a710482a.

Conflicts:
	drivers/gpu/ion/ion_priv.h
	drivers/gpu/ion/ion_system_heap.c
Revert "mfd: twl: Register suspend/resume hooks for IRQ wakeup capability."

This reverts commit 8d96b8201fc57840ff0361df4db399c9e2156b6c.
Revert "MFD: TWL: Regulator: Link USB LDO with USB OTG"

This reverts commit 6ca2057bb522d1a75824fdb4409402cd66dca1f6.
Revert "OMAP4: USB: remove unused function twl6030_set_phy_clk"

This reverts commit 5ac98a916d6ad1cca58e8e236e28f7d5bbe98078.
Revert "USB: OTG : Wake lock holding decision based on usb connect/disconnect"

This reverts commit a5ef0daeab7e24b51c98c586b877021761c3a85f.
Revert " soundcontrol: add a new version that talks directly with the HSGAIN h…"

This reverts commit 69970d0abb392613ed6c1d7b1d1e786158a7d38a.

Conflicts:
	arch/arm/boot/zImage
	drivers/misc/Makefile
one more build fix