summaryrefslogtreecommitdiffstats
path: root/include/linux
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-next/usb-host'Sascha Hauer2014-08-071-0/+18
|\ | | | | | | | | Conflicts: drivers/usb/core/Makefile
| * USB: EHCI: use min3 from LinuxSebastian Hesselbarth2014-07-281-0/+18
| | | | | | | | | | | | | | | | | | EHCI HCD has a private version of min3() determining the smallest number out of 3. We already have min()/max() imported from Linux, also get min3()/max3() and use it instead of EHCI's private one. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/rtc'Sascha Hauer2014-08-072-0/+69
|\ \ | | | | | | | | | | | | | | | Conflicts: arch/mips/dts/jz4755.dtsi commands/Makefile
| * | rtc-lib: import rtc_time_to_tm() from linux-3.15Antony Pavlov2014-08-021-0/+1
| | | | | | | | | | | | | | | Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | Add a simple rtc frameworkAntony Pavlov2014-07-311-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds a simple rtc framework for reading and setting board's RTC time. Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | lib: import 'bcd' from linux-3.15Antony Pavlov2014-07-311-0/+22
| |/ | | | | | | | | Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/net'Sascha Hauer2014-08-071-0/+1
|\ \
| * | net: phy: Add minimal support for QSGMII PHYEzequiel Garcia2014-07-311-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on Linux's support by Thomas Petazzoni: commit b9d12085f2f531fdea67f0361564e0812696227c Author: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Date: Tue Apr 15 15:50:19 2014 +0200 net: phy: add minimal support for QSGMII PHY This commit adds the necessary definitions for the PHY layer to recognize "qsgmii" as a valid PHY interface. A QSMII interface, as defined at http://en.wikipedia.org/wiki/Media_Independent_Interface#Quad_Serial_Gigabit_Media_Independent_Interface, is "is a method of combining four SGMII lines into a 5Gbit/s interface. QSGMII, like SGMII, uses LVDS signalling for the TX and RX data and a single LVDS clock signal. QSGMII uses significantly fewer signal lines than four SGMII busses." This type of MAC <-> PHY connection might require special handling on the MAC driver side, so it should be possible to express this type of MAC <-> PHY connection, for example in the Device Tree. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: devicetree@vger.kernel.org Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/misc'Sascha Hauer2014-08-075-1/+543
|\ \ | | | | | | | | | | | | Conflicts: lib/Makefile
| * | lib: Add bitmap functions from kernelSascha Hauer2014-07-171-0/+285
| | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | include: update bitop functions from kernelSascha Hauer2014-07-171-1/+213
| | | | | | | | | | | | | | | | | | Updates the bitop functions from v3.16-rc4 Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | include: Add foreign endianess adding functions from kernelSascha Hauer2014-07-171-0/+29
| | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | include: Add round_up/round_down macros from kernelSascha Hauer2014-07-171-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Yes, we already have roundup/rounddown. Unlike these macros round_up/round_down are optimized to (and only work with) power-of-2 arguments. It's a poor name, but kernel code needs it, so add it to barebox aswell. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | include: Add DECLARE_BITMAP from kernelSascha Hauer2014-07-171-0/+3
| |/ | | | | | | | | | | Some code operating on bitmaps needs it. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/marvell'Sascha Hauer2014-08-072-9/+5
|\ \
| * | pci: set auto-incremented bus numberSebastian Hesselbarth2014-07-311-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using more than one PCI bus, we have to assign unique numbers to each bus. Use an auto-incremented bus index and assign it to each registered bus. Also, allow the PCI host controller to update internal registers by calling set_busno with assigned bus number. While at it, add pci_controller struct to set_busno callback, add a back reference to pci_controller to pci_bus, and clean up unused left-overs from Linux import. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Acked-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: mvebu: allow to fixup mbus rangesSebastian Hesselbarth2014-07-251-0/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Marvell MVEBU SoCs internal registers are usually remapped from reset default. While Dove and Kirkwood always had their registers remapped, some Armada 370 and XP where shipped with bootloaders that did not remap them. On Barebox these registers are remapped early and on all MVEBU SoCs, so provided DTs should always reflect that in their mbus ranges property. This patch registers a fixup for DTBs and allows individual SoCs to add specific remap ranges to the fixup list. The fixup is registered on pure_initcall to even allow to fixup pbl or appended DTBs. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Move efi.h to include/Sascha Hauer2014-07-141-547/+0
| | | | | | | | | | | | | | With upcoming EFI payload support the efi.h file will diverge from the kernel, so move it from include/linux/ to include/ Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Add hex_byte_pack and hex_byte_pack_upper from kernelSascha Hauer2014-07-111-1/+22
|/ | | | | | Utility functions needed by the UUID/GUID printf support. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/mips'Sascha Hauer2014-07-045-0/+569
|\
| * net: add RealTek RTL-8139 PCI Ethernet driverAntony Pavlov2014-07-041-0/+5
| | | | | | | | | | | | | | | | This driver is based on Linux 2.6.39 8139too driver. Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * PCI: initial commitAntony Pavlov2014-07-044-0/+563
| | | | | | | | | | | | | | | | used shorten version of linux-2.6.39 pci_ids.h Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * linux/ioport.h: include missed <linux/list.h>Antony Pavlov2014-07-041-0/+1
| | | | | | | | | | Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Documentation: remove doxygen documentationSascha Hauer2014-06-262-8/+0
|/ | | | | | | The doxygen documentation is long outdated. Remove it. It will be replaced with sphinx based documentation later. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/tegra'Sascha Hauer2014-06-042-0/+117
|\
| * reset: add reset controller frameworkLucas Stach2014-05-152-0/+117
| | | | | | | | | | | | | | | | Add stripped sown version of the reset controller framework from the Linux kernel. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | net: phy: remove now unused of_phy_device_connectSascha Hauer2014-05-231-14/+0
| | | | | | | | | | | | | | Since barebox handles phys from devicetree transparently we no longer need of_phy_device_connect. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | net: phy: Support limiting phy speed in the devicetreeSascha Hauer2014-05-211-7/+15
|/ | | | | | | | Even when both the ethernet controller and the phy support certain features a board may have additional limitations. Allow specifying it in the devicetree. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/rockchip'Sascha Hauer2014-05-051-2/+7
|\
| * clk: gate: add CLK_GATE_HIWORD_MASK flagBeniamino Galvani2014-04-291-0/+1
| | | | | | | | | | | | | | | | | | Clock gates having the CLK_GATE_HIWORD_MASK flag set use the upper 16 bits of the register as a "write enable" mask for the value in the lower 16 bits. Signed-off-by: Beniamino Galvani <b.galvani@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * clk: gate: add flags argument to clock gate constructorBeniamino Galvani2014-04-291-2/+5
| | | | | | | | | | | | | | | | This adds a clk_gate_flags argument to clock gate creation functions to allow the introduction of new clock gate modifiers. Signed-off-by: Beniamino Galvani <b.galvani@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * clk: move of_clk_get_parent_name() to common clk codeAntony Pavlov2014-04-291-0/+1
| | | | | | | | | | Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/ioresource'Sascha Hauer2014-05-051-1/+4
|\ \
| * | common: Allow for I/O mapped I/OMichel Stam2014-04-081-1/+4
| |/ | | | | | | | | | | | | | | Rework the current framework so that I/O mapped I/O resources are also possible. Signed-off-by: Michel Stam <michel@reverze.net> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* / mtd: nand: create bb devices automaticallySascha Hauer2014-04-281-0/+2
|/ | | | | | | | When a mtd device can have bad blocks we want to create a bb device, so do this automatically. This allows us to drop bb device creation from the environment. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/mtd'Sascha Hauer2014-04-042-5/+22
|\
| * mtd: Support for 4GB partitionsDmitry Lavnikevich2014-03-121-2/+2
| | | | | | | | | | | | | | | | | | This patch implements correct way of creating partitions on mtd devices with size >= 4GB. Signed-off-by: Dmitry Lavnikevich <d.lavnikevich@sam-solutions.com> Signed-off-by: Grigory Milev <g.milev@sam-solutions.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * mtd: Update internal API to support 64-bit device sizeDmitry Lavnikevich2014-03-122-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MTD internal API presently uses 32-bit values to represent device size. This patch updates them to 64-bits but leaves the external API unchanged. In general, changing from 32-bit to 64-bit values cause little or no changes to the majority of the code with the following exceptions: - printk message formats; - division and modulus of 64-bit values (mtd_div_by_wb, mtd_div_by_eb may be used in some of such cases). Was tested on phyFLEX i.MX6. Signed-off-by: Dmitry Lavnikevich <d.lavnikevich@sam-solutions.com> Signed-off-by: Grigory Milev <g.milev@sam-solutions.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/davinci'Sascha Hauer2014-04-041-0/+27
|\ \
| * | import _AC and UL macros from linux kernelAntony Pavlov2014-03-181-0/+27
| |/ | | | | | | | | | | | | | | This macros are used in exported from linux TI DaVinci code. Also this macros are used in MIPS cache support code. Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | clk: Add parent round/set rate for mux and gateSascha Hauer2014-03-281-0/+4
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | clk: clk-divider: sync with kernel codeSascha Hauer2014-03-281-0/+3
| | | | | | | | | | | | | | | | This updates the clk-divider to Kernel code, but without power-of-two divider support which we do not need yet. This also adds table based divider support to the divider. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | clk: introduce CLK_SET_RATE_PARENT flagSascha Hauer2014-03-281-0/+3
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | clk: clk-divider: pass flags to initializersSascha Hauer2014-03-281-3/+3
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | clk: clk-fixed-factor: pass flags to initializersSascha Hauer2014-03-281-1/+2
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | clk: clk-gate: pass flags to initializersSascha Hauer2014-03-281-3/+3
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | clk: clk-mux: pass clk flags from initializersSascha Hauer2014-03-281-2/+4
| | | | | | | | | | | | | | struct clk has a flags field, let the clk-mux initializers set this field. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | err.h: Add PTR_ERR_OR_ZERO from kernelSascha Hauer2014-03-281-0/+8
|/ | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/mtd'Sascha Hauer2014-03-071-1/+4
|\ | | | | | | | | | | Conflicts: drivers/mtd/core.c net/eth.c
| * mtd: Simplify partitionsSascha Hauer2014-02-131-1/+4
| | | | | | | | | | | | | | Embed the partition information in struct mtd_info. This makes the mtd partition code simpler. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 05:04:19 +0000