From 9cf61423edbcde19878964cee4efdf73c4573524 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Tue, 22 May 2012 12:52:11 -0500 Subject: [PATCH 01/53] v3.4 first pass Signed-off-by: Robert Nelson --- patch.sh | 153 +- ...state-usage-of-hi-speed-PLL-divider.patch} | 10 +- ...B-regulator-on-Beagle-xM-explicitly.patch} | 12 +- ...Toshiba-LTA070B220F-800x480-support.patch} | 6 +- ...to-fifo-mode-5-for-old-musb-beagles.patch} | 16 +- ...init-uart2-for-beagle-rev-AX-BX-only.patch | 136 ++ ...d-TLC59108-backlight-control-driver.patch} | 20 +- ...c59108-adjust-for-beagleboard-uLCD7.patch} | 6 +- .../0010-beagleboard-fix-uLCD7-support.patch | 66 - ...ODULE_ALIAS-to-mcbsp-and-pcm-drivers.patch | 37 - ...t-per-board-modules-to-platform-driv.patch | 1119 -------------- ...buddy-param-for-expansionboard-names.patch | 12 +- ...ion-add-mmc-regulator-and-ds1307-rtc.patch | 16 +- .../0003-expansion-add-zippy.patch | 19 +- .../0004-expansion-add-zippy2.patch | 19 +- .../0005-expansion-add-trainer.patch | 10 +- ...xpansion-add-CircuitCo-ulcd-Support.patch} | 115 +- .../0007-expansion-add-wifi.patch | 0 patches/defconfig | 362 +++-- ...d-use-samsung_lte_panel-2.6.37-git10.patch | 6 +- ...et-host-machine-after-dpkg-gencontro.patch | 8 +- patches/drm/0001-omap2-add-drm-device.patch | 221 +++ ...OD-Add-missing-flags-for-dispc-class.patch | 44 + ...WMOD-Add-missing-flag-for-rfbi-class.patch | 29 + ...Add-omap_hwmod_class_sysconfig-for-d.patch | 42 + ...age_alloc-remove-trailing-whitespace.patch | 63 + ...introduce-isolate_migratepages_range.patch | 142 ++ ...03-mm-compaction-introduce-map_pages.patch | 55 + ...on-introduce-isolate_freepages_range.patch | 195 +++ ...paction-export-some-of-the-functions.patch | 501 +++++++ ...e_alloc-introduce-alloc_contig_range.patch | 251 ++++ ...lloc-change-fallbacks-array-handling.patch | 61 + ...one-MIGRATE_CMA-migration-type-added.patch | 317 ++++ ...n-MIGRATE_CMA-isolation-functions-ad.patch | 262 ++++ ...-Serialize-access-to-min_free_kbytes.patch | 63 + ...im-code-from-__alloc_pages_direct_re.patch | 83 ++ ...reclaim-in-alloc_contig_range-to-sta.patch | 142 ++ ...vers-add-Contiguous-Memory-Allocator.patch | 757 ++++++++++ ...grate-CMA-with-DMA-mapping-subsystem.patch | 154 ++ ...grate-CMA-with-DMA-mapping-subsystem.patch | 805 ++++++++++ ...CMA-for-2-memory-banks-for-s5p-mfc-d.patch | 90 ++ ...w-APIs-to-configure-boot-address-and.patch | 109 ++ ...nterface-to-control-module-functions.patch | 53 + ...dge-use-scm-functions-to-set-boot-ad.patch | 74 + ...ake-board_onenand_init-visible-to-bo.patch | 61 - ...dd-support-for-Micron-NAND-Flash-sto.patch | 144 -- ...-ksz8851-eeprom-93cx6-add-drive_data.patch | 62 - ...-eeprom-93cx6-add-eeprom_93cx6_write.patch | 129 -- .../0003-ksz8851-read_mac_addr.patch | 93 -- .../0004-ksz8851-93cx6-eeprom-access.patch | 130 -- ...it-helps-to-include-the-include-file.patch | 43 - .../0006-ksz8851-move-to-header.patch | 326 ---- .../0007-ksz8851-move-more-to-header.patch | 143 -- ...08-ksz8851-share-ks8851_tx_hdr-union.patch | 95 -- .../0009-ksz8851-add-is_level_irq.patch | 101 -- ...-hardware-interrupt-druing-receive-p.patch | 42 - ...ake-sure-is-awake-before-writing-mac.patch | 63 - ...-ksz8851-add-mutex-lock-unlock-to-ks.patch | 42 - .../0013-ksz8851-add-ks8851_tx_check.patch | 121 -- ...14-ksz8851-move-ks8851_set_powermode.patch | 71 - ...anup-for-multi-SoC-support-move-into.patch | 422 ------ ...ufreq-OMAP-Add-SMP-support-for-OMAP4.patch | 191 --- ...nable-all-CPUs-in-shared-policy-mask.patch | 42 - ...-notify-even-with-bad-boot-frequency.patch | 48 - ...-OMAP-move-clk-name-decision-to-init.patch | 64 - ...MAP-deny-initialization-if-no-mpudev.patch | 64 - ...cpufreq-OMAP-dont-support-freq_table.patch | 125 -- ...ufreq-OMAP-only-supports-OPP-library.patch | 43 - ...freq-OMAP-put-clk-if-cpu_init-failed.patch | 61 - ...010-cpufreq-OMAP-fix-freq_table-leak.patch | 90 -- ...up-for-omap_device-changes-include-l.patch | 47 - ...tch => 0001-Fix-sprz319-erratum-2.1.patch} | 4 +- ...p3-Increase-limit-on-bootarg-mpurate.patch | 10 +- ...e-cpu-checks-for-populating-errata-f.patch | 150 ++ ...3505-fix-crash-on-boot-due-to-incorr.patch | 110 -- ...ART-enable-tx-wakeup-bit-for-wer-reg.patch | 95 ++ ...Don-t-wait-for-the-idle-status-if-mo.patch | 200 --- ...ce-omap34xx-omap4xx-cpu-checks-with-.patch | 34 + ...clock-Add-CPU-local-timer-clock-node.patch | 56 - ...05-mfd-cpu_is_omap3430-wasnt-defined.patch | 25 + ...data-disable-multiblock-reads-on-MMC.patch | 161 -- ...P-HWMOD-add-es3plus-to-am36xx-am35xx.patch | 34 - patches/panda/0001-panda-enable-asoc.patch | 1309 ----------------- .../0001-panda-fix-wl12xx-regulator.patch | 8 +- .../panda/0002-panda-enable-bluetooth.patch | 38 +- ...03-ti-st-st-kim-fixing-firmware-path.patch | 7 +- patches/ref_omap2plus_defconfig | 273 +++- ...SS2-add-bootarg-for-selecting-svideo.patch | 12 +- .../0002-video-add-timings-for-hd720.patch | 4 +- ...just-dto-to-eliminate-timeout-errors.patch | 8 +- .../sgx/0001-Revert-drm-kill-drm_sman.patch | 404 +++++ ...1-omap3-touchbook-remove-mmc-gpio_wp.patch | 39 - .../touchbook/0001-touchbook-add-madc.patch | 44 - ...omap3-touchbook-drop-u-boot-readonly.patch | 25 - ...02-touchbook-add-twl4030-bci-battery.patch | 41 - .../touchbook/board-omap3touchbook.c.3.0.0 | 650 -------- .../board-omap3touchbook.c.always.2.6.32 | 804 ---------- patches/touchbook/touchbook_fix.sh | 112 -- version.sh | 6 +- 99 files changed, 6072 insertions(+), 8115 deletions(-) rename patches/beagle/{0008-beagleboard-reinstate-usage-of-hi-speed-PLL-divider.patch => 0001-beagleboard-reinstate-usage-of-hi-speed-PLL-divider.patch} (72%) rename patches/beagle/{0009-Turn-on-the-USB-regulator-on-Beagle-xM-explicitly.patch => 0002-Turn-on-the-USB-regulator-on-Beagle-xM-explicitly.patch} (83%) rename patches/beagle/{0010-meego-modedb-add-Toshiba-LTA070B220F-800x480-support.patch => 0003-meego-modedb-add-Toshiba-LTA070B220F-800x480-support.patch} (85%) rename patches/beagle/{0011-default-to-fifo-mode-5-for-old-musb-beagles.patch => 0004-default-to-fifo-mode-5-for-old-musb-beagles.patch} (65%) create mode 100644 patches/beagle/0005-omap3_beagle-init-uart2-for-beagle-rev-AX-BX-only.patch rename patches/beagle/{0012-backlight-Add-TLC59108-backlight-control-driver.patch => 0006-backlight-Add-TLC59108-backlight-control-driver.patch} (92%) rename patches/beagle/{0013-tlc59108-adjust-for-beagleboard-uLCD7.patch => 0007-tlc59108-adjust-for-beagleboard-uLCD7.patch} (96%) delete mode 100644 patches/beagle/0010-beagleboard-fix-uLCD7-support.patch delete mode 100644 patches/beagle/0012-ASoC-omap-add-MODULE_ALIAS-to-mcbsp-and-pcm-drivers.patch delete mode 100644 patches/beagle/0013-ASoC-omap-convert-per-board-modules-to-platform-driv.patch rename patches/beagle/{ => expansion}/0001-expansion-add-buddy-param-for-expansionboard-names.patch (82%) rename patches/beagle/{ => expansion}/0002-expansion-add-mmc-regulator-and-ds1307-rtc.patch (77%) rename patches/beagle/{ => expansion}/0003-expansion-add-zippy.patch (81%) rename patches/beagle/{ => expansion}/0004-expansion-add-zippy2.patch (80%) rename patches/beagle/{ => expansion}/0005-expansion-add-trainer.patch (87%) rename patches/beagle/{0006-expansion-add-ulcd.patch => expansion/0006-expansion-add-CircuitCo-ulcd-Support.patch} (76%) rename patches/beagle/{ => expansion}/0007-expansion-add-wifi.patch (100%) create mode 100644 patches/drm/0001-omap2-add-drm-device.patch create mode 100644 patches/drm/0002-ARM-OMAP2-3-HWMOD-Add-missing-flags-for-dispc-class.patch create mode 100644 patches/drm/0003-ARM-OMAP2-3-HWMOD-Add-missing-flag-for-rfbi-class.patch create mode 100644 patches/drm/0004-ARM-OMAP3-HWMOD-Add-omap_hwmod_class_sysconfig-for-d.patch create mode 100644 patches/drm/cma/0001-mm-page_alloc-remove-trailing-whitespace.patch create mode 100644 patches/drm/cma/0002-mm-compaction-introduce-isolate_migratepages_range.patch create mode 100644 patches/drm/cma/0003-mm-compaction-introduce-map_pages.patch create mode 100644 patches/drm/cma/0004-mm-compaction-introduce-isolate_freepages_range.patch create mode 100644 patches/drm/cma/0005-mm-compaction-export-some-of-the-functions.patch create mode 100644 patches/drm/cma/0006-mm-page_alloc-introduce-alloc_contig_range.patch create mode 100644 patches/drm/cma/0007-mm-page_alloc-change-fallbacks-array-handling.patch create mode 100644 patches/drm/cma/0008-mm-mmzone-MIGRATE_CMA-migration-type-added.patch create mode 100644 patches/drm/cma/0009-mm-page_isolation-MIGRATE_CMA-isolation-functions-ad.patch create mode 100644 patches/drm/cma/0010-mm-Serialize-access-to-min_free_kbytes.patch create mode 100644 patches/drm/cma/0011-mm-extract-reclaim-code-from-__alloc_pages_direct_re.patch create mode 100644 patches/drm/cma/0012-mm-trigger-page-reclaim-in-alloc_contig_range-to-sta.patch create mode 100644 patches/drm/cma/0013-drivers-add-Contiguous-Memory-Allocator.patch create mode 100644 patches/drm/cma/0014-X86-integrate-CMA-with-DMA-mapping-subsystem.patch create mode 100644 patches/drm/cma/0015-ARM-integrate-CMA-with-DMA-mapping-subsystem.patch create mode 100644 patches/drm/cma/0016-ARM-Samsung-use-CMA-for-2-memory-banks-for-s5p-mfc-d.patch create mode 100644 patches/dsp/0001-OMAP2-control-new-APIs-to-configure-boot-address-and.patch create mode 100644 patches/dsp/0002-OMAP-dsp-interface-to-control-module-functions.patch create mode 100644 patches/dsp/0003-staging-tidspbridge-use-scm-functions-to-set-boot-ad.patch delete mode 100644 patches/igep0020/0001-ARM-OMAP2-nand-Make-board_onenand_init-visible-to-bo.patch delete mode 100644 patches/igep0020/0002-OMAP3-igep0020-Add-support-for-Micron-NAND-Flash-sto.patch delete mode 100644 patches/micrel_zippy2/0001-ksz8851-eeprom-93cx6-add-drive_data.patch delete mode 100644 patches/micrel_zippy2/0002-ksz8851-eeprom-93cx6-add-eeprom_93cx6_write.patch delete mode 100644 patches/micrel_zippy2/0003-ksz8851-read_mac_addr.patch delete mode 100644 patches/micrel_zippy2/0004-ksz8851-93cx6-eeprom-access.patch delete mode 100644 patches/micrel_zippy2/0005-ks8851.h-it-helps-to-include-the-include-file.patch delete mode 100644 patches/micrel_zippy2/0006-ksz8851-move-to-header.patch delete mode 100644 patches/micrel_zippy2/0007-ksz8851-move-more-to-header.patch delete mode 100644 patches/micrel_zippy2/0008-ksz8851-share-ks8851_tx_hdr-union.patch delete mode 100644 patches/micrel_zippy2/0009-ksz8851-add-is_level_irq.patch delete mode 100644 patches/micrel_zippy2/0010-ksz8851-turn-off-hardware-interrupt-druing-receive-p.patch delete mode 100644 patches/micrel_zippy2/0011-ksz8851-make-sure-is-awake-before-writing-mac.patch delete mode 100644 patches/micrel_zippy2/0012-ksz8851-add-mutex-lock-unlock-to-ks.patch delete mode 100644 patches/micrel_zippy2/0013-ksz8851-add-ks8851_tx_check.patch delete mode 100644 patches/micrel_zippy2/0014-ksz8851-move-ks8851_set_powermode.patch delete mode 100644 patches/omap_cpufreq/0001-cpufreq-OMAP-cleanup-for-multi-SoC-support-move-into.patch delete mode 100644 patches/omap_cpufreq/0002-cpufreq-OMAP-Add-SMP-support-for-OMAP4.patch delete mode 100644 patches/omap_cpufreq/0003-cpufreq-OMAP-Enable-all-CPUs-in-shared-policy-mask.patch delete mode 100644 patches/omap_cpufreq/0004-cpufreq-OMAP-notify-even-with-bad-boot-frequency.patch delete mode 100644 patches/omap_cpufreq/0005-cpufreq-OMAP-move-clk-name-decision-to-init.patch delete mode 100644 patches/omap_cpufreq/0006-cpufreq-OMAP-deny-initialization-if-no-mpudev.patch delete mode 100644 patches/omap_cpufreq/0007-cpufreq-OMAP-dont-support-freq_table.patch delete mode 100644 patches/omap_cpufreq/0008-cpufreq-OMAP-only-supports-OPP-library.patch delete mode 100644 patches/omap_cpufreq/0009-cpufreq-OMAP-put-clk-if-cpu_init-failed.patch delete mode 100644 patches/omap_cpufreq/0010-cpufreq-OMAP-fix-freq_table-leak.patch delete mode 100644 patches/omap_cpufreq/0011-cpufreq-OMAP-fixup-for-omap_device-changes-include-l.patch rename patches/omap_fixes/{0002-Fix-sprz319-erratum-2.1.patch => 0001-Fix-sprz319-erratum-2.1.patch} (98%) create mode 100644 patches/omap_fixes/0002-OMAP2-UART-Remove-cpu-checks-for-populating-errata-f.patch delete mode 100644 patches/omap_fixes/0003-ARM-OMAP-AM3517-3505-fix-crash-on-boot-due-to-incorr.patch create mode 100644 patches/omap_fixes/0003-OMAP2-UART-enable-tx-wakeup-bit-for-wer-reg.patch delete mode 100644 patches/omap_fixes/0004-ARM-OMAP4-hwmod-Don-t-wait-for-the-idle-status-if-mo.patch create mode 100644 patches/omap_fixes/0004-OMAP2-UART-replace-omap34xx-omap4xx-cpu-checks-with-.patch delete mode 100644 patches/omap_fixes/0005-ARM-OMAP4-clock-Add-CPU-local-timer-clock-node.patch create mode 100644 patches/omap_fixes/0005-mfd-cpu_is_omap3430-wasnt-defined.patch delete mode 100644 patches/omap_fixes/0006-ARM-OMAP3-hwmod-data-disable-multiblock-reads-on-MMC.patch delete mode 100644 patches/omap_fixes/0007-OMAP-HWMOD-add-es3plus-to-am36xx-am35xx.patch delete mode 100644 patches/panda/0001-panda-enable-asoc.patch create mode 100644 patches/sgx/0001-Revert-drm-kill-drm_sman.patch delete mode 100644 patches/touchbook/0001-omap3-touchbook-remove-mmc-gpio_wp.patch delete mode 100644 patches/touchbook/0001-touchbook-add-madc.patch delete mode 100644 patches/touchbook/0002-omap3-touchbook-drop-u-boot-readonly.patch delete mode 100644 patches/touchbook/0002-touchbook-add-twl4030-bci-battery.patch delete mode 100644 patches/touchbook/board-omap3touchbook.c.3.0.0 delete mode 100644 patches/touchbook/board-omap3touchbook.c.always.2.6.32 delete mode 100644 patches/touchbook/touchbook_fix.sh diff --git a/patch.sh b/patch.sh index b57ada599..074f4d8ed 100644 --- a/patch.sh +++ b/patch.sh @@ -41,42 +41,6 @@ distro () { git am "${DIR}/patches/distro/0001-kbuild-deb-pkg-set-host-machine-after-dpkg-gencontro.patch" } -omap_cpufreq () { - echo "omap-cpufreq" - git am "${DIR}/patches/omap_cpufreq/0001-cpufreq-OMAP-cleanup-for-multi-SoC-support-move-into.patch" - git am "${DIR}/patches/omap_cpufreq/0002-cpufreq-OMAP-Add-SMP-support-for-OMAP4.patch" - git am "${DIR}/patches/omap_cpufreq/0003-cpufreq-OMAP-Enable-all-CPUs-in-shared-policy-mask.patch" - git am "${DIR}/patches/omap_cpufreq/0004-cpufreq-OMAP-notify-even-with-bad-boot-frequency.patch" - git am "${DIR}/patches/omap_cpufreq/0005-cpufreq-OMAP-move-clk-name-decision-to-init.patch" - git am "${DIR}/patches/omap_cpufreq/0006-cpufreq-OMAP-deny-initialization-if-no-mpudev.patch" - git am "${DIR}/patches/omap_cpufreq/0007-cpufreq-OMAP-dont-support-freq_table.patch" - git am "${DIR}/patches/omap_cpufreq/0008-cpufreq-OMAP-only-supports-OPP-library.patch" - git am "${DIR}/patches/omap_cpufreq/0009-cpufreq-OMAP-put-clk-if-cpu_init-failed.patch" - git am "${DIR}/patches/omap_cpufreq/0010-cpufreq-OMAP-fix-freq_table-leak.patch" - git am "${DIR}/patches/omap_cpufreq/0011-cpufreq-OMAP-fixup-for-omap_device-changes-include-l.patch" -} - -micrel_zippy2 () { - echo "Micrel KZ8851 patches for: zippy2" - #originaly from: - #ftp://www.micrel.com/ethernet/8851/beagle_zippy_patches.tar.gz 137 KB 04/10/2010 12:26:00 AM - - git am "${DIR}/patches/micrel_zippy2/0001-ksz8851-eeprom-93cx6-add-drive_data.patch" - git am "${DIR}/patches/micrel_zippy2/0002-ksz8851-eeprom-93cx6-add-eeprom_93cx6_write.patch" - git am "${DIR}/patches/micrel_zippy2/0003-ksz8851-read_mac_addr.patch" - git am "${DIR}/patches/micrel_zippy2/0004-ksz8851-93cx6-eeprom-access.patch" - git am "${DIR}/patches/micrel_zippy2/0005-ks8851.h-it-helps-to-include-the-include-file.patch" - git am "${DIR}/patches/micrel_zippy2/0006-ksz8851-move-to-header.patch" - git am "${DIR}/patches/micrel_zippy2/0007-ksz8851-move-more-to-header.patch" - git am "${DIR}/patches/micrel_zippy2/0008-ksz8851-share-ks8851_tx_hdr-union.patch" - git am "${DIR}/patches/micrel_zippy2/0009-ksz8851-add-is_level_irq.patch" - git am "${DIR}/patches/micrel_zippy2/0010-ksz8851-turn-off-hardware-interrupt-druing-receive-p.patch" - git am "${DIR}/patches/micrel_zippy2/0011-ksz8851-make-sure-is-awake-before-writing-mac.patch" - git am "${DIR}/patches/micrel_zippy2/0012-ksz8851-add-mutex-lock-unlock-to-ks.patch" - git am "${DIR}/patches/micrel_zippy2/0013-ksz8851-add-ks8851_tx_check.patch" - git am "${DIR}/patches/micrel_zippy2/0014-ksz8851-move-ks8851_set_powermode.patch" -} - sakoman () { echo "Patches from: Sakoman git tree" git am "${DIR}/patches/sakoman/0001-OMAP-DSS2-add-bootarg-for-selecting-svideo.patch" @@ -88,26 +52,24 @@ sakoman () { beagle () { echo "Board Patches for: BeagleBoard" - git am "${DIR}/patches/beagle/0001-expansion-add-buddy-param-for-expansionboard-names.patch" - git am "${DIR}/patches/beagle/0002-expansion-add-mmc-regulator-and-ds1307-rtc.patch" - git am "${DIR}/patches/beagle/0003-expansion-add-zippy.patch" - git am "${DIR}/patches/beagle/0004-expansion-add-zippy2.patch" - git am "${DIR}/patches/beagle/0005-expansion-add-trainer.patch" - git am "${DIR}/patches/beagle/0006-expansion-add-ulcd.patch" - git am "${DIR}/patches/beagle/0007-expansion-add-wifi.patch" - - git am "${DIR}/patches/beagle/0008-beagleboard-reinstate-usage-of-hi-speed-PLL-divider.patch" - git am "${DIR}/patches/beagle/0009-Turn-on-the-USB-regulator-on-Beagle-xM-explicitly.patch" - git am "${DIR}/patches/beagle/0010-meego-modedb-add-Toshiba-LTA070B220F-800x480-support.patch" - git am "${DIR}/patches/beagle/0011-default-to-fifo-mode-5-for-old-musb-beagles.patch" - - git am "${DIR}/patches/beagle/0010-beagleboard-fix-uLCD7-support.patch" - git am "${DIR}/patches/beagle/0012-backlight-Add-TLC59108-backlight-control-driver.patch" - git am "${DIR}/patches/beagle/0013-tlc59108-adjust-for-beagleboard-uLCD7.patch" - - #dont push, upstream went a different way.. - git am "${DIR}/patches/beagle/0012-ASoC-omap-add-MODULE_ALIAS-to-mcbsp-and-pcm-drivers.patch" - git am "${DIR}/patches/beagle/0013-ASoC-omap-convert-per-board-modules-to-platform-driv.patch" + git am "${DIR}/patches/beagle/expansion/0001-expansion-add-buddy-param-for-expansionboard-names.patch" + git am "${DIR}/patches/beagle/expansion/0002-expansion-add-mmc-regulator-and-ds1307-rtc.patch" + git am "${DIR}/patches/beagle/expansion/0003-expansion-add-zippy.patch" + git am "${DIR}/patches/beagle/expansion/0004-expansion-add-zippy2.patch" + git am "${DIR}/patches/beagle/expansion/0005-expansion-add-trainer.patch" + git am "${DIR}/patches/beagle/expansion/0006-expansion-add-CircuitCo-ulcd-Support.patch" + +#changes need to be ported to the 3.4-rc.. +# git am "${DIR}/patches/beagle/expansion/0007-expansion-add-wifi.patch" + + git am "${DIR}/patches/beagle/0001-beagleboard-reinstate-usage-of-hi-speed-PLL-divider.patch" + git am "${DIR}/patches/beagle/0002-Turn-on-the-USB-regulator-on-Beagle-xM-explicitly.patch" + git am "${DIR}/patches/beagle/0003-meego-modedb-add-Toshiba-LTA070B220F-800x480-support.patch" + git am "${DIR}/patches/beagle/0004-default-to-fifo-mode-5-for-old-musb-beagles.patch" + git am "${DIR}/patches/beagle/0005-omap3_beagle-init-uart2-for-beagle-rev-AX-BX-only.patch" + + git am "${DIR}/patches/beagle/0006-backlight-Add-TLC59108-backlight-control-driver.patch" + git am "${DIR}/patches/beagle/0007-tlc59108-adjust-for-beagleboard-uLCD7.patch" } devkit8000 () { @@ -115,35 +77,65 @@ devkit8000 () { git am "${DIR}/patches/devkit8000/0001-arm-omap-devkit8000-for-lcd-use-samsung_lte_panel-2.6.37-git10.patch" } -igep0020 () { - echo "Board Patches for: igep0020" - git am "${DIR}/patches/igep0020/0001-ARM-OMAP2-nand-Make-board_onenand_init-visible-to-bo.patch" - git am "${DIR}/patches/igep0020/0002-OMAP3-igep0020-Add-support-for-Micron-NAND-Flash-sto.patch" -} - -touchbook () { - echo "Board Patches for: Touchbook" - git am "${DIR}/patches/touchbook/0001-omap3-touchbook-remove-mmc-gpio_wp.patch" - git am "${DIR}/patches/touchbook/0002-omap3-touchbook-drop-u-boot-readonly.patch" -} - panda () { echo "Board Patches for: PandaBoard" git am "${DIR}/patches/panda/0001-panda-fix-wl12xx-regulator.patch" git am "${DIR}/patches/panda/0002-panda-enable-bluetooth.patch" git am "${DIR}/patches/panda/0003-ti-st-st-kim-fixing-firmware-path.patch" - git am "${DIR}/patches/panda/0001-panda-enable-asoc.patch" } omap_fixes () { echo "omap cherry pick fixes" git am "${DIR}/patches/omap_fixes/0001-omap3-Increase-limit-on-bootarg-mpurate.patch" -# git am "${DIR}/patches/omap_fixes/0002-Fix-sprz319-erratum-2.1.patch" - git am "${DIR}/patches/omap_fixes/0003-ARM-OMAP-AM3517-3505-fix-crash-on-boot-due-to-incorr.patch" - git am "${DIR}/patches/omap_fixes/0004-ARM-OMAP4-hwmod-Don-t-wait-for-the-idle-status-if-mo.patch" - git am "${DIR}/patches/omap_fixes/0005-ARM-OMAP4-clock-Add-CPU-local-timer-clock-node.patch" - git am "${DIR}/patches/omap_fixes/0006-ARM-OMAP3-hwmod-data-disable-multiblock-reads-on-MMC.patch" - git am "${DIR}/patches/omap_fixes/0007-OMAP-HWMOD-add-es3plus-to-am36xx-am35xx.patch" + git am "${DIR}/patches/omap_fixes/0002-OMAP2-UART-Remove-cpu-checks-for-populating-errata-f.patch" + git am "${DIR}/patches/omap_fixes/0003-OMAP2-UART-enable-tx-wakeup-bit-for-wer-reg.patch" + git am "${DIR}/patches/omap_fixes/0004-OMAP2-UART-replace-omap34xx-omap4xx-cpu-checks-with-.patch" +# git am "${DIR}/patches/omap_fixes/0005-mfd-cpu_is_omap3430-wasnt-defined.patch" + +#breaks beagle c4, needs fix.. +# git am "${DIR}/patches/omap_fixes/0001-Fix-sprz319-erratum-2.1.patch" +} + +omapdrm () { + echo "omap testing omapdrm/kms" + + echo "Patches for 3.4-rc1-cma-v24" + #git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git 3.4-rc1-cma-v24 + git am "${DIR}/patches/drm/cma/0001-mm-page_alloc-remove-trailing-whitespace.patch" + git am "${DIR}/patches/drm/cma/0002-mm-compaction-introduce-isolate_migratepages_range.patch" + git am "${DIR}/patches/drm/cma/0003-mm-compaction-introduce-map_pages.patch" + git am "${DIR}/patches/drm/cma/0004-mm-compaction-introduce-isolate_freepages_range.patch" + git am "${DIR}/patches/drm/cma/0005-mm-compaction-export-some-of-the-functions.patch" + git am "${DIR}/patches/drm/cma/0006-mm-page_alloc-introduce-alloc_contig_range.patch" + git am "${DIR}/patches/drm/cma/0007-mm-page_alloc-change-fallbacks-array-handling.patch" + git am "${DIR}/patches/drm/cma/0008-mm-mmzone-MIGRATE_CMA-migration-type-added.patch" + git am "${DIR}/patches/drm/cma/0009-mm-page_isolation-MIGRATE_CMA-isolation-functions-ad.patch" + git am "${DIR}/patches/drm/cma/0010-mm-Serialize-access-to-min_free_kbytes.patch" + git am "${DIR}/patches/drm/cma/0011-mm-extract-reclaim-code-from-__alloc_pages_direct_re.patch" + git am "${DIR}/patches/drm/cma/0012-mm-trigger-page-reclaim-in-alloc_contig_range-to-sta.patch" + git am "${DIR}/patches/drm/cma/0013-drivers-add-Contiguous-Memory-Allocator.patch" + git am "${DIR}/patches/drm/cma/0014-X86-integrate-CMA-with-DMA-mapping-subsystem.patch" + git am "${DIR}/patches/drm/cma/0015-ARM-integrate-CMA-with-DMA-mapping-subsystem.patch" + + #posted: 13 Mar 2012 for 3.4 + git am "${DIR}/patches/drm/0001-omap2-add-drm-device.patch" + + #might be merged in 3.4 + git am "${DIR}/patches/drm/0002-ARM-OMAP2-3-HWMOD-Add-missing-flags-for-dispc-class.patch" + git am "${DIR}/patches/drm/0003-ARM-OMAP2-3-HWMOD-Add-missing-flag-for-rfbi-class.patch" + git am "${DIR}/patches/drm/0004-ARM-OMAP3-HWMOD-Add-omap_hwmod_class_sysconfig-for-d.patch" +} + +dsp () { + echo "dsp patches" + git am "${DIR}/patches/dsp/0001-OMAP2-control-new-APIs-to-configure-boot-address-and.patch" + git am "${DIR}/patches/dsp/0002-OMAP-dsp-interface-to-control-module-functions.patch" + git am "${DIR}/patches/dsp/0003-staging-tidspbridge-use-scm-functions-to-set-boot-ad.patch" +} + +sgx_mainline () { + echo "patches needed for external sgx bins" + git am "${DIR}/patches/sgx/0001-Revert-drm-kill-drm_sman.patch" } sgx () { @@ -206,18 +198,15 @@ patch -s -p1 < "${DIR}/patches/sgx/0001-Revert-OMAP-DSS2-remove-update_mode-from } distro -omap_cpufreq -micrel_zippy2 sakoman beagle devkit8000 -igep0020 -touchbook panda omap_fixes - -#dont push -sgx +omapdrm +dsp +sgx_mainline +#sgx echo "patch.sh ran successful" diff --git a/patches/beagle/0008-beagleboard-reinstate-usage-of-hi-speed-PLL-divider.patch b/patches/beagle/0001-beagleboard-reinstate-usage-of-hi-speed-PLL-divider.patch similarity index 72% rename from patches/beagle/0008-beagleboard-reinstate-usage-of-hi-speed-PLL-divider.patch rename to patches/beagle/0001-beagleboard-reinstate-usage-of-hi-speed-PLL-divider.patch index 5f5e25b28..f79d487b5 100644 --- a/patches/beagle/0008-beagleboard-reinstate-usage-of-hi-speed-PLL-divider.patch +++ b/patches/beagle/0001-beagleboard-reinstate-usage-of-hi-speed-PLL-divider.patch @@ -1,7 +1,7 @@ -From c33abd12fb974aebb5b72eebddfa5d5c78d5f8ea Mon Sep 17 00:00:00 2001 +From 2e9ac5ce24d1e416a885c3da20097d25a562264c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 25 Jan 2012 15:48:36 +0100 -Subject: [PATCH 08/13] beagleboard: reinstate usage of hi-speed PLL divider +Subject: [PATCH 1/7] beagleboard: reinstate usage of hi-speed PLL divider Signed-off-by: Koen Kooi --- @@ -9,10 +9,10 @@ Signed-off-by: Koen Kooi 1 file changed, 5 insertions(+) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index 8c37e99..21e7d08 100644 +index d4d8d96..f6a5554 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c -@@ -377,6 +377,11 @@ static struct omap_dss_device beagle_dvi_device = { +@@ -306,6 +306,11 @@ static struct omap_dss_device beagle_dvi_device = { .driver_name = "dvi", .data = &dvi_panel, .phy.dpi.data_lines = 24, @@ -25,5 +25,5 @@ index 8c37e99..21e7d08 100644 }; -- -1.7.9.5 +1.7.10 diff --git a/patches/beagle/0009-Turn-on-the-USB-regulator-on-Beagle-xM-explicitly.patch b/patches/beagle/0002-Turn-on-the-USB-regulator-on-Beagle-xM-explicitly.patch similarity index 83% rename from patches/beagle/0009-Turn-on-the-USB-regulator-on-Beagle-xM-explicitly.patch rename to patches/beagle/0002-Turn-on-the-USB-regulator-on-Beagle-xM-explicitly.patch index 6c0c7614c..01ad5c81b 100644 --- a/patches/beagle/0009-Turn-on-the-USB-regulator-on-Beagle-xM-explicitly.patch +++ b/patches/beagle/0002-Turn-on-the-USB-regulator-on-Beagle-xM-explicitly.patch @@ -1,7 +1,7 @@ -From 3023012ea12d051ea273566087ae47ededb25922 Mon Sep 17 00:00:00 2001 +From 2be0bf9cab68c56946218b83328dfc66f53623d5 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Thu, 23 Feb 2012 09:23:10 -0600 -Subject: [PATCH 09/13] Turn on the USB regulator on Beagle xM explicitly +Subject: [PATCH 2/7] Turn on the USB regulator on Beagle xM explicitly Turn on the USB regulator on Beagle xM explicitly when the USB subsystem asks for it, rather than relying on u-boot to do it. @@ -14,10 +14,10 @@ Signed-off-by: Robert Nelson 1 file changed, 19 insertions(+) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index 21e7d08..084abb5 100644 +index f6a5554..e3026a6 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c -@@ -480,6 +480,24 @@ static struct regulator_consumer_supply beagle_vsim_supply[] = { +@@ -417,6 +417,24 @@ static struct regulator_consumer_supply beagle_vsim_supply[] = { REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.0"), }; @@ -42,7 +42,7 @@ index 21e7d08..084abb5 100644 static struct gpio_led gpio_leds[]; static int beagle_twl_gpio_setup(struct device *dev, -@@ -590,6 +608,7 @@ static struct twl4030_platform_data beagle_twldata = { +@@ -517,6 +535,7 @@ static struct twl4030_platform_data beagle_twldata = { .gpio = &beagle_gpio_data, .vmmc1 = &beagle_vmmc1, .vsim = &beagle_vsim, @@ -51,5 +51,5 @@ index 21e7d08..084abb5 100644 static struct i2c_board_info __initdata beagle_i2c_eeprom[] = { -- -1.7.9.5 +1.7.10 diff --git a/patches/beagle/0010-meego-modedb-add-Toshiba-LTA070B220F-800x480-support.patch b/patches/beagle/0003-meego-modedb-add-Toshiba-LTA070B220F-800x480-support.patch similarity index 85% rename from patches/beagle/0010-meego-modedb-add-Toshiba-LTA070B220F-800x480-support.patch rename to patches/beagle/0003-meego-modedb-add-Toshiba-LTA070B220F-800x480-support.patch index b5503a445..c7cc0aa35 100644 --- a/patches/beagle/0010-meego-modedb-add-Toshiba-LTA070B220F-800x480-support.patch +++ b/patches/beagle/0003-meego-modedb-add-Toshiba-LTA070B220F-800x480-support.patch @@ -1,7 +1,7 @@ -From e4530cf3139f96d814e095a764f9b914332cc3ee Mon Sep 17 00:00:00 2001 +From d97eab0ae42d8b9a0cf36c4b07c4496a783101b8 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Wed, 23 Mar 2011 08:37:54 -0500 -Subject: [PATCH 10/13] meego: modedb add Toshiba LTA070B220F 800x480 support +Subject: [PATCH 3/7] meego: modedb add Toshiba LTA070B220F 800x480 support from http://wiki.meego.com/ARM/Meego_on_Beagleboard_from_scratch @@ -26,5 +26,5 @@ index 5b686de..69ad1ec 100644 #ifdef CONFIG_FB_MODE_HELPERS -- -1.7.9.5 +1.7.10 diff --git a/patches/beagle/0011-default-to-fifo-mode-5-for-old-musb-beagles.patch b/patches/beagle/0004-default-to-fifo-mode-5-for-old-musb-beagles.patch similarity index 65% rename from patches/beagle/0011-default-to-fifo-mode-5-for-old-musb-beagles.patch rename to patches/beagle/0004-default-to-fifo-mode-5-for-old-musb-beagles.patch index faca96035..069540921 100644 --- a/patches/beagle/0011-default-to-fifo-mode-5-for-old-musb-beagles.patch +++ b/patches/beagle/0004-default-to-fifo-mode-5-for-old-musb-beagles.patch @@ -1,7 +1,7 @@ -From 312ee1ae237f52bd1f94e08e48d328d1612a486b Mon Sep 17 00:00:00 2001 +From 41431ebd0f6e100266990a3ca3e5472d1f6d2cc4 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Sat, 8 Jan 2011 14:31:37 -0600 -Subject: [PATCH 11/13] default to fifo mode 5, for old musb beagles +Subject: [PATCH 4/7] default to fifo mode 5, for old musb beagles The fifo mode 4, 16kb can cause corruption on musb/omap35xx, use mode 5, 8kb... @@ -12,18 +12,18 @@ Signed-off-by: Robert Nelson 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c -index 920f04e..66ce5e0 100644 +index 66aaccf..d4bd034 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c -@@ -1015,7 +1015,7 @@ static void musb_shutdown(struct platform_device *pdev) +@@ -1035,7 +1035,7 @@ static void musb_shutdown(struct platform_device *pdev) || defined(CONFIG_USB_MUSB_OMAP2PLUS_MODULE) \ || defined(CONFIG_USB_MUSB_AM35X) \ || defined(CONFIG_USB_MUSB_AM35X_MODULE) --static ushort __initdata fifo_mode = 4; -+static ushort __initdata fifo_mode = 5; +-static ushort __devinitdata fifo_mode = 4; ++static ushort __devinitdata fifo_mode = 5; #elif defined(CONFIG_USB_MUSB_UX500) \ || defined(CONFIG_USB_MUSB_UX500_MODULE) - static ushort __initdata fifo_mode = 5; + static ushort __devinitdata fifo_mode = 5; -- -1.7.9.5 +1.7.10 diff --git a/patches/beagle/0005-omap3_beagle-init-uart2-for-beagle-rev-AX-BX-only.patch b/patches/beagle/0005-omap3_beagle-init-uart2-for-beagle-rev-AX-BX-only.patch new file mode 100644 index 000000000..dae06f83c --- /dev/null +++ b/patches/beagle/0005-omap3_beagle-init-uart2-for-beagle-rev-AX-BX-only.patch @@ -0,0 +1,136 @@ +From 7b106889464a0a1b1ad23df86a29ef81df79602d Mon Sep 17 00:00:00 2001 +From: "Govindraj.R" +Date: Tue, 6 Mar 2012 14:35:11 +0530 +Subject: [PATCH 5/7] omap3_beagle: init uart2 for beagle rev AX/BX only + +All beagle boards rev > AX/BX have external usb hubs connected to ehci +interface, external hub/peripheral uses a nreset sequence for which +uart2_rx.gpio_147 pin in mux mode4(USB2HS_nRST) is used on all beagle +boards expect rev Ax/BX. +(Reference to all beagle boards rev schematics: +http://beagleboard.org/hardware/design) + +Initialising uart2 will lead to serial init taking over uart2_rx pin +so init uart2_rx pin mux only for Beagle AX/BX rev boards. +Dont init uart2 for all other boards allowing usb_ehci functionality. + +To initialise individual uart port by id utilise and modify the existing +available func. omap_serial_board_init. + +Cc: Tony Lindgren +Cc: Kevin Hilman +Cc: Koen Kooi +Tested-by: Peter Ujfalusi +Tested-by: Robert Nelson +Signed-off-by: Govindraj.R +--- + arch/arm/mach-omap2/board-omap3beagle.c | 6 ++++- + arch/arm/mach-omap2/serial.c | 41 +++++++++++++++++------------- + arch/arm/plat-omap/include/plat/serial.h | 3 ++- + 3 files changed, 30 insertions(+), 20 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index e3026a6..059a308 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -132,6 +132,7 @@ static void __init omap3_beagle_init_rev(void) + beagle_config.mmc1_gpio_wp = 29; + beagle_config.reset_gpio = 170; + beagle_config.usr_button_gpio = 7; ++ omap_serial_board_init(NULL, 1); + break; + case 6: + printk(KERN_INFO "OMAP3 Beagle Rev: C1/C2/C3\n"); +@@ -797,7 +798,10 @@ static void __init omap3_beagle_init(void) + platform_add_devices(omap3_beagle_devices, + ARRAY_SIZE(omap3_beagle_devices)); + omap_display_init(&beagle_dss_data); +- omap_serial_init(); ++ omap_serial_board_init(NULL, 0); ++ omap_serial_board_init(NULL, 2); ++ omap_serial_board_init(NULL, 3); ++ + omap_sdrc_init(mt46h32m32lf6_sdrc_params, + mt46h32m32lf6_sdrc_params); + +diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c +index 9fc2f44..619f864 100644 +--- a/arch/arm/mach-omap2/serial.c ++++ b/arch/arm/mach-omap2/serial.c +@@ -279,30 +279,32 @@ void __init omap_serial_init_port(struct omap_board_data *bdata, + /** + * omap_serial_board_init() - initialize all supported serial ports + * @info: platform specific data pointer ++ * @port_id: uart port number to be initialised + * +- * Initializes all available UARTs as serial ports. Platforms ++ * Initializes individual UARTs as serial ports. Platforms + * can call this function when they want to have default behaviour +- * for serial ports (e.g initialize them all as serial ports). ++ * for serial ports (e.g initialize individual serial ports based on port id). + */ +-void __init omap_serial_board_init(struct omap_uart_port_info *info) ++void __init omap_serial_board_init(struct omap_uart_port_info *info, u8 port_id) + { + struct omap_uart_state *uart; + struct omap_board_data bdata; + +- list_for_each_entry(uart, &uart_list, node) { +- bdata.id = uart->num; +- bdata.flags = 0; +- bdata.pads = NULL; +- bdata.pads_cnt = 0; +- +- if (cpu_is_omap44xx() || cpu_is_omap34xx()) +- omap_serial_fill_default_pads(&bdata); +- +- if (!info) +- omap_serial_init_port(&bdata, NULL); +- else +- omap_serial_init_port(&bdata, &info[uart->num]); +- } ++ list_for_each_entry(uart, &uart_list, node) ++ if (uart->num == port_id) { ++ bdata.id = uart->num; ++ bdata.flags = 0; ++ bdata.pads = NULL; ++ bdata.pads_cnt = 0; ++ ++ if (!cpu_is_omap24xx()) ++ omap_serial_fill_default_pads(&bdata); ++ ++ if (!info) ++ omap_serial_init_port(&bdata, NULL); ++ else ++ omap_serial_init_port(&bdata, info); ++ } + } + + /** +@@ -314,5 +316,8 @@ void __init omap_serial_board_init(struct omap_uart_port_info *info) + */ + void __init omap_serial_init(void) + { +- omap_serial_board_init(NULL); ++ struct omap_uart_state *uart; ++ ++ list_for_each_entry(uart, &uart_list, node) ++ omap_serial_board_init(NULL, uart->num); + } +diff --git a/arch/arm/plat-omap/include/plat/serial.h b/arch/arm/plat-omap/include/plat/serial.h +index b073e5f..fd14d28 100644 +--- a/arch/arm/plat-omap/include/plat/serial.h ++++ b/arch/arm/plat-omap/include/plat/serial.h +@@ -110,7 +110,8 @@ struct omap_board_data; + struct omap_uart_port_info; + + extern void omap_serial_init(void); +-extern void omap_serial_board_init(struct omap_uart_port_info *platform_data); ++extern void omap_serial_board_init(struct omap_uart_port_info *platform_data, ++ u8 port_id); + extern void omap_serial_init_port(struct omap_board_data *bdata, + struct omap_uart_port_info *platform_data); + #endif +-- +1.7.10 + diff --git a/patches/beagle/0012-backlight-Add-TLC59108-backlight-control-driver.patch b/patches/beagle/0006-backlight-Add-TLC59108-backlight-control-driver.patch similarity index 92% rename from patches/beagle/0012-backlight-Add-TLC59108-backlight-control-driver.patch rename to patches/beagle/0006-backlight-Add-TLC59108-backlight-control-driver.patch index 3d854b94c..804c546e0 100644 --- a/patches/beagle/0012-backlight-Add-TLC59108-backlight-control-driver.patch +++ b/patches/beagle/0006-backlight-Add-TLC59108-backlight-control-driver.patch @@ -1,7 +1,7 @@ -From 3bec68a6e77311064e5274284dce131fa3891bf0 Mon Sep 17 00:00:00 2001 +From 2134615ec7a47ebbe3e94b9dd4104eecd337216d Mon Sep 17 00:00:00 2001 From: "Manjunathappa, Prakash" Date: Mon, 1 Aug 2011 18:25:11 +0530 -Subject: [PATCH 12/13] backlight: Add TLC59108 backlight control driver +Subject: [PATCH 6/7] backlight: Add TLC59108 backlight control driver This patch adds support for I2C configurable TLC59108 backlight control driver. @@ -13,14 +13,14 @@ Signed-off-by: Vaibhav Hiremath drivers/video/backlight/Makefile | 1 + drivers/video/backlight/tlc59108.c | 160 ++++++++++++++++++++++++++++++++++++ 3 files changed, 169 insertions(+) - create mode 100755 drivers/video/backlight/tlc59108.c + create mode 100644 drivers/video/backlight/tlc59108.c diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig -index 278aeaa..df9dac7 100644 +index af16884..55650a0 100644 --- a/drivers/video/backlight/Kconfig +++ b/drivers/video/backlight/Kconfig -@@ -342,6 +342,14 @@ config BACKLIGHT_AAT2870 - If you have a AnalogicTech AAT2870 say Y to enable the +@@ -361,6 +361,14 @@ config BACKLIGHT_PANDORA + If you have a Pandora console, say Y to enable the backlight driver. +config BACKLIGHT_TLC59108 @@ -35,17 +35,17 @@ index 278aeaa..df9dac7 100644 endif # BACKLIGHT_LCD_SUPPORT diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile -index fdd1fc4..ba31474 100644 +index 36855ae..3ebfaf8 100644 --- a/drivers/video/backlight/Makefile +++ b/drivers/video/backlight/Makefile -@@ -39,4 +39,5 @@ obj-$(CONFIG_BACKLIGHT_ADP8870) += adp8870_bl.o +@@ -41,4 +41,5 @@ obj-$(CONFIG_BACKLIGHT_ADP8870) += adp8870_bl.o obj-$(CONFIG_BACKLIGHT_88PM860X) += 88pm860x_bl.o obj-$(CONFIG_BACKLIGHT_PCF50633) += pcf50633-backlight.o obj-$(CONFIG_BACKLIGHT_AAT2870) += aat2870_bl.o +obj-$(CONFIG_BACKLIGHT_TLC59108) += tlc59108.o - + obj-$(CONFIG_BACKLIGHT_OT200) += ot200_bl.o diff --git a/drivers/video/backlight/tlc59108.c b/drivers/video/backlight/tlc59108.c -new file mode 100755 +new file mode 100644 index 0000000..4f4ea34 --- /dev/null +++ b/drivers/video/backlight/tlc59108.c diff --git a/patches/beagle/0013-tlc59108-adjust-for-beagleboard-uLCD7.patch b/patches/beagle/0007-tlc59108-adjust-for-beagleboard-uLCD7.patch similarity index 96% rename from patches/beagle/0013-tlc59108-adjust-for-beagleboard-uLCD7.patch rename to patches/beagle/0007-tlc59108-adjust-for-beagleboard-uLCD7.patch index ebcd773d8..42afe78f8 100644 --- a/patches/beagle/0013-tlc59108-adjust-for-beagleboard-uLCD7.patch +++ b/patches/beagle/0007-tlc59108-adjust-for-beagleboard-uLCD7.patch @@ -1,7 +1,7 @@ -From 7736b7376c4251e6a52010ac22e3c9673a41fba8 Mon Sep 17 00:00:00 2001 +From e2003817f197f6b7af7d86a1679daf00c9ab656e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 27 Apr 2012 21:30:00 +0200 -Subject: [PATCH 13/13] tlc59108: adjust for beagleboard+uLCD7 +Subject: [PATCH 7/7] tlc59108: adjust for beagleboard+uLCD7 Signed-off-by: Koen Kooi --- @@ -9,7 +9,7 @@ Signed-off-by: Koen Kooi 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/drivers/video/backlight/tlc59108.c b/drivers/video/backlight/tlc59108.c -index 4f4ea34..40a21e7 100755 +index 4f4ea34..40a21e7 100644 --- a/drivers/video/backlight/tlc59108.c +++ b/drivers/video/backlight/tlc59108.c @@ -29,9 +29,16 @@ diff --git a/patches/beagle/0010-beagleboard-fix-uLCD7-support.patch b/patches/beagle/0010-beagleboard-fix-uLCD7-support.patch deleted file mode 100644 index 08cbe2461..000000000 --- a/patches/beagle/0010-beagleboard-fix-uLCD7-support.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 2eb8353e5d6ad3bf3ce7f0e212f647fbb8362ec9 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Fri, 27 Apr 2012 16:57:27 +0200 -Subject: [PATCH 10/13] beagleboard: fix uLCD7 support - -Signed-off-by: Koen Kooi ---- - arch/arm/mach-omap2/board-omap3beagle.c | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index 30cb2f0..0299d47 100644 ---- a/arch/arm/mach-omap2/board-omap3beagle.c -+++ b/arch/arm/mach-omap2/board-omap3beagle.c -@@ -44,6 +44,7 @@ - #include - #include - #include