Skip to content

Commit

Permalink
powerpc/fsl_soc: isolate legacy fsl_spi support to mpc832x_rdb boards
Browse files Browse the repository at this point in the history 
The advantages of this:
- Don't encourage legacy support;
- Less external symbols, less code to compile-in for !MPC832x_RDB
  platforms.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Cc: David Brownell <david-b@pacbell.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Kumar Gala <galak@gate.crashing.org>
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Anton Vorontsov authored and Linus Torvalds committed Apr 1, 2009
1 parent 7545828 commit e280180
Show file tree
Hide file tree
Showing 3 changed files with 107 additions and 111 deletions.
107 changes: 107 additions & 0 deletions arch/powerpc/platforms/83xx/mpc832x_rdb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <linux/spi/mmc_spi.h>
#include <linux/mmc/host.h>
#include <linux/of_platform.h>
#include <linux/fsl_devices.h>

#include <asm/time.h>
#include <asm/ipic.h>
Expand All @@ -39,6 +40,112 @@
#endif

#ifdef CONFIG_QUICC_ENGINE
static int __init of_fsl_spi_probe(char *type, char *compatible, u32 sysclk,
struct spi_board_info *board_infos,
unsigned int num_board_infos,
void (*cs_control)(struct spi_device *dev,
bool on))
{
struct device_node *np;
unsigned int i = 0;

for_each_compatible_node(np, type, compatible) {
int ret;
unsigned int j;
const void *prop;
struct resource res[2];
struct platform_device *pdev;
struct fsl_spi_platform_data pdata = {
.cs_control = cs_control,
};

memset(res, 0, sizeof(res));

pdata.sysclk = sysclk;

prop = of_get_property(np, "reg", NULL);
if (!prop)
goto err;
pdata.bus_num = *(u32 *)prop;

prop = of_get_property(np, "cell-index", NULL);
if (prop)
i = *(u32 *)prop;

prop = of_get_property(np, "mode", NULL);
if (prop && !strcmp(prop, "cpu-qe"))
pdata.qe_mode = 1;

for (j = 0; j < num_board_infos; j++) {
if (board_infos[j].bus_num == pdata.bus_num)
pdata.max_chipselect++;
}

if (!pdata.max_chipselect)
continue;

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

ret = of_irq_to_resource(np, 0, &res[1]);
if (ret == NO_IRQ)
goto err;

pdev = platform_device_alloc("mpc83xx_spi", i);
if (!pdev)
goto err;

ret = platform_device_add_data(pdev, &pdata, sizeof(pdata));
if (ret)
goto unreg;

ret = platform_device_add_resources(pdev, res,
ARRAY_SIZE(res));
if (ret)
goto unreg;

ret = platform_device_add(pdev);
if (ret)
goto unreg;

goto next;
unreg:
platform_device_del(pdev);
err:
pr_err("%s: registration failed\n", np->full_name);
next:
i++;
}

return i;
}

static int __init fsl_spi_init(struct spi_board_info *board_infos,
unsigned int num_board_infos,
void (*cs_control)(struct spi_device *spi,
bool on))
{
u32 sysclk = -1;
int ret;

/* SPI controller is either clocked from QE or SoC clock */
sysclk = get_brgfreq();
if (sysclk == -1) {
sysclk = fsl_get_sys_freq();
if (sysclk == -1)
return -ENODEV;
}

ret = of_fsl_spi_probe(NULL, "fsl,spi", sysclk, board_infos,
num_board_infos, cs_control);
if (!ret)
of_fsl_spi_probe("spi", "fsl_spi", sysclk, board_infos,
num_board_infos, cs_control);

return spi_register_board_info(board_infos, num_board_infos);
}

static void mpc83xx_spi_cs_control(struct spi_device *spi, bool on)
{
pr_debug("%s %d %d\n", __func__, spi->chip_select, on);
Expand Down
107 changes: 0 additions & 107 deletions arch/powerpc/sysdev/fsl_soc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -417,113 +417,6 @@ static int __init fsl_usb_of_init(void)

arch_initcall(fsl_usb_of_init);

static int __init of_fsl_spi_probe(char *type, char *compatible, u32 sysclk,
struct spi_board_info *board_infos,
unsigned int num_board_infos,
void (*cs_control)(struct spi_device *dev,
bool on))
{
struct device_node *np;
unsigned int i = 0;

for_each_compatible_node(np, type, compatible) {
int ret;
unsigned int j;
const void *prop;
struct resource res[2];
struct platform_device *pdev;
struct fsl_spi_platform_data pdata = {
.cs_control = cs_control,
};

memset(res, 0, sizeof(res));

pdata.sysclk = sysclk;

prop = of_get_property(np, "reg", NULL);
if (!prop)
goto err;
pdata.bus_num = *(u32 *)prop;

prop = of_get_property(np, "cell-index", NULL);
if (prop)
i = *(u32 *)prop;

prop = of_get_property(np, "mode", NULL);
if (prop && !strcmp(prop, "cpu-qe"))
pdata.qe_mode = 1;

for (j = 0; j < num_board_infos; j++) {
if (board_infos[j].bus_num == pdata.bus_num)
pdata.max_chipselect++;
}

if (!pdata.max_chipselect)
continue;

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

ret = of_irq_to_resource(np, 0, &res[1]);
if (ret == NO_IRQ)
goto err;

pdev = platform_device_alloc("mpc83xx_spi", i);
if (!pdev)
goto err;

ret = platform_device_add_data(pdev, &pdata, sizeof(pdata));
if (ret)
goto unreg;

ret = platform_device_add_resources(pdev, res,
ARRAY_SIZE(res));
if (ret)
goto unreg;

ret = platform_device_add(pdev);
if (ret)
goto unreg;

goto next;
unreg:
platform_device_del(pdev);
err:
pr_err("%s: registration failed\n", np->full_name);
next:
i++;
}

return i;
}

int __init fsl_spi_init(struct spi_board_info *board_infos,
unsigned int num_board_infos,
void (*cs_control)(struct spi_device *spi, bool on))
{
u32 sysclk = -1;
int ret;

#ifdef CONFIG_QUICC_ENGINE
/* SPI controller is either clocked from QE or SoC clock */
sysclk = get_brgfreq();
#endif
if (sysclk == -1) {
sysclk = fsl_get_sys_freq();
if (sysclk == -1)
return -ENODEV;
}

ret = of_fsl_spi_probe(NULL, "fsl,spi", sysclk, board_infos,
num_board_infos, cs_control);
if (!ret)
of_fsl_spi_probe("spi", "fsl_spi", sysclk, board_infos,
num_board_infos, cs_control);

return spi_register_board_info(board_infos, num_board_infos);
}

#if defined(CONFIG_PPC_85xx) || defined(CONFIG_PPC_86xx)
static __be32 __iomem *rstcr;

Expand Down
4 changes: 0 additions & 4 deletions arch/powerpc/sysdev/fsl_soc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ extern u32 fsl_get_sys_freq(void);
struct spi_board_info;
struct device_node;

extern int fsl_spi_init(struct spi_board_info *board_infos,
unsigned int num_board_infos,
void (*cs_control)(struct spi_device *spi, bool on));

extern void fsl_rstcr_restart(char *cmd);

#if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE)
Expand Down

0 comments on commit e280180

Please sign in to comment.