Skip to content

Commit

Permalink
POWERPC: Add cpm2 stuff support to the fsl_soc.c
Browse files Browse the repository at this point in the history 
This patch contains necessary modifications to support the CPM2 SoC peripherals.
For the time being, those are fs_enet Ethernet driver and cpm_uart serial.
Written initially to support mpc8560, it also suites to the part of the large PQ2
(more specifically, mpc8260) family.

Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
  • Loading branch information
Vitaly Bordug committed Sep 21, 2006
1 parent 7dcd86e commit fba4366
Show file tree
Hide file tree
Showing 2 changed files with 265 additions and 5 deletions.
268 changes: 263 additions & 5 deletions arch/powerpc/sysdev/fsl_soc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
*
* Maintained by Kumar Gala (see MAINTAINERS for contact information)
*
* 2006 (c) MontaVista Software, Inc.
* Vitaly Bordug <vbordug@ru.mvista.com>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
Expand All @@ -20,14 +23,18 @@
#include <linux/device.h>
#include <linux/platform_device.h>
#include <linux/fsl_devices.h>
#include <linux/fs_enet_pd.h>
#include <linux/fs_uart_pd.h>

#include <asm/system.h>
#include <asm/atomic.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/time.h>
#include <asm/prom.h>
#include <sysdev/fsl_soc.h>
#include <mm/mmu_decl.h>
#include <asm/cpm2.h>

static phys_addr_t immrbase = -1;

Expand All @@ -42,7 +49,9 @@ phys_addr_t get_immrbase(void)
if (soc) {
unsigned int size;
const void *prop = get_property(soc, "reg", &size);
immrbase = of_translate_address(soc, prop);

if (prop)
immrbase = of_translate_address(soc, prop);
of_node_put(soc);
};

Expand All @@ -51,6 +60,59 @@ phys_addr_t get_immrbase(void)

EXPORT_SYMBOL(get_immrbase);

#ifdef CONFIG_CPM2

static u32 brgfreq = -1;

u32 get_brgfreq(void)
{
struct device_node *node;

if (brgfreq != -1)
return brgfreq;

node = of_find_node_by_type(NULL, "cpm");
if (node) {
unsigned int size;
const unsigned int *prop = get_property(node, "brg-frequency",
&size);

if (prop)
brgfreq = *prop;
of_node_put(node);
};

return brgfreq;
}

EXPORT_SYMBOL(get_brgfreq);

static u32 fs_baudrate = -1;

u32 get_baudrate(void)
{
struct device_node *node;

if (fs_baudrate != -1)
return fs_baudrate;

node = of_find_node_by_type(NULL, "serial");
if (node) {
unsigned int size;
const unsigned int *prop = get_property(node, "current-speed",
&size);

if (prop)
fs_baudrate = *prop;
of_node_put(node);
};

return fs_baudrate;
}

EXPORT_SYMBOL(get_baudrate);
#endif /* CONFIG_CPM2 */

static int __init gfar_mdio_of_init(void)
{
struct device_node *np;
Expand Down Expand Up @@ -85,8 +147,11 @@ static int __init gfar_mdio_of_init(void)
mdio_data.irq[k] = -1;

while ((child = of_get_next_child(np, child)) != NULL) {
const u32 *id = get_property(child, "reg", NULL);
mdio_data.irq[*id] = irq_of_parse_and_map(child, 0);
int irq = irq_of_parse_and_map(child, 0);
if (irq != NO_IRQ) {
const u32 *id = get_property(child, "reg", NULL);
mdio_data.irq[*id] = irq;
}
}

ret =
Expand Down Expand Up @@ -128,7 +193,7 @@ static int __init gfar_of_init(void)
const char *model;
const void *mac_addr;
const phandle *ph;
int n_res = 1;
int n_res = 2;

memset(r, 0, sizeof(r));
memset(&gfar_data, 0, sizeof(gfar_data));
Expand Down Expand Up @@ -159,7 +224,7 @@ static int __init gfar_of_init(void)

gfar_dev =
platform_device_register_simple("fsl-gianfar", i, &r[0],
n_res + 1);
n_res);

if (IS_ERR(gfar_dev)) {
ret = PTR_ERR(gfar_dev);
Expand Down Expand Up @@ -478,3 +543,196 @@ static int __init fsl_usb_of_init(void)
}

arch_initcall(fsl_usb_of_init);

#ifdef CONFIG_CPM2

static const char fcc_regs[] = "fcc_regs";
static const char fcc_regs_c[] = "fcc_regs_c";
static const char fcc_pram[] = "fcc_pram";
static char bus_id[9][BUS_ID_SIZE];

