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

Commit c0fabf75 authored by Morten Banzon's avatar Morten Banzon Committed by Paul Mackerras
Browse files

[PPC] MCC2 missing in MPC826x device_list 



Adds the MCC2 device to the 826x device_list and fixed MCC1/MCC2 entries
in all other PQ2 processors.

Signed-off-by: default avatarMorten Banzon <morten.banzon@ericsson.com>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 4da421d6

arch/ppc/syslib/pq2_sys.c

+20 −16
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ struct ppc_sys_spec ppc_sys_specs[] = { 
		{

			MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3,

			MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3,

			MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_SMC1,

			MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC2, MPC82xx_CPM_SMC1,

			MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C,

		}

	},
@@ -39,7 +39,7 @@ struct ppc_sys_spec ppc_sys_specs[] = { 
		{

			MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_SCC1,

			MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3, MPC82xx_CPM_SCC4,

			MPC82xx_CPM_MCC1, MPC82xx_CPM_SMC1, MPC82xx_CPM_SMC2,

			MPC82xx_CPM_MCC2, MPC82xx_CPM_SMC1, MPC82xx_CPM_SMC2,

			MPC82xx_CPM_SPI, MPC82xx_CPM_I2C,

		}

	},
@@ -47,52 +47,56 @@ struct ppc_sys_spec ppc_sys_specs[] = { 
		.ppc_sys_name	= "8260",

		.mask		= 0x0000ff00,

		.value		= 0x00000000,

		.num_devices	= 12,

		.num_devices	= 13,

		.device_list = (enum ppc_sys_devices[])

		{

			MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3,

			MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3,

			MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_SMC1,

			MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C,

			MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_MCC2,

			MPC82xx_CPM_SMC1, MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI,

			MPC82xx_CPM_I2C,

		}

	},

	{

		.ppc_sys_name	= "8264",

		.mask		= 0x0000ff00,

		.value		= 0x00000000,

		.num_devices	= 12,

		.num_devices	= 13,

		.device_list = (enum ppc_sys_devices[])

		{

			MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3,

			MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3,

			MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_SMC1,

			MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C,

			MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_MCC2,

			MPC82xx_CPM_SMC1, MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI,

			MPC82xx_CPM_I2C,

		}

	},

	{

		.ppc_sys_name	= "8265",

		.mask		= 0x0000ff00,

		.value		= 0x00000000,

		.num_devices	= 12,

		.num_devices	= 13,

		.device_list = (enum ppc_sys_devices[])

		{

			MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3,

			MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3,

			MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_SMC1,

			MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C,

			MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_MCC2,

			MPC82xx_CPM_SMC1, MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI,

			MPC82xx_CPM_I2C,

		}

	},

	{

		.ppc_sys_name	= "8266",

		.mask		= 0x0000ff00,

		.value		= 0x00000000,

		.num_devices	= 12,

		.num_devices	= 13,

		.device_list = (enum ppc_sys_devices[])

		{

			MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3,

			MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3,

			MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_SMC1,

			MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C,

			MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_MCC2,

			MPC82xx_CPM_SMC1, MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI,

			MPC82xx_CPM_I2C,

		}

	},

	/* below is a list of the 8272 family of processors */
@@ -159,7 +163,7 @@ struct ppc_sys_spec ppc_sys_specs[] = { 
		{

			MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3,

			MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3,

			MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_SMC1,

			MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC2, MPC82xx_CPM_SMC1,

			MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C,

		},

	},
@@ -172,7 +176,7 @@ struct ppc_sys_spec ppc_sys_specs[] = { 
		{

			MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3,

			MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3,

			MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_SMC1,

			MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC2, MPC82xx_CPM_SMC1,

			MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C,

		},

	},