Эх сурвалжийг харах

PCI: Fix typos and whitespace errors

Fix various typos and whitespace errors:

  s/Synopsis/Synopsys/
  s/Designware/DesignWare/
  s/Keystine/Keystone/
  s/gpio/GPIO/
  s/pcie/PCIe/
  s/phy/PHY/
  s/confgiruation/configuration/

No functional change intended.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Bjorn Helgaas 8 жил өмнө
parent
commit
96291d5655
37 өөрчлөгдсөн 99 нэмэгдсэн , 103 устгасан
  1. 1 1
      CREDITS
  2. 3 3
      Documentation/devicetree/bindings/pci/83xx-512x-pci.txt
  3. 9 9
      Documentation/devicetree/bindings/pci/altera-pcie.txt
  4. 1 1
      Documentation/devicetree/bindings/pci/axis,artpec6-pcie.txt
  5. 11 13
      Documentation/devicetree/bindings/pci/designware-pcie.txt
  6. 1 1
      Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt
  7. 2 2
      Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
  8. 4 4
      Documentation/devicetree/bindings/pci/kirin-pcie.txt
  9. 1 1
      Documentation/devicetree/bindings/pci/layerscape-pci.txt
  10. 1 1
      Documentation/devicetree/bindings/pci/mvebu-pci.txt
  11. 1 1
      Documentation/devicetree/bindings/pci/pci-armada8k.txt
  12. 7 8
      Documentation/devicetree/bindings/pci/pci-keystone.txt
  13. 2 2
      Documentation/devicetree/bindings/pci/qcom,pcie.txt
  14. 1 1
      Documentation/devicetree/bindings/pci/ralink,rt3883-pci.txt
  15. 3 4
      Documentation/devicetree/bindings/pci/rcar-pci.txt
  16. 1 1
      Documentation/devicetree/bindings/pci/rockchip-pcie.txt
  17. 11 11
      Documentation/devicetree/bindings/pci/samsung,exynos5440-pcie.txt
  18. 3 3
      Documentation/devicetree/bindings/pci/spear13xx-pcie.txt
  19. 4 4
      Documentation/devicetree/bindings/pci/ti-pci.txt
  20. 1 1
      Documentation/devicetree/bindings/pci/versatile.txt
  21. 3 2
      Documentation/devicetree/bindings/pci/xgene-pci-msi.txt
  22. 4 4
      Documentation/devicetree/bindings/pci/xgene-pci.txt
  23. 4 3
      Documentation/devicetree/bindings/pci/xilinx-nwl-pcie.txt
  24. 1 1
      MAINTAINERS
  25. 6 6
      drivers/pci/dwc/Kconfig
  26. 0 1
      drivers/pci/dwc/pci-dra7xx.c
  27. 1 1
      drivers/pci/dwc/pci-keystone-dw.c
  28. 1 1
      drivers/pci/dwc/pcie-designware-ep.c
  29. 1 1
      drivers/pci/dwc/pcie-designware-host.c
  30. 1 1
      drivers/pci/dwc/pcie-designware.c
  31. 1 1
      drivers/pci/dwc/pcie-designware.h
  32. 1 1
      drivers/pci/host/pcie-rockchip.c
  33. 1 1
      drivers/pci/host/pcie-xilinx.c
  34. 2 2
      drivers/pci/pcie/aer/aerdrv_core.c
  35. 1 1
      drivers/pci/quirks.c
  36. 2 3
      include/linux/aer.h
  37. 1 1
      include/linux/pcieport_if.h

+ 1 - 1
CREDITS

@@ -2090,7 +2090,7 @@ S: Kuala Lumpur, Malaysia
 
 
 N: Mohit Kumar
 N: Mohit Kumar
 D: ST Microelectronics SPEAr13xx PCI host bridge driver
 D: ST Microelectronics SPEAr13xx PCI host bridge driver
-D: Synopsys Designware PCI host bridge driver
+D: Synopsys DesignWare PCI host bridge driver
 
 
 N: Gabor Kuti
 N: Gabor Kuti
 E: seasons@falcon.sch.bme.hu
 E: seasons@falcon.sch.bme.hu

+ 3 - 3
Documentation/devicetree/bindings/pci/83xx-512x-pci.txt

@@ -1,11 +1,11 @@
 * Freescale 83xx and 512x PCI bridges
 * Freescale 83xx and 512x PCI bridges
 
 
-Freescale 83xx and 512x SOCs include the same pci bridge core.
+Freescale 83xx and 512x SOCs include the same PCI bridge core.
 
 
 83xx/512x specific notes:
 83xx/512x specific notes:
 - reg: should contain two address length tuples
 - reg: should contain two address length tuples
