<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">Hi all,<div>I have merged the latest linus/master into 3.12-wip and then done a</div><div><br></div><div><span class="Apple-tab-span" style="white-space:pre"> </span>git diff --stat linus/master</div><div><br></div><div>This gives and interesting result showing how far away our 3.12-plus is from the mainline tree.</div><div>Mainly we have differences in</div><div><br></div><div><span class="Apple-tab-span" style="white-space:pre"> </span>299 files</div><div><br></div><div>Approx. half of it is the GPU/PVR driver source. So this sets a scale and a direction for upstreaming work:</div><div>get this number down...</div><div><br></div><div>Most differences are quite clear and can be easily grouped into topics.</div><div><br></div><div>I think such differences can also help to find the change/patch that did break some things in 3.12</div><div>(i.e. things that did work in 3.7 but aren't working any more, like WLAN/BT power control).</div><div><br></div><div>So I hope this list is helpful for all our kernel development activities.</div><div><br></div><div>BR,</div><div>Nikolaus</div><div><br></div><div><br></div><div><br></div><div>Here is the commented list:</div><div><font class="Apple-style-span" face="Courier"><br></font></div><div><font class="Apple-style-span" face="Courier">These files are simply usefull to keep synchronized with our tree and never will go upstream:</font></div><div><font class="Apple-style-span" face="Courier"><br></font></div><div><font class="Apple-style-span" face="Courier"> GTA04/README | 30 +<br> GTA04/bootargs.txt | 57 +<br> GTA04/scripts/vibra.py | 111 +<br> GTA04/udev-rules/charging.rules | 6 +<br> GTA04/udev-rules/hso.rules | 1 +<br> GTA04/udev-rules/input.rules | 7 +<br> GTA04/udev-rules/sensor.rules | 3 +</font></div><div><font class="Apple-style-span" face="Courier"><br></font></div><div><font class="Apple-style-span" face="Courier">Here we have our board config; DTS is planned to go upstream (they did forget us during the 3.12 merge window):</font></div><div><font class="Apple-style-span" face="Courier"><br> arch/arm/boot/dts/omap3-gta04.dts | 65 +<br> arch/arm/configs/gta04_debug_defconfig | 3372 +++++++++++++<br> arch/arm/configs/gta04_defconfig | 3741 ++++++++++++++<br> arch/arm/mach-omap2/Kconfig | 9 +<br> arch/arm/mach-omap2/Makefile | 3 +-<br> arch/arm/mach-omap2/board-omap3gta04.c | 1785 +++++++</font></div><div><font class="Apple-style-span" face="Courier"><br></font></div><div><font class="Apple-style-span" face="Courier">This needs some analysis what differences we really have and if we need them or if they are even harmful:<br> arch/arm/mach-omap2/clock.c | 2 +<br> arch/arm/mach-omap2/hsmmc.c | 7 +-<br> arch/arm/mach-omap2/hsmmc.h | 3 +<br> arch/arm/mach-omap2/omap_device.c | 8 +-<br> arch/arm/mach-omap2/omap_hwmod.c | 4 +-<br> arch/arm/mach-omap2/pm34xx.c | 8 +<br> arch/arm/mach-omap2/powerdomains3xxx_data.c | 2 +-</font></div><div><font class="Apple-style-span" face="Courier"><br></font></div><div><font class="Apple-style-span" face="Courier">Unclear:<br> arch/arm/tools/mach-types | 1 +<br> drivers/dma/omap-dma.c | 4 +-</font></div><div><font class="Apple-style-span" face="Courier"><br></font></div><div><font class="Apple-style-span" face="Courier">I think this are the modifications from Neil to make the WLAN/BT reset and power control a GPIO:<br> drivers/gpio/Kconfig | 13 +<br> drivers/gpio/Makefile | 2 +<br> drivers/gpio/gpio-omap.c | 137 +-<br> drivers/gpio/gpio-reg.c | 124 +<br> drivers/gpio/gpio-w2sg0004.c | 324 ++</font></div><div><font class="Apple-style-span" face="Courier"><br></font></div><div><font class="Apple-style-span" face="Courier">All the GPU/PVR additions:<br> drivers/gpu/Makefile | 2 +-<br> drivers/gpu/pvr/omap3/Kconfig | 92 +<br> drivers/gpu/pvr/omap3/Makefile | 266 +<br> drivers/gpu/pvr/omap3/ORIGIN.txt | 5 +<br> drivers/gpu/pvr/omap3/TSPA.txt | 54 +<br> drivers/gpu/pvr/omap3/include4/dbgdrvif.h | 381 ++<br> drivers/gpu/pvr/omap3/include4/img_defs.h | 153 +<br> drivers/gpu/pvr/omap3/include4/img_types.h | 214 +<br> drivers/gpu/pvr/omap3/include4/pdumpdefs.h | 126 +<br> drivers/gpu/pvr/omap3/include4/pvr_debug.h | 235 +<br> drivers/gpu/pvr/omap3/include4/pvrmodule.h | 48 +<br> drivers/gpu/pvr/omap3/include4/pvrversion.h | 69 +<br> drivers/gpu/pvr/omap3/include4/services.h | 1771 +++++++<br> drivers/gpu/pvr/omap3/include4/servicesext.h | 965 ++++<br> drivers/gpu/pvr/omap3/include4/sgx_options.h | 258 +<br> drivers/gpu/pvr/omap3/include4/sgxapi_km.h | 524 ++<br> drivers/gpu/pvr/omap3/include4/sgxscript.h | 99 +<br> .../3rdparty/bufferclass_example/Kbuild.mk | 45 +<br> .../3rdparty/bufferclass_example/Linux.mk | 45 +<br> .../bufferclass_example/bufferclass_example.c | 626 +++<br> .../bufferclass_example/bufferclass_example.h | 238 +<br> .../bufferclass_example_linux.c | 610 +++<br> .../bufferclass_example_linux.h | 67 +<br> .../bufferclass_example_private.c | 432 ++<br> .../bufferclass_example_private.h | 49 +<br> .../omap3/services4/3rdparty/bufferclass_ti/Kbuild | 11 +<br> .../services4/3rdparty/bufferclass_ti/Makefile | 25 +<br> .../services4/3rdparty/bufferclass_ti/bc_cat.c | 1157 +++++<br> .../services4/3rdparty/bufferclass_ti/bc_cat.h | 89 +<br> .../dc_omapfb3_linux/3rdparty_dc_drm_shared.h | 65 +<br> .../services4/3rdparty/dc_omapfb3_linux/Kbuild | 34 +<br> .../services4/3rdparty/dc_omapfb3_linux/Kbuild.mk | 49 +<br> .../services4/3rdparty/dc_omapfb3_linux/Linux.mk | 46 +<br> .../services4/3rdparty/dc_omapfb3_linux/omaplfb.h | 324 ++<br> .../dc_omapfb3_linux/omaplfb_displayclass.c | 1724 +++++++<br> .../3rdparty/dc_omapfb3_linux/omaplfb_linux.c | 1200 +++++<br> .../dc_ti335x_linux/3rdparty_dc_drm_shared.h | 65 +<br> .../services4/3rdparty/dc_ti335x_linux/Kbuild | 32 +<br> .../services4/3rdparty/dc_ti335x_linux/Kbuild.mk | 49 +<br> .../services4/3rdparty/dc_ti335x_linux/Linux.mk | 46 +<br> .../services4/3rdparty/dc_ti335x_linux/omaplfb.h | 324 ++<br> .../dc_ti335x_linux/omaplfb_displayclass.c | 1736 +++++++<br> .../3rdparty/dc_ti335x_linux/omaplfb_linux.c | 1219 +++++<br> .../dc_ti81xx_linux/3rdparty_dc_drm_shared.h | 65 +<br> .../services4/3rdparty/dc_ti81xx_linux/Kbuild | 32 +<br> .../services4/3rdparty/dc_ti81xx_linux/Kbuild.mk | 49 +<br> .../services4/3rdparty/dc_ti81xx_linux/Linux.mk | 46 +<br> .../services4/3rdparty/dc_ti81xx_linux/omaplfb.h | 324 ++<br> .../dc_ti81xx_linux/omaplfb_displayclass.c | 1736 +++++++<br> .../3rdparty/dc_ti81xx_linux/omaplfb_linux.c | 1212 +++++<br> .../pvr/omap3/services4/3rdparty/linux_drm/Kbuild | 51 +<br> .../omap3/services4/3rdparty/linux_drm/Kbuild.mk | 86 +<br> .../omap3/services4/3rdparty/linux_drm/Linux.mk | 45 +<br> .../services4/3rdparty/linux_drm/pvr_drm_mod.h | 49 +<br> .../services4/3rdparty/linux_drm/pvr_drm_stubs.c | 221 +<br> .../services4/include/env/linux/pvr_drm_shared.h | 70 +<br> .../gpu/pvr/omap3/services4/include/kernelbuffer.h | 97 +<br> .../pvr/omap3/services4/include/kerneldisplay.h | 238 +<br> drivers/gpu/pvr/omap3/services4/include/pdump.h | 51 +<br> .../gpu/pvr/omap3/services4/include/pvr_bridge.h | 2231 +++++++++<br> .../pvr/omap3/services4/include/pvr_bridge_km.h | 400 ++<br> drivers/gpu/pvr/omap3/services4/include/pvrmmap.h | 81 +<br> .../pvr/omap3/services4/include/pvrsrv_errors.h | 311 ++<br> .../gpu/pvr/omap3/services4/include/servicesint.h | 550 ++<br> .../gpu/pvr/omap3/services4/include/sgx_bridge.h | 779 +++<br> .../gpu/pvr/omap3/services4/include/sgx_mkif_km.h | 475 ++<br> .../services4/include/sgx_ukernel_status_codes.h | 966 ++++<br> drivers/gpu/pvr/omap3/services4/include/sgxinfo.h | 493 ++<br> .../services4/srvkm/bridged/bridged_pvr_bridge.c | 5274 ++++++++++++++++++++<br> .../services4/srvkm/bridged/bridged_pvr_bridge.h | 257 +<br> .../services4/srvkm/bridged/bridged_support.c | 117 +<br> .../services4/srvkm/bridged/bridged_support.h | 72 +<br> .../srvkm/bridged/sgx/bridged_sgx_bridge.c | 3864 ++++++++++++++<br> .../srvkm/bridged/sgx/bridged_sgx_bridge.h | 61 +<br> .../omap3/services4/srvkm/common/buffer_manager.c | 3365 +++++++++++++<br> .../pvr/omap3/services4/srvkm/common/deviceclass.c | 2786 +++++++++++<br> .../pvr/omap3/services4/srvkm/common/deviceid.h | 51 +<br> .../pvr/omap3/services4/srvkm/common/devicemem.c | 2430 +++++++++<br> .../gpu/pvr/omap3/services4/srvkm/common/handle.c | 2689 ++++++++++<br> .../gpu/pvr/omap3/services4/srvkm/common/hash.c | 738 +++<br> .../gpu/pvr/omap3/services4/srvkm/common/lists.c | 156 +<br> drivers/gpu/pvr/omap3/services4/srvkm/common/mem.c | 175 +<br> .../pvr/omap3/services4/srvkm/common/mem_debug.c | 272 +<br> .../gpu/pvr/omap3/services4/srvkm/common/metrics.c | 209 +<br> .../omap3/services4/srvkm/common/osfunc_common.c | 48 +<br> .../omap3/services4/srvkm/common/pdump_common.c | 2967 +++++++++++<br> .../gpu/pvr/omap3/services4/srvkm/common/perproc.c | 398 ++<br> .../gpu/pvr/omap3/services4/srvkm/common/power.c | 996 ++++<br> .../gpu/pvr/omap3/services4/srvkm/common/pvrsrv.c | 1833 +++++++<br> .../gpu/pvr/omap3/services4/srvkm/common/queue.c | 1493 ++++++<br> drivers/gpu/pvr/omap3/services4/srvkm/common/ra.c | 2149 ++++++++<br> .../pvr/omap3/services4/srvkm/common/refcount.c | 588 +++<br> .../gpu/pvr/omap3/services4/srvkm/common/resman.c | 985 ++++<br> .../pvr/omap3/services4/srvkm/devices/sgx/mmu.c | 4600 +++++++++++++++++<br> .../pvr/omap3/services4/srvkm/devices/sgx/mmu.h | 501 ++<br> .../gpu/pvr/omap3/services4/srvkm/devices/sgx/pb.c | 493 ++<br> .../services4/srvkm/devices/sgx/sgx_bridge_km.h | 279 ++<br> .../omap3/services4/srvkm/devices/sgx/sgxconfig.h | 481 ++<br> .../omap3/services4/srvkm/devices/sgx/sgxinfokm.h | 610 +++<br> .../omap3/services4/srvkm/devices/sgx/sgxinit.c | 3429 +++++++++++++<br> .../omap3/services4/srvkm/devices/sgx/sgxkick.c | 899 ++++<br> .../omap3/services4/srvkm/devices/sgx/sgxpower.c | 623 +++<br> .../omap3/services4/srvkm/devices/sgx/sgxreset.c | 808 +++<br> .../services4/srvkm/devices/sgx/sgxtransfer.c | 814 +++<br> .../omap3/services4/srvkm/devices/sgx/sgxutils.c | 1910 +++++++<br> .../omap3/services4/srvkm/devices/sgx/sgxutils.h | 195 +<br> .../pvr/omap3/services4/srvkm/env/linux/Kbuild.mk | 163 +<br> .../pvr/omap3/services4/srvkm/env/linux/Linux.mk | 45 +<br> .../pvr/omap3/services4/srvkm/env/linux/env_data.h | 93 +<br> .../omap3/services4/srvkm/env/linux/env_perproc.h | 79 +<br> .../pvr/omap3/services4/srvkm/env/linux/event.c | 414 ++<br> .../pvr/omap3/services4/srvkm/env/linux/event.h | 48 +<br> .../pvr/omap3/services4/srvkm/env/linux/linkage.h | 72 +<br> .../gpu/pvr/omap3/services4/srvkm/env/linux/lock.h | 56 +<br> .../gpu/pvr/omap3/services4/srvkm/env/linux/mm.c | 2799 +++++++++++<br> .../gpu/pvr/omap3/services4/srvkm/env/linux/mm.h | 734 +++<br> .../gpu/pvr/omap3/services4/srvkm/env/linux/mmap.c | 1630 ++++++<br> .../gpu/pvr/omap3/services4/srvkm/env/linux/mmap.h | 240 +<br> .../pvr/omap3/services4/srvkm/env/linux/module.c | 1214 +++++<br> .../pvr/omap3/services4/srvkm/env/linux/mutex.c | 153 +<br> .../pvr/omap3/services4/srvkm/env/linux/mutex.h | 90 +<br> .../pvr/omap3/services4/srvkm/env/linux/mutils.c | 166 +<br> .../pvr/omap3/services4/srvkm/env/linux/mutils.h | 119 +<br> .../pvr/omap3/services4/srvkm/env/linux/osfunc.c | 4639 +++++++++++++++++<br> .../omap3/services4/srvkm/env/linux/osperproc.c | 146 +<br> .../pvr/omap3/services4/srvkm/env/linux/pdump.c | 804 +++<br> .../omap3/services4/srvkm/env/linux/private_data.h | 95 +<br> .../gpu/pvr/omap3/services4/srvkm/env/linux/proc.c | 1417 ++++++<br> .../gpu/pvr/omap3/services4/srvkm/env/linux/proc.h | 134 +<br> .../omap3/services4/srvkm/env/linux/pvr_bridge_k.c | 524 ++<br> .../omap3/services4/srvkm/env/linux/pvr_debug.c | 506 ++<br> .../pvr/omap3/services4/srvkm/env/linux/pvr_drm.c | 716 +++<br> .../pvr/omap3/services4/srvkm/env/linux/pvr_drm.h | 160 +<br> .../omap3/services4/srvkm/env/linux/pvr_uaccess.h | 88 +<br> .../gpu/pvr/omap3/services4/srvkm/hwdefs/ocpdefs.h | 308 ++<br> .../pvr/omap3/services4/srvkm/hwdefs/sgx530defs.h | 542 ++<br> .../pvr/omap3/services4/srvkm/hwdefs/sgx540defs.h | 605 +++<br> .../pvr/omap3/services4/srvkm/hwdefs/sgx544defs.h | 1487 ++++++<br> .../gpu/pvr/omap3/services4/srvkm/hwdefs/sgxdefs.h | 112 +<br> .../pvr/omap3/services4/srvkm/hwdefs/sgxerrata.h | 518 ++<br> .../omap3/services4/srvkm/hwdefs/sgxfeaturedefs.h | 274 +<br> .../gpu/pvr/omap3/services4/srvkm/hwdefs/sgxmmu.h | 99 +<br> .../pvr/omap3/services4/srvkm/hwdefs/sgxmpdefs.h | 365 ++<br> .../omap3/services4/srvkm/include/buffer_manager.h | 622 +++<br> .../gpu/pvr/omap3/services4/srvkm/include/device.h | 409 ++<br> .../gpu/pvr/omap3/services4/srvkm/include/handle.h | 567 +++<br> .../gpu/pvr/omap3/services4/srvkm/include/hash.h | 277 +<br> .../gpu/pvr/omap3/services4/srvkm/include/lists.h | 349 ++<br> .../pvr/omap3/services4/srvkm/include/metrics.h | 146 +<br> .../gpu/pvr/omap3/services4/srvkm/include/osfunc.h | 793 +++<br> .../pvr/omap3/services4/srvkm/include/osperproc.h | 94 +<br> .../pvr/omap3/services4/srvkm/include/pdump_int.h | 100 +<br> .../pvr/omap3/services4/srvkm/include/pdump_km.h | 441 ++<br> .../omap3/services4/srvkm/include/pdump_osfunc.h | 337 ++<br> .../gpu/pvr/omap3/services4/srvkm/include/perfkm.h | 53 +<br> .../pvr/omap3/services4/srvkm/include/perproc.h | 150 +<br> .../gpu/pvr/omap3/services4/srvkm/include/power.h | 140 +<br> .../gpu/pvr/omap3/services4/srvkm/include/queue.h | 145 +<br> drivers/gpu/pvr/omap3/services4/srvkm/include/ra.h | 290 ++<br> .../pvr/omap3/services4/srvkm/include/refcount.h | 203 +<br> .../gpu/pvr/omap3/services4/srvkm/include/resman.h | 152 +<br> .../services4/srvkm/include/services_headers.h | 68 +<br> .../gpu/pvr/omap3/services4/srvkm/include/srvkm.h | 129 +<br> .../gpu/pvr/omap3/services4/srvkm/include/ttrace.h | 200 +<br> .../omap3/services4/srvkm/include/ttrace_common.h | 146 +<br> .../omap3/services4/srvkm/include/ttrace_tokens.h | 119 +<br> .../pvr/omap3/services4/system/include/syscommon.h | 395 ++<br> .../pvr/omap3/services4/system/omap3/oemfuncs.h | 56 +<br> .../pvr/omap3/services4/system/omap3/sysconfig.c | 966 ++++<br> .../pvr/omap3/services4/system/omap3/sysconfig.h | 54 +<br> .../gpu/pvr/omap3/services4/system/omap3/sysinfo.h | 41 +<br> .../pvr/omap3/services4/system/omap3/syslocal.h | 212 +<br> .../pvr/omap3/services4/system/omap3/sysutils.c | 30 +<br> .../omap3/services4/system/omap3/sysutils_linux.c | 587 +++<br> .../pvr/omap3/services4/system/omap3630/oemfuncs.h | 56 +<br> .../omap3/services4/system/omap3630/sysconfig.c | 966 ++++<br> .../omap3/services4/system/omap3630/sysconfig.h | 54 +<br> .../pvr/omap3/services4/system/omap3630/sysinfo.h | 41 +<br> .../pvr/omap3/services4/system/omap3630/syslocal.h | 212 +<br> .../pvr/omap3/services4/system/omap3630/sysutils.c | 30 +<br> .../services4/system/omap3630/sysutils_linux.c | 587 +++<br> .../pvr/omap3/services4/system/omap4/oemfuncs.h | 80 +<br> .../pvr/omap3/services4/system/omap4/sysconfig.c | 1298 +++++<br> .../pvr/omap3/services4/system/omap4/sysconfig.h | 110 +<br> .../gpu/pvr/omap3/services4/system/omap4/sysinfo.h | 64 +<br> .../pvr/omap3/services4/system/omap4/syslocal.h | 258 +<br> .../pvr/omap3/services4/system/omap4/sysutils.c | 49 +<br> .../omap3/services4/system/omap4/sysutils_linux.c | 849 ++++<br> .../pvr/omap3/services4/system/ti335x/oemfuncs.h | 56 +<br> .../pvr/omap3/services4/system/ti335x/sysconfig.c | 966 ++++<br> .../pvr/omap3/services4/system/ti335x/sysconfig.h | 54 +<br> .../pvr/omap3/services4/system/ti335x/sysinfo.h | 41 +<br> .../pvr/omap3/services4/system/ti335x/syslocal.h | 212 +<br> .../pvr/omap3/services4/system/ti335x/sysutils.c | 30 +<br> .../omap3/services4/system/ti335x/sysutils_linux.c | 536 ++<br> .../pvr/omap3/services4/system/ti81xx/oemfuncs.h | 56 +<br> .../pvr/omap3/services4/system/ti81xx/sysconfig.c | 969 ++++<br> .../pvr/omap3/services4/system/ti81xx/sysconfig.h | 59 +<br> .../pvr/omap3/services4/system/ti81xx/sysinfo.h | 41 +<br> .../pvr/omap3/services4/system/ti81xx/syslocal.h | 212 +<br> .../pvr/omap3/services4/system/ti81xx/sysutils.c | 30 +<br> .../omap3/services4/system/ti81xx/sysutils_linux.c | 559 +++</font></div><div><font class="Apple-style-span" face="Courier"><br></font></div><div><font class="Apple-style-span" face="Courier">Unclear:<br> drivers/input/misc/bma150.c | 2 +-</font></div><div><font class="Apple-style-span" face="Courier"><br></font></div><div><font class="Apple-style-span" face="Courier">Ok, our specific tsc2007-gta04 addition - we should try to get it upstream:<br> drivers/input/touchscreen/Kconfig | 11 +<br> drivers/input/touchscreen/Makefile | 1 +<br> drivers/input/touchscreen/tsc2007-gta04.c | 606 +++<br> drivers/input/touchscreen/tsc2007.c | 8 +-</font></div><div><font class="Apple-style-span" face="Courier"><br></font></div><div><font class="Apple-style-span" face="Courier">Camera addition (should go upstream - maybe in drivers/staging/media)):<br> drivers/media/i2c/Kconfig | 8 +<br> drivers/media/i2c/Makefile | 1 +<br> drivers/media/i2c/ov9655.c | 1824 +++++++</font></div><div><font class="Apple-style-span" face="Courier"><br></font></div><div><font class="Apple-style-span" face="Courier">I think here hide some of Neil's patches for power management and wakeup:<br> drivers/mfd/twl4030-irq.c | 2 +-<br> drivers/mfd/twl4030-power.c | 11 +-<br> drivers/misc/bmp085.c | 69 +-<br> drivers/mmc/host/omap_hsmmc.c | 26 +-<br> drivers/net/usb/hso.c | 6 +-<br> drivers/power/Kconfig | 6 +<br> drivers/power/Makefile | 1 +<br> drivers/power/bq27x00_battery.c | 20 +-<br> drivers/power/twl4030_charger.c | 148 +-<br> drivers/pwm/Kconfig | 9 +<br> drivers/pwm/Makefile | 1 +<br> drivers/pwm/pwm-omap.c | 249 +</font></div><div><font class="Apple-style-span" face="Courier"><br></font></div><div><font class="Apple-style-span" face="Courier">CCG is the Android Gadget stuff (neither tested nor wanted by upstream maintainers):<br> drivers/staging/Kconfig | 2 +<br> drivers/staging/Makefile | 1 +<br> drivers/staging/ccg/Kconfig | 20 +<br> drivers/staging/ccg/Makefile | 4 +<br> drivers/staging/ccg/TODO | 6 +<br> drivers/staging/ccg/ccg.c | 995 ++++<br> drivers/staging/ccg/sysfs-class-ccg_usb | 128 +</font></div><div><font class="Apple-style-span" face="Courier"><br></font></div><div><font class="Apple-style-span" face="Courier">The ITG3200 (I think this is our own addition since it is so big):<br> drivers/staging/iio/gyro/Kconfig | 12 +<br> drivers/staging/iio/gyro/Makefile | 2 +<br> drivers/staging/iio/gyro/itg3200_core.c | 580 +++<br> drivers/staging/iio/gyro/itg3200_platform_data.h | 11 +</font></div><div><font class="Apple-style-span" face="Courier"><br></font></div><div><font class="Apple-style-span" face="Courier">Maybe Neil's special wakeup code for GPS/BT power control:<br> drivers/tty/serial/omap-serial.c | 38 +-</font></div><div><font class="Apple-style-span" face="Courier"><br></font></div><div><font class="Apple-style-span" face="Courier">Unclear:<br> drivers/usb/gadget/f_uac2.c | 2 +-<br> drivers/usb/musb/musb_core.c | 3 +<br> drivers/usb/phy/phy-twl4030-usb.c | 84 +-<br> drivers/usb/phy/phy.c | 3 +-</font></div><div><font class="Apple-style-span" face="Courier"><br></font></div><div><font class="Apple-style-span" face="Courier">The new Display panel driver (should go upstream easily into 3.13):<br> drivers/video/Kconfig | 2 +<br> drivers/video/omap2/displays-new/Kconfig | 6 +<br> drivers/video/omap2/displays-new/Makefile | 1 +<br> .../omap2/displays-new/panel-tpo-td028ttec1.c | 549 ++</font></div><div><font class="Apple-style-span" face="Courier"><br></font></div><div><font class="Apple-style-span" face="Courier">Header files for additions/modifications:<br> include/linux/gpio-reg.h | 8 +<br> include/linux/gpio-w2sg0004.h | 10 +<br> include/linux/i2c/bmp085.h | 16 +<br> include/linux/i2c/tsc2007.h | 15 +-<br> include/linux/platform_data/mmc-omap.h | 1 +<br> include/linux/platform_data/omap-pwm.h | 20 +<br> include/linux/platform_data/omap-twl4030.h | 5 +<br> include/media/ov9655.h | 16 +<br> include/video/omap-panel-data.h | 22 +</font></div><div><font class="Apple-style-span" face="Courier"><br></font></div><div><font class="Apple-style-span" face="Courier">Unclear:<br> kernel/irq/pm.c | 2 +-</font></div><div><font class="Apple-style-span" face="Courier"><br></font></div><div><font class="Apple-style-span" face="Courier">To get it cross-compiled on a Mac OS X HOSTCC:<br> scripts/sortextable.c | 3 +</font></div><div><font class="Apple-style-span" face="Courier"><br></font></div><div><font class="Apple-style-span" face="Courier">Finally all GTA04 voice & sound additions:<br> sound/soc/codecs/Kconfig | 24 +<br> sound/soc/codecs/Makefile | 10 +<br> sound/soc/codecs/gtm601.c | 95 +<br> sound/soc/codecs/gtm601.h | 23 +<br> sound/soc/codecs/si47xx.c | 497 ++<br> sound/soc/codecs/si47xx.h | 23 +<br> sound/soc/codecs/twl4030.c | 134 +-<br> sound/soc/codecs/twl4030.h | 53 +<br> sound/soc/codecs/w2cbw003-bt.c | 100 +<br> sound/soc/codecs/w2cbw003-bt.h | 23 +<br> sound/soc/omap/Kconfig | 8 +<br> sound/soc/omap/Makefile | 3 +<br> sound/soc/omap/gta04-audio.c | 372 ++<br> sound/soc/omap/gta04-fm.c | 187 +<br> sound/soc/omap/gta04-headset.c | 146 +<br> sound/soc/omap/gta04-jack.c | 230 +<br> sound/soc/omap/gta04-voice.c | 159 +<br> sound/soc/omap/omap-mcbsp.c | 33 +<br> sound/soc/omap/omap-twl4030.c | 7 +<br> 299 files changed, 131675 insertions(+), 99 deletions(-)<br></font><br></div></body></html>