static int __init fs_enet_of_init(void)
{
struct device_node *np;
unsigned int i;
struct platform_device *fs_enet_dev;
struct resource res;
int ret;

for (np = NULL, i = 0;
(np = of_find_compatible_node(np, "network", "fs_enet")) != NULL;
i++) {
struct resource r[4];
struct device_node *phy, *mdio;
struct fs_platform_info fs_enet_data;
const unsigned int *id, *phy_addr;
const void *mac_addr;
const phandle *ph;
const char *model;

memset(r, 0, sizeof(r));
memset(&fs_enet_data, 0, sizeof(fs_enet_data));

ret = of_address_to_resource(np, 0, &r[0]);
if (ret)
goto err;
r[0].name = fcc_regs;

ret = of_address_to_resource(np, 1, &r[1]);
if (ret)
goto err;
r[1].name = fcc_pram;

ret = of_address_to_resource(np, 2, &r[2]);
if (ret)
goto err;
r[2].name = fcc_regs_c;

r[3].start = r[3].end = irq_of_parse_and_map(np, 0);
r[3].flags = IORESOURCE_IRQ;

fs_enet_dev =
platform_device_register_simple("fsl-cpm-fcc", i, &r[0], 4);

if (IS_ERR(fs_enet_dev)) {
ret = PTR_ERR(fs_enet_dev);
goto err;
}

model = get_property(np, "model", NULL);
if (model == NULL) {
ret = -ENODEV;
goto unreg;
}

mac_addr = get_property(np, "mac-address", NULL);
memcpy(fs_enet_data.macaddr, mac_addr, 6);

ph = get_property(np, "phy-handle", NULL);
phy = of_find_node_by_phandle(*ph);

if (phy == NULL) {
ret = -ENODEV;
goto unreg;
}

phy_addr = get_property(phy, "reg", NULL);
fs_enet_data.phy_addr = *phy_addr;

id = get_property(np, "device-id", NULL);
fs_enet_data.fs_no = *id;

mdio = of_get_parent(phy);
ret = of_address_to_resource(mdio, 0, &res);
if (ret) {
of_node_put(phy);
of_node_put(mdio);
goto unreg;
}

if (strstr(model, "FCC")) {
int fcc_index = fs_get_fcc_index(*id);

fs_enet_data.dpram_offset = (u32)cpm2_immr->im_dprambase;
fs_enet_data.rx_ring = 32;
fs_enet_data.tx_ring = 32;
fs_enet_data.rx_copybreak = 240;
fs_enet_data.use_napi = 0;
fs_enet_data.napi_weight = 17;
fs_enet_data.mem_offset = FCC_MEM_OFFSET(fcc_index);
fs_enet_data.cp_page = CPM_CR_FCC_PAGE(fcc_index);
fs_enet_data.cp_block = CPM_CR_FCC_SBLOCK(fcc_index);

snprintf((char*)&bus_id[(*id)], BUS_ID_SIZE, "%x:%02x",
(u32)res.start, fs_enet_data.phy_addr);
fs_enet_data.bus_id = (char*)&bus_id[(*id)];
}

of_node_put(phy);
of_node_put(mdio);

ret = platform_device_add_data(fs_enet_dev, &fs_enet_data,
sizeof(struct
fs_platform_info));
if (ret)
goto unreg;
}
return 0;

unreg:
platform_device_unregister(fs_enet_dev);
err:
return ret;
}

arch_initcall(fs_enet_of_init);

static const char scc_regs[] = "regs";
static const char scc_pram[] = "pram";

static int __init cpm_uart_of_init(void)
{
struct device_node *np;
unsigned int i;
struct platform_device *cpm_uart_dev;
int ret;

for (np = NULL, i = 0;
(np = of_find_compatible_node(np, "serial", "cpm_uart")) != NULL;
i++) {
struct resource r[3];
struct fs_uart_platform_info cpm_uart_data;
const int *id;

memset(r, 0, sizeof(r));
memset(&cpm_uart_data, 0, sizeof(cpm_uart_data));

ret = of_address_to_resource(np, 0, &r[0]);
if (ret)
goto err;

r[0].name = scc_regs;

ret = of_address_to_resource(np, 1, &r[1]);
if (ret)
goto err;
r[1].name = scc_pram;

r[2].start = r[2].end = irq_of_parse_and_map(np, 0);
r[2].flags = IORESOURCE_IRQ;

cpm_uart_dev =
platform_device_register_simple("fsl-cpm-scc:uart", i, &r[0], 3);

if (IS_ERR(cpm_uart_dev)) {
ret = PTR_ERR(cpm_uart_dev);
goto err;
}

id = get_property(np, "device-id", NULL);
cpm_uart_data.fs_no = *id;
cpm_uart_data.uart_clk = ppc_proc_freq;

cpm_uart_data.tx_num_fifo = 4;
cpm_uart_data.tx_buf_size = 32;
cpm_uart_data.rx_num_fifo = 4;
cpm_uart_data.rx_buf_size = 32;

ret =
platform_device_add_data(cpm_uart_dev, &cpm_uart_data,
sizeof(struct
fs_uart_platform_info));
if (ret)
goto unreg;
}

return 0;

unreg:
platform_device_unregister(cpm_uart_dev);
err:
return ret;
}

arch_initcall(cpm_uart_of_init);
#endif /* CONFIG_CPM2 */
2 changes: 2 additions & 0 deletions arch/powerpc/sysdev/fsl_soc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
#ifdef __KERNEL__

extern phys_addr_t get_immrbase(void);
extern u32 get_brgfreq(void);
extern u32 get_baudrate(void);

#endif
#endif

0 comments on commit fba4366

Please sign in to comment.