-    The first is for the internal pci bridge registers
-    The second is for the pci config space access registers
+    The first is for the internal PCI bridge registers
+    The second is for the PCI config space access registers
 
 
 Example (MPC8313ERDB)
 Example (MPC8313ERDB)
 	pci0: pci@e0008500 {
 	pci0: pci@e0008500 {

+ 9 - 9
Documentation/devicetree/bindings/pci/altera-pcie.txt

@@ -7,21 +7,21 @@ Required properties:
 		"Txs": TX slave port region
 		"Txs": TX slave port region
 		"Cra": Control register access region
 		"Cra": Control register access region
 - interrupt-parent:	interrupt source phandle.
 - interrupt-parent:	interrupt source phandle.
-- interrupts:	specifies the interrupt source of the parent interrupt controller.
-		The format of the interrupt specifier depends on the parent interrupt
-		controller.
+- interrupts:	specifies the interrupt source of the parent interrupt
+		controller.  The format of the interrupt specifier depends
+		on the parent interrupt controller.
 - device_type:	must be "pci"
 - device_type:	must be "pci"
 - #address-cells:	set to <3>
 - #address-cells:	set to <3>
-- #size-cells:	set to <2>
+- #size-cells:		set to <2>
 - #interrupt-cells:	set to <1>
 - #interrupt-cells:	set to <1>
-- ranges:		describes the translation of addresses for root ports and standard
-		PCI regions.
+- ranges:	describes the translation of addresses for root ports and
+		standard PCI regions.
 - interrupt-map-mask and interrupt-map: standard PCI properties to define the
 - interrupt-map-mask and interrupt-map: standard PCI properties to define the
 		mapping of the PCIe interface to interrupt numbers.
 		mapping of the PCIe interface to interrupt numbers.
 
 
 Optional properties:
 Optional properties:
-- msi-parent:	Link to the hardware entity that serves as the MSI controller for this PCIe
-		controller.
+- msi-parent:	Link to the hardware entity that serves as the MSI controller
+		for this PCIe controller.
 - bus-range:	PCI bus numbers covered
 - bus-range:	PCI bus numbers covered
 
 
 Example
 Example
@@ -45,5 +45,5 @@ Example
 			            <0 0 0 3 &pcie_0 3>,
 			            <0 0 0 3 &pcie_0 3>,
 			            <0 0 0 4 &pcie_0 4>;
 			            <0 0 0 4 &pcie_0 4>;
 		ranges = <0x82000000 0x00000000 0x00000000 0xc0000000 0x00000000 0x10000000
 		ranges = <0x82000000 0x00000000 0x00000000 0xc0000000 0x00000000 0x10000000
-			    0x82000000 0x00000000 0x10000000 0xd0000000 0x00000000 0x10000000>;
+			  0x82000000 0x00000000 0x10000000 0xd0000000 0x00000000 0x10000000>;
 	};
 	};

+ 1 - 1
Documentation/devicetree/bindings/pci/axis,artpec6-pcie.txt

@@ -6,7 +6,7 @@ and thus inherits all the common properties defined in designware-pcie.txt.
 Required properties:
 Required properties:
 - compatible: "axis,artpec6-pcie", "snps,dw-pcie"
 - compatible: "axis,artpec6-pcie", "snps,dw-pcie"
 - reg: base addresses and lengths of the PCIe controller (DBI),
 - reg: base addresses and lengths of the PCIe controller (DBI),
-	the phy controller, and configuration address space.
+	the PHY controller, and configuration address space.
 - reg-names: Must include the following entries:
 - reg-names: Must include the following entries:
 	- "dbi"
 	- "dbi"
 	- "phy"
 	- "phy"

+ 11 - 13
Documentation/devicetree/bindings/pci/designware-pcie.txt

@@ -1,4 +1,4 @@
-* Synopsys Designware PCIe interface
+* Synopsys DesignWare PCIe interface
 
 
 Required properties:
 Required properties:
 - compatible: should contain "snps,dw-pcie" to identify the core.
 - compatible: should contain "snps,dw-pcie" to identify the core.
@@ -17,29 +17,27 @@ RC mode:
 	properties to define the mapping of the PCIe interface to interrupt
 	properties to define the mapping of the PCIe interface to interrupt
 	numbers.
 	numbers.
 EP mode:
 EP mode:
-- num-ib-windows: number of inbound address translation
-        windows
-- num-ob-windows: number of outbound address translation
-        windows
+- num-ib-windows: number of inbound address translation windows
+- num-ob-windows: number of outbound address translation windows
 
 
 Optional properties:
 Optional properties:
 - num-lanes: number of lanes to use (this property should be specified unless
 - num-lanes: number of lanes to use (this property should be specified unless
   the link is brought already up in BIOS)
   the link is brought already up in BIOS)
-- reset-gpio: gpio pin number of power good signal
+- reset-gpio: GPIO pin number of power good signal
 - clocks: Must contain an entry for each entry in clock-names.
 - clocks: Must contain an entry for each entry in clock-names.
 	See ../clocks/clock-bindings.txt for details.
 	See ../clocks/clock-bindings.txt for details.
 - clock-names: Must include the following entries:
 - clock-names: Must include the following entries:
 	- "pcie"
 	- "pcie"
 	- "pcie_bus"
 	- "pcie_bus"
 RC mode:
 RC mode:
-- num-viewport: number of view ports configured in
-  hardware. If a platform does not specify it, the driver assumes 2.
-- bus-range: PCI bus numbers covered (it is recommended
-  for new devicetrees to specify this property, to keep backwards
-  compatibility a range of 0x00-0xff is assumed if not present)
+- num-viewport: number of view ports configured in hardware. If a platform
+  does not specify it, the driver assumes 2.
+- bus-range: PCI bus numbers covered (it is recommended for new devicetrees
+  to specify this property, to keep backwards compatibility a range of
+  0x00-0xff is assumed if not present)
+
 EP mode:
 EP mode:
-- max-functions: maximum number of functions that can be
-  configured
+- max-functions: maximum number of functions that can be configured
 
 
 Example configuration:
 Example configuration:
 
 

+ 1 - 1
Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt

@@ -1,6 +1,6 @@
 * Freescale i.MX6 PCIe interface
 * Freescale i.MX6 PCIe interface
 
 
-This PCIe host controller is based on the Synopsis Designware PCIe IP
+This PCIe host controller is based on the Synopsys DesignWare PCIe IP
 and thus inherits all the common properties defined in designware-pcie.txt.
 and thus inherits all the common properties defined in designware-pcie.txt.
 
 
 Required properties:
 Required properties:

+ 2 - 2
Documentation/devicetree/bindings/pci/hisilicon-pcie.txt

