leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ee1a8d402e
linux/Documentation/devicetree/bindings/clock
History
Linus Torvalds ee1a8d402e ARM SoC device tree changes 
These changes from 30 individual branches for the most part update device
 tree files, but there are also a few source code changes that have crept
 in this time, usually in order to atomically move over a driver from
 using hardcoded data to DT probing.
 
 A number of platforms change their DT files to use the C preprocessor,
 which is causing a bit of churn, but that is hopefully only this once.
 
 There are a few conflicts with the other branches unfortunately:
 
 * in exynos5440.dtsi and kirkwood-6281.dtsi, device nodes are added
   from multiple branches. Need to be careful to have the right
   set of closing braces as git gets this one wrong.
 
 * In kirkwood.dtsi, one 'ranges' line got split into two lines, while
   another line got added. Order of the lines does not matter.
 
 * in sama5d3.dtsi, some cleanup was merged the wrong way, causing
   a bogus conflict. We want the 'dmas' and 'dma-names' properties
   to get added here.
 
 * Two lines got removed independently in arch/arm/mach-mxs/mach-mxs.c
 
 * Contents get added independently in arch/arm/mach-omap2/cclock33xx_data.c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIVAwUAUdLnpGCrR//JCVInAQI50RAAsXbH1SGvjKJemXhRkFloPDYpCbgdDUFr
 ChUbjNV1xsY/jaNCfMa5/Qo7lgz/Ot7BpJef9fZn7ret+dc7nchqe/4iIkAokAUh
 E4ao9D1dP5aAA0ihdbSQHCZtR/0SUR81h6BoOVuo/1mvEiBaFbWAeYe8/6LJd9II
 OU1w9bDmjfZWYFUXs+j2VF76ueZQ+kz69XDKZUGtkqN76m1AL8lGDurj5jxvyllF
 VJns8d9q2nr2q9PferfajK6rkOIPaTpwKblxZHUgobCyOitZaiZM0NgF733TsNM6
 HXmhDhkcn7T81+SiHVfigJ/nxo9UgU4zNJCODF3WZIwGIj3FbxvCOpdCYi2NhCO8
 oLcgDk57tpoKpB3gvAmYVQHP9FIepFa/WAWyPIADA7PkpYrwgc4v+cLEHXpd8SRv
 viLLIa5QuNdMeaK+Md9OKmKZFd7uFD9jiMtmdm6IpEVDDjMgoteb2XSoEtNebmtY
 MfbW4okn118a2dFKKaPTKcXVW/a5FRp2JGfB0A58RQHaJWj3JsY1bFn/xWPEpTOA
 IWB/HHMln0LYTL2AXN9HcaL1jnGI1Wq5eWBurX+cXQ/ij1A6jfoRKYglx7AQqOHj
 iWcGYtKLLJCgiWFnLSwcljZhfoYr0/z7rhns6yo7/vhN0riy+M84OgN4HbAmUzc1
 Bgy9PnJTNo8=
 =8PtJ
 -----END PGP SIGNATURE-----

Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC device tree changes from Arnd Bergmann:
 "These changes from 30 individual branches for the most part update
  device tree files, but there are also a few source code changes that
  have crept in this time, usually in order to atomically move over a
  driver from using hardcoded data to DT probing.

  A number of platforms change their DT files to use the C preprocessor,
  which is causing a bit of churn, but that is hopefully only this once"

* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (372 commits)
  ARM: at91: dt: rm9200ek: add spi support
  ARM: at91: dt: rm9200: add spi support
  ARM: at91/DT: at91sam9n12: add SPI DMA client infos
  ARM: at91/DT: sama5d3: add SPI DMA client infos
  ARM: at91/DT: fix SPI compatibility string
  ARM: Kirkwood: Fix the internal register ranges translation
  ARM: dts: bcm281xx: change comment to C89 style
  ARM: mmc: bcm281xx SDHCI driver (dt mods)
  ARM: nomadik: add the new clocks to the device tree
  clk: nomadik: implement the Nomadik clocks properly
  ARM: dts: omap5-uevm: Provide USB Host PHY clock frequency
  ARM: dts: omap4-panda: Fix DVI EDID reads
  ARM: dts: omap4-panda: Add USB Host support
  arm: mvebu: enable mini-PCIe connectors on Armada 370 RD
  ARM: shmobile: irqpin: add a DT property to enable masking on parent
  ARM: dts: AM43x EPOS EVM support
  ARM: dts: OMAP5: Add bandgap DT entry
  ARM: dts: AM33XX: Add pinmux configuration for CPSW to am335x EVM
  ARM: dts: AM33XX: Add pinmux configuration for CPSW to EVMsk
  ARM: dts: AM33XX: Add pinmux configuration for CPSW to beaglebone
  ...
