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

Commit 14bdc913 authored by Timur Tabi's avatar Timur Tabi Committed by Kumar Gala
Browse files

powerpc/85xx: fix various PCI node compatible strings 



Fix and/or improve the compatible strings of the PCI device tree nodes for
some Freescale SOCs.  This fixes some issues and improves consistency among
the SOCs.

Specifically:

1) The P1022 has a v1 PCIe controller, so the compatible property should just
say "fsl,mpc8548-pcie".  U-Boot does not look for "fsl,p1022-pcie", so it
wasn't fixing up the node.

2) The P4080 has a v2.1 PCIe controller, so add that version-specific string
to the device tree.  Update the kernel to also look for that string.
Currently, the kernel looks for "fsl,p4080-pcie" specifically, but
eventually that check should be deleted.

3) The P1010 device tree claims compatibility with v2.2 and v2.3, but that's
redundant.  No other device tree does this.  Remove the v2.2 string.

4) The kernel looks for both "fsl,p1023-pcie" and "fsl,qoriq-pcie-v2.2",
even though the P1023 device trees has always included both strings.  Remove
the search for "fsl,p1023-pcie".

Signed-off-by: default avatarTimur Tabi <timur@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 0408753f

arch/powerpc/boot/dts/fsl/p1010si-post.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 


/* controller at 0x9000 */

&pci0 {

	compatible = "fsl,p1010-pcie", "fsl,qoriq-pcie-v2.3", "fsl,qoriq-pcie-v2.2";

	compatible = "fsl,p1010-pcie", "fsl,qoriq-pcie-v2.3";

	device_type = "pci";

	#size-cells = <2>;

	#address-cells = <3>;
@@ -69,7 +69,7 @@ 


/* controller at 0xa000 */

&pci1 {

	compatible = "fsl,p1010-pcie", "fsl,qoriq-pcie-v2.3", "fsl,qoriq-pcie-v2.2";

	compatible = "fsl,p1010-pcie", "fsl,qoriq-pcie-v2.3";

	device_type = "pci";

	#size-cells = <2>;

	#address-cells = <3>;

arch/powerpc/boot/dts/fsl/p1022si-post.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 


/* controller at 0x9000 */

&pci0 {

	compatible = "fsl,p1022-pcie";

	compatible = "fsl,mpc8548-pcie";

	device_type = "pci";

	#size-cells = <2>;

	#address-cells = <3>;
@@ -73,7 +73,7 @@ 


/* controller at 0xa000 */

&pci1 {

	compatible = "fsl,p1022-pcie";

	compatible = "fsl,mpc8548-pcie";

	device_type = "pci";

	#size-cells = <2>;

	#address-cells = <3>;
@@ -102,7 +102,7 @@ 


/* controller at 0xb000 */

&pci2 {

	compatible = "fsl,p1022-pcie";

	compatible = "fsl,mpc8548-pcie";

	device_type = "pci";

	#size-cells = <2>;

	#address-cells = <3>;

arch/powerpc/boot/dts/fsl/p4080si-post.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 


/* controller at 0x200000 */

&pci0 {

	compatible = "fsl,p4080-pcie";

	compatible = "fsl,p4080-pcie", "fsl,qoriq-pcie-v2.1";

	device_type = "pci";

	#size-cells = <2>;

	#address-cells = <3>;
@@ -70,7 +70,7 @@ 


/* controller at 0x201000 */

&pci1 {

	compatible = "fsl,p4080-pcie";

	compatible = "fsl,p4080-pcie", "fsl,qoriq-pcie-v2.1";

	device_type = "pci";

	#size-cells = <2>;

	#address-cells = <3>;
@@ -99,7 +99,7 @@ 


/* controller at 0x202000 */

&pci2 {

	compatible = "fsl,p4080-pcie";

	compatible = "fsl,p4080-pcie", "fsl,qoriq-pcie-v2.1";

	device_type = "pci";

	#size-cells = <2>;

	#address-cells = <3>;

arch/powerpc/sysdev/fsl_pci.c

+10 −5
Original line number Diff line number Diff line
@@ -827,13 +827,18 @@ static const struct of_device_id pci_ids[] = { 
	{ .compatible = "fsl,mpc8548-pcie", },

	{ .compatible = "fsl,mpc8610-pci", },

	{ .compatible = "fsl,mpc8641-pcie", },

	{ .compatible = "fsl,qoriq-pcie-v2.1", },

	{ .compatible = "fsl,qoriq-pcie-v2.2", },

	{ .compatible = "fsl,qoriq-pcie-v2.3", },

	{ .compatible = "fsl,qoriq-pcie-v2.4", },



	/*

	 * The following entries are for compatibility with older device

	 * trees.

	 */

	{ .compatible = "fsl,p1022-pcie", },

	{ .compatible = "fsl,p1010-pcie", },

	{ .compatible = "fsl,p1023-pcie", },

	{ .compatible = "fsl,p4080-pcie", },

	{ .compatible = "fsl,qoriq-pcie-v2.4", },

	{ .compatible = "fsl,qoriq-pcie-v2.3", },

	{ .compatible = "fsl,qoriq-pcie-v2.2", },



	{},

};