@@ -1,7 +1,7 @@
 HiSilicon Hip05 and Hip06 PCIe host bridge DT description
 HiSilicon Hip05 and Hip06 PCIe host bridge DT description
 
 
-HiSilicon PCIe host controller is based on Designware PCI core.
-It shares common functions with PCIe Designware core driver and inherits
+HiSilicon PCIe host controller is based on the Synopsys DesignWare PCI core.
+It shares common functions with the PCIe DesignWare core driver and inherits
 common properties defined in
 common properties defined in
 Documentation/devicetree/bindings/pci/designware-pci.txt.
 Documentation/devicetree/bindings/pci/designware-pci.txt.
 
 

+ 4 - 4
Documentation/devicetree/bindings/pci/kirin-pcie.txt

@@ -1,8 +1,8 @@
 HiSilicon Kirin SoCs PCIe host DT description
 HiSilicon Kirin SoCs PCIe host DT description
 
 
-Kirin PCIe host controller is based on Designware PCI core.
-It shares common functions with PCIe Designware core driver
-and inherits common properties defined in
+Kirin PCIe host controller is based on the Synopsys DesignWare PCI core.
+It shares common functions with the PCIe DesignWare core driver and
+inherits common properties defined in
 Documentation/devicetree/bindings/pci/designware-pci.txt.
 Documentation/devicetree/bindings/pci/designware-pci.txt.
 
 
 Additional properties are described here:
 Additional properties are described here:
@@ -16,7 +16,7 @@ Required properties
   "apb": apb Ctrl register defined by Kirin;
   "apb": apb Ctrl register defined by Kirin;
   "phy": apb PHY register defined by Kirin;
   "phy": apb PHY register defined by Kirin;
   "config": PCIe configuration space registers.
   "config": PCIe configuration space registers.
-- reset-gpios: The gpio to generate PCIe perst assert and deassert signal.
+- reset-gpios: The GPIO to generate PCIe PERST# assert and deassert signal.
 
 
 Optional properties:
 Optional properties:
 
 

+ 1 - 1
Documentation/devicetree/bindings/pci/layerscape-pci.txt

@@ -16,7 +16,7 @@ Required properties:
         "fsl,ls1021a-pcie", "snps,dw-pcie"
         "fsl,ls1021a-pcie", "snps,dw-pcie"
         "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie"
         "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie"
         "fsl,ls1046a-pcie"
         "fsl,ls1046a-pcie"
-- reg: base addresses and lengths of the PCIe controller
+- reg: base addresses and lengths of the PCIe controller register blocks.
 - interrupts: A list of interrupt outputs of the controller. Must contain an
 - interrupts: A list of interrupt outputs of the controller. Must contain an
   entry for each entry in the interrupt-names property.
   entry for each entry in the interrupt-names property.
 - interrupt-names: Must include the following entries:
 - interrupt-names: Must include the following entries:

+ 1 - 1
Documentation/devicetree/bindings/pci/mvebu-pci.txt

@@ -77,7 +77,7 @@ and the following optional properties:
 - marvell,pcie-lane: the physical PCIe lane number, for ports having
 - marvell,pcie-lane: the physical PCIe lane number, for ports having
   multiple lanes. If this property is not found, we assume that the
   multiple lanes. If this property is not found, we assume that the
   value is 0.
   value is 0.
-- reset-gpios: optional gpio to PERST#
+- reset-gpios: optional GPIO to PERST#
 - reset-delay-us: delay in us to wait after reset de-assertion, if not
 - reset-delay-us: delay in us to wait after reset de-assertion, if not
   specified will default to 100ms, as required by the PCIe specification.
   specified will default to 100ms, as required by the PCIe specification.
 
 

+ 1 - 1
Documentation/devicetree/bindings/pci/pci-armada8k.txt

@@ -1,6 +1,6 @@
 * Marvell Armada 7K/8K PCIe interface
 * Marvell Armada 7K/8K PCIe interface
 
 
-This PCIe host controller is based on the Synopsis Designware PCIe IP
+This PCIe host controller is based on the Synopsys DesignWare PCIe IP
 and thus inherits all the common properties defined in designware-pcie.txt.
 and thus inherits all the common properties defined in designware-pcie.txt.
 
 
 Required properties:
 Required properties:

+ 7 - 8
Documentation/devicetree/bindings/pci/pci-keystone.txt

@@ -1,12 +1,12 @@
 TI Keystone PCIe interface
 TI Keystone PCIe interface
 
 
-Keystone PCI host Controller is based on Designware PCI h/w version 3.65.
-It shares common functions with PCIe Designware core driver and inherit
-common properties defined in
+Keystone PCI host Controller is based on the Synopsys DesignWare PCI
+hardware version 3.65.  It shares common functions with the PCIe DesignWare
+core driver and inherits common properties defined in
 Documentation/devicetree/bindings/pci/designware-pci.txt
 Documentation/devicetree/bindings/pci/designware-pci.txt
 
 
 Please refer to Documentation/devicetree/bindings/pci/designware-pci.txt
 Please refer to Documentation/devicetree/bindings/pci/designware-pci.txt
-for the details of Designware DT bindings.  Additional properties are
+for the details of DesignWare DT bindings.  Additional properties are
 described here as well as properties that are not applicable.
 described here as well as properties that are not applicable.
 
 
 Required Properties:-
 Required Properties:-
@@ -52,13 +52,12 @@ pcie_intc: Interrupt controller device node for Legacy IRQ chip
 	};
 	};
 
 
 Optional properties:-
 Optional properties:-
