Skip to contentSkip to conversation

powerpc: don't create two devices for each cpm_uart device tree node

PATCH In review Nikita V. Youshchenko 2 participants 3 messages Feb 19, 2008 – Feb 21, 2008 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc: don't create two devices for each cpm_uart device tree node

powerpc: don't create two devices for each cpm_uart device tree node

Code in arch/powerpc/sysdev/fsl_soc.c used to create two 'struct device' objects for each cpm_uart device tree node - one "fsl-cpm-scc:uart" in cpm_uart_of_init() and one "fsl-cpm-smc:uart" in cpm_smc_uart_of_init().

This patch adds additional test to those routines, such that cpm_uart_of_init() only registers devices with model "SCC", and cpm_smc_uart_of_init() only registers devices with model "SMC".

arch/powerpc/sysdev/fsl_soc.c +8 -2
index f1b8412..536f8c9 100644
@@ -890,6 +890,10 @@ static int __init cpm_uart_of_init(void)
 		const int *id;
 		const char *model;
 
+		model = of_get_property(np, "model", NULL);
+		if (!model || strcmp(model, "SCC") != 0)
+			continue;
+
 		memset(r, 0, sizeof(r));
 		memset(&cpm_uart_data, 0, sizeof(cpm_uart_data));
 
@@ -917,7 +921,6 @@ static int __init cpm_uart_of_init(void)
 		id = of_get_property(np, "device-id", NULL);
 		cpm_uart_data.fs_no = *id;
 
-		model = of_get_property(np, "model", NULL);
 		strcpy(cpm_uart_data.fs_type, model);
 
 		cpm_uart_data.uart_clk = ppc_proc_freq;
@@ -1175,6 +1178,10 @@ static int __init cpm_smc_uart_of_init(void)
 		const int *id;
 		const char *model;
 
+		model = of_get_property(np, "model", NULL);
+		if (!model || strcmp(model, "SMC") != 0)
+			continue;
+
 		memset(r, 0, sizeof(r));
 		memset(&cpm_uart_data, 0, sizeof(cpm_uart_data));
 
@@ -1200,7 +1207,6 @@ static int __init cpm_smc_uart_of_init(void)
 			goto err;
 		}
 
-		model = of_get_property(np, "model", NULL);
 		strcpy(cpm_uart_data.fs_type, model);
 
 		id = of_get_property(np, "device-id", NULL);
#1 lore raw
Quoted 6 lines · Nikita V. Youshchenko

powerpc: don't create two devices for each cpm_uart device tree node

Code in arch/powerpc/sysdev/fsl_soc.c used to create two 'struct device' objects for each cpm_uart device tree node - one "fsl-cpm-scc:uart" in cpm_uart_of_init() and one "fsl-cpm-smc:uart" in cpm_smc_uart_of_init().

This is old code that only exists for non-CONFIG_PPC_CPM_NEW_BINDING boards. As there are none of these remaining in-tree, this code should go away soon.

-Scott

#2 lore raw
Quoted 12 lines · Nikita V. Youshchenko
Quoted 7 lines

powerpc: don't create two devices for each cpm_uart device tree
node

Code in arch/powerpc/sysdev/fsl_soc.c used to create two 'struct
device' objects for each cpm_uart device tree node - one "fsl-cpm-scc:uart" in cpm_uart_of_init() and one "fsl-cpm-smc:uart" in cpm_smc_uart_of_init().

This is old code that only exists for non-CONFIG_PPC_CPM_NEW_BINDING boards. As there are none of these remaining in-tree, this code should go away soon.

Thank you for information.

I am working with vendor kernel, based on 2.6.18, and that does not have CONFIG_PPC_CPM_NEW_BINDING. I thought that fix I made for that kernel could be usable for mainline, but if not - nevermind.