2013-07-02 14:23:01 -07:00
..
altr_socfpga.txt ARM: socfpga: dts: Add gate-clock bindings 2013-06-11 16:35:00 -07:00
axi-clkgen.txt clk: Add axi-clkgen driver 2013-03-19 17:20:30 -07:00
calxeda.txt clk: add highbank clock support 2012-07-11 17:58:47 -07:00
clock-bindings.txt
exynos4-clock.txt clk: exynos4: Add additional G2D clocks 2013-06-12 04:54:49 +09:00
exynos5250-clock.txt clk: exynos5250: register display block gate clocks to common clock framework 2013-04-04 15:51:23 +09:00
exynos5440-clock.txt clk: exynos5440: register clocks using common clock framework 2013-03-25 18:17:05 +09:00
fixed-clock.txt
fixed-factor-clock.txt clk: add device tree fixed-factor-clock binding support 2013-04-12 10:52:23 -07:00
imx5-clock.txt ARM i.MX5: Add S/PDIF clocks 2013-06-17 15:45:13 +08:00
imx6q-clock.txt ARM: imx6q: clk: add the eim_slow clock 2013-06-17 15:45:12 +08:00
imx6sl-clock.txt ARM: imx: add clock support for imx6sl 2013-06-17 15:45:11 +08:00
imx23-clock.txt clk: imx: Remove 'clock-output-names' from the examples 2013-01-04 13:16:00 +08:00
imx25-clock.txt clk: imx: Remove 'clock-output-names' from the examples 2013-01-04 13:16:00 +08:00
imx27-clock.txt ARM: mx27: Replace clk_register_clkdev with clock DT lookup 2013-04-09 22:52:52 +08:00
imx28-clock.txt clk: imx: Remove 'clock-output-names' from the examples 2013-01-04 13:16:00 +08:00
imx31-clock.txt ARM: mx31: Replace clk_register_clkdev with clock DT lookup 2013-01-25 11:12:37 +01:00
mvebu-core-clock.txt clk: mvebu: add mvebu core clocks. 2012-11-20 14:34:08 +01:00
mvebu-cpu-clock.txt clk: mvebu: add armada-370-xp CPU specific clocks 2012-11-20 14:35:42 +01:00
mvebu-gated-clock.txt ARM: mvebu: correct gated clock documentation 2013-02-15 20:32:38 +00:00
nvidia,tegra20-car.txt ARM: tegra20: create a DT header defining CLK IDs 2013-05-28 16:10:39 -06:00
nvidia,tegra30-car.txt ARM: tegra30: create a DT header defining CLK IDs 2013-05-28 16:10:53 -06:00
nvidia,tegra114-car.txt ARM: tegra114: create a DT header defining CLK IDs 2013-05-28 16:11:11 -06:00
prima2-clock.txt clk: prima2: enable dt-binding clkdev mapping 2013-01-18 09:44:01 -08:00
silabs,si5351.txt clk: add si5351 i2c common clock driver 2013-04-12 11:04:38 -07:00
st,nomadik.txt clk: nomadik: implement the Nomadik clocks properly 2013-06-20 10:15:30 +02:00
ste-u300-syscon-clock.txt ARM: u300: convert MMC/SD clock to device tree 2013-06-17 13:54:37 +02:00
sunxi.txt clk: sunxi: Add support for AXI, AHB, APB0 and APB1 gates 2013-04-04 13:51:35 -07:00
vf610-clock.txt ARM: imx: add VF610 clock support 2013-06-17 15:45:15 +08:00
vt8500.txt arm: vt8500: doc: Add device tree bindings for arch-vt8500 devices 2012-09-21 19:23:58 +12:00
zynq-7000.txt clk: zynq: Remove deprecated clock code 2013-05-27 09:21:49 +02:00