-	phys: phandle to Generic Keystone SerDes phy for PCI
-	phy-names: name of the Generic Keystine SerDes phy for PCI
+	phys: phandle to generic Keystone SerDes PHY for PCI
+	phy-names: name of the generic Keystone SerDes PHY for PCI
 	  - If boot loader already does PCI link establishment, then phys and
 	  - If boot loader already does PCI link establishment, then phys and
 	    phy-names shouldn't be present.
 	    phy-names shouldn't be present.
 	interrupts: platform interrupt for error interrupts.
 	interrupts: platform interrupt for error interrupts.
 
 
-Designware DT Properties not applicable for Keystone PCI
+DesignWare DT Properties not applicable for Keystone PCI
 
 
 1. pcie_bus clock-names not used.  Instead, a phandle to phys is used.
 1. pcie_bus clock-names not used.  Instead, a phandle to phys is used.
-

+ 2 - 2
Documentation/devicetree/bindings/pci/qcom,pcie.txt

@@ -20,7 +20,7 @@
 	Value type: <stringlist>
 	Value type: <stringlist>
 	Definition: Must include the following entries
 	Definition: Must include the following entries
 			- "parf"   Qualcomm specific registers
 			- "parf"   Qualcomm specific registers
-			- "dbi"	   Designware PCIe registers
+			- "dbi"	   DesignWare PCIe registers
 			- "elbi"   External local bus interface registers
 			- "elbi"   External local bus interface registers
 			- "config" PCIe configuration space
 			- "config" PCIe configuration space
 
 
@@ -180,7 +180,7 @@
 - <name>-gpios:
 - <name>-gpios:
 	Usage: optional
 	Usage: optional
 	Value type: <prop-encoded-array>
 	Value type: <prop-encoded-array>
-	Definition: List of phandle and gpio specifier pairs. Should contain
+	Definition: List of phandle and GPIO specifier pairs. Should contain
 			- "perst-gpios"	PCIe endpoint reset signal line
 			- "perst-gpios"	PCIe endpoint reset signal line
 			- "wake-gpios"	PCIe endpoint wake signal line
 			- "wake-gpios"	PCIe endpoint wake signal line
 
 

+ 1 - 1
Documentation/devicetree/bindings/pci/ralink,rt3883-pci.txt

@@ -71,7 +71,7 @@
    - interrupt-map: standard PCI properties to define the mapping of the
    - interrupt-map: standard PCI properties to define the mapping of the
      PCI interface to interrupt numbers.
      PCI interface to interrupt numbers.
 
 
-   The PCI host bridge node migh have additional sub-nodes representing
+   The PCI host bridge node might have additional sub-nodes representing
    the onboard PCI devices/PCI slots. Each such sub-node must have the
    the onboard PCI devices/PCI slots. Each such sub-node must have the
    following mandatory properties:
    following mandatory properties:
 
 

+ 3 - 4
Documentation/devicetree/bindings/pci/rcar-pci.txt

@@ -14,7 +14,7 @@ compatible: "renesas,pcie-r8a7779" for the R8A7779 SoC;
 	    SoC-specific version corresponding to the platform first
 	    SoC-specific version corresponding to the platform first
 	    followed by the generic version.
 	    followed by the generic version.
 
 
-- reg: base address and length of the pcie controller registers.
+- reg: base address and length of the PCIe controller registers.
 - #address-cells: set to <3>
 - #address-cells: set to <3>
 - #size-cells: set to <2>
 - #size-cells: set to <2>
 - bus-range: PCI bus numbers covered
 - bus-range: PCI bus numbers covered
@@ -25,15 +25,14 @@ compatible: "renesas,pcie-r8a7779" for the R8A7779 SoC;
 	source for hardware related interrupts (e.g. link speed change).
 	source for hardware related interrupts (e.g. link speed change).
 - #interrupt-cells: set to <1>
 - #interrupt-cells: set to <1>
 - interrupt-map-mask and interrupt-map: standard PCI properties
 - interrupt-map-mask and interrupt-map: standard PCI properties
-	to define the mapping of the PCIe interface to interrupt
-	numbers.
+	to define the mapping of the PCIe interface to interrupt numbers.
 - clocks: from common clock binding: clock specifiers for the PCIe controller
 - clocks: from common clock binding: clock specifiers for the PCIe controller
 	and PCIe bus clocks.
 	and PCIe bus clocks.
 - clock-names: from common clock binding: should be "pcie" and "pcie_bus".
 - clock-names: from common clock binding: should be "pcie" and "pcie_bus".
 
 
 Example:
 Example:
 
 
