Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25f00328 authored Jul 18, 2014 by Olof Johansson

Merge branch 'spear/pcie-support-v10' of...

Merge branch 'spear/pcie-support-v10' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/linux into next/drivers

Merge "ARM: SPEAr13xx PCIe updates for v3.17" from Viresh Kumar:

This is another attempt to merge SPEAr PCIe updates after olof
pointed out *enough* issues with initial PULL request:

https://lkml.org/lkml/2014/7/9/641

Last version was sent here: http://patchwork.ozlabs.org/patch/368479/
and all the nits pointed out by Kishon & Bjorn are fixed in this pull
request.

Apart from ARM specific changes, this updates drivers/{pci|phy}. Bjorn
advised to get complete series via arm-soc tree earlier:

http://www.spinics.net/lists/linux-pci/msg30271.html

* 'spear/pcie-support-v10' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/linux

:
  ARM: SPEAr13xx: Update defconfigs
  ARM: SPEAr13xx: Add pcie and miphy DT nodes
  ARM: SPEAr13xx: Add bindings and dt node for misc block
  ARM: SPEAr13xx: Fix static mapping table
  phy: Add drivers for PCIe and SATA phy on SPEAr13xx
  PCI: spear: Add PCIe driver for ST Microelectronics SPEAr13xx

Signed-off-by: Olof Johansson <olof@lixom.net>

parents bde19a7e f6e670a3

Documentation/devicetree/bindings/arm/spear-misc.txt

0 → 100644

+9 −0

Original line number	Diff line number	Diff line
		SPEAr Misc configuration
		===========================
		SPEAr SOCs have some miscellaneous registers which are used to configure
		few properties of different peripheral controllers.

		misc node required properties:

		- compatible Should be "st,spear1340-misc", "syscon".
		- reg: Address range of misc space upto 8K

Documentation/devicetree/bindings/pci/spear13xx-pcie.txt

0 → 100644

+14 −0

Original line number	Diff line number	Diff line
		SPEAr13XX PCIe DT detail:
		================================

		SPEAr13XX uses synopsis designware PCIe controller and ST MiPHY as phy
		controller.

		Required properties:
		- compatible : should be "st,spear1340-pcie", "snps,dw-pcie".
		- phys : phandle to phy node associated with pcie controller
		- phy-names : must be "pcie-phy"
		- All other definitions as per generic PCI bindings

		Optional properties:
		- st,pcie-is-gen1 indicates that forced gen1 initialization is needed.

Documentation/devicetree/bindings/phy/st-spear-miphy.txt

0 → 100644

+15 −0

Original line number	Diff line number	Diff line
		ST SPEAr miphy DT details
		=========================

		ST Microelectronics SPEAr miphy is a phy controller supporting PCIe and SATA.

		Required properties:
		- compatible : should be "st,spear1310-miphy" or "st,spear1340-miphy"
		- reg : offset and length of the PHY register set.
		- misc: phandle for the syscon node to access misc registers
		- #phy-cells : from the generic PHY bindings, must be 1.
		- cell[1]: 0 if phy used for SATA, 1 for PCIe.

		Optional properties:
		- phy-id: Instance id of the phy. Only required when there are multiple phys
		present on a implementation.

MAINTAINERS

+6 −0

Original line number	Diff line number	Diff line
		@@ -6820,6 +6820,12 @@ S: Maintained
		F: Documentation/devicetree/bindings/pci/host-generic-pci.txt
		F: drivers/pci/host/pci-host-generic.c

		PCIE DRIVER FOR ST SPEAR13XX
		M: Mohit Kumar <mohit.kumar@st.com>
		L: linux-pci@vger.kernel.org
		S: Maintained
		F: drivers/pci/host/spear

		PCMCIA SUBSYSTEM
		P: Linux PCMCIA Team
		L: linux-pcmcia@lists.infradead.org

arch/arm/boot/dts/spear1310-evb.dts

+4 −0

Original line number	Diff line number	Diff line
		@@ -106,6 +106,10 @@
		status = "okay";
		};

		miphy@eb800000 {
		status = "okay";
		};

		cf@b2800000 {
		status = "okay";
		};