From 01e64ad1310344c78aee3b2634acaed5b8e988cf Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 27 Nov 2014 07:33:50 +0100 Subject: [PATCH] kernel: remove obsolete modules and patches. --- lfs/compat-drivers | 138 - lfs/e1000 | 90 - lfs/kvm-kmod | 86 - lfs/linux | 2 - lfs/mISDN | 119 - lfs/r8101 | 90 - lfs/r8168 | 89 - lfs/r8169 | 95 - lfs/v4l-dvb | 103 - make.sh | 23 - ...mmon-Add-default-power-configuration.patch | 88 - ...p3isp-Use-the-common-clock-framework.patch | 444 -- .../3isp/0002-mt9m032-Fix-PLL-setup.patch | 91 - ...9m032-Define-MT9M032_READ_MODE1-bits.patch | 55 - ...04-mt9p031-Use-devm_-managed-helpers.patch | 62 - ...5-mt9p031-Add-support-for-regulators.patch | 82 - ...9p031-Use-the-common-clock-framework.patch | 110 - ...-Toshiba-LTA070B220F-800x480-support.patch | 30 - ...dd-TLC59108-backlight-control-driver.patch | 217 - ...lc59108-adjust-for-beagleboard-uLCD7.patch | 124 - .../beagle/0004-zeroMAP-Open-your-eyes.patch | 31 - ...gle-use-TWL4030-generic-reset-script.patch | 29 - ...-DSS2-use-DSI-PLL-for-DPI-with-OMAP3.patch | 28 - ...-add-buddy-param-for-expansionboard-.patch | 63 - .../0002-Beagle-expansion-add-zippy.patch | 242 - .../0003-Beagle-expansion-add-zippy2.patch | 86 - .../0004-Beagle-expansion-add-trainer.patch | 55 - ...expansion-add-CircuitCo-ulcd-Support.patch | 285 - .../0006-Beagle-expansion-add-wifi.patch | 180 - ...0007-Beagle-expansion-add-beaglefpga.patch | 117 - .../0008-Beagle-expansion-add-spidev.patch | 35 - ...e-expansion-add-Aptina-li5m03-camera.patch | 217 - ...xpansion-add-LSR-COM6L-Adapter-Board.patch | 123 - ...-LSR-COM6L-Adapter-Board-also-initia.patch | 73 - ...gle-expansion-extend-spidev-to-uart2.patch | 43 - .../0001-panda-fix-wl12xx-regulator.patch | 27 - ...02-ti-st-st-kim-fixing-firmware-path.patch | 36 - .../0003-Panda-expansion-add-spidev.patch | 112 - ...S-disable-cpufreq-so-board-will-boot.patch | 38 - ...t-Enable-debug-powerdown-only-if-sys.patch | 122 - ...or-twl-Remove-TWL6030_FIXED_RESOURCE.patch | 39 - ...-twl-Remove-another-unused-variable-.patch | 34 - ...-twl-Remove-references-to-the-twl403.patch | 28 - ...-twl-Remove-references-to-32kHz-cloc.patch | 49 - .../0011-panda-spidev-setup-pinmux.patch | 50 - ...SS2-add-bootarg-for-selecting-svideo.patch | 78 - .../0002-video-add-timings-for-hd720.patch | 28 - ...-flush-management-symbols-when-MULTI.patch | 34 - .../0001-imx6qdl-wandboard-dts-backport.patch | 6354 ----------------- ...wandboard-add-gpio-lines-to-wandboar.patch | 41 - ...x6qdl-wandboard-Add-support-for-i2c1.patch | 33 - ...d-add-binding-for-wand-rfkill-driver.patch | 52 - ...ARM-dts-imx6qdl-add-pcie-device-node.patch | 38 - .../imx/0001-i2c-imx-retry-on-NAK.patch | 38 - ....MX6-Wandboard-add-CKO1-clock-output.patch | 29 - ...ermal-add-imx-thermal-driver-support.patch | 489 -- ...-Wandboard-add-wifi-bt-rfkill-driver.patch | 341 - .../imx/0005-Add-IMX6Q-AHCI-support.patch | 85 - .../imx/0006-imx-Add-IMX53-AHCI-support.patch | 25 - ...nable-sata-clk-if-SATA_AHCI_PLATFORM.patch | 33 - ...e-the-sata-bits-definitions-of-gpr13.patch | 150 - ...d-ahci-sata-support-on-imx-platforms.patch | 316 - ...ahci_imx-depend-on-CONFIG_MFD_SYSCON.patch | 24 - .../imx/0011-add-pcie-designware.patch | 636 -- .../imx/0012-pcie-backport-fixes.patch | 17 - ...upport-for-parsing-PCI-DT-ranges-pro.patch | 194 - ...d-PCIe-bits-to-GPR-syscon-definition.patch | 37 - ...dd-support-for-i.MX6-PCIe-controller.patch | 616 -- .../wandboard/imx/0016-imx6-pci-tweaks.patch | 24 - ...VDS-general-purpose-clocks-to-i.MX6Q.patch | 70 - ...-and-Kconfig-update-for-PCIe-support.patch | 38 - .../linux-2.6-arm-asm-constraint.patch | 347 - .../linux-2.6-silence-acpi-blacklist.patch | 25 - ...vmscan_remove_wait_on_page_writeback.patch | 37 - src/patches/linux-2.6.32-crypto-mv_cesa.patch | 647 -- src/patches/linux-2.6.32-imq-test2.patch | 1462 ---- src/patches/linux-2.6.32.11-netdev-1.patch | 478 -- ...-2.6.32.15-option_add_huawei_android.patch | 19 - .../linux-2.6.32.27_ipg-fix-driver-name.patch | 15 - ...45_align_ssb_modtable_32bit_boundary.patch | 12 - .../linux-2.6.32.8-ipp2p-0.8.2-pomng.patch | 1033 --- .../linux-2.6.32.8-xen-imq-test2.patch | 1353 ---- ...inux-2.x-smsc95xx-add_mac_addr_param.patch | 149 - .../linux-3.0-ipp2p-0.8.2-ipfire.patch | 1039 --- src/patches/linux-3.1-imq.patch | 1603 ----- src/patches/linux-3.10-layer7-filter.patch | 2185 ------ .../linux-3.10.10-arm_kirkwood_setups.patch | 704 -- ...4-operand-requires-impossible-reload.patch | 11 - src/patches/linux-3.10.30-imq.patch | 3304 --------- ...34-iwlwifi-noibss_only_on_radar_chan.patch | 23 - .../linux-3.10.39-pie_packet_sch.patch | 674 -- .../linux-3.10.57-mmc_add_eMMC_5.x.patch | 12 - .../linux-3.10.9-ledtrig-netdev-1.patch | 478 -- ....y-usbnet_mcs7830_rework_link_detect.patch | 71 - .../linux-3.2-0001-panda-wlan-fix.patch | 12 - src/patches/linux-3.2-0002-panda-i2c.patch | 51 - src/patches/linux-3.2-imq.patch | 1603 ----- src/patches/linux-3.2-panda-reboot.patch | 29 - .../linux-3.2.25-arm_kirkwood_setups.patch | 692 -- ...inux-3.2.27-rpi_fix_dwc_common_build.patch | 38 - .../linux-3.2.33-ledtrig-netdev-1.patch | 479 -- src/patches/linux-3.9-dvbsky-wot2.patch | 6161 ---------------- 102 files changed, 38846 deletions(-) delete mode 100644 lfs/compat-drivers delete mode 100644 lfs/e1000 delete mode 100644 lfs/kvm-kmod delete mode 100644 lfs/mISDN delete mode 100644 lfs/r8101 delete mode 100644 lfs/r8168 delete mode 100644 lfs/r8169 delete mode 100644 lfs/v4l-dvb delete mode 100644 src/patches/kernel/omap/0002-omap2-twl-common-Add-default-power-configuration.patch delete mode 100644 src/patches/kernel/omap/3isp/0001-omap3isp-Use-the-common-clock-framework.patch delete mode 100644 src/patches/kernel/omap/3isp/0002-mt9m032-Fix-PLL-setup.patch delete mode 100644 src/patches/kernel/omap/3isp/0003-mt9m032-Define-MT9M032_READ_MODE1-bits.patch delete mode 100644 src/patches/kernel/omap/3isp/0004-mt9p031-Use-devm_-managed-helpers.patch delete mode 100644 src/patches/kernel/omap/3isp/0005-mt9p031-Add-support-for-regulators.patch delete mode 100644 src/patches/kernel/omap/3isp/0006-mt9p031-Use-the-common-clock-framework.patch delete mode 100644 src/patches/kernel/omap/beagle/0001-meego-modedb-add-Toshiba-LTA070B220F-800x480-support.patch delete mode 100644 src/patches/kernel/omap/beagle/0002-backlight-Add-TLC59108-backlight-control-driver.patch delete mode 100644 src/patches/kernel/omap/beagle/0003-tlc59108-adjust-for-beagleboard-uLCD7.patch delete mode 100644 src/patches/kernel/omap/beagle/0004-zeroMAP-Open-your-eyes.patch delete mode 100644 src/patches/kernel/omap/beagle/0005-ARM-OMAP-Beagle-use-TWL4030-generic-reset-script.patch delete mode 100644 src/patches/kernel/omap/beagle/0006-DSS2-use-DSI-PLL-for-DPI-with-OMAP3.patch delete mode 100644 src/patches/kernel/omap/beagle/expansion/0001-Beagle-expansion-add-buddy-param-for-expansionboard-.patch delete mode 100644 src/patches/kernel/omap/beagle/expansion/0002-Beagle-expansion-add-zippy.patch delete mode 100644 src/patches/kernel/omap/beagle/expansion/0003-Beagle-expansion-add-zippy2.patch delete mode 100644 src/patches/kernel/omap/beagle/expansion/0004-Beagle-expansion-add-trainer.patch delete mode 100644 src/patches/kernel/omap/beagle/expansion/0005-Beagle-expansion-add-CircuitCo-ulcd-Support.patch delete mode 100644 src/patches/kernel/omap/beagle/expansion/0006-Beagle-expansion-add-wifi.patch delete mode 100644 src/patches/kernel/omap/beagle/expansion/0007-Beagle-expansion-add-beaglefpga.patch delete mode 100644 src/patches/kernel/omap/beagle/expansion/0008-Beagle-expansion-add-spidev.patch delete mode 100644 src/patches/kernel/omap/beagle/expansion/0009-Beagle-expansion-add-Aptina-li5m03-camera.patch delete mode 100644 src/patches/kernel/omap/beagle/expansion/0010-Beagle-expansion-add-LSR-COM6L-Adapter-Board.patch delete mode 100644 src/patches/kernel/omap/beagle/expansion/0011-Beagle-expansion-LSR-COM6L-Adapter-Board-also-initia.patch delete mode 100644 src/patches/kernel/omap/beagle/expansion/0011-WIP-Beagle-expansion-extend-spidev-to-uart2.patch delete mode 100644 src/patches/kernel/omap/panda/0001-panda-fix-wl12xx-regulator.patch delete mode 100644 src/patches/kernel/omap/panda/0002-ti-st-st-kim-fixing-firmware-path.patch delete mode 100644 src/patches/kernel/omap/panda/0003-Panda-expansion-add-spidev.patch delete mode 100644 src/patches/kernel/omap/panda/0004-HACK-PandaES-disable-cpufreq-so-board-will-boot.patch delete mode 100644 src/patches/kernel/omap/panda/0006-ARM-hw_breakpoint-Enable-debug-powerdown-only-if-sys.patch delete mode 100644 src/patches/kernel/omap/panda/0007-Revert-regulator-twl-Remove-TWL6030_FIXED_RESOURCE.patch delete mode 100644 src/patches/kernel/omap/panda/0008-Revert-regulator-twl-Remove-another-unused-variable-.patch delete mode 100644 src/patches/kernel/omap/panda/0009-Revert-regulator-twl-Remove-references-to-the-twl403.patch delete mode 100644 src/patches/kernel/omap/panda/0010-Revert-regulator-twl-Remove-references-to-32kHz-cloc.patch delete mode 100644 src/patches/kernel/omap/panda/0011-panda-spidev-setup-pinmux.patch delete mode 100644 src/patches/kernel/omap/sakoman/0001-OMAP-DSS2-add-bootarg-for-selecting-svideo.patch delete mode 100644 src/patches/kernel/omap/sakoman/0002-video-add-timings-for-hd720.patch delete mode 100644 src/patches/kernel/omap/sgx/0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch delete mode 100644 src/patches/kernel/wandboard/dts/0001-imx6qdl-wandboard-dts-backport.patch delete mode 100644 src/patches/kernel/wandboard/dts/0002-ARM-dts-imx6qdl-wandboard-add-gpio-lines-to-wandboar.patch delete mode 100644 src/patches/kernel/wandboard/dts/0003-ARM-dts-imx6qdl-wandboard-Add-support-for-i2c1.patch delete mode 100644 src/patches/kernel/wandboard/dts/0004-ARM-dts-wandboard-add-binding-for-wand-rfkill-driver.patch delete mode 100644 src/patches/kernel/wandboard/dts/0005-ARM-dts-imx6qdl-add-pcie-device-node.patch delete mode 100644 src/patches/kernel/wandboard/imx/0001-i2c-imx-retry-on-NAK.patch delete mode 100644 src/patches/kernel/wandboard/imx/0002-i.MX6-Wandboard-add-CKO1-clock-output.patch delete mode 100644 src/patches/kernel/wandboard/imx/0003-thermal-add-imx-thermal-driver-support.patch delete mode 100644 src/patches/kernel/wandboard/imx/0004-ARM-i.MX6-Wandboard-add-wifi-bt-rfkill-driver.patch delete mode 100644 src/patches/kernel/wandboard/imx/0005-Add-IMX6Q-AHCI-support.patch delete mode 100644 src/patches/kernel/wandboard/imx/0006-imx-Add-IMX53-AHCI-support.patch delete mode 100644 src/patches/kernel/wandboard/imx/0007-imx6-enable-sata-clk-if-SATA_AHCI_PLATFORM.patch delete mode 100644 src/patches/kernel/wandboard/imx/0008-ARM-imx6q-update-the-sata-bits-definitions-of-gpr13.patch delete mode 100644 src/patches/kernel/wandboard/imx/0009-ahci_imx-add-ahci-sata-support-on-imx-platforms.patch delete mode 100644 src/patches/kernel/wandboard/imx/0010-ahci_imx-depend-on-CONFIG_MFD_SYSCON.patch delete mode 100644 src/patches/kernel/wandboard/imx/0011-add-pcie-designware.patch delete mode 100644 src/patches/kernel/wandboard/imx/0012-pcie-backport-fixes.patch delete mode 100644 src/patches/kernel/wandboard/imx/0013-of-pci-Provide-support-for-parsing-PCI-DT-ranges-pro.patch delete mode 100644 src/patches/kernel/wandboard/imx/0014-ARM-imx6q-Add-PCIe-bits-to-GPR-syscon-definition.patch delete mode 100644 src/patches/kernel/wandboard/imx/0015-PCI-imx6-Add-support-for-i.MX6-PCIe-controller.patch delete mode 100644 src/patches/kernel/wandboard/imx/0016-imx6-pci-tweaks.patch delete mode 100644 src/patches/kernel/wandboard/imx/0017-ARM-imx-Add-LVDS-general-purpose-clocks-to-i.MX6Q.patch delete mode 100644 src/patches/kernel/wandboard/imx/0018-ARM-imx6q-clock-and-Kconfig-update-for-PCIe-support.patch delete mode 100644 src/patches/linux-2.6-arm-asm-constraint.patch delete mode 100644 src/patches/linux-2.6-silence-acpi-blacklist.patch delete mode 100644 src/patches/linux-2.6-vmscan_remove_wait_on_page_writeback.patch delete mode 100644 src/patches/linux-2.6.32-crypto-mv_cesa.patch delete mode 100644 src/patches/linux-2.6.32-imq-test2.patch delete mode 100644 src/patches/linux-2.6.32.11-netdev-1.patch delete mode 100644 src/patches/linux-2.6.32.15-option_add_huawei_android.patch delete mode 100644 src/patches/linux-2.6.32.27_ipg-fix-driver-name.patch delete mode 100644 src/patches/linux-2.6.32.45_align_ssb_modtable_32bit_boundary.patch delete mode 100644 src/patches/linux-2.6.32.8-ipp2p-0.8.2-pomng.patch delete mode 100644 src/patches/linux-2.6.32.8-xen-imq-test2.patch delete mode 100644 src/patches/linux-2.x-smsc95xx-add_mac_addr_param.patch delete mode 100644 src/patches/linux-3.0-ipp2p-0.8.2-ipfire.patch delete mode 100644 src/patches/linux-3.1-imq.patch delete mode 100644 src/patches/linux-3.10-layer7-filter.patch delete mode 100644 src/patches/linux-3.10.10-arm_kirkwood_setups.patch delete mode 100644 src/patches/linux-3.10.27-fs-exec-atomic64-operand-requires-impossible-reload.patch delete mode 100644 src/patches/linux-3.10.30-imq.patch delete mode 100644 src/patches/linux-3.10.34-iwlwifi-noibss_only_on_radar_chan.patch delete mode 100644 src/patches/linux-3.10.39-pie_packet_sch.patch delete mode 100644 src/patches/linux-3.10.57-mmc_add_eMMC_5.x.patch delete mode 100644 src/patches/linux-3.10.9-ledtrig-netdev-1.patch delete mode 100644 src/patches/linux-3.10.y-usbnet_mcs7830_rework_link_detect.patch delete mode 100644 src/patches/linux-3.2-0001-panda-wlan-fix.patch delete mode 100644 src/patches/linux-3.2-0002-panda-i2c.patch delete mode 100644 src/patches/linux-3.2-imq.patch delete mode 100644 src/patches/linux-3.2-panda-reboot.patch delete mode 100644 src/patches/linux-3.2.25-arm_kirkwood_setups.patch delete mode 100644 src/patches/linux-3.2.27-rpi_fix_dwc_common_build.patch delete mode 100644 src/patches/linux-3.2.33-ledtrig-netdev-1.patch delete mode 100644 src/patches/linux-3.9-dvbsky-wot2.patch diff --git a/lfs/compat-drivers b/lfs/compat-drivers deleted file mode 100644 index 57a9b163ff..0000000000 --- a/lfs/compat-drivers +++ /dev/null @@ -1,138 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VERSUFIX=ipfire$(KCFG) - -VER = 3.8.3-2-snpu - -ifeq "$(KCFG)" "-xen" - KVER = 2.6.32.61 -endif - -THISAPP = compat-drivers-$(VER) -DL_FILE = compat-drivers-$(VER).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) asix-4.7.0a.tar.xz asix_gb-1.4.0a.tar.xz - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) -asix-4.7.0a.tar.xz = $(DL_FROM)/asix-4.7.0a.tar.xz -asix_gb-1.4.0a.tar.xz = $(DL_FROM)/asix_gb-1.4.0a.tar.xz - -$(DL_FILE)_MD5 = 5a1e27e5b694aa5022116a5a3220bfdc -asix-4.7.0a.tar.xz_MD5=491f7e8c3ee74433975812d86a0fa98b -asix_gb-1.4.0a.tar.xz_MD5=9c9db731631abf00da2069d03253f9a7 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-drivers-3.8-1-u-kref_get_unless_zero.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-drivers-3.8.3-ath_ignore_eeprom_regdomain.patch - - # kfifo has no license info and taints kernel - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.39_kfifo_module_info.patch - - # Codel patches - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless_codel-avoid-a-nul-rec_inv_sqrt.patch - - # Build ath5k only if target has pci - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-3.5-build_ath5k_only_with_pci.patch - - # Copy USB-Net drivers from Kernel... - mkdir $(DIR_APP)/drivers/net/usb/new - cp $(DIR_APP)/drivers/net/usb/*.c $(DIR_APP)/drivers/net/usb/new - cp /usr/src/linux/drivers/net/usb/{*.c,*.h,Makefile} $(DIR_APP)/drivers/net/usb - cp $(DIR_APP)/drivers/net/usb/new/*.c $(DIR_APP)/drivers/net/usb - - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.34-usbnet_compile.patch - - # Build Updated asix usb lan driver - cd $(DIR_APP)/drivers/net/usb && tar xvJf $(DIR_DL)/asix-4.7.0a.tar.xz - - # Build Updated asix usb gigabit lan driver - cd $(DIR_APP)/drivers/net/usb && tar xvJf $(DIR_DL)/asix_gb-1.4.0a.tar.xz - echo 'obj-$$(CONFIG_USB_ASIX_GB) += asix_gb.o' >> $(DIR_APP)/drivers/net/usb/Makefile - cd $(DIR_APP) && echo export CONFIG_USB_ASIX_GB=m >> config.mk - - # Add libartas uAP driver - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-3.5-libertas_uap.patch - - # uAP will not build with xen-kernel (2.6) -ifneq "$(KCFG)" "-xen" - cd $(DIR_APP) && echo export CONFIG_LIBERTAS_UAP=m >> config.mk -endif - -ifeq "$(MACHINE_TYPE)" "arm" - # disable video because it not build on Arm - cd $(DIR_APP) && sed -i -e \ - "s/export CONFIG_COMPAT_VIDEO_MODULES=y//g" config.mk -endif - - # Erase some modules that are obsolete or moved to other path - rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/net/bluetooth - rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/wireless/wl12* - - cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) \ - KLIB_BUILD=/lib/modules/$(KVER)-$(VERSUFIX)/build \ - KMODPATH_ARG='INSTALL_MOD_PATH=' KMODDIR=kernel install-modules - - # Install firmware udev files... - cd $(DIR_APP)/udev && install -m 644 50-compat_firmware.rules /lib/udev/rules.d/ - cd $(DIR_APP)/udev && install -m 755 compat_firmware.sh /lib/udev/ - - -rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/e1000 b/lfs/e1000 deleted file mode 100644 index d9ae7c63f8..0000000000 --- a/lfs/e1000 +++ /dev/null @@ -1,90 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VERSUFIX = ipfire$(KCFG) - -# e1000 vendor modul is only for legacy xen kernel -# The 3.2.x kernel has newer module. - -KVER = 2.6.32.61 -MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/e1000/ - -VER = 8.0.35 - -THISAPP = e1000-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 0f452b979f7a7b9ea0b5a87a117f7408 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - $(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - #Save original e1000 module - -mv $(MODPATH)/e1000.ko \ - $(MODPATH)/e1000.ko.org - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP)/src && make BUILD_KERNEL=$(KVER)-$(VERSUFIX) - cd $(DIR_APP)/src && install -m 644 e1000.ko $(MODPATH) - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/kvm-kmod b/lfs/kvm-kmod deleted file mode 100644 index 90bd790a9d..0000000000 --- a/lfs/kvm-kmod +++ /dev/null @@ -1,86 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VERSUFIX=ipfire$(KCFG) - -VER = 3.6 - -THISAPP = kvm-kmod-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX) -SUP_ARCH = i586 - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 3e51d395d6a0ecac6ae600a0515880c2 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - $(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --kerneldir=/usr/src/linux - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && install -m 644 x86/*.ko \ - /lib/modules/$(KVER)-$(VERSUFIX)/kernel/arch/x86/kvm/ - cd $(DIR_APP) && cp -f include/asm/* /usr/include/asm - cd $(DIR_APP) && cp -f include/linux/* /usr/include/linux - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/linux b/lfs/linux index 1e6298c393..383dac04a2 100644 --- a/lfs/linux +++ b/lfs/linux @@ -125,11 +125,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14-layer7-filter.patch # Grsecurity-patches -ifneq "$(KCFG)" "-headers" cd $(DIR_APP) && xz -c -d $(DIR_DL)/$(GRS_PATCHES) | patch -Np1 cd $(DIR_APP) && rm localversion-grsec cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.7-disable-compat_vdso.patch -endif # DVB Patches cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-dvbsky.patch diff --git a/lfs/mISDN b/lfs/mISDN deleted file mode 100644 index 5cd4972ca3..0000000000 --- a/lfs/mISDN +++ /dev/null @@ -1,119 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VERSUFIX=ipfire$(KCFG) - -ifeq "$(KCFG)" "-xen" - KVER = "2.6.32.61" -endif - -VER = 20121008 - -THISAPP = mISDN-$(VER) -DL_FILE = $(THISAPP).tar.xz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(VERSUFIX) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 7fee0514fd523176b36fca53b02b45cc - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_SRC)/mISDN* && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_SRC)/mISDN && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-hfcusb-reportl1down.patch - cd $(DIR_SRC)/mISDN && patch -Np1 < $(DIR_SRC)/src/patches/mISDN_hfc-s_add_id.patch -ifeq "$(MACHINE_TYPE)" "arm" - # Remove unsupported timestampcounter on arm. the result seems to be unused - cd $(DIR_SRC)/mISDN && sed -i -e "s|rdtscl(pChan->ulTimestampIn);||g" drivers/isdn/mISDN/octvqe/octvqe_linux.c -endif -ifeq "$(NOPCI)" "1" - # Disable PCI drivers if kernel has no PCI - cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_HFCPCI|#&|g" mISDN.cfg.default - cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_HFCMULTI|#&|g" mISDN.cfg.default - cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_XHFC|#&|g" mISDN.cfg.default - cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_AVMFRITZ|#&|g" mISDN.cfg.default - cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_SPEEDFAX|#&|g" mISDN.cfg.default - cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_INFINEON|#&|g" mISDN.cfg.default - cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_W6692|#&|g" mISDN.cfg.default - cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_NETJET|#&|g" mISDN.cfg.default - cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_IPAC|#&|g" mISDN.cfg.default - cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_ISAR|#&|g" mISDN.cfg.default -endif - cd $(DIR_SRC)/mISDN && ./configure --with-kerneldir=/usr/src/linux - cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) modules - cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) \ - INSTALL_PREFIX=$(DIR_SRC)/mISDN/dest/ \ - modules_install - mv $(DIR_SRC)/mISDN/dest/lib/modules/*/extra \ - /lib/modules/$(KVER)-$(VERSUFIX)/mISDN - -ifneq "$(XEN)" "1" - # Blacklist misdn modules - for f in $$(find /lib/modules/$(KVER)-$(VERSUFIX)/mISDN -name *.ko); do \ - echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/mISDN.conf ; \ - done - sed -i -e "s|.ko||g" /etc/modprobe.d/mISDN.conf -endif - - # Remove mISDN modules that was shipped with the kernel - rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN - rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN - - @rm -rf $(DIR_SRC)/mISDN* - @$(POSTBUILD) diff --git a/lfs/r8101 b/lfs/r8101 deleted file mode 100644 index fb03e56f95..0000000000 --- a/lfs/r8101 +++ /dev/null @@ -1,90 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VERSUFIX = ipfire$(KCFG) -ifeq "$(KCFG)" "-xen" - KVER = 2.6.32.61 - MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net - MODNAME = r8101.ko -else - MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/realtek - MODNAME = r8101.ko.vendor -endif - -VER = 1.023.00 - -THISAPP = r8101-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 03cfc34e41522cd34ac6f4b1b6508896 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - $(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/r8101_add_missing_pciids.patch - cd $(DIR_APP) && make -C /lib/modules/$(KVER)-$(VERSUFIX)/build/ SUBDIRS=$(DIR_APP)/src modules - cd $(DIR_APP)/src && install -m 644 r8101.ko $(MODPATH)/$(MODNAME) - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/r8168 b/lfs/r8168 deleted file mode 100644 index 98267370ab..0000000000 --- a/lfs/r8168 +++ /dev/null @@ -1,89 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VERSUFIX = ipfire$(KCFG) -ifeq "$(KCFG)" "-xen" - KVER = 2.6.32.61 - MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net - MODNAME = r8168.ko -else - MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/realtek - MODNAME = r8168.ko.vendor -endif - -VER = 8.035.00 - -THISAPP = r8168-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 80b8d23e463e5408dced1b1377579dae - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - $(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make -C /lib/modules/$(KVER)-$(VERSUFIX)/build/ SUBDIRS=$(DIR_APP)/src modules - cd $(DIR_APP)/src && install -m 644 r8168.ko $(MODPATH)/$(MODNAME) - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/r8169 b/lfs/r8169 deleted file mode 100644 index 5a8be3c31e..0000000000 --- a/lfs/r8169 +++ /dev/null @@ -1,95 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VERSUFIX = ipfire$(KCFG) -ifeq "$(KCFG)" "-xen" - KVER = 2.6.32.61 - MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net - MODNAME = r8169.ko -else - MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/realtek - MODNAME = r8169.ko.vendor -endif - -VER = 6.017.00 - -THISAPP = r8169-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 396d7e28d573bde416fbdfdef723f4bd - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - $(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - #Save original r8169 module -ifeq "$(KCFG)" "-xen" - -mv $(MODPATH)/r8169.ko \ - $(MODPATH)/r8169.ko.org -endif - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/r8169_add_missing_pciids.patch - cd $(DIR_APP) && make -C /lib/modules/$(KVER)-$(VERSUFIX)/build/ SUBDIRS=$(DIR_APP)/src modules - cd $(DIR_APP)/src && install -m 644 r8169.ko $(MODPATH)/$(MODNAME) - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/v4l-dvb b/lfs/v4l-dvb deleted file mode 100644 index 9cf277caf9..0000000000 --- a/lfs/v4l-dvb +++ /dev/null @@ -1,103 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VERSUFIX=ipfire$(KCFG) - -VER = 20120916 -THISAPP = v4l-dvb-$(VER) -DL_FILE = $(THISAPP).tar.xz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX) - -ifeq "$(KCFG)" "-xen" - XVER = 2.6.32 - KVER = 2.6.32.61 -else - XVER = 3.2.0 -endif -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 7824fdd540605c54584df0d16f0e923b - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/v4l-dvb_rtl28xx_add_usb_ids.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/v4l-dvb_rtl28xx_commented_usb_clear_halt.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/v4l-dvb_usbv2_dont_report_pidfilter_fail.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/v4l-dvb_fix_tua6034_pll.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/v4l-dvb_bestunar_us638x.patch - - cd $(DIR_APP) && make allyesconfig KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=$(XVER) -ifeq "$(KCFG)" "-omap" - # Disable failing OMAP2 Video Out and IR RX51 driver - cd $(DIR_APP) && sed -i -e \ - "s|^CONFIG_VIDEO_OMAP2_VOUT=m|# CONFIG_VIDEO_OMAP2_VOUT is not set|g" \ - v4l/.config - cd $(DIR_APP) && sed -i -e \ - "s|^CONFIG_IR_RX51=m|# CONFIG_IR_RX51 is not set|g" \ - v4l/.config -endif - # Disable Radio Shark (missing tuner module) - cd $(DIR_APP) && sed -i -e \ - "s|^CONFIG_RADIO_SHARK=m|# CONFIG_RADIO_SHARK is not set|g" \ - v4l/.config - cd $(DIR_APP) && make all KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=$(XVER) - cd $(DIR_APP) && make install KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=$(XVER) - ln -sf $(DIR_APP)/ /usr/src/v4l-dvb - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 3121fdd31a..40075916eb 100755 --- a/make.sh +++ b/make.sh @@ -408,14 +408,7 @@ buildipfire() { i586) # x86-pae (Native and new XEN) kernel build ipfiremake linux KCFG="-pae" -# ipfiremake kvm-kmod KCFG="-pae" -# ipfiremake v4l-dvb KCFG="-pae" -# ipfiremake mISDN KCFG="-pae" ipfiremake cryptodev KCFG="-pae" -# ipfiremake compat-drivers KCFG="-pae" -# ipfiremake r8169 KCFG="-pae" -# ipfiremake r8168 KCFG="-pae" -# ipfiremake r8101 KCFG="-pae" ipfiremake e1000e KCFG="-pae" ipfiremake igb KCFG="-pae" ipfiremake ixgbe KCFG="-pae" @@ -423,14 +416,7 @@ buildipfire() { # x86 kernel build ipfiremake linux KCFG="" -# ipfiremake kvm-kmod KCFG="" -# ipfiremake v4l-dvb KCFG="" -# ipfiremake mISDN KCFG="" ipfiremake cryptodev KCFG="" -# ipfiremake compat-drivers KCFG="" -# ipfiremake r8169 KCFG="" -# ipfiremake r8168 KCFG="" -# ipfiremake r8101 KCFG="" ipfiremake e1000e KCFG="" ipfiremake igb KCFG="" ipfiremake ixgbe KCFG="" @@ -440,10 +426,7 @@ buildipfire() { armv5tel) # arm-rpi (Raspberry Pi) kernel build ipfiremake linux KCFG="-rpi" -# ipfiremake v4l-dvb KCFG="-rpi" -# ipfiremake mISDN KCFG="-rpi" NOPCI=1 ipfiremake cryptodev KCFG="-rpi" -# ipfiremake compat-drivers KCFG="-rpi" ipfiremake linux-initrd KCFG="-rpi" # arm multi platform (Panda, Wandboard ...) kernel build @@ -456,13 +439,7 @@ buildipfire() { # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build ipfiremake linux KCFG="-kirkwood" -# ipfiremake v4l-dvb KCFG="-kirkwood" -# ipfiremake mISDN KCFG="-kirkwood" ipfiremake cryptodev KCFG="-kirkwood" -# ipfiremake compat-drivers KCFG="-kirkwood" -# ipfiremake r8169 KCFG="-kirkwood" -# ipfiremake r8168 KCFG="-kirkwood" -# ipfiremake r8101 KCFG="-kirkwood" ipfiremake e1000e KCFG="-kirkwood" ipfiremake igb KCFG="-kirkwood" ipfiremake ixgbe KCFG="-kirkwood" diff --git a/src/patches/kernel/omap/0002-omap2-twl-common-Add-default-power-configuration.patch b/src/patches/kernel/omap/0002-omap2-twl-common-Add-default-power-configuration.patch deleted file mode 100644 index d27ad54ea3..0000000000 --- a/src/patches/kernel/omap/0002-omap2-twl-common-Add-default-power-configuration.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 2e908aeebd6804296e7d14a96de6be1e2de38e93 Mon Sep 17 00:00:00 2001 -From: Matthias Brugger -Date: Wed, 23 Jan 2013 19:50:38 +0100 -Subject: [PATCH 2/2] omap2: twl-common: Add default power configuration - -This patch adds a generic power script configuration. -When rebooting an OMAP3530 at 125 MHz, the reboot hangs. -With the generic power script, TWL4030 will be reset -when a warm reset occures. This way the OMAP3530 does not -hang on reboot. - -Signed-off-by: Matthias Brugger ---- - arch/arm/mach-omap2/twl-common.c | 38 ++++++++++++++++++++++++++++++++++++++ - arch/arm/mach-omap2/twl-common.h | 1 + - 2 files changed, 39 insertions(+) - -diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c -index e49b40b..f096beb 100644 ---- a/arch/arm/mach-omap2/twl-common.c -+++ b/arch/arm/mach-omap2/twl-common.c -@@ -120,6 +120,41 @@ static struct twl4030_audio_data omap3_audio_pdata = { - .codec = &omap3_codec, - }; - -+static struct twl4030_ins wrst_seq[] __initdata = { -+ {MSG_SINGULAR(DEV_GRP_NULL, 0x1b, RES_STATE_OFF), 2}, -+ {MSG_SINGULAR(DEV_GRP_P1, 0xf, RES_STATE_WRST), 15}, -+ {MSG_SINGULAR(DEV_GRP_P1, 0x10, RES_STATE_WRST), 15}, -+ {MSG_SINGULAR(DEV_GRP_P1, 0x7, RES_STATE_WRST), 0x60}, -+ {MSG_SINGULAR(DEV_GRP_P1, 0x19, RES_STATE_ACTIVE), 2}, -+ {MSG_SINGULAR(DEV_GRP_NULL, 0x1b, RES_STATE_ACTIVE), 2}, -+}; -+ -+static struct twl4030_script wrst_script __initdata = { -+ .script = wrst_seq, -+ .size = ARRAY_SIZE(wrst_seq), -+ .flags = TWL4030_WRST_SCRIPT, -+}; -+ -+static struct twl4030_script *omap3_power_scripts[] __initdata = { -+ &wrst_script, -+}; -+ -+static struct twl4030_resconfig omap3_rconfig[] = { -+ { .resource = RES_HFCLKOUT, .devgroup = DEV_GRP_P3, .type = -1, -+ .type2 = -1 }, -+ { .resource = RES_VDD1, .devgroup = DEV_GRP_P1, .type = -1, -+ .type2 = -1 }, -+ { .resource = RES_VDD2, .devgroup = DEV_GRP_P1, .type = -1, -+ .type2 = -1 }, -+ { 0, 0}, -+}; -+ -+static struct twl4030_power_data omap3_power_pdata = { -+ .scripts = omap3_power_scripts, -+ .num = ARRAY_SIZE(omap3_power_scripts), -+ .resource_config = omap3_rconfig, -+}; -+ - static struct regulator_consumer_supply omap3_vdda_dac_supplies[] = { - REGULATOR_SUPPLY("vdda_dac", "omapdss_venc"), - }; -@@ -224,6 +259,9 @@ void __init omap3_pmic_get_config(struct twl4030_platform_data *pmic_data, - if (pdata_flags & TWL_COMMON_PDATA_AUDIO && !pmic_data->audio) - pmic_data->audio = &omap3_audio_pdata; - -+ if (pdata_flags & TWL_COMMON_PDATA_POWER && !pmic_data->power) -+ pmic_data->power = &omap3_power_pdata; -+ - /* Common regulator configurations */ - if (regulators_flags & TWL_COMMON_REGULATOR_VDAC && !pmic_data->vdac) - pmic_data->vdac = &omap3_vdac_idata; -diff --git a/arch/arm/mach-omap2/twl-common.h b/arch/arm/mach-omap2/twl-common.h -index dcfbad5..dbeb905 100644 ---- a/arch/arm/mach-omap2/twl-common.h -+++ b/arch/arm/mach-omap2/twl-common.h -@@ -7,6 +7,7 @@ - #define TWL_COMMON_PDATA_BCI (1 << 1) - #define TWL_COMMON_PDATA_MADC (1 << 2) - #define TWL_COMMON_PDATA_AUDIO (1 << 3) -+#define TWL_COMMON_PDATA_POWER (1 << 4) - - /* Common LDO regulators for TWL4030/TWL6030 */ - #define TWL_COMMON_REGULATOR_VDAC (1 << 0) --- -1.7.10.4 - diff --git a/src/patches/kernel/omap/3isp/0001-omap3isp-Use-the-common-clock-framework.patch b/src/patches/kernel/omap/3isp/0001-omap3isp-Use-the-common-clock-framework.patch deleted file mode 100644 index a61d5b8113..0000000000 --- a/src/patches/kernel/omap/3isp/0001-omap3isp-Use-the-common-clock-framework.patch +++ /dev/null @@ -1,444 +0,0 @@ -From 369b60c157f67a71a6f302ab9843ae2de1805a2a Mon Sep 17 00:00:00 2001 -From: Laurent Pinchart -Date: Mon, 22 Oct 2012 15:43:00 +0200 -Subject: [PATCH 1/6] omap3isp: Use the common clock framework - -Expose the two ISP external clocks XCLKA and XCLKB as common clocks for -subdev drivers. - -Signed-off-by: Laurent Pinchart -Acked-by: Mike Turquette ---- - drivers/media/platform/omap3isp/isp.c | 277 ++++++++++++++++++++++++--------- - drivers/media/platform/omap3isp/isp.h | 22 ++- - include/media/omap3isp.h | 10 +- - 3 files changed, 225 insertions(+), 84 deletions(-) - -diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c -index 6e5ad8e..1d7dbd5 100644 ---- a/drivers/media/platform/omap3isp/isp.c -+++ b/drivers/media/platform/omap3isp/isp.c -@@ -55,6 +55,7 @@ - #include - - #include -+#include - #include - #include - #include -@@ -148,6 +149,201 @@ void omap3isp_flush(struct isp_device *isp) - isp_reg_readl(isp, OMAP3_ISP_IOMEM_MAIN, ISP_REVISION); - } - -+/* ----------------------------------------------------------------------------- -+ * XCLK -+ */ -+ -+#define to_isp_xclk(_hw) container_of(_hw, struct isp_xclk, hw) -+ -+static void isp_xclk_update(struct isp_xclk *xclk, u32 divider) -+{ -+ switch (xclk->id) { -+ case ISP_XCLK_A: -+ isp_reg_clr_set(xclk->isp, OMAP3_ISP_IOMEM_MAIN, ISP_TCTRL_CTRL, -+ ISPTCTRL_CTRL_DIVA_MASK, -+ divider << ISPTCTRL_CTRL_DIVA_SHIFT); -+ break; -+ case ISP_XCLK_B: -+ isp_reg_clr_set(xclk->isp, OMAP3_ISP_IOMEM_MAIN, ISP_TCTRL_CTRL, -+ ISPTCTRL_CTRL_DIVB_MASK, -+ divider << ISPTCTRL_CTRL_DIVB_SHIFT); -+ break; -+ } -+} -+ -+static int isp_xclk_prepare(struct clk_hw *hw) -+{ -+ struct isp_xclk *xclk = to_isp_xclk(hw); -+ -+ omap3isp_get(xclk->isp); -+ -+ return 0; -+} -+ -+static void isp_xclk_unprepare(struct clk_hw *hw) -+{ -+ struct isp_xclk *xclk = to_isp_xclk(hw); -+ -+ omap3isp_put(xclk->isp); -+} -+ -+static int isp_xclk_enable(struct clk_hw *hw) -+{ -+ struct isp_xclk *xclk = to_isp_xclk(hw); -+ unsigned long flags; -+ -+ spin_lock_irqsave(&xclk->lock, flags); -+ isp_xclk_update(xclk, xclk->divider); -+ xclk->enabled = true; -+ spin_unlock_irqrestore(&xclk->lock, flags); -+ -+ return 0; -+} -+ -+static void isp_xclk_disable(struct clk_hw *hw) -+{ -+ struct isp_xclk *xclk = to_isp_xclk(hw); -+ unsigned long flags; -+ -+ spin_lock_irqsave(&xclk->lock, flags); -+ isp_xclk_update(xclk, 0); -+ xclk->enabled = false; -+ spin_unlock_irqrestore(&xclk->lock, flags); -+} -+ -+static unsigned long isp_xclk_recalc_rate(struct clk_hw *hw, -+ unsigned long parent_rate) -+{ -+ struct isp_xclk *xclk = to_isp_xclk(hw); -+ -+ return parent_rate / xclk->divider; -+} -+ -+static u32 isp_xclk_calc_divider(unsigned long *rate, unsigned long parent_rate) -+{ -+ u32 divider; -+ -+ if (*rate >= parent_rate) { -+ *rate = parent_rate; -+ return ISPTCTRL_CTRL_DIV_BYPASS; -+ } -+ -+ divider = DIV_ROUND_CLOSEST(parent_rate, *rate); -+ if (divider >= ISPTCTRL_CTRL_DIV_BYPASS) -+ divider = ISPTCTRL_CTRL_DIV_BYPASS - 1; -+ -+ *rate = parent_rate / divider; -+ return divider; -+} -+ -+static long isp_xclk_round_rate(struct clk_hw *hw, unsigned long rate, -+ unsigned long *parent_rate) -+{ -+ isp_xclk_calc_divider(&rate, *parent_rate); -+ return rate; -+} -+ -+static int isp_xclk_set_rate(struct clk_hw *hw, unsigned long rate, -+ unsigned long parent_rate) -+{ -+ struct isp_xclk *xclk = to_isp_xclk(hw); -+ unsigned long flags; -+ u32 divider; -+ -+ divider = isp_xclk_calc_divider(&rate, parent_rate); -+ -+ spin_lock_irqsave(&xclk->lock, flags); -+ -+ xclk->divider = divider; -+ if (xclk->enabled) -+ isp_xclk_update(xclk, divider); -+ -+ spin_unlock_irqrestore(&xclk->lock, flags); -+ -+ dev_dbg(xclk->isp->dev, "%s: cam_xclk%c set to %lu Hz (div %u)\n", -+ __func__, xclk->id == ISP_XCLK_A ? 'a' : 'b', rate, divider); -+ return 0; -+} -+ -+static const struct clk_ops isp_xclk_ops = { -+ .prepare = isp_xclk_prepare, -+ .unprepare = isp_xclk_unprepare, -+ .enable = isp_xclk_enable, -+ .disable = isp_xclk_disable, -+ .recalc_rate = isp_xclk_recalc_rate, -+ .round_rate = isp_xclk_round_rate, -+ .set_rate = isp_xclk_set_rate, -+}; -+ -+static const char *isp_xclk_parent_name = "cam_mclk"; -+ -+static const struct clk_init_data isp_xclk_init_data = { -+ .name = "cam_xclk", -+ .ops = &isp_xclk_ops, -+ .parent_names = &isp_xclk_parent_name, -+ .num_parents = 1, -+}; -+ -+static int isp_xclk_init(struct isp_device *isp) -+{ -+ struct isp_platform_data *pdata = isp->pdata; -+ struct clk_init_data init; -+ unsigned int i; -+ -+ for (i = 0; i < ARRAY_SIZE(isp->xclks); ++i) { -+ struct isp_xclk *xclk = &isp->xclks[i]; -+ struct clk *clk; -+ -+ xclk->isp = isp; -+ xclk->id = i == 0 ? ISP_XCLK_A : ISP_XCLK_B; -+ xclk->divider = 1; -+ spin_lock_init(&xclk->lock); -+ -+ init.name = i == 0 ? "cam_xclka" : "cam_xclkb"; -+ init.ops = &isp_xclk_ops; -+ init.parent_names = &isp_xclk_parent_name; -+ init.num_parents = 1; -+ -+ xclk->hw.init = &init; -+ -+ clk = devm_clk_register(isp->dev, &xclk->hw); -+ if (IS_ERR(clk)) -+ return PTR_ERR(clk); -+ -+ if (pdata->xclks[i].con_id == NULL && -+ pdata->xclks[i].dev_id == NULL) -+ continue; -+ -+ xclk->lookup = kzalloc(sizeof(*xclk->lookup), GFP_KERNEL); -+ if (xclk->lookup == NULL) -+ return -ENOMEM; -+ -+ xclk->lookup->con_id = pdata->xclks[i].con_id; -+ xclk->lookup->dev_id = pdata->xclks[i].dev_id; -+ xclk->lookup->clk = clk; -+ -+ clkdev_add(xclk->lookup); -+ } -+ -+ return 0; -+} -+ -+static void isp_xclk_cleanup(struct isp_device *isp) -+{ -+ unsigned int i; -+ -+ for (i = 0; i < ARRAY_SIZE(isp->xclks); ++i) { -+ struct isp_xclk *xclk = &isp->xclks[i]; -+ -+ if (xclk->lookup) -+ clkdev_drop(xclk->lookup); -+ } -+} -+ -+/* ----------------------------------------------------------------------------- -+ * Interrupts -+ */ -+ - /* - * isp_enable_interrupts - Enable ISP interrupts. - * @isp: OMAP3 ISP device -@@ -180,80 +376,6 @@ static void isp_disable_interrupts(struct isp_device *isp) - isp_reg_writel(isp, 0, OMAP3_ISP_IOMEM_MAIN, ISP_IRQ0ENABLE); - } - --/** -- * isp_set_xclk - Configures the specified cam_xclk to the desired frequency. -- * @isp: OMAP3 ISP device -- * @xclk: Desired frequency of the clock in Hz. 0 = stable low, 1 is stable high -- * @xclksel: XCLK to configure (0 = A, 1 = B). -- * -- * Configures the specified MCLK divisor in the ISP timing control register -- * (TCTRL_CTRL) to generate the desired xclk clock value. -- * -- * Divisor = cam_mclk_hz / xclk -- * -- * Returns the final frequency that is actually being generated -- **/ --static u32 isp_set_xclk(struct isp_device *isp, u32 xclk, u8 xclksel) --{ -- u32 divisor; -- u32 currentxclk; -- unsigned long mclk_hz; -- -- if (!omap3isp_get(isp)) -- return 0; -- -- mclk_hz = clk_get_rate(isp->clock[ISP_CLK_CAM_MCLK]); -- -- if (xclk >= mclk_hz) { -- divisor = ISPTCTRL_CTRL_DIV_BYPASS; -- currentxclk = mclk_hz; -- } else if (xclk >= 2) { -- divisor = mclk_hz / xclk; -- if (divisor >= ISPTCTRL_CTRL_DIV_BYPASS) -- divisor = ISPTCTRL_CTRL_DIV_BYPASS - 1; -- currentxclk = mclk_hz / divisor; -- } else { -- divisor = xclk; -- currentxclk = 0; -- } -- -- switch (xclksel) { -- case ISP_XCLK_A: -- isp_reg_clr_set(isp, OMAP3_ISP_IOMEM_MAIN, ISP_TCTRL_CTRL, -- ISPTCTRL_CTRL_DIVA_MASK, -- divisor << ISPTCTRL_CTRL_DIVA_SHIFT); -- dev_dbg(isp->dev, "isp_set_xclk(): cam_xclka set to %d Hz\n", -- currentxclk); -- break; -- case ISP_XCLK_B: -- isp_reg_clr_set(isp, OMAP3_ISP_IOMEM_MAIN, ISP_TCTRL_CTRL, -- ISPTCTRL_CTRL_DIVB_MASK, -- divisor << ISPTCTRL_CTRL_DIVB_SHIFT); -- dev_dbg(isp->dev, "isp_set_xclk(): cam_xclkb set to %d Hz\n", -- currentxclk); -- break; -- case ISP_XCLK_NONE: -- default: -- omap3isp_put(isp); -- dev_dbg(isp->dev, "ISP_ERR: isp_set_xclk(): Invalid requested " -- "xclk. Must be 0 (A) or 1 (B).\n"); -- return -EINVAL; -- } -- -- /* Do we go from stable whatever to clock? */ -- if (divisor >= 2 && isp->xclk_divisor[xclksel - 1] < 2) -- omap3isp_get(isp); -- /* Stopping the clock. */ -- else if (divisor < 2 && isp->xclk_divisor[xclksel - 1] >= 2) -- omap3isp_put(isp); -- -- isp->xclk_divisor[xclksel - 1] = divisor; -- -- omap3isp_put(isp); -- -- return currentxclk; --} -- - /* - * isp_core_init - ISP core settings - * @isp: OMAP3 ISP device -@@ -1969,6 +2091,7 @@ static int isp_remove(struct platform_device *pdev) - - isp_unregister_entities(isp); - isp_cleanup_modules(isp); -+ isp_xclk_cleanup(isp); - - __omap3isp_get(isp, false); - iommu_detach_device(isp->domain, &pdev->dev); -@@ -2042,7 +2165,6 @@ static int isp_probe(struct platform_device *pdev) - } - - isp->autoidle = autoidle; -- isp->platform_cb.set_xclk = isp_set_xclk; - - mutex_init(&isp->isp_mutex); - spin_lock_init(&isp->stat_lock); -@@ -2093,6 +2215,10 @@ static int isp_probe(struct platform_device *pdev) - if (ret < 0) - goto error_isp; - -+ ret = isp_xclk_init(isp); -+ if (ret < 0) -+ goto error_isp; -+ - /* Memory resources */ - for (m = 0; m < ARRAY_SIZE(isp_res_maps); m++) - if (isp->revision == isp_res_maps[m].isp_rev) -@@ -2162,6 +2288,7 @@ detach_dev: - free_domain: - iommu_domain_free(isp->domain); - error_isp: -+ isp_xclk_cleanup(isp); - omap3isp_put(isp); - error: - platform_set_drvdata(pdev, NULL); -diff --git a/drivers/media/platform/omap3isp/isp.h b/drivers/media/platform/omap3isp/isp.h -index c77e1f2..cd3eff4 100644 ---- a/drivers/media/platform/omap3isp/isp.h -+++ b/drivers/media/platform/omap3isp/isp.h -@@ -29,6 +29,7 @@ - - #include - #include -+#include - #include - #include - #include -@@ -125,8 +126,20 @@ struct isp_reg { - u32 val; - }; - --struct isp_platform_callback { -- u32 (*set_xclk)(struct isp_device *isp, u32 xclk, u8 xclksel); -+enum isp_xclk_id { -+ ISP_XCLK_A, -+ ISP_XCLK_B, -+}; -+ -+struct isp_xclk { -+ struct isp_device *isp; -+ struct clk_hw hw; -+ struct clk_lookup *lookup; -+ enum isp_xclk_id id; -+ -+ spinlock_t lock; /* Protects enabled and divider */ -+ bool enabled; -+ unsigned int divider; - }; - - /* -@@ -149,6 +162,7 @@ struct isp_platform_callback { - * @cam_mclk: Pointer to camera functional clock structure. - * @csi2_fck: Pointer to camera CSI2 complexIO clock structure. - * @l3_ick: Pointer to OMAP3 L3 bus interface clock. -+ * @xclks: External clocks provided by the ISP - * @irq: Currently attached ISP ISR callbacks information structure. - * @isp_af: Pointer to current settings for ISP AutoFocus SCM. - * @isp_hist: Pointer to current settings for ISP Histogram SCM. -@@ -185,12 +199,12 @@ struct isp_device { - int has_context; - int ref_count; - unsigned int autoidle; -- u32 xclk_divisor[2]; /* Two clocks, a and b. */ - #define ISP_CLK_CAM_ICK 0 - #define ISP_CLK_CAM_MCLK 1 - #define ISP_CLK_CSI2_FCK 2 - #define ISP_CLK_L3_ICK 3 - struct clk *clock[4]; -+ struct isp_xclk xclks[2]; - - /* ISP modules */ - struct ispstat isp_af; -@@ -209,8 +223,6 @@ struct isp_device { - unsigned int subclk_resources; - - struct iommu_domain *domain; -- -- struct isp_platform_callback platform_cb; - }; - - #define v4l2_dev_to_isp_device(dev) \ -diff --git a/include/media/omap3isp.h b/include/media/omap3isp.h -index 9584269..c9d06d9 100644 ---- a/include/media/omap3isp.h -+++ b/include/media/omap3isp.h -@@ -29,10 +29,6 @@ - struct i2c_board_info; - struct isp_device; - --#define ISP_XCLK_NONE 0 --#define ISP_XCLK_A 1 --#define ISP_XCLK_B 2 -- - enum isp_interface_type { - ISP_INTERFACE_PARALLEL, - ISP_INTERFACE_CSI2A_PHY2, -@@ -153,7 +149,13 @@ struct isp_v4l2_subdevs_group { - } bus; /* gcc < 4.6.0 chokes on anonymous union initializers */ - }; - -+struct isp_platform_xclk { -+ const char *dev_id; -+ const char *con_id; -+}; -+ - struct isp_platform_data { -+ struct isp_platform_xclk xclks[2]; - struct isp_v4l2_subdevs_group *subdevs; - void (*set_constraints)(struct isp_device *isp, bool enable); - }; --- -1.7.10.4 - diff --git a/src/patches/kernel/omap/3isp/0002-mt9m032-Fix-PLL-setup.patch b/src/patches/kernel/omap/3isp/0002-mt9m032-Fix-PLL-setup.patch deleted file mode 100644 index 9d2b19caf9..0000000000 --- a/src/patches/kernel/omap/3isp/0002-mt9m032-Fix-PLL-setup.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 7c44c8a989ad01bd7cd02370d4ca4a742db218be Mon Sep 17 00:00:00 2001 -From: Laurent Pinchart -Date: Tue, 25 Sep 2012 15:46:34 +0200 -Subject: [PATCH 2/6] mt9m032: Fix PLL setup - -The MT9M032 PLL was assumed to be identical to the MT9P031 PLL but -differs significantly. Update the registers definitions and PLL limits -according to the datasheet. - -Signed-off-by: Laurent Pinchart ---- - drivers/media/i2c/mt9m032.c | 24 +++++++++++++----------- - 1 file changed, 13 insertions(+), 11 deletions(-) - -diff --git a/drivers/media/i2c/mt9m032.c b/drivers/media/i2c/mt9m032.c -index f80c1d7e..30d755a 100644 ---- a/drivers/media/i2c/mt9m032.c -+++ b/drivers/media/i2c/mt9m032.c -@@ -87,7 +87,7 @@ - #define MT9M032_RESTART 0x0b - #define MT9M032_RESET 0x0d - #define MT9M032_PLL_CONFIG1 0x11 --#define MT9M032_PLL_CONFIG1_OUTDIV_MASK 0x3f -+#define MT9M032_PLL_CONFIG1_PREDIV_MASK 0x3f - #define MT9M032_PLL_CONFIG1_MUL_SHIFT 8 - #define MT9M032_READ_MODE1 0x1e - #define MT9M032_READ_MODE2 0x20 -@@ -106,6 +106,8 @@ - #define MT9M032_GAIN_AMUL_SHIFT 6 - #define MT9M032_GAIN_ANALOG_MASK 0x3f - #define MT9M032_FORMATTER1 0x9e -+#define MT9M032_FORMATTER1_PLL_P1_6 (1 << 8) -+#define MT9M032_FORMATTER1_PARALLEL (1 << 12) - #define MT9M032_FORMATTER2 0x9f - #define MT9M032_FORMATTER2_DOUT_EN 0x1000 - #define MT9M032_FORMATTER2_PIXCLK_EN 0x2000 -@@ -121,8 +123,6 @@ - #define MT9P031_PLL_CONTROL_PWROFF 0x0050 - #define MT9P031_PLL_CONTROL_PWRON 0x0051 - #define MT9P031_PLL_CONTROL_USEPLL 0x0052 --#define MT9P031_PLL_CONFIG2 0x11 --#define MT9P031_PLL_CONFIG2_P1_DIV_MASK 0x1f - - struct mt9m032 { - struct v4l2_subdev subdev; -@@ -255,13 +255,14 @@ static int mt9m032_setup_pll(struct mt9m032 *sensor) - .n_max = 64, - .m_min = 16, - .m_max = 255, -- .p1_min = 1, -- .p1_max = 128, -+ .p1_min = 6, -+ .p1_max = 7, - }; - - struct i2c_client *client = v4l2_get_subdevdata(&sensor->subdev); - struct mt9m032_platform_data *pdata = sensor->pdata; - struct aptina_pll pll; -+ u16 reg_val; - int ret; - - pll.ext_clock = pdata->ext_clock; -@@ -274,18 +275,19 @@ static int mt9m032_setup_pll(struct mt9m032 *sensor) - sensor->pix_clock = pdata->pix_clock; - - ret = mt9m032_write(client, MT9M032_PLL_CONFIG1, -- (pll.m << MT9M032_PLL_CONFIG1_MUL_SHIFT) -- | (pll.p1 - 1)); -- if (!ret) -- ret = mt9m032_write(client, MT9P031_PLL_CONFIG2, pll.n - 1); -+ (pll.m << MT9M032_PLL_CONFIG1_MUL_SHIFT) | -+ ((pll.n - 1) & MT9M032_PLL_CONFIG1_PREDIV_MASK)); - if (!ret) - ret = mt9m032_write(client, MT9P031_PLL_CONTROL, - MT9P031_PLL_CONTROL_PWRON | - MT9P031_PLL_CONTROL_USEPLL); - if (!ret) /* more reserved, Continuous, Master Mode */ - ret = mt9m032_write(client, MT9M032_READ_MODE1, 0x8006); -- if (!ret) /* Set 14-bit mode, select 7 divider */ -- ret = mt9m032_write(client, MT9M032_FORMATTER1, 0x111e); -+ if (!ret) { -+ reg_val = (pll.p1 == 6 ? MT9M032_FORMATTER1_PLL_P1_6 : 0) -+ | MT9M032_FORMATTER1_PARALLEL | 0x001e; /* 14-bit */ -+ ret = mt9m032_write(client, MT9M032_FORMATTER1, reg_val); -+ } - - return ret; - } --- -1.7.10.4 - diff --git a/src/patches/kernel/omap/3isp/0003-mt9m032-Define-MT9M032_READ_MODE1-bits.patch b/src/patches/kernel/omap/3isp/0003-mt9m032-Define-MT9M032_READ_MODE1-bits.patch deleted file mode 100644 index c80e876414..0000000000 --- a/src/patches/kernel/omap/3isp/0003-mt9m032-Define-MT9M032_READ_MODE1-bits.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 1115becbb4875d62abb10f94a9510c81f376606f Mon Sep 17 00:00:00 2001 -From: Laurent Pinchart -Date: Wed, 26 Sep 2012 10:54:17 +0200 -Subject: [PATCH 3/6] mt9m032: Define MT9M032_READ_MODE1 bits - -Replace hardcoded values with #define's. - -Signed-off-by: Laurent Pinchart ---- - drivers/media/i2c/mt9m032.c | 22 +++++++++++++++++++++- - 1 file changed, 21 insertions(+), 1 deletion(-) - -diff --git a/drivers/media/i2c/mt9m032.c b/drivers/media/i2c/mt9m032.c -index 30d755a..de150d3 100644 ---- a/drivers/media/i2c/mt9m032.c -+++ b/drivers/media/i2c/mt9m032.c -@@ -90,6 +90,24 @@ - #define MT9M032_PLL_CONFIG1_PREDIV_MASK 0x3f - #define MT9M032_PLL_CONFIG1_MUL_SHIFT 8 - #define MT9M032_READ_MODE1 0x1e -+#define MT9M032_READ_MODE1_OUTPUT_BAD_FRAMES (1 << 13) -+#define MT9M032_READ_MODE1_MAINTAIN_FRAME_RATE (1 << 12) -+#define MT9M032_READ_MODE1_XOR_LINE_VALID (1 << 11) -+#define MT9M032_READ_MODE1_CONT_LINE_VALID (1 << 10) -+#define MT9M032_READ_MODE1_INVERT_TRIGGER (1 << 9) -+#define MT9M032_READ_MODE1_SNAPSHOT (1 << 8) -+#define MT9M032_READ_MODE1_GLOBAL_RESET (1 << 7) -+#define MT9M032_READ_MODE1_BULB_EXPOSURE (1 << 6) -+#define MT9M032_READ_MODE1_INVERT_STROBE (1 << 5) -+#define MT9M032_READ_MODE1_STROBE_ENABLE (1 << 4) -+#define MT9M032_READ_MODE1_STROBE_START_TRIG1 (0 << 2) -+#define MT9M032_READ_MODE1_STROBE_START_EXP (1 << 2) -+#define MT9M032_READ_MODE1_STROBE_START_SHUTTER (2 << 2) -+#define MT9M032_READ_MODE1_STROBE_START_TRIG2 (3 << 2) -+#define MT9M032_READ_MODE1_STROBE_END_TRIG1 (0 << 0) -+#define MT9M032_READ_MODE1_STROBE_END_EXP (1 << 0) -+#define MT9M032_READ_MODE1_STROBE_END_SHUTTER (2 << 0) -+#define MT9M032_READ_MODE1_STROBE_END_TRIG2 (3 << 0) - #define MT9M032_READ_MODE2 0x20 - #define MT9M032_READ_MODE2_VFLIP_SHIFT 15 - #define MT9M032_READ_MODE2_HFLIP_SHIFT 14 -@@ -282,7 +300,9 @@ static int mt9m032_setup_pll(struct mt9m032 *sensor) - MT9P031_PLL_CONTROL_PWRON | - MT9P031_PLL_CONTROL_USEPLL); - if (!ret) /* more reserved, Continuous, Master Mode */ -- ret = mt9m032_write(client, MT9M032_READ_MODE1, 0x8006); -+ ret = mt9m032_write(client, MT9M032_READ_MODE1, 0x8000 | -+ MT9M032_READ_MODE1_STROBE_START_EXP | -+ MT9M032_READ_MODE1_STROBE_END_SHUTTER); - if (!ret) { - reg_val = (pll.p1 == 6 ? MT9M032_FORMATTER1_PLL_P1_6 : 0) - | MT9M032_FORMATTER1_PARALLEL | 0x001e; /* 14-bit */ --- -1.7.10.4 - diff --git a/src/patches/kernel/omap/3isp/0004-mt9p031-Use-devm_-managed-helpers.patch b/src/patches/kernel/omap/3isp/0004-mt9p031-Use-devm_-managed-helpers.patch deleted file mode 100644 index bcc4360144..0000000000 --- a/src/patches/kernel/omap/3isp/0004-mt9p031-Use-devm_-managed-helpers.patch +++ /dev/null @@ -1,62 +0,0 @@ -From d3f188f38eaa34acf6375d5d88fe27971aae1170 Mon Sep 17 00:00:00 2001 -From: Laurent Pinchart -Date: Fri, 21 Dec 2012 20:34:06 +0100 -Subject: [PATCH 4/6] mt9p031: Use devm_* managed helpers - -Replace kzalloc and gpio_request_one by their managed equivalents. - -Signed-off-by: Laurent Pinchart ---- - drivers/media/i2c/mt9p031.c | 13 +++---------- - 1 file changed, 3 insertions(+), 10 deletions(-) - -diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c -index e328332..e0bad59 100644 ---- a/drivers/media/i2c/mt9p031.c -+++ b/drivers/media/i2c/mt9p031.c -@@ -927,7 +927,7 @@ static int mt9p031_probe(struct i2c_client *client, - return -EIO; - } - -- mt9p031 = kzalloc(sizeof(*mt9p031), GFP_KERNEL); -+ mt9p031 = devm_kzalloc(&client->dev, sizeof(*mt9p031), GFP_KERNEL); - if (mt9p031 == NULL) - return -ENOMEM; - -@@ -1001,8 +1001,8 @@ static int mt9p031_probe(struct i2c_client *client, - mt9p031->format.colorspace = V4L2_COLORSPACE_SRGB; - - if (pdata->reset != -1) { -- ret = gpio_request_one(pdata->reset, GPIOF_OUT_INIT_LOW, -- "mt9p031_rst"); -+ ret = devm_gpio_request_one(&client->dev, pdata->reset, -+ GPIOF_OUT_INIT_LOW, "mt9p031_rst"); - if (ret < 0) - goto done; - -@@ -1013,12 +1013,8 @@ static int mt9p031_probe(struct i2c_client *client, - - done: - if (ret < 0) { -- if (mt9p031->reset != -1) -- gpio_free(mt9p031->reset); -- - v4l2_ctrl_handler_free(&mt9p031->ctrls); - media_entity_cleanup(&mt9p031->subdev.entity); -- kfree(mt9p031); - } - - return ret; -@@ -1032,9 +1028,6 @@ static int mt9p031_remove(struct i2c_client *client) - v4l2_ctrl_handler_free(&mt9p031->ctrls); - v4l2_device_unregister_subdev(subdev); - media_entity_cleanup(&subdev->entity); -- if (mt9p031->reset != -1) -- gpio_free(mt9p031->reset); -- kfree(mt9p031); - - return 0; - } --- -1.7.10.4 - diff --git a/src/patches/kernel/omap/3isp/0005-mt9p031-Add-support-for-regulators.patch b/src/patches/kernel/omap/3isp/0005-mt9p031-Add-support-for-regulators.patch deleted file mode 100644 index 57c80fd0eb..0000000000 --- a/src/patches/kernel/omap/3isp/0005-mt9p031-Add-support-for-regulators.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 9ff2bc0c9458f0eecde6d9b52a899fd2bb1dd3a3 Mon Sep 17 00:00:00 2001 -From: Laurent Pinchart -Date: Tue, 8 May 2012 15:10:36 +0200 -Subject: [PATCH 5/6] mt9p031: Add support for regulators - -Enable the regulators when powering the sensor up, and disable them when -powering it down. - -The regulators are mandatory. Boards that don't allow controlling the -sensor power lines must provide fixed voltage regulators. - -Signed-off-by: Laurent Pinchart ---- - drivers/media/i2c/mt9p031.c | 24 ++++++++++++++++++++++++ - 1 file changed, 24 insertions(+) - -diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c -index e0bad59..ecf4492 100644 ---- a/drivers/media/i2c/mt9p031.c -+++ b/drivers/media/i2c/mt9p031.c -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -121,6 +122,10 @@ struct mt9p031 { - struct mutex power_lock; /* lock to protect power_count */ - int power_count; - -+ struct regulator *vaa; -+ struct regulator *vdd; -+ struct regulator *vdd_io; -+ - enum mt9p031_model model; - struct aptina_pll pll; - int reset; -@@ -264,6 +269,11 @@ static int mt9p031_power_on(struct mt9p031 *mt9p031) - usleep_range(1000, 2000); - } - -+ /* Bring up the supplies */ -+ regulator_enable(mt9p031->vdd); -+ regulator_enable(mt9p031->vdd_io); -+ regulator_enable(mt9p031->vaa); -+ - /* Emable clock */ - if (mt9p031->pdata->set_xclk) - mt9p031->pdata->set_xclk(&mt9p031->subdev, -@@ -285,6 +295,10 @@ static void mt9p031_power_off(struct mt9p031 *mt9p031) - usleep_range(1000, 2000); - } - -+ regulator_disable(mt9p031->vaa); -+ regulator_disable(mt9p031->vdd_io); -+ regulator_disable(mt9p031->vdd); -+ - if (mt9p031->pdata->set_xclk) - mt9p031->pdata->set_xclk(&mt9p031->subdev, 0); - } -@@ -937,6 +951,16 @@ static int mt9p031_probe(struct i2c_client *client, - mt9p031->model = did->driver_data; - mt9p031->reset = -1; - -+ mt9p031->vaa = devm_regulator_get(&client->dev, "vaa"); -+ mt9p031->vdd = devm_regulator_get(&client->dev, "vdd"); -+ mt9p031->vdd_io = devm_regulator_get(&client->dev, "vdd_io"); -+ -+ if (IS_ERR(mt9p031->vaa) || IS_ERR(mt9p031->vdd) || -+ IS_ERR(mt9p031->vdd_io)) { -+ dev_err(&client->dev, "Unable to get regulators\n"); -+ return -ENODEV; -+ } -+ - v4l2_ctrl_handler_init(&mt9p031->ctrls, ARRAY_SIZE(mt9p031_ctrls) + 6); - - v4l2_ctrl_new_std(&mt9p031->ctrls, &mt9p031_ctrl_ops, --- -1.7.10.4 - diff --git a/src/patches/kernel/omap/3isp/0006-mt9p031-Use-the-common-clock-framework.patch b/src/patches/kernel/omap/3isp/0006-mt9p031-Use-the-common-clock-framework.patch deleted file mode 100644 index fc8d583e8d..0000000000 --- a/src/patches/kernel/omap/3isp/0006-mt9p031-Use-the-common-clock-framework.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 6cd62f5ae305142c0490e80caa04f99f00029b68 Mon Sep 17 00:00:00 2001 -From: Laurent Pinchart -Date: Fri, 21 Dec 2012 20:11:55 +0100 -Subject: [PATCH 6/6] mt9p031: Use the common clock framework - -Configure the device external clock using the common clock framework -instead of a board code callback function. - -Signed-off-by: Laurent Pinchart -Acked-by: Sakari Ailus ---- - drivers/media/i2c/mt9p031.c | 21 ++++++++++++++------- - include/media/mt9p031.h | 2 -- - 2 files changed, 14 insertions(+), 9 deletions(-) - -diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c -index ecf4492..28cf95b 100644 ---- a/drivers/media/i2c/mt9p031.c -+++ b/drivers/media/i2c/mt9p031.c -@@ -12,6 +12,7 @@ - * published by the Free Software Foundation. - */ - -+#include - #include - #include - #include -@@ -122,6 +123,7 @@ struct mt9p031 { - struct mutex power_lock; /* lock to protect power_count */ - int power_count; - -+ struct clk *clk; - struct regulator *vaa; - struct regulator *vdd; - struct regulator *vdd_io; -@@ -200,7 +202,7 @@ static int mt9p031_reset(struct mt9p031 *mt9p031) - 0); - } - --static int mt9p031_pll_setup(struct mt9p031 *mt9p031) -+static int mt9p031_clk_setup(struct mt9p031 *mt9p031) - { - static const struct aptina_pll_limits limits = { - .ext_clock_min = 6000000, -@@ -221,6 +223,12 @@ static int mt9p031_pll_setup(struct mt9p031 *mt9p031) - struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); - struct mt9p031_platform_data *pdata = mt9p031->pdata; - -+ mt9p031->clk = devm_clk_get(&client->dev, NULL); -+ if (IS_ERR(mt9p031->clk)) -+ return PTR_ERR(mt9p031->clk); -+ -+ clk_set_rate(mt9p031->clk, pdata->ext_freq); -+ - mt9p031->pll.ext_clock = pdata->ext_freq; - mt9p031->pll.pix_clock = pdata->target_freq; - -@@ -275,9 +283,8 @@ static int mt9p031_power_on(struct mt9p031 *mt9p031) - regulator_enable(mt9p031->vaa); - - /* Emable clock */ -- if (mt9p031->pdata->set_xclk) -- mt9p031->pdata->set_xclk(&mt9p031->subdev, -- mt9p031->pdata->ext_freq); -+ if (mt9p031->clk) -+ clk_prepare_enable(mt9p031->clk); - - /* Now RESET_BAR must be high */ - if (mt9p031->reset != -1) { -@@ -299,8 +306,8 @@ static void mt9p031_power_off(struct mt9p031 *mt9p031) - regulator_disable(mt9p031->vdd_io); - regulator_disable(mt9p031->vdd); - -- if (mt9p031->pdata->set_xclk) -- mt9p031->pdata->set_xclk(&mt9p031->subdev, 0); -+ if (mt9p031->clk) -+ clk_disable_unprepare(mt9p031->clk); - } - - static int __mt9p031_set_power(struct mt9p031 *mt9p031, bool on) -@@ -1033,7 +1040,7 @@ static int mt9p031_probe(struct i2c_client *client, - mt9p031->reset = pdata->reset; - } - -- ret = mt9p031_pll_setup(mt9p031); -+ ret = mt9p031_clk_setup(mt9p031); - - done: - if (ret < 0) { -diff --git a/include/media/mt9p031.h b/include/media/mt9p031.h -index 0c97b19..b1e63f2 100644 ---- a/include/media/mt9p031.h -+++ b/include/media/mt9p031.h -@@ -5,13 +5,11 @@ struct v4l2_subdev; - - /* - * struct mt9p031_platform_data - MT9P031 platform data -- * @set_xclk: Clock frequency set callback - * @reset: Chip reset GPIO (set to -1 if not used) - * @ext_freq: Input clock frequency - * @target_freq: Pixel clock frequency - */ - struct mt9p031_platform_data { -- int (*set_xclk)(struct v4l2_subdev *subdev, int hz); - int reset; - int ext_freq; - int target_freq; --- -1.7.10.4 - diff --git a/src/patches/kernel/omap/beagle/0001-meego-modedb-add-Toshiba-LTA070B220F-800x480-support.patch b/src/patches/kernel/omap/beagle/0001-meego-modedb-add-Toshiba-LTA070B220F-800x480-support.patch deleted file mode 100644 index 34d60349b2..0000000000 --- a/src/patches/kernel/omap/beagle/0001-meego-modedb-add-Toshiba-LTA070B220F-800x480-support.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 6ac98647956cbff190954b4cac6bd71fdbb8647b Mon Sep 17 00:00:00 2001 -From: Robert Nelson -Date: Wed, 23 Mar 2011 08:37:54 -0500 -Subject: [PATCH 1/5] meego: modedb add Toshiba LTA070B220F 800x480 support - - from http://wiki.meego.com/ARM/Meego_on_Beagleboard_from_scratch - -Signed-off-by: Robert Nelson ---- - drivers/video/modedb.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c -index 5b686de..69ad1ec 100644 ---- a/drivers/video/modedb.c -+++ b/drivers/video/modedb.c -@@ -293,6 +293,10 @@ static const struct fb_videomode modedb[] = { - /* 864x480 @ 60 Hz, 35.15 kHz hsync */ - { NULL, 60, 864, 480, 27777, 1, 1, 1, 1, 0, 0, - 0, FB_VMODE_NONINTERLACED }, -+ -+ /* 800x480 @ 60 Hz, Toshiba LTA070B220F 7 inch LCD */ -+ { NULL, 60, 800, 480, 32787, 48, 80, 33, 31, 32, 2, -+ FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED }, - }; - - #ifdef CONFIG_FB_MODE_HELPERS --- -1.7.7.6 - diff --git a/src/patches/kernel/omap/beagle/0002-backlight-Add-TLC59108-backlight-control-driver.patch b/src/patches/kernel/omap/beagle/0002-backlight-Add-TLC59108-backlight-control-driver.patch deleted file mode 100644 index ce4df825b7..0000000000 --- a/src/patches/kernel/omap/beagle/0002-backlight-Add-TLC59108-backlight-control-driver.patch +++ /dev/null @@ -1,217 +0,0 @@ -From e989473bea15beef8d480b822a619e7b8fca860c Mon Sep 17 00:00:00 2001 -From: "Manjunathappa, Prakash" -Date: Mon, 1 Aug 2011 18:25:11 +0530 -Subject: [PATCH 2/5] backlight: Add TLC59108 backlight control driver - -This patch adds support for I2C configurable TLC59108 backlight -control driver. - -Signed-off-by: Manjunathappa, Prakash -Signed-off-by: Vaibhav Hiremath ---- - drivers/video/backlight/Kconfig | 8 ++ - drivers/video/backlight/Makefile | 1 + - drivers/video/backlight/tlc59108.c | 160 ++++++++++++++++++++++++++++++++++++ - 3 files changed, 169 insertions(+) - create mode 100644 drivers/video/backlight/tlc59108.c - -diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig -index db10d01..04a2275 100644 ---- a/drivers/video/backlight/Kconfig -+++ b/drivers/video/backlight/Kconfig -@@ -418,6 +418,14 @@ config BACKLIGHT_AS3711 - If you have an Austrian Microsystems AS3711 say Y to enable the - backlight driver. - -+config BACKLIGHT_TLC59108 -+ tristate "TLC59108 LCD Backlight Driver" -+ depends on I2C && BACKLIGHT_CLASS_DEVICE -+ default n -+ help -+ If you have an LCD Panel with backlight control via TLC59108, -+ say Y to enable its LCD control driver. -+ - endif # BACKLIGHT_CLASS_DEVICE - - endif # BACKLIGHT_LCD_SUPPORT -diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile -index 96c4d62..3687852 100644 ---- a/drivers/video/backlight/Makefile -+++ b/drivers/video/backlight/Makefile -@@ -41,6 +41,7 @@ obj-$(CONFIG_BACKLIGHT_LP855X) += lp855x_bl.o - obj-$(CONFIG_BACKLIGHT_LP8788) += lp8788_bl.o - obj-$(CONFIG_BACKLIGHT_MAX8925) += max8925_bl.o - obj-$(CONFIG_BACKLIGHT_OMAP1) += omap1_bl.o -+obj-$(CONFIG_BACKLIGHT_TLC59108) += tlc59108.o - obj-$(CONFIG_BACKLIGHT_OT200) += ot200_bl.o - obj-$(CONFIG_BACKLIGHT_PANDORA) += pandora_bl.o - obj-$(CONFIG_BACKLIGHT_PCF50633) += pcf50633-backlight.o -diff --git a/drivers/video/backlight/tlc59108.c b/drivers/video/backlight/tlc59108.c -new file mode 100644 -index 0000000..4f4ea34 ---- /dev/null -+++ b/drivers/video/backlight/tlc59108.c -@@ -0,0 +1,160 @@ -+/* -+ * ti81xxhdmi_tlc59108.c -+ * -+ * Copyright (C) 2011 Texas Instruments -+ * Author: Senthil Natarajan -+ * -+ * tlc59108 HDMI Driver -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 as published by -+ * the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program. If not, see . -+ * History: -+ * -+ * Senthil Natarajan July 2011 I2C driver for tlc59108 -+ * backlight control -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#define tlc59108_MODULE_NAME "tlc59108" -+#define TLC59108_MODE1 0x00 -+#define TLC59108_PWM2 0x04 -+#define TLC59108_LEDOUT0 0x0c -+#define TLC59108_LEDOUT1 0x0d -+#define TLC59108_MAX_BRIGHTNESS 0xFF -+ -+struct tlc59108_bl { -+ struct i2c_client *client; -+ struct backlight_device *bl; -+}; -+ -+static void tlc59108_bl_set_backlight(struct tlc59108_bl *data, int brightness) -+{ -+ /* Set Mode1 Register */ -+ i2c_smbus_write_byte_data(data->client, TLC59108_MODE1, 0x00); -+ -+ /* Set LEDOUT0 Register */ -+ i2c_smbus_write_byte_data(data->client, TLC59108_LEDOUT0, 0x21); -+ -+ /* Set Backlight Duty Cycle*/ -+ i2c_smbus_write_byte_data(data->client, TLC59108_PWM2, -+ brightness & 0xff); -+} -+ -+static int tlc59108_bl_get_brightness(struct backlight_device *dev) -+{ -+ struct backlight_properties *props = &dev->props; -+ -+ return props->brightness; -+} -+ -+static int tlc59108_bl_update_status(struct backlight_device *dev) -+{ -+ struct backlight_properties *props = &dev->props; -+ struct tlc59108_bl *data = dev_get_drvdata(&dev->dev); -+ int brightness = props->brightness; -+ -+ tlc59108_bl_set_backlight(data, brightness); -+ -+ return 0; -+} -+ -+static const struct backlight_ops bl_ops = { -+ .get_brightness = tlc59108_bl_get_brightness, -+ .update_status = tlc59108_bl_update_status, -+}; -+ -+static int tlc59108_probe(struct i2c_client *c, const struct i2c_device_id *id) -+{ -+ struct backlight_properties props; -+ struct tlc59108_bl *data = kzalloc(sizeof(struct tlc59108_bl), -+ GFP_KERNEL); -+ int ret = 0; -+ -+ if (!data) -+ return -ENOMEM; -+ -+ i2c_set_clientdata(c, data); -+ data->client = c; -+ -+ memset(&props, 0, sizeof(struct backlight_properties)); -+ props.max_brightness = TLC59108_MAX_BRIGHTNESS; -+ props.type = BACKLIGHT_RAW; -+ data->bl = backlight_device_register("tlc59108-bl", &c->dev, data, -+ &bl_ops, &props); -+ if (IS_ERR(data->bl)) { -+ ret = PTR_ERR(data->bl); -+ goto err_reg; -+ } -+ -+ data->bl->props.brightness = TLC59108_MAX_BRIGHTNESS; -+ -+ backlight_update_status(data->bl); -+ -+ return 0; -+ -+err_reg: -+ data->bl = NULL; -+ kfree(data); -+ return ret; -+} -+ -+static int tlc59108_remove(struct i2c_client *c) -+{ -+ struct tlc59108_bl *data = i2c_get_clientdata(c); -+ -+ backlight_device_unregister(data->bl); -+ data->bl = NULL; -+ -+ kfree(data); -+ -+ return 0; -+} -+ -+/* I2C Device ID table */ -+static const struct i2c_device_id tlc59108_id[] = { -+ { "tlc59108", 0 }, -+ { } -+}; -+MODULE_DEVICE_TABLE(i2c, tlc59108_id); -+ -+/* I2C driver data */ -+static struct i2c_driver tlc59108_driver = { -+ .driver = { -+ .owner = THIS_MODULE, -+ .name = tlc59108_MODULE_NAME, -+ }, -+ .probe = tlc59108_probe, -+ .remove = tlc59108_remove, -+ .id_table = tlc59108_id, -+}; -+ -+static int __init tlc59108_init(void) -+{ -+ return i2c_add_driver(&tlc59108_driver); -+} -+ -+static void __exit tlc59108_exit(void) -+{ -+ i2c_del_driver(&tlc59108_driver); -+} -+ -+module_init(tlc59108_init); -+module_exit(tlc59108_exit); -+ -+MODULE_DESCRIPTION("LCD/Backlight control for TLC59108"); -+MODULE_AUTHOR("Senthil Natarajan "); -+MODULE_LICENSE("GPL v2"); --- -1.7.10.4 - diff --git a/src/patches/kernel/omap/beagle/0003-tlc59108-adjust-for-beagleboard-uLCD7.patch b/src/patches/kernel/omap/beagle/0003-tlc59108-adjust-for-beagleboard-uLCD7.patch deleted file mode 100644 index 5c9659b6be..0000000000 --- a/src/patches/kernel/omap/beagle/0003-tlc59108-adjust-for-beagleboard-uLCD7.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 40cbddde06a9f0e1845810b904502f922fc3288f Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Fri, 27 Apr 2012 21:30:00 +0200 -Subject: [PATCH 3/5] tlc59108: adjust for beagleboard+uLCD7 - -Signed-off-by: Koen Kooi ---- - drivers/video/backlight/tlc59108.c | 46 ++++++++++++++++++++++++----------- - 1 files changed, 31 insertions(+), 15 deletions(-) - -diff --git a/drivers/video/backlight/tlc59108.c b/drivers/video/backlight/tlc59108.c -index 4f4ea34..40a21e7 100644 ---- a/drivers/video/backlight/tlc59108.c -+++ b/drivers/video/backlight/tlc59108.c -@@ -29,9 +29,16 @@ - #include - #include - --#define tlc59108_MODULE_NAME "tlc59108" - #define TLC59108_MODE1 0x00 --#define TLC59108_PWM2 0x04 -+#define TLC59108_MODE2 0x01 -+#define TLC59108_PWM0 0x02 -+#define TLC59108_PWM1 0x03 -+#define TLC59108_PWM2 0x04 -+#define TLC59108_PWM3 0x05 -+#define TLC59108_PWM4 0x06 -+#define TLC59108_PWM5 0x07 -+#define TLC59108_PWM6 0x08 -+#define TLC59108_PWM7 0x09 - #define TLC59108_LEDOUT0 0x0c - #define TLC59108_LEDOUT1 0x0d - #define TLC59108_MAX_BRIGHTNESS 0xFF -@@ -43,15 +50,9 @@ struct tlc59108_bl { - - static void tlc59108_bl_set_backlight(struct tlc59108_bl *data, int brightness) - { -- /* Set Mode1 Register */ -- i2c_smbus_write_byte_data(data->client, TLC59108_MODE1, 0x00); -- -- /* Set LEDOUT0 Register */ -- i2c_smbus_write_byte_data(data->client, TLC59108_LEDOUT0, 0x21); -- - /* Set Backlight Duty Cycle*/ - i2c_smbus_write_byte_data(data->client, TLC59108_PWM2, -- brightness & 0xff); -+ 0xff - brightness ); - } - - static int tlc59108_bl_get_brightness(struct backlight_device *dev) -@@ -65,8 +66,18 @@ static int tlc59108_bl_update_status(struct backlight_device *dev) - { - struct backlight_properties *props = &dev->props; - struct tlc59108_bl *data = dev_get_drvdata(&dev->dev); -+ - int brightness = props->brightness; - -+ if (dev->props.state & BL_CORE_FBBLANK) { -+ brightness = 0; -+ /* Set LEDOUT0 Register */ -+ i2c_smbus_write_byte_data(data->client, TLC59108_LEDOUT0, 0x10); -+ } else { -+ /* Set LEDOUT0 Register */ -+ i2c_smbus_write_byte_data(data->client, TLC59108_LEDOUT0, 0x30); -+ } -+ - tlc59108_bl_set_backlight(data, brightness); - - return 0; -@@ -77,7 +88,7 @@ static const struct backlight_ops bl_ops = { - .update_status = tlc59108_bl_update_status, - }; - --static int tlc59108_probe(struct i2c_client *c, const struct i2c_device_id *id) -+static int __devinit tlc59108_probe(struct i2c_client *c, const struct i2c_device_id *id) - { - struct backlight_properties props; - struct tlc59108_bl *data = kzalloc(sizeof(struct tlc59108_bl), -@@ -104,6 +115,11 @@ static int tlc59108_probe(struct i2c_client *c, const struct i2c_device_id *id) - - backlight_update_status(data->bl); - -+ i2c_smbus_write_byte_data(data->client, TLC59108_MODE1, 0x00); -+ i2c_smbus_write_byte_data(data->client, TLC59108_PWM2, 0x80); -+ i2c_smbus_write_byte_data(data->client, TLC59108_LEDOUT1, 0x05); -+ i2c_smbus_write_byte_data(data->client, TLC59108_LEDOUT1, 0x15); -+ - return 0; - - err_reg: -@@ -125,7 +141,7 @@ static int tlc59108_remove(struct i2c_client *c) - } - - /* I2C Device ID table */ --static const struct i2c_device_id tlc59108_id[] = { -+static struct i2c_device_id tlc59108_id[] = { - { "tlc59108", 0 }, - { } - }; -@@ -134,12 +150,12 @@ MODULE_DEVICE_TABLE(i2c, tlc59108_id); - /* I2C driver data */ - static struct i2c_driver tlc59108_driver = { - .driver = { -- .owner = THIS_MODULE, -- .name = tlc59108_MODULE_NAME, -+ .owner = THIS_MODULE, -+ .name = "tlc59108" - }, -+ .id_table = tlc59108_id, - .probe = tlc59108_probe, - .remove = tlc59108_remove, -- .id_table = tlc59108_id, - }; - - static int __init tlc59108_init(void) -@@ -157,4 +173,4 @@ module_exit(tlc59108_exit); - - MODULE_DESCRIPTION("LCD/Backlight control for TLC59108"); - MODULE_AUTHOR("Senthil Natarajan "); --MODULE_LICENSE("GPL v2"); -+MODULE_LICENSE("GPL"); --- -1.7.7.6 - diff --git a/src/patches/kernel/omap/beagle/0004-zeroMAP-Open-your-eyes.patch b/src/patches/kernel/omap/beagle/0004-zeroMAP-Open-your-eyes.patch deleted file mode 100644 index d179420812..0000000000 --- a/src/patches/kernel/omap/beagle/0004-zeroMAP-Open-your-eyes.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 81ff7627ad0d958a5c156cb7d880af8707e14f47 Mon Sep 17 00:00:00 2001 -From: Alexander Holler -Date: Wed, 4 Jul 2012 00:03:04 +0200 -Subject: [PATCH 4/5] zeroMAP: Open your eyes! - -Signed-off-by: Alexander Holler ---- - kernel/printk.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -diff --git a/kernel/printk.c b/kernel/printk.c -index 22e070f..3678740 100644 ---- a/kernel/printk.c -+++ b/kernel/printk.c -@@ -1759,6 +1759,13 @@ static int __init console_setup(char *str) - char *s, *options, *brl_options = NULL; - int idx; - -+#ifdef CONFIG_SERIAL_OMAP -+ if (!strncmp(str, "tty0", 4) && '0' <= str[4] && '9' >= str[4]) { -+ str[3] = 'O'; -+ pr_warn("We are opening your eyes, assuming you want to use an OMAP based serial driver and not a zeroMAP based one! ;)\n"); -+ pr_warn("Which means 'tty0%s' was changed to 'ttyO%s' automagically for your pleasure.\n", str+4, str+4); -+ } -+#endif - #ifdef CONFIG_A11Y_BRAILLE_CONSOLE - if (!memcmp(str, "brl,", 4)) { - brl_options = ""; --- -1.7.7.6 - diff --git a/src/patches/kernel/omap/beagle/0005-ARM-OMAP-Beagle-use-TWL4030-generic-reset-script.patch b/src/patches/kernel/omap/beagle/0005-ARM-OMAP-Beagle-use-TWL4030-generic-reset-script.patch deleted file mode 100644 index ffb5ffb570..0000000000 --- a/src/patches/kernel/omap/beagle/0005-ARM-OMAP-Beagle-use-TWL4030-generic-reset-script.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f2ec859cb99e6137d78b457f8a6693e69e3b1f33 Mon Sep 17 00:00:00 2001 -From: Robert Nelson -Date: Thu, 24 Jan 2013 09:43:51 -0600 -Subject: [PATCH 5/5] ARM: OMAP: Beagle: use TWL4030 generic reset script - -Enable TWL_COMMON_PDATA_POWER such that OMAP3530 revisions of the -Beagle (Bx/Cx) will not hang on reboot when running at 125 Mhz. - -Signed-off-by: Robert Nelson ---- - arch/arm/mach-omap2/board-omap3beagle.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index 5b57885..9a2c80b 100644 ---- a/arch/arm/mach-omap2/board-omap3beagle.c -+++ b/arch/arm/mach-omap2/board-omap3beagle.c -@@ -831,7 +831,7 @@ static int __init omap3_beagle_i2c_init(void) - { - omap3_pmic_get_config(&beagle_twldata, - TWL_COMMON_PDATA_USB | TWL_COMMON_PDATA_MADC | -- TWL_COMMON_PDATA_AUDIO, -+ TWL_COMMON_PDATA_AUDIO | TWL_COMMON_PDATA_POWER, - TWL_COMMON_REGULATOR_VDAC | TWL_COMMON_REGULATOR_VPLL2); - - beagle_twldata.vpll2->constraints.name = "VDVI"; --- -1.7.10.4 - diff --git a/src/patches/kernel/omap/beagle/0006-DSS2-use-DSI-PLL-for-DPI-with-OMAP3.patch b/src/patches/kernel/omap/beagle/0006-DSS2-use-DSI-PLL-for-DPI-with-OMAP3.patch deleted file mode 100644 index 56879cbaf9..0000000000 --- a/src/patches/kernel/omap/beagle/0006-DSS2-use-DSI-PLL-for-DPI-with-OMAP3.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 40d889a09a05765138f3b737becadfe927c9b004 Mon Sep 17 00:00:00 2001 -From: Robert Nelson -Date: Tue, 19 Mar 2013 13:40:50 -0500 -Subject: [PATCH 6/6] DSS2: use DSI PLL for DPI with OMAP3 - -Signed-off-by: Robert Nelson ---- - drivers/video/omap2/dss/dpi.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c -index 757b57f..12ed14f 100644 ---- a/drivers/video/omap2/dss/dpi.c -+++ b/drivers/video/omap2/dss/dpi.c -@@ -58,10 +58,6 @@ static struct platform_device *dpi_get_dsidev(enum omap_channel channel) - */ - switch (omapdss_get_version()) { - case OMAPDSS_VER_OMAP24xx: -- case OMAPDSS_VER_OMAP34xx_ES1: -- case OMAPDSS_VER_OMAP34xx_ES3: -- case OMAPDSS_VER_OMAP3630: -- case OMAPDSS_VER_AM35xx: - return NULL; - - case OMAPDSS_VER_OMAP4430_ES1: --- -1.7.10.4 - diff --git a/src/patches/kernel/omap/beagle/expansion/0001-Beagle-expansion-add-buddy-param-for-expansionboard-.patch b/src/patches/kernel/omap/beagle/expansion/0001-Beagle-expansion-add-buddy-param-for-expansionboard-.patch deleted file mode 100644 index 44a1ae367c..0000000000 --- a/src/patches/kernel/omap/beagle/expansion/0001-Beagle-expansion-add-buddy-param-for-expansionboard-.patch +++ /dev/null @@ -1,63 +0,0 @@ -From c070885eaf883884f89a77e2f71def5b447f914b Mon Sep 17 00:00:00 2001 -From: Robert Nelson -Date: Tue, 11 Dec 2012 06:25:27 -0600 -Subject: [PATCH 01/10] Beagle: expansion: add buddy param for expansionboard - names - -Signed-off-by: Robert Nelson ---- - arch/arm/mach-omap2/board-omap3beagle.c | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) - -diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index c3558f9..29d549c 100644 ---- a/arch/arm/mach-omap2/board-omap3beagle.c -+++ b/arch/arm/mach-omap2/board-omap3beagle.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -191,6 +192,8 @@ static void __init omap3_beagle_init_rev(void) - } - } - -+char expansionboard_name[16]; -+ - static struct mtd_partition omap3beagle_nand_partitions[] = { - /* All the partition sizes are listed in terms of NAND block size */ - { -@@ -470,6 +473,18 @@ static struct omap_board_mux board_mux[] __initdata = { - }; - #endif - -+static int __init expansionboard_setup(char *str) -+{ -+ if (!machine_is_omap3_beagle()) -+ return 0; -+ -+ if (!str) -+ return -EINVAL; -+ strncpy(expansionboard_name, str, 16); -+ pr_info("Beagle expansionboard: %s\n", expansionboard_name); -+ return 0; -+} -+ - static int __init beagle_opp_init(void) - { - int r = 0; -@@ -559,6 +574,8 @@ static void __init omap3_beagle_init(void) - pwm_add_table(pwm_lookup, ARRAY_SIZE(pwm_lookup)); - } - -+early_param("buddy", expansionboard_setup); -+ - MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board") - /* Maintainer: Syed Mohammed Khasim - http://beagleboard.org */ - .atag_offset = 0x100, --- -1.7.10.4 - diff --git a/src/patches/kernel/omap/beagle/expansion/0002-Beagle-expansion-add-zippy.patch b/src/patches/kernel/omap/beagle/expansion/0002-Beagle-expansion-add-zippy.patch deleted file mode 100644 index fff62431e8..0000000000 --- a/src/patches/kernel/omap/beagle/expansion/0002-Beagle-expansion-add-zippy.patch +++ /dev/null @@ -1,242 +0,0 @@ -From e71075202707e044a28604bd929fd6f7a89adeae Mon Sep 17 00:00:00 2001 -From: Robert Nelson -Date: Mon, 21 Jan 2013 11:47:02 -0600 -Subject: [PATCH 02/10] Beagle: expansion: add zippy - -v2: add #include -build fix from Pantelis Antoniou - -Signed-off-by: Robert Nelson ---- - arch/arm/mach-omap2/board-omap3beagle.c | 164 +++++++++++++++++++++++++++++-- - 1 file changed, 158 insertions(+), 6 deletions(-) - -diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index 4e6e767..b3685ed 100644 ---- a/arch/arm/mach-omap2/board-omap3beagle.c -+++ b/arch/arm/mach-omap2/board-omap3beagle.c -@@ -37,6 +37,7 @@ - #include - - #include -+#include - #include - - #include -@@ -195,6 +196,86 @@ static void __init omap3_beagle_init_rev(void) - - char expansionboard_name[16]; - -+enum { -+ EXPANSION_MMC_NONE = 0, -+ EXPANSION_MMC_ZIPPY, -+ EXPANSION_MMC_WIFI, -+}; -+ -+enum { -+ EXPANSION_I2C_NONE = 0, -+ EXPANSION_I2C_ZIPPY, -+}; -+ -+static struct { -+ int mmc_settings; -+ int i2c_settings; -+} expansion_config = { -+ .mmc_settings = EXPANSION_MMC_NONE, -+ .i2c_settings = EXPANSION_I2C_NONE, -+}; -+ -+//rcn-ee: this is just a fake regulator, the zippy hardware provides 3.3/1.8 with jumper.. -+static struct fixed_voltage_config beagle_vzippy = { -+ .supply_name = "vzippy", -+ .microvolts = 3300000, /* 3.3V */ -+ .startup_delay = 70000, /* 70ms */ -+ .enable_high = 1, -+ .enabled_at_boot = 0, -+ .init_data = &beagle_vmmc2, -+}; -+ -+static struct platform_device omap_zippy_device = { -+ .name = "reg-fixed-voltage", -+ .id = 1, -+ .dev = { -+ .platform_data = &beagle_vzippy, -+ }, -+}; -+ -+#define OMAP3BEAGLE_GPIO_ZIPPY_MMC_WP 141 -+#define OMAP3BEAGLE_GPIO_ZIPPY_MMC_CD 162 -+ -+#if IS_ENABLED(CONFIG_ENC28J60) -+#include -+#include -+ -+#define OMAP3BEAGLE_GPIO_ENC28J60_IRQ 157 -+ -+static struct omap2_mcspi_device_config enc28j60_spi_chip_info = { -+ .turbo_mode = 0, -+}; -+ -+static struct spi_board_info omap3beagle_zippy_spi_board_info[] __initdata = { -+ { -+ .modalias = "enc28j60", -+ .bus_num = 4, -+ .chip_select = 0, -+ .max_speed_hz = 20000000, -+ .controller_data = &enc28j60_spi_chip_info, -+ }, -+}; -+ -+static void __init omap3beagle_enc28j60_init(void) -+{ -+ if ((gpio_request(OMAP3BEAGLE_GPIO_ENC28J60_IRQ, "ENC28J60_IRQ") == 0) && -+ (gpio_direction_input(OMAP3BEAGLE_GPIO_ENC28J60_IRQ) == 0)) { -+ gpio_export(OMAP3BEAGLE_GPIO_ENC28J60_IRQ, 0); -+ omap3beagle_zippy_spi_board_info[0].irq = gpio_to_irq(OMAP3BEAGLE_GPIO_ENC28J60_IRQ); -+ irq_set_irq_type(omap3beagle_zippy_spi_board_info[0].irq, IRQ_TYPE_EDGE_FALLING); -+ } else { -+ pr_err("Beagle expansionboard: could not obtain gpio for ENC28J60_IRQ\n"); -+ return; -+ } -+ -+ spi_register_board_info(omap3beagle_zippy_spi_board_info, -+ ARRAY_SIZE(omap3beagle_zippy_spi_board_info)); -+} -+ -+#else -+static inline void __init omap3beagle_enc28j60_init(void) { return; } -+#endif -+ - static struct mtd_partition omap3beagle_nand_partitions[] = { - /* All the partition sizes are listed in terms of NAND block size */ - { -@@ -271,6 +352,23 @@ static struct omap2_hsmmc_info mmc[] = { - {} /* Terminator */ - }; - -+static struct omap2_hsmmc_info mmc_zippy[] = { -+ { -+ .mmc = 1, -+ .caps = MMC_CAP_4_BIT_DATA, -+ .gpio_wp = -EINVAL, -+ .deferred = true, -+ }, -+ { -+ .mmc = 2, -+ .caps = MMC_CAP_4_BIT_DATA, -+ .gpio_wp = OMAP3BEAGLE_GPIO_ZIPPY_MMC_WP, -+ .gpio_cd = OMAP3BEAGLE_GPIO_ZIPPY_MMC_CD, -+ .transceiver = true, -+ .deferred = true, -+ }, -+ {} /* Terminator */ -+}; - static struct regulator_consumer_supply beagle_vmmc1_supply[] = { - REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"), - }; -@@ -301,10 +399,21 @@ static int beagle_twl_gpio_setup(struct device *dev, - { - int r; - -- mmc[0].gpio_wp = beagle_config.mmc1_gpio_wp; -- /* gpio + 0 is "mmc0_cd" (input/IRQ) */ -- mmc[0].gpio_cd = gpio + 0; -- omap_hsmmc_late_init(mmc); -+ switch (expansion_config.mmc_settings) { -+ case EXPANSION_MMC_ZIPPY: -+ mmc_zippy[0].gpio_wp = beagle_config.mmc1_gpio_wp; -+ /* gpio + 0 is "mmc0_cd" (input/IRQ) */ -+ mmc_zippy[0].gpio_cd = gpio + 0; -+ -+ omap_hsmmc_late_init(mmc_zippy); -+ break; -+ default: -+ mmc[0].gpio_wp = beagle_config.mmc1_gpio_wp; -+ /* gpio + 0 is "mmc0_cd" (input/IRQ) */ -+ mmc[0].gpio_cd = gpio + 0; -+ -+ omap_hsmmc_late_init(mmc); -+ } - - /* - * TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, XM active -@@ -396,6 +505,14 @@ static struct i2c_board_info __initdata beagle_i2c_eeprom[] = { - }, - }; - -+static struct i2c_board_info __initdata zippy_i2c2_rtc[] = { -+#if defined(CONFIG_RTC_DRV_DS1307) || defined(CONFIG_RTC_DRV_DS1307_MODULE) -+ { -+ I2C_BOARD_INFO("ds1307", 0x68), -+ }, -+#endif -+}; -+ - static int __init omap3_beagle_i2c_init(void) - { - omap3_pmic_get_config(&beagle_twldata, -@@ -406,6 +523,15 @@ static int __init omap3_beagle_i2c_init(void) - beagle_twldata.vpll2->constraints.name = "VDVI"; - - omap3_pmic_init("twl4030", &beagle_twldata); -+ -+ switch (expansion_config.i2c_settings) { -+ case EXPANSION_I2C_ZIPPY: -+ omap_register_i2c_bus(2, 400, zippy_i2c2_rtc, ARRAY_SIZE(zippy_i2c2_rtc)); -+ break; -+ default: -+ omap_register_i2c_bus(2, 400, NULL, 0); -+ } -+ - /* Bus 3 is attached to the DVI port where devices like the pico DLP - * projector don't work reliably with 400kHz */ - omap_register_i2c_bus(3, 100, beagle_i2c_eeprom, ARRAY_SIZE(beagle_i2c_eeprom)); -@@ -548,10 +674,30 @@ static void __init omap3_beagle_init(void) - omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); - omap3_beagle_init_rev(); - -+ if (!strcmp(expansionboard_name, "zippy")) -+ { -+ pr_info("Beagle expansionboard: initializing zippy mmc\n"); -+ platform_device_register(&omap_zippy_device); -+ -+ expansion_config.i2c_settings = EXPANSION_I2C_ZIPPY; -+ expansion_config.mmc_settings = EXPANSION_MMC_ZIPPY; -+ -+ omap_mux_init_gpio(OMAP3BEAGLE_GPIO_ZIPPY_MMC_WP, OMAP_PIN_INPUT); -+ omap_mux_init_gpio(OMAP3BEAGLE_GPIO_ZIPPY_MMC_CD, OMAP_PIN_INPUT); -+ } -+ - if (gpio_is_valid(beagle_config.mmc1_gpio_wp)) - omap_mux_init_gpio(beagle_config.mmc1_gpio_wp, OMAP_PIN_INPUT); -- mmc[0].caps = beagle_config.mmc_caps; -- omap_hsmmc_init(mmc); -+ -+ switch (expansion_config.mmc_settings) { -+ case EXPANSION_MMC_ZIPPY: -+ mmc_zippy[0].caps = beagle_config.mmc_caps; -+ omap_hsmmc_init(mmc_zippy); -+ break; -+ default: -+ mmc[0].caps = beagle_config.mmc_caps; -+ omap_hsmmc_init(mmc); -+ } - - omap3_beagle_i2c_init(); - -@@ -566,6 +712,12 @@ static void __init omap3_beagle_init(void) - omap_sdrc_init(mt46h32m32lf6_sdrc_params, - mt46h32m32lf6_sdrc_params); - -+ if (!strcmp(expansionboard_name, "zippy")) -+ { -+ pr_info("Beagle expansionboard: initializing enc28j60\n"); -+ omap3beagle_enc28j60_init(); -+ } -+ - usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb"); - usb_musb_init(NULL); - --- -1.7.10.4 - diff --git a/src/patches/kernel/omap/beagle/expansion/0003-Beagle-expansion-add-zippy2.patch b/src/patches/kernel/omap/beagle/expansion/0003-Beagle-expansion-add-zippy2.patch deleted file mode 100644 index b569f92d61..0000000000 --- a/src/patches/kernel/omap/beagle/expansion/0003-Beagle-expansion-add-zippy2.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 45bed17e65e1a83f753896e250f3458654dcb229 Mon Sep 17 00:00:00 2001 -From: Robert Nelson -Date: Tue, 11 Dec 2012 06:32:15 -0600 -Subject: [PATCH 03/10] Beagle: expansion: add zippy2 - -Signed-off-by: Robert Nelson ---- - arch/arm/mach-omap2/board-omap3beagle.c | 48 ++++++++++++++++++++++++++++++- - 1 file changed, 47 insertions(+), 1 deletion(-) - -diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index b3685ed..74da505 100644 ---- a/arch/arm/mach-omap2/board-omap3beagle.c -+++ b/arch/arm/mach-omap2/board-omap3beagle.c -@@ -276,6 +276,46 @@ static void __init omap3beagle_enc28j60_init(void) - static inline void __init omap3beagle_enc28j60_init(void) { return; } - #endif - -+#if IS_ENABLED(CONFIG_KS8851) -+#include -+#include -+ -+#define OMAP3BEAGLE_GPIO_KS8851_IRQ 157 -+ -+static struct omap2_mcspi_device_config ks8851_spi_chip_info = { -+ .turbo_mode = 0, -+}; -+ -+static struct spi_board_info omap3beagle_zippy2_spi_board_info[] __initdata = { -+ { -+ .modalias = "ks8851", -+ .bus_num = 4, -+ .chip_select = 0, -+ .max_speed_hz = 36000000, -+ .controller_data = &ks8851_spi_chip_info, -+ }, -+}; -+ -+static void __init omap3beagle_ks8851_init(void) -+{ -+ if ((gpio_request(OMAP3BEAGLE_GPIO_KS8851_IRQ, "KS8851_IRQ") == 0) && -+ (gpio_direction_input(OMAP3BEAGLE_GPIO_KS8851_IRQ) == 0)) { -+ gpio_export(OMAP3BEAGLE_GPIO_KS8851_IRQ, 0); -+ omap3beagle_zippy2_spi_board_info[0].irq = gpio_to_irq(OMAP3BEAGLE_GPIO_KS8851_IRQ); -+ irq_set_irq_type(omap3beagle_zippy2_spi_board_info[0].irq, IRQ_TYPE_EDGE_FALLING); -+ } else { -+ pr_err("Beagle expansionboard: could not obtain gpio for KS8851_IRQ\n"); -+ return; -+ } -+ -+ spi_register_board_info(omap3beagle_zippy2_spi_board_info, -+ ARRAY_SIZE(omap3beagle_zippy2_spi_board_info)); -+} -+ -+#else -+static inline void __init omap3beagle_ks8851_init(void) { return; } -+#endif -+ - static struct mtd_partition omap3beagle_nand_partitions[] = { - /* All the partition sizes are listed in terms of NAND block size */ - { -@@ -674,7 +714,7 @@ static void __init omap3_beagle_init(void) - omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); - omap3_beagle_init_rev(); - -- if (!strcmp(expansionboard_name, "zippy")) -+ if ((!strcmp(expansionboard_name, "zippy")) || (!strcmp(expansionboard_name, "zippy2"))) - { - pr_info("Beagle expansionboard: initializing zippy mmc\n"); - platform_device_register(&omap_zippy_device); -@@ -718,6 +758,12 @@ static void __init omap3_beagle_init(void) - omap3beagle_enc28j60_init(); - } - -+ if (!strcmp(expansionboard_name, "zippy2")) -+ { -+ pr_info("Beagle expansionboard: initializing ks_8851\n"); -+ omap3beagle_ks8851_init(); -+ } -+ - usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb"); - usb_musb_init(NULL); - --- -1.7.10.4 - diff --git a/src/patches/kernel/omap/beagle/expansion/0004-Beagle-expansion-add-trainer.patch b/src/patches/kernel/omap/beagle/expansion/0004-Beagle-expansion-add-trainer.patch deleted file mode 100644 index 08ace67a14..0000000000 --- a/src/patches/kernel/omap/beagle/expansion/0004-Beagle-expansion-add-trainer.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 4d9b4e5795e322ed3efed9b8402f604e2e53cc6f Mon Sep 17 00:00:00 2001 -From: Robert Nelson -Date: Tue, 11 Dec 2012 06:33:24 -0600 -Subject: [PATCH 04/10] Beagle: expansion: add trainer - -Signed-off-by: Robert Nelson ---- - arch/arm/mach-omap2/board-omap3beagle.c | 31 +++++++++++++++++++++++++++++++ - 1 file changed, 31 insertions(+) - -diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index 74da505..b5ed547 100644 ---- a/arch/arm/mach-omap2/board-omap3beagle.c -+++ b/arch/arm/mach-omap2/board-omap3beagle.c -@@ -764,6 +764,37 @@ static void __init omap3_beagle_init(void) - omap3beagle_ks8851_init(); - } - -+ if (!strcmp(expansionboard_name, "trainer")) -+ { -+ pr_info("Beagle expansionboard: exporting GPIOs 130-141,162 to userspace\n"); -+ gpio_request(130, "sysfs"); -+ gpio_export(130, 1); -+ gpio_request(131, "sysfs"); -+ gpio_export(131, 1); -+ gpio_request(132, "sysfs"); -+ gpio_export(132, 1); -+ gpio_request(133, "sysfs"); -+ gpio_export(133, 1); -+ gpio_request(134, "sysfs"); -+ gpio_export(134, 1); -+ gpio_request(135, "sysfs"); -+ gpio_export(135, 1); -+ gpio_request(136, "sysfs"); -+ gpio_export(136, 1); -+ gpio_request(137, "sysfs"); -+ gpio_export(137, 1); -+ gpio_request(138, "sysfs"); -+ gpio_export(138, 1); -+ gpio_request(139, "sysfs"); -+ gpio_export(139, 1); -+ gpio_request(140, "sysfs"); -+ gpio_export(140, 1); -+ gpio_request(141, "sysfs"); -+ gpio_export(141, 1); -+ gpio_request(162, "sysfs"); -+ gpio_export(162, 1); -+ } -+ - usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb"); - usb_musb_init(NULL); - --- -1.7.10.4 - diff --git a/src/patches/kernel/omap/beagle/expansion/0005-Beagle-expansion-add-CircuitCo-ulcd-Support.patch b/src/patches/kernel/omap/beagle/expansion/0005-Beagle-expansion-add-CircuitCo-ulcd-Support.patch deleted file mode 100644 index 8b716eebc0..0000000000 --- a/src/patches/kernel/omap/beagle/expansion/0005-Beagle-expansion-add-CircuitCo-ulcd-Support.patch +++ /dev/null @@ -1,285 +0,0 @@ -From a53e7913a95faefde1ee87a7ea048c04b0850066 Mon Sep 17 00:00:00 2001 -From: Robert Nelson -Date: Tue, 11 Dec 2012 06:42:03 -0600 -Subject: [PATCH 05/10] Beagle: expansion: add CircuitCo ulcd Support - -This of a cleanup, squashed both ulcd commits into one: - -====================================================================== - -expansion: add ulcd -Signed-off-by: Robert Nelson - -====================================================================== - -beagleboard: fix uLCD7 support -Signed-off-by: Koen Kooi - -====================================================================== - -Signed-off-by: Robert Nelson ---- - arch/arm/mach-omap2/board-omap3beagle.c | 136 ++++++++++++++++++++++ - drivers/video/omap2/displays/panel-generic-dpi.c | 27 +++++ - 2 files changed, 163 insertions(+) - -diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index 0f9b253..b2807c2 100644 ---- a/arch/arm/mach-omap2/board-omap3beagle.c -+++ b/arch/arm/mach-omap2/board-omap3beagle.c -@@ -118,12 +118,16 @@ static struct { - int dvi_pd_gpio; - int usr_button_gpio; - int mmc_caps; -+ char *lcd_driver_name; -+ int lcd_pwren; - } beagle_config = { - .mmc1_gpio_wp = -EINVAL, - .usb_pwr_level = 0, - .dvi_pd_gpio = -EINVAL, - .usr_button_gpio = 4, - .mmc_caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA, -+ .lcd_driver_name = "", -+ .lcd_pwren = 156, - }; - - static struct gpio omap3_beagle_rev_gpios[] __initdata = { -@@ -195,6 +199,7 @@ static void __init omap3_beagle_init_rev(void) - } - - char expansionboard_name[16]; -+char expansionboard2_name[16]; - - enum { - EXPANSION_MMC_NONE = 0, -@@ -205,6 +210,7 @@ enum { - enum { - EXPANSION_I2C_NONE = 0, - EXPANSION_I2C_ZIPPY, -+ EXPANSION_I2C_7ULCD, - }; - - static struct { -@@ -369,9 +375,53 @@ static struct omap_dss_device beagle_tv_device = { - .phy.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO, - }; - -+static int beagle_enable_lcd(struct omap_dss_device *dssdev) -+{ -+ if (gpio_is_valid(beagle_config.lcd_pwren)) { -+ pr_info("%s: Enabling LCD\n", __FUNCTION__); -+ gpio_set_value(beagle_config.lcd_pwren, 0); -+ } else { -+ pr_info("%s: Invalid LCD enable GPIO: %d\n", -+ __FUNCTION__, beagle_config.lcd_pwren); -+ } -+ -+ return 0; -+} -+ -+static void beagle_disable_lcd(struct omap_dss_device *dssdev) -+{ -+ if (gpio_is_valid(beagle_config.lcd_pwren)) { -+ pr_info("%s: Disabling LCD\n", __FUNCTION__); -+ gpio_set_value(beagle_config.lcd_pwren, 1); -+ } else { -+ pr_info("%s: Invalid LCD enable GPIO: %d\n", -+ __FUNCTION__, beagle_config.lcd_pwren); -+ } -+ -+ return; -+} -+ -+static struct panel_generic_dpi_data lcd_panel = { -+ .name = "tfc_s9700rtwv35tr-01b", -+ .platform_enable = beagle_enable_lcd, -+ .platform_disable = beagle_disable_lcd, -+}; -+ -+static struct omap_dss_device beagle_lcd_device = { -+ .type = OMAP_DISPLAY_TYPE_DPI, -+ .name = "lcd", -+ .driver_name = "generic_dpi_panel", -+ .phy.dpi.data_lines = 24, -+ .platform_enable = beagle_enable_lcd, -+ .platform_disable = beagle_disable_lcd, -+ .reset_gpio = -EINVAL, -+ .data = &lcd_panel, -+}; -+ - static struct omap_dss_device *beagle_dss_devices[] = { - &beagle_dvi_device, - &beagle_tv_device, -+ &beagle_lcd_device, - }; - - static struct omap_dss_board_info beagle_dss_data = { -@@ -553,6 +603,53 @@ static struct i2c_board_info __initdata zippy_i2c2_rtc[] = { - #endif - }; - -+#if IS_ENABLED(CONFIG_TOUCHSCREEN_TSC2007) -+/* Touchscreen */ -+#include -+ -+#define OMAP3BEAGLE_TSC2007_GPIO 157 -+ -+static int omap3beagle_tsc2007_get_pendown_state(void) -+{ -+ return !gpio_get_value(OMAP3BEAGLE_TSC2007_GPIO); -+} -+ -+static struct tsc2007_platform_data tsc2007_info = { -+ .model = 2007, -+ .x_plate_ohms = 180, -+ .get_pendown_state = omap3beagle_tsc2007_get_pendown_state, -+}; -+ -+static struct i2c_board_info __initdata beagle_i2c2_bbtoys_ulcd[] = { -+ { -+ I2C_BOARD_INFO("tlc59108", 0x40), -+ }, -+ { -+ I2C_BOARD_INFO("tsc2007", 0x48), -+ .platform_data = &tsc2007_info, -+ }, -+}; -+ -+static void __init omap3beagle_tsc2007_init(void) -+{ -+ int r; -+ -+ omap_mux_init_gpio(OMAP3BEAGLE_TSC2007_GPIO, OMAP_PIN_INPUT_PULLUP); -+ -+ r = gpio_request_one(OMAP3BEAGLE_TSC2007_GPIO, GPIOF_IN, "tsc2007_pen_down"); -+ if (r < 0) { -+ pr_err("Beagle expansionboard: failed to request GPIO#%d for " -+ "tsc2007 pen down IRQ\n", OMAP3BEAGLE_TSC2007_GPIO); -+ return; -+ } -+ -+ beagle_i2c2_bbtoys_ulcd[0].irq = gpio_to_irq(OMAP3BEAGLE_TSC2007_GPIO); -+ irq_set_irq_type(gpio_to_irq(OMAP3BEAGLE_TSC2007_GPIO), IRQ_TYPE_EDGE_FALLING); -+} -+#else -+static struct i2c_board_info __initdata beagle_i2c2_bbtoys_ulcd[] = {}; -+#endif -+ - static int __init omap3_beagle_i2c_init(void) - { - omap3_pmic_get_config(&beagle_twldata, -@@ -565,6 +662,10 @@ static int __init omap3_beagle_i2c_init(void) - omap3_pmic_init("twl4030", &beagle_twldata); - - switch (expansion_config.i2c_settings) { -+ case EXPANSION_I2C_7ULCD: -+ omap_register_i2c_bus(2, 400, beagle_i2c2_bbtoys_ulcd, -+ ARRAY_SIZE(beagle_i2c2_bbtoys_ulcd)); -+ break; - case EXPANSION_I2C_ZIPPY: - omap_register_i2c_bus(2, 400, zippy_i2c2_rtc, ARRAY_SIZE(zippy_i2c2_rtc)); - break; -@@ -661,6 +762,18 @@ static int __init expansionboard_setup(char *str) - return 0; - } - -+static int __init expansionboard2_setup(char *str) -+{ -+ if (!machine_is_omap3_beagle()) -+ return 0; -+ -+ if (!str) -+ return -EINVAL; -+ strncpy(expansionboard2_name, str, 16); -+ pr_info("Beagle expansionboard2: %s\n", expansionboard2_name); -+ return 0; -+} -+ - static int __init beagle_opp_init(void) - { - int r = 0; -@@ -726,6 +839,20 @@ static void __init omap3_beagle_init(void) - omap_mux_init_gpio(OMAP3BEAGLE_GPIO_ZIPPY_MMC_CD, OMAP_PIN_INPUT); - } - -+ if (!strcmp(expansionboard2_name, "bbtoys-ulcd")) -+ { -+ int r; -+ expansion_config.i2c_settings = EXPANSION_I2C_7ULCD; -+ -+ /* TODO: set lcd_driver_name by command line or device tree */ -+ beagle_config.lcd_driver_name = "tfc_s9700rtwv35tr-01b", -+ lcd_panel.name = beagle_config.lcd_driver_name; -+ -+ r = gpio_request_one(beagle_config.lcd_pwren, GPIOF_OUT_INIT_LOW, "LCD power"); -+ if (r < 0) -+ pr_err("Beagle expansionboard: Unable to get LCD power enable GPIO\n"); -+ } -+ - if (gpio_is_valid(beagle_config.mmc1_gpio_wp)) - omap_mux_init_gpio(beagle_config.mmc1_gpio_wp, OMAP_PIN_INPUT); - -@@ -795,6 +922,14 @@ static void __init omap3_beagle_init(void) - gpio_export(162, 1); - } - -+ if (!strcmp(expansionboard2_name, "bbtoys-ulcd")) -+ { -+ #if IS_ENABLED(CONFIG_TOUCHSCREEN_TSC2007) -+ pr_info("Beagle expansionboard: initializing touchscreen: tsc2007\n"); -+ omap3beagle_tsc2007_init(); -+ #endif -+ } -+ - usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb"); - usb_musb_init(NULL); - -@@ -816,6 +951,7 @@ static void __init omap3_beagle_init(void) - } - - early_param("buddy", expansionboard_setup); -+early_param("buddy2", expansionboard2_setup); - - MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board") - /* Maintainer: Syed Mohammed Khasim - http://beagleboard.org */ -diff --git a/drivers/video/omap2/displays/panel-generic-dpi.c b/drivers/video/omap2/displays/panel-generic-dpi.c -index 97363f7..614031f 100644 ---- a/drivers/video/omap2/displays/panel-generic-dpi.c -+++ b/drivers/video/omap2/displays/panel-generic-dpi.c -@@ -515,6 +515,33 @@ static struct panel_config generic_dpi_panels[] = { - }, - .name = "primeview_pd104slf", - }, -+ -+ /* ThreeFiveCorp S9700RTWV35TR-01B */ -+ { -+ { -+ .x_res = 800, -+ .y_res = 480, -+ -+ .pixel_clock = 30000, -+ -+ .hsw = 49, -+ .hfp = 41, -+ .hbp = 40, -+ -+ .vsw = 4, -+ .vfp = 14, -+ .vbp = 29, -+ -+ .vsync_level = OMAPDSS_SIG_ACTIVE_LOW, -+ .hsync_level = OMAPDSS_SIG_ACTIVE_LOW, -+ .data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE, -+ .de_level = OMAPDSS_SIG_ACTIVE_HIGH, -+ .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, -+ }, -+ .power_on_delay = 50, -+ .power_off_delay = 100, -+ .name = "tfc_s9700rtwv35tr-01b", -+ }, - }; - - struct panel_drv_data { --- -1.7.10.4 - diff --git a/src/patches/kernel/omap/beagle/expansion/0006-Beagle-expansion-add-wifi.patch b/src/patches/kernel/omap/beagle/expansion/0006-Beagle-expansion-add-wifi.patch deleted file mode 100644 index 88d48af8ce..0000000000 --- a/src/patches/kernel/omap/beagle/expansion/0006-Beagle-expansion-add-wifi.patch +++ /dev/null @@ -1,180 +0,0 @@ -From f78cd93d767cd75969c4661723cfce46071e5b1b Mon Sep 17 00:00:00 2001 -From: Robert Nelson -Date: Tue, 11 Dec 2012 06:48:52 -0600 -Subject: [PATCH 06/10] Beagle: expansion: add wifi - -build fixes from Pantelis Antoniou - -Signed-off-by: Robert Nelson ---- - arch/arm/mach-omap2/board-omap3beagle.c | 119 +++++++++++++++++++++++++++++++ - 1 file changed, 119 insertions(+) - -diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index a8de97e..2322d6c 100644 ---- a/arch/arm/mach-omap2/board-omap3beagle.c -+++ b/arch/arm/mach-omap2/board-omap3beagle.c -@@ -221,6 +221,73 @@ static struct { - .i2c_settings = EXPANSION_I2C_NONE, - }; - -+#if IS_ENABLED(CONFIG_WL12XX) -+#include -+#include -+#include -+ -+#define OMAP_BEAGLE_WLAN_EN_GPIO (139) -+#define OMAP_BEAGLE_BT_EN_GPIO (138) -+#define OMAP_BEAGLE_WLAN_IRQ_GPIO (137) -+#define OMAP_BEAGLE_FM_EN_BT_WU (136) -+ -+struct wl12xx_platform_data omap_beagle_wlan_data __initdata = { -+ .board_ref_clock = WL12XX_REFCLOCK_38, /* 38.4 MHz */ -+}; -+ -+static struct ti_st_plat_data wilink_platform_data = { -+ .nshutdown_gpio = OMAP_BEAGLE_BT_EN_GPIO, -+ .dev_name = "/dev/ttyO1", -+ .flow_cntrl = 1, -+ .baud_rate = 3000000, -+ .chip_enable = NULL, -+ .suspend = NULL, -+ .resume = NULL, -+}; -+ -+static struct platform_device wl12xx_device = { -+ .name = "kim", -+ .id = -1, -+ .dev.platform_data = &wilink_platform_data, -+}; -+ -+static struct platform_device btwilink_device = { -+ .name = "btwilink", -+ .id = -1, -+}; -+#endif -+ -+static struct regulator_consumer_supply beagle_vmmc2_supply = -+ REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"); -+ -+static struct regulator_init_data beagle_vmmc2 = { -+ .constraints = { -+ .valid_ops_mask = REGULATOR_CHANGE_STATUS, -+ }, -+ .num_consumer_supplies = 1, -+ .consumer_supplies = &beagle_vmmc2_supply, -+}; -+ -+#if IS_ENABLED(CONFIG_WL12XX) -+static struct fixed_voltage_config beagle_vwlan = { -+ .supply_name = "vwl1271", -+ .microvolts = 1800000, /* 1.8V */ -+ .gpio = OMAP_BEAGLE_WLAN_EN_GPIO, -+ .startup_delay = 70000, /* 70ms */ -+ .enable_high = 1, -+ .enabled_at_boot = 0, -+ .init_data = &beagle_vmmc2, -+}; -+ -+static struct platform_device omap_vwlan_device = { -+ .name = "reg-fixed-voltage", -+ .id = 1, -+ .dev = { -+ .platform_data = &beagle_vwlan, -+ }, -+}; -+#endif -+ - //rcn-ee: this is just a fake regulator, the zippy hardware provides 3.3/1.8 with jumper.. - static struct fixed_voltage_config beagle_vzippy = { - .supply_name = "vzippy", -@@ -459,6 +526,26 @@ static struct omap2_hsmmc_info mmc_zippy[] = { - }, - {} /* Terminator */ - }; -+ -+static struct omap2_hsmmc_info mmcbbt[] = { -+ { -+ .mmc = 1, -+ .caps = MMC_CAP_4_BIT_DATA, -+ .gpio_wp = -EINVAL, -+ .deferred = true, -+ }, -+ { -+ .name = "wl1271", -+ .mmc = 2, -+ .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_POWER_OFF_CARD, -+ .gpio_wp = -EINVAL, -+ .gpio_cd = -EINVAL, -+ .ocr_mask = MMC_VDD_165_195, -+ .nonremovable = true, -+ }, -+ {} /* Terminator */ -+}; -+ - static struct regulator_consumer_supply beagle_vmmc1_supply[] = { - REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"), - }; -@@ -490,6 +577,13 @@ static int beagle_twl_gpio_setup(struct device *dev, - int r; - - switch (expansion_config.mmc_settings) { -+ case EXPANSION_MMC_WIFI: -+ mmcbbt[0].gpio_wp = beagle_config.mmc1_gpio_wp; -+ /* gpio + 0 is "mmc0_cd" (input/IRQ) */ -+ mmcbbt[0].gpio_cd = gpio + 0; -+ -+ omap_hsmmc_late_init(mmcbbt); -+ break; - case EXPANSION_MMC_ZIPPY: - mmc_zippy[0].gpio_wp = beagle_config.mmc1_gpio_wp; - /* gpio + 0 is "mmc0_cd" (input/IRQ) */ -@@ -839,6 +933,13 @@ static void __init omap3_beagle_init(void) - omap_mux_init_gpio(OMAP3BEAGLE_GPIO_ZIPPY_MMC_CD, OMAP_PIN_INPUT); - } - -+ if (!strcmp(expansionboard_name, "bbtoys-wifi")) -+ { -+ #if IS_ENABLED(CONFIG_WL12XX) -+ expansion_config.mmc_settings = EXPANSION_MMC_WIFI; -+ #endif -+ } -+ - if (!strcmp(expansionboard2_name, "bbtoys-ulcd")) - { - int r; -@@ -857,6 +958,10 @@ static void __init omap3_beagle_init(void) - omap_mux_init_gpio(beagle_config.mmc1_gpio_wp, OMAP_PIN_INPUT); - - switch (expansion_config.mmc_settings) { -+ case EXPANSION_MMC_WIFI: -+ mmcbbt[0].caps = beagle_config.mmc_caps; -+ omap_hsmmc_init(mmcbbt); -+ break; - case EXPANSION_MMC_ZIPPY: - mmc_zippy[0].caps = beagle_config.mmc_caps; - omap_hsmmc_init(mmc_zippy); -@@ -922,6 +1027,20 @@ static void __init omap3_beagle_init(void) - gpio_export(162, 1); - } - -+ if (!strcmp(expansionboard_name, "bbtoys-wifi")) -+ { -+ #if IS_ENABLED(CONFIG_WL12XX) -+ omap_beagle_wlan_data.irq = gpio_to_irq(OMAP_BEAGLE_WLAN_IRQ_GPIO); -+ if (wl12xx_set_platform_data(&omap_beagle_wlan_data)) -+ pr_err("error setting wl12xx data\n"); -+ pr_info("Beagle expansionboard: registering wl12xx bt platform device\n"); -+ platform_device_register(&wl12xx_device); -+ platform_device_register(&btwilink_device); -+ pr_info("Beagle expansionboard: registering wl12xx wifi platform device\n"); -+ platform_device_register(&omap_vwlan_device); -+ #endif -+ } -+ - if (!strcmp(expansionboard2_name, "bbtoys-ulcd")) - { - #if IS_ENABLED(CONFIG_TOUCHSCREEN_TSC2007) --- -1.7.10.4 - diff --git a/src/patches/kernel/omap/beagle/expansion/0007-Beagle-expansion-add-beaglefpga.patch b/src/patches/kernel/omap/beagle/expansion/0007-Beagle-expansion-add-beaglefpga.patch deleted file mode 100644 index a006c7b026..0000000000 --- a/src/patches/kernel/omap/beagle/expansion/0007-Beagle-expansion-add-beaglefpga.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 0c361e9db10f9ec3598bf062a605a451857ee06e Mon Sep 17 00:00:00 2001 -From: Bas van der Doorn -Date: Tue, 11 Dec 2012 06:52:22 -0600 -Subject: [PATCH 07/10] Beagle: expansion: add beaglefpga - -Added SPI dev and McBSP 3 mux when FPGA is detected - -Signed-off-by: Bas van der Doorn -Signed-off-by: Robert Nelson ---- - arch/arm/mach-omap2/board-omap3beagle.c | 76 +++++++++++++++++++++++++++++++ - 1 file changed, 76 insertions(+) - -diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index 2322d6c..c257f3c 100644 ---- a/arch/arm/mach-omap2/board-omap3beagle.c -+++ b/arch/arm/mach-omap2/board-omap3beagle.c -@@ -44,6 +44,7 @@ - #include - #include - #include -+#include - - #include