[PATCH] powerpc: Add FSL SOC library and setup code
Hi,
On Fri, Jan 13, 2006 at 11:19:13AM -0600, Kumar Gala wrote:
Parse the flat device tree for devices on Freescale SOC's that we know
about (gianfar, gianfar_mdio, i2c, mpc83xx_wdt). We need to setup
platform devices and platform data for these devices to match arch/ppc
usage.
Also add a helper function (get_immrbase) that reports the base
address of the MMIO registers on the SOC.
Besides the specific comments below, you have long lines in some
places. Can you break them at 78-80 columns? I know it's awkward when
a function name is 30 characters, but still.
Thanks,
Olof
Signed-off-by: Kumar Gala galak at kernel.crashing.org
---
commit 8699b259e5432c100d06ea406616453a2ccc1989
tree ad1a3444ab98051bf6e88a10ca3d6aa27e6ec822
parent 461d4edf6f4a1950a94a190f1fc3a4b9e692453e
author Kumar Gala galak at kernel.crashing.org Fri, 13 Jan 2006 11:20:44
-0600
committer Kumar Gala galak at kernel.crashing.org Fri, 13 Jan 2006 11:20:44
-0600
arch/powerpc/sysdev/Makefile |1
arch/powerpc/sysdev/fsl_soc.c | 317
+
arch/powerpc/sysdev/fsl_soc.h |8 +
3 files changed, 326 insertions(+), 0 deletions(-)
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index 0ae8413..4c2b356 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -7,3 +7,4 @@ obj-$(CONFIG_40x) += dcr.o
obj-$(CONFIG_U3_DART)+= dart_iommu.o
obj-$(CONFIG_MMIO_NVRAM) += mmio_nvram.o
obj-$(CONFIG_PPC_83xx) += ipic.o
+obj-$(CONFIG_FSL_SOC)+= fsl_soc.o
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
new file mode 100644
index 000..064c9de
--- /dev/null
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -0,0 +1,317 @@
+/*
+ * FSL SoC setup code
Maybe explain that FSL is Freescale?
+ *
+ * Maintained by Kumar Gala (see MAINTAINERS for contact information)
+ *
+ * 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
+ * option) any later version.
+ */
+
+#include linux/config.h
+#include linux/stddef.h
+#include linux/kernel.h
+#include linux/init.h
+#include linux/errno.h
+#include linux/major.h
+#include linux/delay.h
+#include linux/irq.h
+#include linux/module.h
+#include linux/device.h
+#include linux/platform_device.h
+#include linux/fsl_devices.h
+
+#include asm/system.h
+#include asm/atomic.h
+#include asm/io.h
+#include asm/irq.h
+#include asm/prom.h
+#include sysdev/fsl_soc.h
+#include mm/mmu_decl.h
+
+static phys_addr_t immrbase = -1;
What does immr mean? Maybe a short comment would be good.
+
+phys_addr_t get_immrbase(void)
+{
+ struct device_node *soc;
+
+ if (immrbase != -1)
+ return immrbase;
+
+ soc = of_find_node_by_type(NULL, soc);
+ if (soc != 0) {
Compare with NULL instead, since it's a pointer? (or just if (soc))
+ unsigned int size;
+ void *prop = get_property(soc, reg, size);
+ immrbase = of_translate_address(soc, prop);
+ of_node_put(soc);
+ };
+
+ return immrbase;
+}
+EXPORT_SYMBOL(get_immrbase);
+
+static const char * gfar_tx_intr = tx;
+static const char * gfar_rx_intr = rx;
+static const char * gfar_err_intr = error;
+
+static int __init gfar_of_init(void)
+{
+ struct device_node *np;
+ unsigned int i;
+ struct platform_device *mdio_dev, *gfar_dev;
+ struct resource res;
+ int ret;
+
+ for (np = NULL, i = 0; (np = of_find_compatible_node(np, mdio,
gianfar)) != NULL; i++) {
Long line, please try to keep them 78-80 characters max.
Maybe a primitive for iterating over compatible nodes would be useful in
other places too.
+ int k;
+ struct device_node *child = NULL;
+ struct gianfar_mdio_data mdio_data;
+
+ memset(res, 0, sizeof(res));
+ memset(mdio_data, 0, sizeof(mdio_data));
+
+ ret = of_address_to_resource(np, 0, res);
+ if (ret)
+ goto mdio_err;
+
+ mdio_dev = platform_device_register_simple(fsl-gianfar_mdio,
res.start, res, 1);
+ if (IS_ERR(mdio_dev)) {
+ ret = PTR_ERR(mdio_dev);
+ goto mdio_err;
+ }
+
+ for (k = 0; k 32; k++)
+ mdio_data.irq[k] = -1;
+
+ while ((child = of_get_next_child(np, child)) != NULL) {
+ if (child-n_intrs) {
+ u32 *id = (u32 *) get_property(child, reg,
NULL);
+ mdio_data.irq[*id] = child-intrs[0].line;
+ }
+ }
+
+ ret = platform_device_add_data(mdio_dev,
[PATCH] powerpc: Add FSL SOC library and setup code
Parse the flat device tree for devices on Freescale SOC's that we know
about (gianfar, gianfar_mdio, i2c, mpc83xx_wdt). We need to setup
platform devices and platform data for these devices to match arch/ppc
usage.
Also add a helper function (get_immrbase) that reports the base
address of the MMIO registers on the SOC.
Signed-off-by: Kumar Gala galak at kernel.crashing.org
---
commit 8699b259e5432c100d06ea406616453a2ccc1989
tree ad1a3444ab98051bf6e88a10ca3d6aa27e6ec822
parent 461d4edf6f4a1950a94a190f1fc3a4b9e692453e
author Kumar Gala galak at kernel.crashing.org Fri, 13 Jan 2006 11:20:44 -0600
committer Kumar Gala galak at kernel.crashing.org Fri, 13 Jan 2006 11:20:44
-0600
arch/powerpc/sysdev/Makefile |1
arch/powerpc/sysdev/fsl_soc.c | 317 +
arch/powerpc/sysdev/fsl_soc.h |8 +
3 files changed, 326 insertions(+), 0 deletions(-)
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index 0ae8413..4c2b356 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -7,3 +7,4 @@ obj-$(CONFIG_40x) += dcr.o
obj-$(CONFIG_U3_DART) += dart_iommu.o
obj-$(CONFIG_MMIO_NVRAM) += mmio_nvram.o
obj-$(CONFIG_PPC_83xx) += ipic.o
+obj-$(CONFIG_FSL_SOC) += fsl_soc.o
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
new file mode 100644
index 000..064c9de
--- /dev/null
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -0,0 +1,317 @@
+/*
+ * FSL SoC setup code
+ *
+ * Maintained by Kumar Gala (see MAINTAINERS for contact information)
+ *
+ * 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
+ * option) any later version.
+ */
+
+#include linux/config.h
+#include linux/stddef.h
+#include linux/kernel.h
+#include linux/init.h
+#include linux/errno.h
+#include linux/major.h
+#include linux/delay.h
+#include linux/irq.h
+#include linux/module.h
+#include linux/device.h
+#include linux/platform_device.h
+#include linux/fsl_devices.h
+
+#include asm/system.h
+#include asm/atomic.h
+#include asm/io.h
+#include asm/irq.h
+#include asm/prom.h
+#include sysdev/fsl_soc.h
+#include mm/mmu_decl.h
+
+static phys_addr_t immrbase = -1;
+
+phys_addr_t get_immrbase(void)
+{
+ struct device_node *soc;
+
+ if (immrbase != -1)
+ return immrbase;
+
+ soc = of_find_node_by_type(NULL, soc);
+ if (soc != 0) {
+ unsigned int size;
+ void *prop = get_property(soc, reg, size);
+ immrbase = of_translate_address(soc, prop);
+ of_node_put(soc);
+ };
+
+ return immrbase;
+}
+EXPORT_SYMBOL(get_immrbase);
+
+static const char * gfar_tx_intr = tx;
+static const char * gfar_rx_intr = rx;
+static const char * gfar_err_intr = error;
+
+static int __init gfar_of_init(void)
+{
+ struct device_node *np;
+ unsigned int i;
+ struct platform_device *mdio_dev, *gfar_dev;
+ struct resource res;
+ int ret;
+
+ for (np = NULL, i = 0; (np = of_find_compatible_node(np, mdio,
gianfar)) != NULL; i++) {
+ int k;
+ struct device_node *child = NULL;
+ struct gianfar_mdio_data mdio_data;
+
+ memset(res, 0, sizeof(res));
+ memset(mdio_data, 0, sizeof(mdio_data));
+
+ ret = of_address_to_resource(np, 0, res);
+ if (ret)
+ goto mdio_err;
+
+ mdio_dev = platform_device_register_simple(fsl-gianfar_mdio,
res.start, res, 1);
+ if (IS_ERR(mdio_dev)) {
+ ret = PTR_ERR(mdio_dev);
+ goto mdio_err;
+ }
+
+ for (k = 0; k 32; k++)
+ mdio_data.irq[k] = -1;
+
+ while ((child = of_get_next_child(np, child)) != NULL) {
+ if (child-n_intrs) {
+ u32 *id = (u32 *) get_property(child, reg,
NULL);
+ mdio_data.irq[*id] = child-intrs[0].line;
+ }
+ }
+
+ ret = platform_device_add_data(mdio_dev, mdio_data,
sizeof(struct gianfar_mdio_data));
+ if (ret)
+ goto mdio_unreg;
+ }
+
+ for (np = NULL, i = 0; (np = of_find_compatible_node(np, network,
gianfar)) != NULL; i++) {
+ struct resource r[4];
+ struct device_node *phy, *mdio;
+ struct gianfar_platform_data gfar_data;
+ unsigned int *id;
+ char *model;
+ void *mac_addr;
+ phandle *ph;
+
+ memset(r, 0, sizeof(r));
+ memset(gfar_data, 0, sizeof(gfar_data));
+
+ ret = of_address_to_resource(np, 0, r[0]);
+
