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

Commit cb9a75c3 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: msm: Add PCIe driver for sdxprarie"

parents 2cc05af9 ff01822a

Documentation/devicetree/bindings/pci/msm_pcie.txt

+3 −0
Original line number Diff line number Diff line
@@ -130,6 +130,9 @@ Optional Properties: 
    property.

  - clock-output-names: name of the outgoing clock signal from the PHY PLL.

  - qcom,keep-powerdown-phy: If present, power down phy in probe to avoid leakage.

  - errata: Selects the list of erratas to configure for the

    corresponding switch port. This could be a third party switch connected to

    the root port.



=================

Root Complex node

arch/arm/configs/vendor/sdxprairie-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ CONFIG_ARCH_SDXPRAIRIE=y 
# CONFIG_VDSO is not set

CONFIG_PCI_MSM=y

CONFIG_PCI_MSM_MSI=y

CONFIG_PCI_SW_QCOM_SWITCH=y

CONFIG_PREEMPT=y

CONFIG_HIGHMEM=y

CONFIG_ARM_MODULE_PLTS=y

arch/arm/configs/vendor/sdxprairie_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ CONFIG_ARCH_SDXPRAIRIE=y 
# CONFIG_VDSO is not set

CONFIG_PCI_MSM=y

CONFIG_PCI_MSM_MSI=y

CONFIG_PCI_SW_QCOM_SWITCH=y

CONFIG_PREEMPT=y

CONFIG_HIGHMEM=y

CONFIG_ARM_MODULE_PLTS=y

arch/arm64/boot/dts/qcom/sdxprairie-pcie.dtsi

+6 −1
Original line number Diff line number Diff line
@@ -209,7 +209,9 @@ 
			<0x100 &apps_smmu 0x0201 0x1>,

			<0x200 &apps_smmu 0x0202 0x1>,

			<0x300 &apps_smmu 0x0203 0x1>,

			<0x400 &apps_smmu 0x0204 0x1>;

			<0x400 &apps_smmu 0x0204 0x1>,

			<0x208 &apps_smmu 0x0205 0x1>,

			<0x210 &apps_smmu 0x0206 0x1>;



		qcom,msm-bus,name = "pcie0";

		qcom,msm-bus,num-cases = <2>;
@@ -252,17 +254,20 @@ 
			pcie0_bus1_dev0_fn0: pcie0_bus1_dev0_fn0 {

				reg = <0 0 0 0 0>;

				pci-ids = "12d8:b304";

				errata = <0>;



				/* BDF 2.1.0 */

				pcie0_bus2_dev1_fn0: pcie0_bus2_dev1_fn0 {

					reg = <0x800 0 0 0 0>;

					pci-ids = "12d8:b304";

					errata = <1>;

				};



				/* BDF 2.2.0 */

				pcie0_bus2_dev2_fn0: pcie0_bus2_dev2_fn0 {

					reg = <0x1000 0 0 0 0>;

					pci-ids = "12d8:b304";

					errata = <2>;

				};

			};

		};

drivers/pci/switch/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -10,4 +10,12 @@ config PCI_SW_SWITCHTEC 
	 devices. See <file:Documentation/switchtec.txt> for more

	 information.



config PCI_SW_QCOM_SWITCH

	depends on ARCH_QCOM

	tristate "Qualcomm Technologies, Inc. PCIe Switch Management Driver"

	help

	 Enables support for switches connected to Qualcomm Technologies, Inc.

	 PCIe Rootport. Switches that require erratas can bind with this driver

	 and run errata for the corresponding port.



endmenu