-SoC specific DT Entry:
+SoC-specific DT Entry:
 
 
 	pcie: pcie@fe000000 {
 	pcie: pcie@fe000000 {
 		compatible = "renesas,pcie-r8a7791", "renesas,pcie-rcar-gen2";
 		compatible = "renesas,pcie-r8a7791", "renesas,pcie-rcar-gen2";

+ 1 - 1
Documentation/devicetree/bindings/pci/rockchip-pcie.txt

@@ -45,7 +45,7 @@ Required properties:
 Optional Property:
 Optional Property:
 - aspm-no-l0s: RC won't support ASPM L0s. This property is needed if
 - aspm-no-l0s: RC won't support ASPM L0s. This property is needed if
 	using 24MHz OSC for RC's PHY.
 	using 24MHz OSC for RC's PHY.
-- ep-gpios: contain the entry for pre-reset gpio
+- ep-gpios: contain the entry for pre-reset GPIO
 - num-lanes: number of lanes to use
 - num-lanes: number of lanes to use
 - vpcie3v3-supply: The phandle to the 3.3v regulator to use for PCIe.
 - vpcie3v3-supply: The phandle to the 3.3v regulator to use for PCIe.
 - vpcie1v8-supply: The phandle to the 1.8v regulator to use for PCIe.
 - vpcie1v8-supply: The phandle to the 1.8v regulator to use for PCIe.

+ 11 - 11
Documentation/devicetree/bindings/pci/samsung,exynos5440-pcie.txt

@@ -1,29 +1,29 @@
 * Samsung Exynos 5440 PCIe interface
 * Samsung Exynos 5440 PCIe interface
 
 
-This PCIe host controller is based on the Synopsis Designware PCIe IP
+This PCIe host controller is based on the Synopsys DesignWare PCIe IP
 and thus inherits all the common properties defined in designware-pcie.txt.
 and thus inherits all the common properties defined in designware-pcie.txt.
 
 
 Required properties:
 Required properties:
 - compatible: "samsung,exynos5440-pcie"
 - compatible: "samsung,exynos5440-pcie"
-- reg: base addresses and lengths of the pcie controller,
-	the phy controller, additional register for the phy controller.
-	(Registers for the phy controller are DEPRECATED.
+- reg: base addresses and lengths of the PCIe controller,
+	the PHY controller, additional register for the PHY controller.
+	(Registers for the PHY controller are DEPRECATED.
 	 Use the PHY framework.)
 	 Use the PHY framework.)
 - reg-names : First name should be set to "elbi".
 - reg-names : First name should be set to "elbi".
-	And use the "config" instead of getting the confgiruation address space
+	And use the "config" instead of getting the configuration address space
 	from "ranges".
 	from "ranges".
-	NOTE: When use the "config" property, reg-names must be set.
+	NOTE: When using the "config" property, reg-names must be set.
 - interrupts: A list of interrupt outputs for level interrupt,
 - interrupts: A list of interrupt outputs for level interrupt,
 	pulse interrupt, special interrupt.
 	pulse interrupt, special interrupt.
-- phys: From PHY binding. Phandle for the Generic PHY.
+- phys: From PHY binding. Phandle for the generic PHY.
 	Refer to Documentation/devicetree/bindings/phy/samsung-phy.txt
 	Refer to Documentation/devicetree/bindings/phy/samsung-phy.txt
 
 
-Other common properties refer to
-	Documentation/devicetree/binding/pci/designware-pcie.txt
+For other common properties, refer to
+	Documentation/devicetree/bindings/pci/designware-pcie.txt
 
 
 Example:
 Example:
 
 
-SoC specific DT Entry:
+SoC-specific DT Entry:
 
 
 	pcie@290000 {
 	pcie@290000 {
 		compatible = "samsung,exynos5440-pcie", "snps,dw-pcie";
 		compatible = "samsung,exynos5440-pcie", "snps,dw-pcie";
@@ -83,7 +83,7 @@ With using PHY framework:
 		...
 		...
 	};
 	};
 
 
-Board specific DT Entry:
+Board-specific DT Entry:
 
 
 	pcie@290000 {
 	pcie@290000 {
 		reset-gpio = <&pin_ctrl 5 0>;
 		reset-gpio = <&pin_ctrl 5 0>;

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

@@ -1,12 +1,12 @@
 SPEAr13XX PCIe DT detail:
 SPEAr13XX PCIe DT detail:
 ================================
 ================================
 
 
-SPEAr13XX uses synopsis designware PCIe controller and ST MiPHY as phy
+SPEAr13XX uses the Synopsys DesignWare PCIe controller and ST MiPHY as PHY
 controller.
 controller.
 
 
 Required properties:
 Required properties:
-- compatible : should be "st,spear1340-pcie", "snps,dw-pcie".
-- phys		    : phandle to phy node associated with pcie controller
+- compatible	    : should be "st,spear1340-pcie", "snps,dw-pcie".
+- phys		    : phandle to PHY node associated with PCIe controller
 - phy-names	    : must be "pcie-phy"
 - phy-names	    : must be "pcie-phy"
 - All other definitions as per generic PCI bindings
 - All other definitions as per generic PCI bindings
 
 

+ 4 - 4
Documentation/devicetree/bindings/pci/ti-pci.txt

@@ -1,6 +1,6 @@
 TI PCI Controllers
 TI PCI Controllers
 
 
-PCIe Designware Controller
+PCIe DesignWare Controller
  - compatible: Should be "ti,dra7-pcie" for RC
  - compatible: Should be "ti,dra7-pcie" for RC
 	       Should be "ti,dra7-pcie-ep" for EP
 	       Should be "ti,dra7-pcie-ep" for EP
  - phys : list of PHY specifiers (used by generic PHY framework)
  - phys : list of PHY specifiers (used by generic PHY framework)
@@ -13,7 +13,7 @@ PCIe Designware Controller
 HOST MODE
 HOST MODE
 =========
 =========
  - reg : Two register ranges as listed in the reg-names property
  - reg : Two register ranges as listed in the reg-names property
- - reg-names : The first entry must be "ti-conf" for the TI specific registers
+ - reg-names : The first entry must be "ti-conf" for the TI-specific registers
 	       The second entry must be "rc-dbics" for the DesignWare PCIe
 	       The second entry must be "rc-dbics" for the DesignWare PCIe
 	       registers
 	       registers
 	       The third entry must be "config" for the PCIe configuration space
 	       The third entry must be "config" for the PCIe configuration space
@@ -30,7 +30,7 @@ HOST MODE
 DEVICE MODE
 DEVICE MODE
 ===========
 ===========
  - reg : Four register ranges as listed in the reg-names property
  - reg : Four register ranges as listed in the reg-names property
- - reg-names : "ti-conf" for the TI specific registers
+ - reg-names : "ti-conf" for the TI-specific registers
 	       "ep_dbics" for the standard configuration registers as
 	       "ep_dbics" for the standard configuration registers as
 		they are locally accessed within the DIF CS space
 		they are locally accessed within the DIF CS space
 	       "ep_dbics2" for the standard configuration registers as
 	       "ep_dbics2" for the standard configuration registers as
@@ -46,7 +46,7 @@ DEVICE MODE
 			       access.
 			       access.
 
 
 Optional Property:
 Optional Property:
- - gpios : Should be added if a gpio line is required to drive PERST# line
+ - gpios : Should be added if a GPIO line is required to drive PERST# line
 
 
 NOTE: Two DT nodes may be added for each PCI controller; one for host
 NOTE: Two DT nodes may be added for each PCI controller; one for host
 mode and another for device mode. So in order for PCI to
 mode and another for device mode. So in order for PCI to

+ 1 - 1
Documentation/devicetree/bindings/pci/versatile.txt

@@ -5,7 +5,7 @@ PCI host controller found on the ARM Versatile PB board's FPGA.
 Required properties:
 Required properties:
 - compatible: should contain "arm,versatile-pci" to identify the Versatile PCI
 - compatible: should contain "arm,versatile-pci" to identify the Versatile PCI
   controller.
   controller.
-- reg: base addresses and lengths of the pci controller. There must be 3
+- reg: base addresses and lengths of the PCI controller. There must be 3
   entries:
   entries:
 	- Versatile-specific registers
 	- Versatile-specific registers
 	- Self Config space
 	- Self Config space

+ 3 - 2
Documentation/devicetree/bindings/pci/xgene-pci-msi.txt

@@ -4,7 +4,7 @@ Required properties:
 
 
 - compatible: should be "apm,xgene1-msi" to identify
 - compatible: should be "apm,xgene1-msi" to identify
 	      X-Gene v1 PCIe MSI controller block.
 	      X-Gene v1 PCIe MSI controller block.
-- msi-controller: indicates that this is X-Gene v1 PCIe MSI controller node
+- msi-controller: indicates that this is an X-Gene v1 PCIe MSI controller node
 - reg: physical base address (0x79000000) and length (0x900000) for controller
 - reg: physical base address (0x79000000) and length (0x900000) for controller
        registers. These registers include the MSI termination address and data
        registers. These registers include the MSI termination address and data
        registers as well as the MSI interrupt status registers.
        registers as well as the MSI interrupt status registers.
@@ -13,7 +13,8 @@ Required properties:
 	      interrupt number 0x10 to 0x1f.
 	      interrupt number 0x10 to 0x1f.
 - interrupt-names: not required
 - interrupt-names: not required
 
 
-Each PCIe node needs to have property msi-parent that points to msi controller node
+Each PCIe node needs to have property msi-parent that points to an MSI
+controller node
 
 
 Examples:
 Examples:
 
 

+ 4 - 4
Documentation/devicetree/bindings/pci/xgene-pci.txt

@@ -8,7 +8,7 @@ Required properties:
        property.
        property.
 - reg-names: Must include the following entries:
 - reg-names: Must include the following entries:
   "csr": controller configuration registers.
   "csr": controller configuration registers.
-  "cfg": pcie configuration space registers.
+  "cfg": PCIe configuration space registers.
 - #address-cells: set to <3>
 - #address-cells: set to <3>
 - #size-cells: set to <2>
 - #size-cells: set to <2>
 - ranges: ranges for the outbound memory, I/O regions.
 - ranges: ranges for the outbound memory, I/O regions.
@@ -21,11 +21,11 @@ Required properties:
 
 
 Optional properties:
 Optional properties:
 - status: Either "ok" or "disabled".
 - status: Either "ok" or "disabled".
-- dma-coherent: Present if dma operations are coherent
+- dma-coherent: Present if DMA operations are coherent
 
 
 Example:
 Example:
 
 
-SoC specific DT Entry:
+SoC-specific DT Entry:
 
 
 	pcie0: pcie@1f2b0000 {
 	pcie0: pcie@1f2b0000 {
 		status = "disabled";
 		status = "disabled";
@@ -51,7 +51,7 @@ SoC specific DT Entry:
 	};
 	};
 
 
 
 
-Board specific DT Entry:
+Board-specific DT Entry:
 	&pcie0 {
 	&pcie0 {
 		status = "ok";
 		status = "ok";
 	};
 	};

+ 4 - 3
Documentation/devicetree/bindings/pci/xilinx-nwl-pcie.txt

@@ -15,9 +15,9 @@ Required properties:
 - device_type: must be "pci"
 - device_type: must be "pci"
 - interrupts: Should contain NWL PCIe interrupt
 - interrupts: Should contain NWL PCIe interrupt
 - interrupt-names: Must include the following entries:
 - interrupt-names: Must include the following entries:
-	"msi1, msi0": interrupt asserted when MSI is received
+	"msi1, msi0": interrupt asserted when an MSI is received
 	"intx": interrupt asserted when a legacy interrupt is received
 	"intx": interrupt asserted when a legacy interrupt is received
-	"misc": interrupt asserted when miscellaneous is received
+	"misc": interrupt asserted when miscellaneous interrupt is received
 - interrupt-map-mask and interrupt-map: standard PCI properties to define the
 - interrupt-map-mask and interrupt-map: standard PCI properties to define the
 	mapping of the PCI interface to interrupt numbers.
 	mapping of the PCI interface to interrupt numbers.
 - ranges: ranges for the PCI memory regions (I/O space region is not
 - ranges: ranges for the PCI memory regions (I/O space region is not
@@ -26,7 +26,8 @@ Required properties:
 	detailed explanation
 	detailed explanation
 - msi-controller: indicates that this is MSI controller node
 - msi-controller: indicates that this is MSI controller node
 - msi-parent:  MSI parent of the root complex itself
 - msi-parent:  MSI parent of the root complex itself
-- legacy-interrupt-controller: Interrupt controller device node for Legacy interrupts
+- legacy-interrupt-controller: Interrupt controller device node for Legacy
+	interrupts
 	- interrupt-controller: identifies the node as an interrupt controller
 	- interrupt-controller: identifies the node as an interrupt controller
 	- #interrupt-cells: should be set to 1
 	- #interrupt-cells: should be set to 1
 	- #address-cells: specifies the number of cells needed to encode an
 	- #address-cells: specifies the number of cells needed to encode an

+ 1 - 1
MAINTAINERS

@@ -10136,7 +10136,7 @@ L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
 S:	Maintained
 S:	Maintained
 F:	drivers/pci/dwc/pci-exynos.c
 F:	drivers/pci/dwc/pci-exynos.c
 
 
-PCI DRIVER FOR SYNOPSIS DESIGNWARE
+PCI DRIVER FOR SYNOPSYS DESIGNWARE
 M:	Jingoo Han <jingoohan1@gmail.com>
 M:	Jingoo Han <jingoohan1@gmail.com>
 M:	Joao Pinto <Joao.Pinto@synopsys.com>
 M:	Joao Pinto <Joao.Pinto@synopsys.com>
 L:	linux-pci@vger.kernel.org
 L:	linux-pci@vger.kernel.org

+ 6 - 6
drivers/pci/dwc/Kconfig

@@ -25,7 +25,7 @@ config PCI_DRA7XX
 	 work either as EP or RC. In order to enable host-specific features
 	 work either as EP or RC. In order to enable host-specific features
 	 PCI_DRA7XX_HOST must be selected and in order to enable device-
 	 PCI_DRA7XX_HOST must be selected and in order to enable device-
 	 specific features PCI_DRA7XX_EP must be selected. This uses
 	 specific features PCI_DRA7XX_EP must be selected. This uses
-	 the Designware core.
+	 the DesignWare core.
 
 
 if PCI_DRA7XX
 if PCI_DRA7XX
 
 
@@ -97,8 +97,8 @@ config PCI_KEYSTONE
 	select PCIE_DW_HOST
 	select PCIE_DW_HOST
 	help
 	help
 	  Say Y here if you want to enable PCI controller support on Keystone
 	  Say Y here if you want to enable PCI controller support on Keystone
-	  SoCs. The PCI controller on Keystone is based on Designware hardware
-	  and therefore the driver re-uses the Designware core functions to
+	  SoCs. The PCI controller on Keystone is based on DesignWare hardware
+	  and therefore the driver re-uses the DesignWare core functions to
 	  implement the driver.
 	  implement the driver.
 
 
 config PCI_LAYERSCAPE
 config PCI_LAYERSCAPE
@@ -132,7 +132,7 @@ config PCIE_QCOM
 	select PCIE_DW_HOST
 	select PCIE_DW_HOST
 	help
 	help
 	  Say Y here to enable PCIe controller support on Qualcomm SoCs. The
 	  Say Y here to enable PCIe controller support on Qualcomm SoCs. The
-	  PCIe controller uses the Designware core plus Qualcomm-specific
+	  PCIe controller uses the DesignWare core plus Qualcomm-specific
 	  hardware wrappers.
 	  hardware wrappers.
 
 
 config PCIE_ARMADA_8K
 config PCIE_ARMADA_8K
@@ -145,8 +145,8 @@ config PCIE_ARMADA_8K
 	help
 	help
 	  Say Y here if you want to enable PCIe controller support on
 	  Say Y here if you want to enable PCIe controller support on
 	  Armada-8K SoCs. The PCIe controller on Armada-8K is based on
 	  Armada-8K SoCs. The PCIe controller on Armada-8K is based on
-	  Designware hardware and therefore the driver re-uses the
-	  Designware core functions to implement the driver.
+	  DesignWare hardware and therefore the driver re-uses the
+	  DesignWare core functions to implement the driver.
 
 
 config PCIE_ARTPEC6
 config PCIE_ARTPEC6
 	bool "Axis ARTPEC-6 PCIe controller"
 	bool "Axis ARTPEC-6 PCIe controller"

+ 0 - 1
drivers/pci/dwc/pci-dra7xx.c

@@ -275,7 +275,6 @@ static irqreturn_t dra7xx_pcie_msi_irq_handler(int irq, void *arg)
 	return IRQ_HANDLED;
 	return IRQ_HANDLED;
 }
 }
 
 
-
 static irqreturn_t dra7xx_pcie_irq_handler(int irq, void *arg)
 static irqreturn_t dra7xx_pcie_irq_handler(int irq, void *arg)
 {
 {
 	struct dra7xx_pcie *dra7xx = arg;
 	struct dra7xx_pcie *dra7xx = arg;

+ 1 - 1
drivers/pci/dwc/pci-keystone-dw.c

@@ -1,5 +1,5 @@
 /*
 /*
- * Designware application register space functions for Keystone PCI controller
+ * DesignWare application register space functions for Keystone PCI controller
  *
  *
  * Copyright (C) 2013-2014 Texas Instruments., Ltd.
  * Copyright (C) 2013-2014 Texas Instruments., Ltd.
  *		http://www.ti.com
  *		http://www.ti.com

+ 1 - 1
drivers/pci/dwc/pcie-designware-ep.c

@@ -1,5 +1,5 @@
 /**
 /**
- * Synopsys Designware PCIe Endpoint controller driver
+ * Synopsys DesignWare PCIe Endpoint controller driver
  *
  *
  * Copyright (C) 2017 Texas Instruments
  * Copyright (C) 2017 Texas Instruments
  * Author: Kishon Vijay Abraham I <kishon@ti.com>
  * Author: Kishon Vijay Abraham I <kishon@ti.com>

+ 1 - 1
drivers/pci/dwc/pcie-designware-host.c

@@ -1,5 +1,5 @@
 /*
 /*
- * Synopsys Designware PCIe host controller driver
+ * Synopsys DesignWare PCIe host controller driver
  *
  *
  * Copyright (C) 2013 Samsung Electronics Co., Ltd.
  * Copyright (C) 2013 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com
  *		http://www.samsung.com

+ 1 - 1
drivers/pci/dwc/pcie-designware.c

@@ -1,5 +1,5 @@
 /*
 /*
- * Synopsys Designware PCIe host controller driver
+ * Synopsys DesignWare PCIe host controller driver
  *
  *
  * Copyright (C) 2013 Samsung Electronics Co., Ltd.
  * Copyright (C) 2013 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com
  *		http://www.samsung.com

+ 1 - 1
drivers/pci/dwc/pcie-designware.h

@@ -1,5 +1,5 @@
 /*
 /*
- * Synopsys Designware PCIe host controller driver
+ * Synopsys DesignWare PCIe host controller driver
  *
  *
  * Copyright (C) 2013 Samsung Electronics Co., Ltd.
  * Copyright (C) 2013 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com
  *		http://www.samsung.com

+ 1 - 1
drivers/pci/host/pcie-rockchip.c

@@ -6,7 +6,7 @@
  * Author: Shawn Lin <shawn.lin@rock-chips.com>
  * Author: Shawn Lin <shawn.lin@rock-chips.com>
  *         Wenrui Li <wenrui.li@rock-chips.com>
  *         Wenrui Li <wenrui.li@rock-chips.com>
  *
  *
- * Bits taken from Synopsys Designware Host controller driver and
+ * Bits taken from Synopsys DesignWare Host controller driver and
  * ARM PCI Host generic driver.
  * ARM PCI Host generic driver.
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * This program is free software: you can redistribute it and/or modify

+ 1 - 1
drivers/pci/host/pcie-xilinx.c

@@ -5,7 +5,7 @@
  *
  *
  * Based on the Tegra PCIe driver
  * Based on the Tegra PCIe driver
  *
  *
- * Bits taken from Synopsys Designware Host controller driver and
+ * Bits taken from Synopsys DesignWare Host controller driver and
  * ARM PCI Host generic driver.
  * ARM PCI Host generic driver.
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * This program is free software: you can redistribute it and/or modify

+ 2 - 2
drivers/pci/pcie/aer/aerdrv_core.c

@@ -5,10 +5,10 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  * for more details.
  *
  *
- * This file implements the core part of PCI-Express AER. When an pci-express
+ * This file implements the core part of PCIe AER. When a PCIe
  * error is delivered, an error message will be collected and printed to
  * error is delivered, an error message will be collected and printed to
  * console, then, an error recovery procedure will be executed by following
  * console, then, an error recovery procedure will be executed by following
- * the pci error recovery rules.
+ * the PCI error recovery rules.
  *
  *
  * Copyright (C) 2006 Intel Corp.
  * Copyright (C) 2006 Intel Corp.
  *	Tom Long Nguyen (tom.l.nguyen@intel.com)
  *	Tom Long Nguyen (tom.l.nguyen@intel.com)

+ 1 - 1
drivers/pci/quirks.c

@@ -2061,7 +2061,7 @@ DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_INTEL, PCI_ANY_ID,
 
 
 /*
 /*
  * The 82575 and 82598 may experience data corruption issues when transitioning
  * The 82575 and 82598 may experience data corruption issues when transitioning
- * out of L0S.  To prevent this we need to disable L0S on the pci-e link
+ * out of L0S.  To prevent this we need to disable L0S on the PCIe link.
  */
  */
 static void quirk_disable_aspm_l0s(struct pci_dev *dev)
 static void quirk_disable_aspm_l0s(struct pci_dev *dev)
 {
 {

+ 2 - 3
include/linux/aer.h

@@ -39,7 +39,7 @@ struct aer_capability_regs {
 };
 };
 
 
 #if defined(CONFIG_PCIEAER)
 #if defined(CONFIG_PCIEAER)
-/* pci-e port driver needs this function to enable aer */
+/* PCIe port driver needs this function to enable AER */
 int pci_enable_pcie_error_reporting(struct pci_dev *dev);
 int pci_enable_pcie_error_reporting(struct pci_dev *dev);
 int pci_disable_pcie_error_reporting(struct pci_dev *dev);
 int pci_disable_pcie_error_reporting(struct pci_dev *dev);
 int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev);
 int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev);
@@ -67,7 +67,6 @@ void cper_print_aer(struct pci_dev *dev, int aer_severity,
 		    struct aer_capability_regs *aer);
 		    struct aer_capability_regs *aer);
 int cper_severity_to_aer(int cper_severity);
 int cper_severity_to_aer(int cper_severity);
 void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn,
 void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn,
-		       int severity,
-		       struct aer_capability_regs *aer_regs);
+		       int severity, struct aer_capability_regs *aer_regs);
 #endif //_AER_H_
 #endif //_AER_H_
 
 

+ 1 - 1
include/linux/pcieport_if.h

@@ -38,7 +38,7 @@ static inline void set_service_data(struct pcie_device *dev, void *data)
 	dev->priv_data = data;
 	dev->priv_data = data;
 }
 }
 
 
-static inline void* get_service_data(struct pcie_device *dev)
+static inline void *get_service_data(struct pcie_device *dev)
 {
 {
 	return dev->priv_data;
 	return dev->priv_data;
 }
 }