HEAD | d5fd0a5 | dts: xilinx: add dts for pvtpool configuration with low memory only | 23 February 2021, 04:34:46 UTC |
refs/heads/2017.1_video_ea | 79a0e60 | media: xilinx: dma: Enable use of Framebuffer Write IP in V4L2 Driver The Xilinx Video Framebuffer driver is video 'format aware' and requires clients to pass video format information as part of DMA programming. As the DMA Engine interface does not support passing this information, a configuration object is passed through the dma channel's private data to the Framebuffer Driver with this information. Signed-off-by: Jeffrey Mouroux <jmouroux@xilinx.com> | 31 March 2017, 22:52:22 UTC |
refs/heads/2017.2_video_ea | a0892f4 | drm: xilinx-hdmi-tx: Fix multiple instance support Bug fix to support multiple instances of Tx IP. Added updates for 2017.2. Signed-off-by: Rohit Consul <rohit.consul@xilinx.com> | 02 August 2017, 23:05:19 UTC |
refs/heads/2017.3_video_ea | 57af48e | staging: apf: Fix warnings in apf drivers This is a small patch to address a number of compiler warnings and style problems in the apf drivers. No features or functional changes are associated with this patch. Signed-off-by: Michael Gill <gill@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com> | 31 October 2017, 18:26:52 UTC |
refs/heads/2017.4_video_ea | 4fd09e2 | uvcvideo: Prevent new URBs being processed at stream stop With asynchronous handling of the URBs from the USB Complete handler, we get a continual stream of packets being received while we are attempting to shutdown the stream. Packets that have already been received and processed are on a work-queue, but during stream shutdown the URBs that those packets belong to are killed and free'd. To prevent this race from causing invalid memory accesses, prevent new URBs from being processed when uvc_stop_streaming() is called by introducing a new flag "UVC_QUEUE_STOPPING" into the queue, and checking this when processing the URB to be queued. With this, we can flush the work queue, and commence a normal pipe shutdown. Work tasks that are already queued are processed, but the URBs are prevented from being re-submitted to the USB stack. Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com> | 14 November 2017, 12:52:23 UTC |
refs/heads/master | d5fd0a5 | dts: xilinx: add dts for pvtpool configuration with low memory only | 23 February 2021, 04:34:46 UTC |
refs/heads/petalinux-v12.12 | 8c5e475 | xilinx_emacps: Dont poll interrupts Don't loop the interrupt service logic in the ISR. Currently it polls for subsequent interrupts after servicing the first. This is not an error, but is non-ideal for two reasons: Firstly, there was a condition where the higher levels of interrupt control could requeue the ISR while it was still acting. The first invocation would then service the new interrupt and the second ISR invocation would be a NOP. Secondly, there is no bound on the length of time the driver spends in ISR context. ISRs ideally have a deterministic duration. Fixed by just unlooping. Each ISR is now a oneshot. Interrupts that re-trigger during servicing are handled by a subsequent incovation of the ISR. Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> Tested-by: Wendy Liang <wendy.liang@xilinx.com> | 11 December 2012, 06:22:24 UTC |
refs/heads/petalinux-v2013.04 | b9b84a2 | xilinx_emacps: Fixes bug in skb handling for fragmented packets The existing driver has a bug related to skb handling for fragmented Tx packets. This patch fixes it. Signed-off-by: Anirudha Sarangi <anirudh@xilinx.com> | 03 April 2013, 17:37:02 UTC |
refs/heads/xilinx/versal | 2ff5a14 | Merge tag 'v4.19' into xilinx/versal This is the 4.19 release - Update versal defconfig. Signed-off-by: Michal Simek <michal.simek@xilinx.com> | 05 November 2018, 09:35:57 UTC |
refs/heads/xlnx_3.14 | c0292a5 | microblaze: Fix issue with msi compilation There are some missing references to linux/irq.h. Warning log: arch/microblaze/pci/msi.c: In function 'create_irq': arch/microblaze/pci/msi.c:59:2: error: implicit declaration of function 'dynamic_irq_init' [-Werror=implicit-function-declaration] dynamic_irq_init(irq); ^ arch/microblaze/pci/msi.c: In function 'destroy_irq': arch/microblaze/pci/msi.c:76:2: error: implicit declaration of function 'dynamic_irq_cleanup' [-Werror=implicit-function-declaration] dynamic_irq_cleanup(irq); ^ arch/microblaze/pci/msi.c: At top level: arch/microblaze/pci/msi.c:107:15: error: variable 'xilinx_msi_chip' has initializer but incomplete type static struct irq_chip xilinx_msi_chip = { ^ arch/microblaze/pci/msi.c:108:3: error: unknown field 'name' specified in initializer .name = "PCI-MSI", ^ arch/microblaze/pci/msi.c:108:3: warning: excess elements in struct initializer [enabled by default] arch/microblaze/pci/msi.c:108:3: warning: (near initialization for 'xilinx_msi_chip') [enabled by default] arch/microblaze/pci/msi.c:109:3: error: unknown field 'irq_ack' specified in initializer .irq_ack = xilinx_msi_nop, ^ arch/microblaze/pci/msi.c:109:3: warning: excess elements in struct initializer [enabled by default] arch/microblaze/pci/msi.c:109:3: warning: (near initialization for 'xilinx_msi_chip') [enabled by default] arch/microblaze/pci/msi.c:110:3: error: unknown field 'irq_enable' specified in initializer .irq_enable = unmask_msi_irq, ^ ... Signed-off-by: Michal Simek <michal.simek@xilinx.com> | 05 August 2014, 09:21:13 UTC |
refs/heads/xlnx_3.17 | 7b042ef | gpu: drm: xylon: Updated logiCVC devicetree bool properties Removed "is-" string from the beginning of logiCVC devicetree bool properties. Signed-off-by: Davor Joja <davorjoja@logicbricks.com> Reviewed-by: Hyun Kwon <hyun.kwon@xilinx.com> Tested-by: Radhey Shyam Pandey <radheys@xilinx.com> Tested-by: Christian Kohn <christian.kohn@xilinx.com> | 10 December 2014, 09:23:59 UTC |
refs/heads/xlnx_3.8 | 297a37e | Revert "microblaze: Fix passing kernel command line from bootloader" This reverts commit 3213f6447f29121d939c671116911d493538ea13. This patch introduced problem with initrd booting that's why I am reverting it. Signed-off-by: Michal Simek <michal.simek@xilinx.com> | 20 December 2013, 07:14:02 UTC |
refs/heads/xlnx_rebase_v4.14 | eeab73d | drm: xlnx: crtc: Fix max width and height overflow The maximum resolution supported is shown as -1x-1 in Xorg.log when trying to run Xorg. This is occurring due to width and height variables overflowing as they are assigned UINT_MAX instead of INT_MAX. This patch fixes this by correcting the data types of width and height variables and correctly assigning INT_MAX as maximum width and height. Signed-off-by: Vishal Sagar <vishal.sagar@xilinx.com> Signed-off-by: Saurabh Sengar <saurabh.singh@xilinx.com> Reviewed-by: Sandip Kothari <sandipk@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com> | 15 November 2018, 07:15:18 UTC |
refs/heads/xlnx_rebase_v4.19 | b983d5f | dt-bindings: remoteproc: zynq: update shared memory Due to upstream remoteproc 4.19 changes merged into Xilinx kernel since 2019.1, need to update how to specify DMA memory for Zynq remoteproc, so that Zynq platform can use predefined shared memory for vring buffers. This patch is to update the device tree documentation to line up with the change. Signed-off-by: Wendy Liang <wendy.liang@xilinx.com> Reviewed-by: Ben Levinsky <ben.levinsky@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com> | 09 October 2019, 17:39:38 UTC |
refs/heads/xlnx_rebase_v4.9 | d436be9 | imx274: Fix error handling Fix error handling in driver probe and unregister the correct control handler in driver remove. Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Christian Kohn <christian.kohn@xilinx.com> Reviewed-by: Vishal Sagar <vishal.sagar@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com> | 02 November 2017, 03:22:30 UTC |
refs/heads/xlnx_rebase_v5.4 | 6ccc4c9 | mmc: arasan: Fix the issue in reading tap values from DT 'of_property_read_variable_u32_array' function returns number of elements read on success. This patch updates the condition check in the driver to overwrite the tap values from DT if exist. Signed-off-by: Sai Krishna Potthuri <lakshmi.sai.krishna.potthuri@xilinx.com> Acked-by: Tony McDowell <tmcdowe@xilinx.com> | 19 January 2021, 13:55:34 UTC |
refs/heads/zynq/cleanup | 34f671d | ARM: zynq: reserve space for jump target in secondary trampoline Add a zero argument to the .word directive in zynq_secondary_trampoline. Without an expression the assembler emits nothing for the .word directive. This makes it so that the intended range is communicated to ioremap and outer_flush_range in zynq_cpun_start; e.g. for LE trampoline_code_size evaluates to 12 now instead of 8. Found by inspection. I'm not aware of any real problem this fixes. Tested by doing on online/offline loop on ZC702. Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com> | 17 July 2015, 21:01:02 UTC |
refs/heads/zynq/clk | 9a3c414 | Linux 3.16-rc6 | 21 July 2014, 04:04:16 UTC |
refs/heads/zynq/defconfig | 9a3c414 | Linux 3.16-rc6 | 21 July 2014, 04:04:16 UTC |
refs/heads/zynq/dt | 9810afd | ARM: dts: ebaz4205: add pinctrl entries for switches Add the pinctrl entries for the GPIOs which are connected to the push buttons on this board. Signed-off-by: Michael Walle <michael@walle.cc> Link: https://lore.kernel.org/r/20210201133000.23402-1-michael@walle.cc Signed-off-by: Michal Simek <michal.simek@xilinx.com> | 01 February 2021, 13:30:00 UTC |
refs/heads/zynq/fixes | d5dbb95 | ARM: zynq: PM: Fixed simple typo. Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com> | 09 January 2015, 15:44:00 UTC |
refs/heads/zynq/soc | 753ccaa | ARM: zynq: Don't select CONFIG_ICST CONFIG_ICST is for ARM Ltd reference platforms and isn't used by Zynq platform, so remove selecting it. It appears to be a copy-n-paste error. Cc: Michal Simek <michal.simek@xilinx.com> Signed-off-by: Rob Herring <robh@kernel.org> Link: https://lore.kernel.org/r/20200409221829.29421-1-robh@kernel.org Signed-off-by: Michal Simek <michal.simek@xilinx.com> | 09 April 2020, 22:18:29 UTC |
refs/heads/zynqmp/dt | 5556339 | arm64: dts: zynqmp: Wire up the DisplayPort subsystem Enable the dpsub device and wire it up to the PS-GTR PHY lanes routed to the DisplayPort connector. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com> Link: https://lore.kernel.org/r/9769d4d103b6eb75e3324825117f6832a746004e.1611232558.git.michal.simek@xilinx.com | 21 January 2021, 12:36:07 UTC |
refs/heads/zynqmp/soc | 75e9e97 | arm64: defconfig: enable clock driver for ZynqMP platforms The Zynqmp Ultrascale clock controller generates clocks for peripherals by default. So enable this clock driver for ZynqMP platforms. Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com> Link: https://lore.kernel.org/r/20201209021416.1017790-1-quanyang.wang@windriver.com Signed-off-by: Michal Simek <michal.simek@xilinx.com> | 09 December 2020, 02:14:16 UTC |
refs/heads/zynqmp/soc-next | 0fa3a21 | firmware: xlnx-zynqmp: fix compilation warning Fix compilation warning when ZYNQMP_FIRMWARE is not defined. include/linux/firmware/xlnx-zynqmp.h: In function 'zynqmp_pm_get_eemi_ops': include/linux/firmware/xlnx-zynqmp.h:363:9: error: implicit declaration of function 'ERR_PTR' [-Werror=implicit-function-declaration] 363 | return ERR_PTR(-ENODEV); include/linux/firmware/xlnx-zynqmp.h:363:18: note: each undeclared identifier is reported only once for each function it appears in include/linux/firmware/xlnx-zynqmp.h: In function 'zynqmp_pm_get_api_version': include/linux/firmware/xlnx-zynqmp.h:367:10: error: 'ENODEV' undeclared (first use in this function) 367 | return -ENODEV; | ^~~~~~ Signed-off-by: Wendy Liang <wendy.liang@xilinx.com> Link: https://lore.kernel.org/r/1606205898-12642-1-git-send-email-wendy.liang@xilinx.com Signed-off-by: Michal Simek <michal.simek@xilinx.com> | 24 November 2020, 08:18:18 UTC |
refs/tags/2.6.13.4-drv-20070112-sp3e-ear.patch | 102e523 | Applied patch: 2.6.13.4-drv-20070112-sp3e-ear.patch Signed-off-by: Wolfgang Reissnegger <wre@gnagflow-desktop.(none)> | 07 March 2007, 23:19:05 UTC |
refs/tags/2.6.13.4-initramfs.patch | 58cd92f | Applied patch: 2.6.13.4-initramfs.patch Signed-off-by: Wolfgang Reissnegger <wre@gnagflow-desktop.(none)> | 07 March 2007, 23:36:50 UTC |
refs/tags/2.6.13.4-mb-20070112-sp3e-ear.patch | ab2af0f | Applied patch: 2.6.13.4-mb-20070112-sp3e-ear.patch Signed-off-by: Wolfgang Reissnegger <wre@gnagflow-desktop.(none)> | 07 March 2007, 23:05:30 UTC |
refs/tags/2.6.20-xlnx-initial-release | c9be257 | Added vmlinux.lds.S file. | 08 March 2007, 23:10:25 UTC |
refs/tags/bad_commit_john | 5c5e3b3 | slab: Fix missing DEBUG_SLAB last user Even with SLAB_RED_ZONE and SLAB_STORE_USER enabled, kernel would NOT store redzone and last user data around allocated memory space if "arch cache line > sizeof(unsigned long long)". As a result, last user information is unexpectedly MISSED while dumping slab corruption log. This fix makes sure that redzone and last user tags get stored unless the required alignment breaks redzone's. Signed-off-by: Shiyong Li <shi-yong.li@motorola.com> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> | 12 April 2010, 05:48:21 UTC |
refs/tags/bad_head | 7e125f7 | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6: cmd640: fix kernel oops in test_irq() method pdc202xx_old: ignore "FIFO empty" bit in test_irq() method pdc202xx_old: wire test_irq() method for PDC2026x IDE: pass IRQ flags to the IDE core ide: fix comment typo in ide.h | 24 May 2010, 15:05:29 UTC |
refs/tags/before_3.0 | 59812e7 | Xilinx: microblaze: Updated PVR lookup table for new EDK versions Updated the PVR version lookup table to include Microblaze version 8.20a. It was tested on the ml507,ml605 and sp605 Signed-off-by: Madhubala Sharma <madhubala.sharma@xilinx.com> | 01 August 2011, 08:25:59 UTC |
refs/tags/edk_10.1.1 | aba38d1 | Merge branch 'master' of http://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: Documentation/powerpc/booting-without-of.txt Makefile arch/powerpc/boot/.gitignore arch/powerpc/boot/Makefile arch/powerpc/boot/ns16550.c arch/powerpc/kernel/cputable.c arch/powerpc/kernel/head_44x.S arch/powerpc/platforms/40x/virtex.c arch/powerpc/sysdev/xilinx_intc.c drivers/char/xilinx_hwicap/xilinx_hwicap.c drivers/i2c/algos/Kconfig drivers/input/serio/Makefile drivers/of/Kconfig | 13 June 2008, 15:19:50 UTC |
refs/tags/initial-version | 89e1196 | First version of ML5->2.6.20 port is compiling... Maybe not running, but compiling. Signed-off-by: Wolfgang Reissnegger <w.reissnegger@gmx.net> | 13 March 2007, 23:56:04 UTC |
refs/tags/last-arch-ppc | 262a212 | Xilinx:V5FXT:Changed all instances of VIRTEX_5_FX to VIRTEX_5_FXT This is a cosmetical patch to change all instances of VIRTEX_5_FX to VIRTEX_5_FXT to be consistent with naming of the product. Signed-off-by: peter.ryser@xilinx.com Signed-off-by: John Linn <john.linn@xilinx.com> | 21 April 2008, 21:53:01 UTC |
refs/tags/linux-xlnx_3.8-r1 | f4ff79d | microblaze: Calculate kernel pad automatically The kernel needs to setup the first two tlbs with pad which is used for early page allocation which is used by mapin_ram() to allocate tables for lowmem memory before memory initialisation is done. Calculate pad directly from lowmem size. Signed-off-by: Michal Simek <michal.simek@xilinx.com> | 06 November 2013, 15:36:08 UTC |
refs/tags/pele-alpha2-release | 3dd3292 | Merge branch 'pele-peep5' into pele-alpha2 Resolved Conflicts: arch/arm/configs/xilinx_defconfig | 25 August 2010, 21:08:19 UTC |
refs/tags/pele-alpha2-validation1 | dd0507e | Merge branch 'pele-peep4' of /home/linnj/linux_arm/devel/linux-2.6-xlnx-peep4-debug into pele-peep4 | 20 August 2010, 23:16:30 UTC |
refs/tags/pele-alpha2_2.0-release | 611585a | Xilinx: ARM: Updated defconfigs to add SD/MMC and QSPI The kernel will now include the drivers for these devices. | 27 October 2010, 17:35:24 UTC |
refs/tags/pele-alpha2_3.0-release | d669822 | Xilinx: ARM: BSP: Updating test defconfigs for USB This also updates them to match the non-test defconfigs while still having some test options on. | 06 December 2010, 19:21:08 UTC |
refs/tags/pele-beta1_1.0 | ce8fcb7 | Revert "Xilinx: ARM: Removed L2 cache from test defconfigs" This reverts commit 8b977c3107e574ec25c6844da43594eff6130240. | 25 February 2011, 18:54:46 UTC |
refs/tags/pele-beta1_1.0-peep9 | 75c3ebd | Xilinx: ARM: Updated SRAM controller initialization for peep10 This change appears to be backward compatible with peep9 also. This was caused by DT 592979. Without this change, the SRAM test does not pass. This change is small as it only sets the SET_BLS bit in the set_opmode register. | 18 March 2011, 22:19:16 UTC |
refs/tags/pele-beta1_1.1 | 25abdf1 | ARM: Xilinx:Device Configuration driver Updated with the fix in driver. Tested downloading a bitstream onto the fabric on PEEP platform. Signed-off-by: Vidhumouli H <vidhum@xilinx.com> | 15 April 2011, 10:26:51 UTC |
refs/tags/pele-beta1_1.15 | 72541ce | Xilinx: ARM: Updated xilinx_qemu_defconfig for SMP xilinx_qemu_defconfig has been updated to configure the kernel with processor local timers disabled since a problem was found with QEMU when trying to run the kernel with processor local timers enabled on SMP enabled QEMU. | 15 August 2011, 15:20:27 UTC |
refs/tags/pele-beta1_1.20 | 83f961b | Revert "Xilinx: ARM: UART: Rx Trigger level and timeout value updates" This reverts commit 11897dedc4ba68dab5100207e1f4ae90725ef61a. This was causing problems with some garbage coming out of the serial port we had not noticed previously. It's easy to duplicate by doing an ls of /usr/bin in busybox. It seems like the larger FIFO size is not working properly. Resolved Conflicts: drivers/tty/serial/xilinx_uartps.c | 01 November 2011, 21:26:25 UTC |
refs/tags/pele-beta2_2.0 | d86f17c | Xilinx: ARM: BSP: Added defconfig for Zynq The old defconfig, xilinx_defconfig, is needed for EP107 but won't work for Zynq due to different UART and early printk. Now Zynq should use xilinx_zynq_defconfig. | 14 January 2012, 02:23:19 UTC |
refs/tags/pele_before_device_tree | 558d366 | Xilinx: ARM: Provide instrumentation to support AMP Linux. CONFIG_XILINX_AMP_CPU0_MASTER coopted for all modifications in this commit. Provide mechanism to send and capture IPI (Inter-Processor Interrupts) for AMP Linux. This is necessary to facilitate IPC with the OS on the other processor (such as FreeRTOS). arch/arm/ common/gic.c: Make gic_raise_softirq() available. kernel/entry-armv.S: Intercept IPI here. Not possible to integrate with request_irq() system. kernel/irq.c: do_IPI() and set_ipi_handler() provided. mach-xilinx/include/mach/hardware.h: Kernel location and size set for AMP. convert_vmlinux.sh: Updated to support kernel location from hardware.h. | 07 March 2011, 15:22:57 UTC |
refs/tags/v2.6.26-merge | 0282e7f | Merge ../../linux-2.6 into 2.6.26-merge | 31 July 2008, 18:59:07 UTC |
refs/tags/xilinx-14.1-build1 | 99c5ff1 | Xilinx: ARM: BSP: Adding QSPI support to XM013 (DC4) BSP Since QSPI is not supported in the device tree with the M25 driver, it must be added in the platform data of the BSP. | 23 April 2012, 22:56:23 UTC |
refs/tags/xilinx-14.1-build2 | eea559b | Xilinx: 14.1 Build2 Release | 01 May 2012, 18:12:15 UTC |
refs/tags/xilinx-14.1-build3 | 765dc8d | Xilinx: 14.1 Build3 Release | 07 May 2012, 20:01:01 UTC |
refs/tags/xilinx-14.1-build3-trd | 86c81cc | Xilinx: ARM: Xylon frame driver rearchiteched - Added support for si570 initialization for pixel clk - Added support for 16bpp framebuffer. - Added more video modes - directory structure also changed. Signed-off-by: Davor Joja <davor.joja@logicbricks.com> | 10 May 2012, 12:56:47 UTC |
refs/tags/xilinx-14.2-build1 | 1e92da8 | Xilinx: ARM: update test defconfigs for usb device testing The defconfigs need mass storage gadget turned on for device testing. Signed-off-by: John Linn <john.linn@xilinx.com> | 29 June 2012, 02:10:25 UTC |
refs/tags/xilinx-14.2-build1-trd | 42fac65 | Xilinx: ARM: DMA: Handled Recoverable Errors in VDMA There are some recoverable errors in AXI-VDMA, which are DMA Internal Error, FSize Less Mismatch, LSize Less Mismatch, FSize More Mismatch errors. When detected, these errors need to be cleared (Write-on-Clear). And these are only recoverable when C_FLUSH_ON_FSYNC is enabled in hardware system. Signed-off-by: SrikanthT <sthokal@xilinx.com> | 30 July 2012, 13:06:21 UTC |
refs/tags/xilinx-14.3-build1 | 7905891 | Xilinx: ARM: DMA: Code Cleanup Minor clean up of the code. Signed-off-by: SrikanthT <sthokal@xilinx.com> | 10 September 2012, 05:43:14 UTC |
refs/tags/xilinx-14.3-build2 | aa09283 | Xilinx: ARM: update to xilinx-14.3-build2 release Minor change to make uname report the 14.3 build 2 for the release. Signed-off-by: John Linn <john.linn@xilinx.com> | 23 October 2012, 17:03:59 UTC |
refs/tags/xilinx-14.3-build2-trd | aa09283 | Xilinx: ARM: update to xilinx-14.3-build2 release Minor change to make uname report the 14.3 build 2 for the release. Signed-off-by: John Linn <john.linn@xilinx.com> | 23 October 2012, 17:03:59 UTC |
refs/tags/xilinx_before_2.6.39 | 59812e7 | Xilinx: microblaze: Updated PVR lookup table for new EDK versions Updated the PVR version lookup table to include Microblaze version 8.20a. It was tested on the ml507,ml605 and sp605 Signed-off-by: Madhubala Sharma <madhubala.sharma@xilinx.com> | 01 August 2011, 08:25:59 UTC |
refs/tags/xilinx_temp | 6e95b50 | Merge branch 'master' of /home/linnj/linux_mb/devel/linux-2.6-xlnx | 01 October 2009, 23:39:18 UTC |
refs/tags/xilinx_v2.6.26 | 0282e7f | Merge ../../linux-2.6 into 2.6.26-merge | 31 July 2008, 18:59:07 UTC |
refs/tags/xilinx_v2.6.27-rc9 | 5dfa964 | Merge ../../linux-2.6 | 07 October 2008, 21:06:59 UTC |
refs/tags/xilinx_v2.6.28 | 90a5ac7 | Merge ../../linux-2.6 into mainline_merge | 06 January 2009, 17:13:53 UTC |
refs/tags/xilinx_v2.6.29 | c7968c1 | Merge ../../linux-2.6 into 2.6.29-merge Conflicts (resolved): drivers/net/Kconfig | 24 March 2009, 16:34:21 UTC |
refs/tags/xilinx_v2.6.29-rc5 | f638da6 | Merge ../../linux-2.6 into mainline_merge | 20 February 2009, 17:18:46 UTC |
refs/tags/xilinx_v2.6.30 | b0b926d | Fix the missing file, initramfs_data.S, from the 2.6.30 merge Somehow the file got deleted during the merge of 2.6.30. This commit adds the file back in. Without this file the kernel won't build. This problem doesn't seem to show up til a new clone of the tree is done. Signed-off-by: John Linn <john.linn@xilinx.com> | 19 June 2009, 17:05:01 UTC |
refs/tags/xilinx_v2.6.31 | 4e2d699 | Merge branch 'microblaze' of git://git-dev.xilinx.com/linux-2.6-xlnx into 2.6.31-merge-withmb | 14 September 2009, 21:44:51 UTC |
refs/tags/xilinx_v2.6.32 | 25a2134 | microblaze: Adding dev_arch_data functions The functions, dev_arch_data_set_node and get_node are missing and are needed by some device drivers such as I2C. Signed-off-by: John Linn <john.linn@xilinx.com> Signed-off-by: Michal Simek <monstr@monstr.eu> | 30 June 2009, 23:14:18 UTC |
refs/tags/xilinx_v2.6.33 | 189ecbf | Merge branch 'master' of /home/linnj/linux_ppc/linux-2.6 into master-2.6.33 Resolved Conflicts: arch/microblaze/kernel/cpu/cache.c | 25 February 2010, 17:45:42 UTC |
refs/tags/xilinx_v2.6.33-rc8 | dc67ea7 | Temporary hack for Xilinx SPI Driver to deal with MicroBlaze io macros The new spi driver from mainline uses function pointers to i/o routines which won't work with the i/o macros in the MicroBlaze architecture. This commit creates inline functions to deal with the problem for now. | 24 February 2010, 16:57:40 UTC |
refs/tags/xilinx_v2.6.34 | 36e1e29 | Merge branch 'master-2.6.34' of ../../../linux_mb/devel/linux-2.6-xlnx | 24 May 2010, 20:33:06 UTC |
refs/tags/xilinx_v2.6.35 | 1832d26 | Merge branch 'master' of /home/linnj/linux_ppc/linux-2.6 Resolved Conflicts: arch/powerpc/kernel/head_44x.S drivers/net/Makefile drivers/net/ll_temac_main.c include/asm-generic/dma-mapping-common.h | 28 September 2010, 14:09:20 UTC |
refs/tags/xilinx_v2.6.37 | a5556fb | Merge branch 'master-2.6.37' | 06 January 2011, 22:45:48 UTC |
refs/tags/xilinx_v2.6.37-rc4 | 75565fc | Xilinx: I2C: Updated out of tree driver to compile with 2.6.37 Some stuff in the API changed so the driver would not build. | 09 December 2010, 14:51:14 UTC |
refs/tags/xilinx_v2.6.38 | c965eb9 | Merge branch 'linus' of ../linux-2.6 into master-2.6.38 | 15 March 2011, 15:04:52 UTC |
refs/tags/xilinx_v3.0 | 92ddb93 | Resolved: Merge branch 'master_v3.0'; commit 'v3.0' into master_v3.0 Conflicts: drivers/mtd/maps/Makefile drivers/usb/gadget/Kconfig drivers/usb/gadget/gadget_chips.h | 26 September 2011, 10:58:40 UTC |
refs/tags/xmb_beta_v1 | 236fe14 | Microblaze: Updated test def configs The heartbeat in the config causes problems with the GPIO test. | 02 July 2009, 19:52:40 UTC |
refs/tags/xmb_beta_v2 | 306416d | Merge branch 'master' of /home/linnj/linux_mb/petalogix/linux-2.6-microblaze into microblaze | 18 August 2009, 12:06:30 UTC |
refs/tags/xmb_beta_v3 | ee1dea1 | Emaclite: removed the old driver from the Kconfig/Makefile The merge from Petalogix tree seemed to leave the old driver in the files. The new flat driver for emaclite is now in the build. Signed-off-by: John Linn <john.linn@xilinx.com> | 09 September 2009, 20:16:41 UTC |