Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc (37185856) · Commits · e / devices / android_kernel_fairphone_FP5

MAINTAINERS

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -565,7 +565,7 @@ BROADBAND PROCESSOR ARCHITECTURE
	P: Arnd Bergmann		P: Arnd Bergmann
	M: arnd@arndb.de		M: arnd@arndb.de
	L: linuxppc-dev@ozlabs.org		L: linuxppc-dev@ozlabs.org
	W: http://linuxppc64.org		W: http://www.penguinppc.org/ppc64/
	S: Supported		S: Supported

	BTTV VIDEO4LINUX DRIVER		BTTV VIDEO4LINUX DRIVER
	@@ -1716,7 +1716,7 @@ M: paulus@au.ibm.com
	P: Anton Blanchard		P: Anton Blanchard
	M: anton@samba.org		M: anton@samba.org
	M: anton@au.ibm.com		M: anton@au.ibm.com
	W: http://linuxppc64.org		W: http://www.penguinppc.org/ppc64/
	L: linuxppc-dev@ozlabs.org		L: linuxppc-dev@ozlabs.org
	S: Supported		S: Supported

arch/powerpc/kernel/prom_init.c

+45 −3

Original line number	Original line	Diff line number	Diff line
	@@ -2057,10 +2057,45 @@ static void __init flatten_device_tree(void)

	}		}

			#ifdef CONFIG_PPC_MAPLE
	static void __init fixup_device_tree(void)		/* PIBS Version 1.05.0000 04/26/2005 has an incorrect /ht/isa/ranges property.
			* The values are bad, and it doesn't even have the right number of cells. */
			static void __init fixup_device_tree_maple(void)
	{		{
			phandle isa;
			u32 isa_ranges[6];

			isa = call_prom("finddevice", 1, 1, ADDR("/ht@0/isa@4"));
			if (!PHANDLE_VALID(isa))
			return;

			if (prom_getprop(isa, "ranges", isa_ranges, sizeof(isa_ranges))
			== PROM_ERROR)
			return;

			if (isa_ranges[0] != 0x1 \|\|
			isa_ranges[1] != 0xf4000000 \|\|
			isa_ranges[2] != 0x00010000)
			return;

			prom_printf("fixing up bogus ISA range on Maple...\n");

			isa_ranges[0] = 0x1;
			isa_ranges[1] = 0x0;
			isa_ranges[2] = 0x01002000; /* IO space; PCI device = 4 */
			isa_ranges[3] = 0x0;
			isa_ranges[4] = 0x0;
			isa_ranges[5] = 0x00010000;
			prom_setprop(isa, "/ht@0/isa@4", "ranges",
			isa_ranges, sizeof(isa_ranges));
			}
			#else
			#define fixup_device_tree_maple()
			#endif

	#if defined(CONFIG_PPC64) && defined(CONFIG_PPC_PMAC)		#if defined(CONFIG_PPC64) && defined(CONFIG_PPC_PMAC)
			static void __init fixup_device_tree_pmac(void)
			{
	phandle u3, i2c, mpic;		phandle u3, i2c, mpic;
	u32 u3_rev;		u32 u3_rev;
	u32 interrupts[2];		u32 interrupts[2];
	@@ -2097,9 +2132,16 @@ static void __init fixup_device_tree(void)
	parent = (u32)mpic;		parent = (u32)mpic;
	prom_setprop(i2c, "/u3@0,f8000000/i2c@f8001000", "interrupt-parent",		prom_setprop(i2c, "/u3@0,f8000000/i2c@f8001000", "interrupt-parent",
	&parent, sizeof(parent));		&parent, sizeof(parent));
	#endif
	}		}
			#else
			#define fixup_device_tree_pmac()
			#endif

			static void __init fixup_device_tree(void)
			{
			fixup_device_tree_maple();
			fixup_device_tree_pmac();
			}

	static void __init prom_find_boot_cpu(void)		static void __init prom_find_boot_cpu(void)
	{		{

arch/ppc/platforms/mpc8272ads_setup.c

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -279,11 +279,11 @@ static int mpc8272ads_platform_notify(struct device *dev)
	static const struct platform_notify_dev_map dev_map[] = {		static const struct platform_notify_dev_map dev_map[] = {
	{		{
	.bus_id = "fsl-cpm-fcc",		.bus_id = "fsl-cpm-fcc",
	.rtn = mpc8272ads_fixup_enet_pdata		.rtn = mpc8272ads_fixup_enet_pdata,
	},		},
	{		{
	.bus_id = "fsl-cpm-scc:uart",		.bus_id = "fsl-cpm-scc:uart",
	.rtn = mpc		.rtn = mpc8272ads_fixup_uart_pdata,
	},		},
	{		{
	.bus_id = NULL		.bus_id = NULL
	@@ -335,15 +335,15 @@ struct platform_device* early_uart_get_pdev(int index)
	struct platform_device* pdev = NULL;		struct platform_device* pdev = NULL;
	if(index) { /assume SCC4 here/		if(index) { /assume SCC4 here/
	pdev = &ppc_sys_platform_devices[MPC82xx_CPM_SCC4];		pdev = &ppc_sys_platform_devices[MPC82xx_CPM_SCC4];
	pinfo = &mpc8272<F12>_uart_pdata[1];		pinfo = &mpc8272_uart_pdata[fsid_scc4_uart];
	} else { /over SCC1/		} else { /over SCC1/
	pdev = &ppc_sys_platform_devices[MPC82xx_CPM_SCC1];		pdev = &ppc_sys_platform_devices[MPC82xx_CPM_SCC1];
	pinfo = &mpc8272_uart_pdata[0];		pinfo = &mpc8272_uart_pdata[fsid_scc1_uart];
	}		}

	pinfo->uart_clk = bd->bi_intfreq;		pinfo->uart_clk = bd->bi_intfreq;
	pdev->dev.platform_data = pinfo;		pdev->dev.platform_data = pinfo;
	ppc_sys_fixup_mem_resource(pdev, IMAP_ADDR);		ppc_sys_fixup_mem_resource(pdev, CPM_MAP_ADDR);
	return NULL;		return NULL;
	}		}

arch/ppc/syslib/pq2_devices.c

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -121,13 +121,13 @@ struct platform_device ppc_sys_platform_devices[] = {
	.num_resources = 3,		.num_resources = 3,
	.resource = (struct resource[]) {		.resource = (struct resource[]) {
	{		{
	.name = "scc_mem",		.name = "regs",
	.start = 0x11A00,		.start = 0x11A00,
	.end = 0x11A1F,		.end = 0x11A1F,
	.flags = IORESOURCE_MEM,		.flags = IORESOURCE_MEM,
	},		},
	{		{
	.name = "scc_pram",		.name = "pram",
	.start = 0x8000,		.start = 0x8000,
	.end = 0x80ff,		.end = 0x80ff,
	.flags = IORESOURCE_MEM,		.flags = IORESOURCE_MEM,
	@@ -145,13 +145,13 @@ struct platform_device ppc_sys_platform_devices[] = {
	.num_resources = 3,		.num_resources = 3,
	.resource = (struct resource[]) {		.resource = (struct resource[]) {
	{		{
	.name = "scc_mem",		.name = "regs",
	.start = 0x11A20,		.start = 0x11A20,
	.end = 0x11A3F,		.end = 0x11A3F,
	.flags = IORESOURCE_MEM,		.flags = IORESOURCE_MEM,
	},		},
	{		{
	.name = "scc_pram",		.name = "pram",
	.start = 0x8100,		.start = 0x8100,
	.end = 0x81ff,		.end = 0x81ff,
	.flags = IORESOURCE_MEM,		.flags = IORESOURCE_MEM,
	@@ -169,13 +169,13 @@ struct platform_device ppc_sys_platform_devices[] = {
	.num_resources = 3,		.num_resources = 3,
	.resource = (struct resource[]) {		.resource = (struct resource[]) {
	{		{
	.name = "scc_mem",		.name = "regs",
	.start = 0x11A40,		.start = 0x11A40,
	.end = 0x11A5F,		.end = 0x11A5F,
	.flags = IORESOURCE_MEM,		.flags = IORESOURCE_MEM,
	},		},
	{		{
	.name = "scc_pram",		.name = "pram",
	.start = 0x8200,		.start = 0x8200,
	.end = 0x82ff,		.end = 0x82ff,
	.flags = IORESOURCE_MEM,		.flags = IORESOURCE_MEM,
	@@ -193,13 +193,13 @@ struct platform_device ppc_sys_platform_devices[] = {
	.num_resources = 3,		.num_resources = 3,
	.resource = (struct resource[]) {		.resource = (struct resource[]) {
	{		{
	.name = "scc_mem",		.name = "regs",
	.start = 0x11A60,		.start = 0x11A60,
	.end = 0x11A7F,		.end = 0x11A7F,
	.flags = IORESOURCE_MEM,		.flags = IORESOURCE_MEM,
	},		},
	{		{
	.name = "scc_pram",		.name = "pram",
	.start = 0x8300,		.start = 0x8300,
	.end = 0x83ff,		.end = 0x83ff,
	.flags = IORESOURCE_MEM,		.flags = IORESOURCE_MEM,

arch/ppc/syslib/pq2_sys.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -139,13 +139,13 @@ struct ppc_sys_spec ppc_sys_specs[] = {
	.ppc_sys_name = "8272",		.ppc_sys_name = "8272",
	.mask = 0x0000ff00,		.mask = 0x0000ff00,
	.value = 0x00000c00,		.value = 0x00000c00,
	.num_devices = 11,		.num_devices = 12,
	.device_list = (enum ppc_sys_devices[])		.device_list = (enum ppc_sys_devices[])
	{		{
	MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_SCC1,		MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_SCC1,
	MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3, MPC82xx_CPM_SMC1,		MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3, MPC82xx_CPM_SCC4,
	MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C,		MPC82xx_CPM_SMC1, MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI,
	MPC82xx_CPM_USB, MPC82xx_SEC1,		MPC82xx_CPM_I2C, MPC82xx_CPM_USB, MPC82xx_SEC1,
	},		},
	},		},
	/* below is a list of the 8280 family of processors */		/* below is a list of the 8280 family of processors */