diff options
Diffstat (limited to 'arch/powerpc/sysdev/fsl_soc.c')
-rw-r--r-- | arch/powerpc/sysdev/fsl_soc.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c index 4e72bb983636..022ed275ea68 100644 --- a/arch/powerpc/sysdev/fsl_soc.c +++ b/arch/powerpc/sysdev/fsl_soc.c | |||
@@ -622,6 +622,7 @@ static int __init fs_enet_of_init(void) | |||
622 | 622 | ||
623 | id = get_property(np, "device-id", NULL); | 623 | id = get_property(np, "device-id", NULL); |
624 | fs_enet_data.fs_no = *id; | 624 | fs_enet_data.fs_no = *id; |
625 | strcpy(fs_enet_data.fs_type, model); | ||
625 | 626 | ||
626 | mdio = of_get_parent(phy); | 627 | mdio = of_get_parent(phy); |
627 | ret = of_address_to_resource(mdio, 0, &res); | 628 | ret = of_address_to_resource(mdio, 0, &res); |
@@ -635,7 +636,7 @@ static int __init fs_enet_of_init(void) | |||
635 | fs_enet_data.clk_tx = *((u32 *) get_property(np, "tx-clock", NULL)); | 636 | fs_enet_data.clk_tx = *((u32 *) get_property(np, "tx-clock", NULL)); |
636 | 637 | ||
637 | if (strstr(model, "FCC")) { | 638 | if (strstr(model, "FCC")) { |
638 | int fcc_index = fs_get_fcc_index(*id); | 639 | int fcc_index = *id - 1; |
639 | 640 | ||
640 | fs_enet_data.dpram_offset = (u32)cpm_dpram_addr(0); | 641 | fs_enet_data.dpram_offset = (u32)cpm_dpram_addr(0); |
641 | fs_enet_data.rx_ring = 32; | 642 | fs_enet_data.rx_ring = 32; |
@@ -688,6 +689,7 @@ static int __init cpm_uart_of_init(void) | |||
688 | struct resource r[3]; | 689 | struct resource r[3]; |
689 | struct fs_uart_platform_info cpm_uart_data; | 690 | struct fs_uart_platform_info cpm_uart_data; |
690 | const int *id; | 691 | const int *id; |
692 | const char *model; | ||
691 | 693 | ||
692 | memset(r, 0, sizeof(r)); | 694 | memset(r, 0, sizeof(r)); |
693 | memset(&cpm_uart_data, 0, sizeof(cpm_uart_data)); | 695 | memset(&cpm_uart_data, 0, sizeof(cpm_uart_data)); |
@@ -716,6 +718,10 @@ static int __init cpm_uart_of_init(void) | |||
716 | 718 | ||
717 | id = get_property(np, "device-id", NULL); | 719 | id = get_property(np, "device-id", NULL); |
718 | cpm_uart_data.fs_no = *id; | 720 | cpm_uart_data.fs_no = *id; |
721 | |||
722 | model = (char*)get_property(np, "model", NULL); | ||
723 | strcpy(cpm_uart_data.fs_type, model); | ||
724 | |||
719 | cpm_uart_data.uart_clk = ppc_proc_freq; | 725 | cpm_uart_data.uart_clk = ppc_proc_freq; |
720 | 726 | ||
721 | cpm_uart_data.tx_num_fifo = 4; | 727 | cpm_uart_data.tx_num_fifo = 4; |