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

Commit 2b00b254 authored by Olof Johansson's avatar Olof Johansson Committed by Paul Mackerras
Browse files

[POWERPC] Fix fsl_soc build breaks 



Hrm, there's no way this ever built at time of merge. There's a missing } and
the wrong type on phy_irq.

Also, another const for get_property().

  CC      arch/powerpc/sysdev/fsl_soc.o
arch/powerpc/sysdev/fsl_soc.c: In function 'fs_enet_of_init':
arch/powerpc/sysdev/fsl_soc.c:625: error: assignment of read-only variable 'phy_irq'
arch/powerpc/sysdev/fsl_soc.c:625: warning: assignment makes integer from pointer without a cast
arch/powerpc/sysdev/fsl_soc.c:661: warning: assignment discards qualifiers from pointer target type
arch/powerpc/sysdev/fsl_soc.c:684: error: subscripted value is neither array nor pointer
arch/powerpc/sysdev/fsl_soc.c:687: error: subscripted value is neither array nor pointer
arch/powerpc/sysdev/fsl_soc.c:722: warning: ISO C90 forbids mixed declarations and code
arch/powerpc/sysdev/fsl_soc.c:728: error: invalid storage class for function 'cpm_uart_of_init'
arch/powerpc/sysdev/fsl_soc.c:798: error: initializer element is not constant
arch/powerpc/sysdev/fsl_soc.c:798: error: expected declaration or statement at end of input
make[1]: *** [arch/powerpc/sysdev/fsl_soc.o] Error 1

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent c1ce464d

arch/powerpc/sysdev/fsl_soc.c

+5 −4
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ static int __init fs_enet_of_init(void) 
		struct resource r[4];

		struct device_node *phy, *mdio;

		struct fs_platform_info fs_enet_data;

		const unsigned int *id, *phy_addr, phy_irq;

		const unsigned int *id, *phy_addr, *phy_irq;

		const void *mac_addr;

		const phandle *ph;

		const char *model;
@@ -641,7 +641,7 @@ static int __init fs_enet_of_init(void) 


		if (strstr(model, "FCC")) {

			int fcc_index = *id - 1;

			unsigned char* mdio_bb_prop;

			const unsigned char *mdio_bb_prop;



			fs_enet_data.dpram_offset = (u32)cpm_dpram_addr(0);

			fs_enet_data.rx_ring = 32;
@@ -711,6 +711,7 @@ static int __init fs_enet_of_init(void) 
			if (ret)

				goto unreg;

		}

	}

	return 0;



unreg: