From: Allen Curtis <acurtis@onz.com>
To: Kumar Gala <galak@freescale.com>
Cc: linuxppc-embedded <linuxppc-embedded@ozlabs.org>
Subject: Re: RFC: cpm2_devices.c
Date: Tue, 14 Jun 2005 20:57:19 -0700 [thread overview]
Message-ID: <42eb0bacadb197b42502ac1828450843@onz.com> (raw)
In-Reply-To: <Pine.LNX.4.61.0506142231040.2447@nylon.am.freescale.net>
> I've also included our version of this patch for commentary. Did you
> see a
> need for the following to actually be devices? (DMA, CPM, SI1, SIC2).
>
The good thing about them actually being devices is that you can find
them and the IO resources had already been remapped. You don't need a
device driver for them but they are resources used by other device
drivers.
> I can provide feedback on all the issues I had with you patch, but
> would
> prefer to start with ours (let me know).
>
Comments:
1. You removed the other PRAM definition from this FCC definition, this
is good.
2. I am torn about using numeric IMMR offsets vs. the structure member
approach. The good thing is that you can create all the devices in a
single table even if they overlay depending on processor. The question
is, will the IMMAP structure become obsolete? If not, then you will
still need the conditional compiles in immap_cpm2.h.
3. Naming convention, are all these devices just in the MPC82xx family?
If the CPM is a general FSL co-processor, used across many processor
families, then I like the CPM2 naming convention.
4. What about PCI?
5. This patch does not address the platform specific device structures.
How do you want to handle these?
Thanks for the patch, this helps.
> - kumar
>
>
> diff --git a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile
> --- a/arch/ppc/syslib/Makefile
> +++ b/arch/ppc/syslib/Makefile
> @@ -80,7 +80,8 @@ obj-$(CONFIG_SANDPOINT) += i8259.o pci_
> obj-$(CONFIG_SBC82xx) += todc_time.o
> obj-$(CONFIG_SPRUCE) += cpc700_pic.o indirect_pci.o pci_auto.o \
> todc_time.o
> -obj-$(CONFIG_8260) += m8260_setup.o
> +obj-$(CONFIG_8260) += m8260_setup.o mpc82xx_devices.o mpc82xx_sys.o \
> + ppc_sys.o
> obj-$(CONFIG_PCI_8260) += m82xx_pci.o indirect_pci.o pci_auto.o
> obj-$(CONFIG_8260_PCI9) += m8260_pci_erratum9.o
> obj-$(CONFIG_CPM2) += cpm2_common.o cpm2_pic.o
> diff --git a/arch/ppc/syslib/mpc82xx_devices.c
> b/arch/ppc/syslib/mpc82xx_devices.c
> new file mode 100644
> --- /dev/null
> +++ b/arch/ppc/syslib/mpc82xx_devices.c
> @@ -0,0 +1,389 @@
> +/*
> + * arch/ppc/syslib/mpc82xx_devices.c
> + *
> + * MPC82xx Device descriptions
> + *
> + * Maintainer: Kumar Gala <kumar.gala@freescale.com>
> + *
> + * This file is licensed under the terms of the GNU General Public
> License
> + * version 2. This program is licensed "as is" without any warranty
> of any
> + * kind, whether express or implied.
> + */
> +
> +
> +#include <linux/init.h>
> +#include <linux/module.h>
> +#include <linux/device.h>
> +#include <linux/ioport.h>
> +#include <asm/cpm2.h>
> +#include <asm/irq.h>
> +#include <asm/ppc_sys.h>
> +
> +struct platform_device ppc_sys_platform_devices[] = {
> + [MPC82xx_CPM_FCC1] = {
> + .name = "fsl-cpm-fcc",
> + .id = 1,
> + .num_resources = 3,
> + .resource = (struct resource[]) {
> + {
> + .name = "fcc_regs",
> + .start = 0x11300,
> + .end = 0x1131f,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .name = "fcc_pram",
> + .start = 0x8400,
> + .end = 0x84ff,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .start = SIU_INT_FCC1,
> + .end = SIU_INT_FCC1,
> + .flags = IORESOURCE_IRQ,
> + },
> + },
> + },
> + [MPC82xx_CPM_FCC2] = {
> + .name = "fsl-cpm-fcc",
> + .id = 2,
> + .num_resources = 3,
> + .resource = (struct resource[]) {
> + {
> + .name = "fcc_regs",
> + .start = 0x11320,
> + .end = 0x1133f,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .name = "fcc_pram",
> + .start = 0x8500,
> + .end = 0x85ff,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .start = SIU_INT_FCC2,
> + .end = SIU_INT_FCC2,
> + .flags = IORESOURCE_IRQ,
> + },
> + },
> + },
> + [MPC82xx_CPM_FCC3] = {
> + .name = "fsl-cpm-fcc",
> + .id = 3,
> + .num_resources = 3,
> + .resource = (struct resource[]) {
> + {
> + .name = "fcc_regs",
> + .start = 0x11340,
> + .end = 0x1135f,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .name = "fcc_pram",
> + .start = 0x8600,
> + .end = 0x86ff,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .start = SIU_INT_FCC3,
> + .end = SIU_INT_FCC3,
> + .flags = IORESOURCE_IRQ,
> + },
> + },
> + },
> + [MPC82xx_CPM_I2C] = {
> + .name = "fsl-cpm-i2c",
> + .id = 1,
> + .num_resources = 3,
> + .resource = (struct resource[]) {
> + {
> + .name = "i2c_mem",
> + .start = 0x11860,
> + .end = 0x118BF,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .name = "i2c_pram",
> + .start = 0x8afc,
> + .end = 0x8afd,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .start = SIU_INT_I2C,
> + .end = SIU_INT_I2C,
> + .flags = IORESOURCE_IRQ,
> + },
> + },
> + },
> + [MPC82xx_CPM_SCC1] = {
> + .name = "fsl-cpm-scc",
> + .id = 1,
> + .num_resources = 3,
> + .resource = (struct resource[]) {
> + {
> + .name = "scc_mem",
> + .start = 0x11A00,
> + .end = 0x11A1F,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .name = "scc_pram",
> + .start = 0x8000,
> + .end = 0x80ff,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .start = SIU_INT_SCC1,
> + .end = SIU_INT_SCC1,
> + .flags = IORESOURCE_IRQ,
> + },
> + },
> + },
> + [MPC82xx_CPM_SCC2] = {
> + .name = "fsl-cpm-scc",
> + .id = 2,
> + .num_resources = 3,
> + .resource = (struct resource[]) {
> + {
> + .name = "scc_mem",
> + .start = 0x11A20,
> + .end = 0x11A3F,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .name = "scc_pram",
> + .start = 0x8100,
> + .end = 0x81ff,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .start = SIU_INT_SCC2,
> + .end = SIU_INT_SCC2,
> + .flags = IORESOURCE_IRQ,
> + },
> + },
> + },
> + [MPC82xx_CPM_SCC3] = {
> + .name = "fsl-cpm-scc",
> + .id = 3,
> + .num_resources = 3,
> + .resource = (struct resource[]) {
> + {
> + .name = "scc_mem",
> + .start = 0x11A40,
> + .end = 0x11A5F,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .name = "scc_pram",
> + .start = 0x8200,
> + .end = 0x82ff,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .start = SIU_INT_SCC3,
> + .end = SIU_INT_SCC3,
> + .flags = IORESOURCE_IRQ,
> + },
> + },
> + },
> + [MPC82xx_CPM_SCC4] = {
> + .name = "fsl-cpm-scc",
> + .id = 4,
> + .num_resources = 3,
> + .resource = (struct resource[]) {
> + {
> + .name = "scc_mem",
> + .start = 0x11A60,
> + .end = 0x11A7F,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .name = "scc_pram",
> + .start = 0x8300,
> + .end = 0x83ff,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .start = SIU_INT_SCC4,
> + .end = SIU_INT_SCC4,
> + .flags = IORESOURCE_IRQ,
> + },
> + },
> + },
> + [MPC82xx_CPM_SPI] = {
> + .name = "fsl-cpm-spi",
> + .id = 1,
> + .num_resources = 3,
> + .resource = (struct resource[]) {
> + {
> + .name = "spi_mem",
> + .start = 0x11AA0,
> + .end = 0x11AFF,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .name = "spi_pram",
> + .start = 0x89fc,
> + .end = 0x89fd,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .start = SIU_INT_SPI,
> + .end = SIU_INT_SPI,
> + .flags = IORESOURCE_IRQ,
> + },
> + },
> + },
> + [MPC82xx_CPM_MCC1] = {
> + .name = "fsl-cpm-mcc",
> + .id = 1,
> + .num_resources = 3,
> + .resource = (struct resource[]) {
> + {
> + .name = "mcc_mem",
> + .start = 0x11B30,
> + .end = 0x11B3F,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .name = "mcc_pram",
> + .start = 0x8700,
> + .end = 0x877f,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .start = SIU_INT_MCC1,
> + .end = SIU_INT_MCC1,
> + .flags = IORESOURCE_IRQ,
> + },
> + },
> + },
> + [MPC82xx_CPM_MCC2] = {
> + .name = "fsl-cpm-mcc",
> + .id = 2,
> + .num_resources = 3,
> + .resource = (struct resource[]) {
> + {
> + .name = "mcc_mem",
> + .start = 0x11B50,
> + .end = 0x11B5F,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .name = "mcc_pram",
> + .start = 0x8800,
> + .end = 0x887f,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .start = SIU_INT_MCC2,
> + .end = SIU_INT_MCC2,
> + .flags = IORESOURCE_IRQ,
> + },
> + },
> + },
> + [MPC82xx_CPM_SMC1] = {
> + .name = "fsl-cpm-smc",
> + .id = 1,
> + .num_resources = 3,
> + .resource = (struct resource[]) {
> + {
> + .name = "smc_mem",
> + .start = 0x11A80,
> + .end = 0x11A8F,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .name = "smc_pram",
> + .start = 0x87fc,
> + .end = 0x87fd,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .start = SIU_INT_SMC1,
> + .end = SIU_INT_SMC1,
> + .flags = IORESOURCE_IRQ,
> + },
> + },
> + },
> + [MPC82xx_CPM_SMC2] = {
> + .name = "fsl-cpm-smc",
> + .id = 2,
> + .num_resources = 3,
> + .resource = (struct resource[]) {
> + {
> + .name = "smc_mem",
> + .start = 0x11A90,
> + .end = 0x11A9F,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .name = "smc_pram",
> + .start = 0x88fc,
> + .end = 0x88fd,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .start = SIU_INT_SMC2,
> + .end = SIU_INT_SMC2,
> + .flags = IORESOURCE_IRQ,
> + },
> + },
> + },
> + [MPC82xx_CPM_USB] = {
> + .name = "fsl-cpm-usb",
> + .id = 1,
> + .num_resources = 3,
> + .resource = (struct resource[]) {
> + {
> + .name = "usb_mem",
> + .start = 0x11b60,
> + .end = 0x11b78,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .name = "usb_pram",
> + .start = 0x8b00,
> + .end = 0x8bff,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .start = SIU_INT_USB,
> + .end = SIU_INT_USB,
> + .flags = IORESOURCE_IRQ,
> + },
> +
> + },
> + },
> + [MPC82xx_SEC1] = {
> + .name = "fsl-sec",
> + .id = 1,
> + .num_resources = 1,
> + .resource = (struct resource[]) {
> + {
> + .name = "sec_mem",
> + .start = 0x40000,
> + .end = 0x52fff,
> + .flags = IORESOURCE_MEM,
> + },
> + },
> + },
> +};
> +
> +static int __init mach_mpc82xx_fixup(struct platform_device *pdev)
> +{
> + ppc_sys_fixup_mem_resource(pdev, CPM_MAP_ADDR);
> + return 0;
> +}
> +
> +static int __init mach_mpc82xx_init(void)
> +{
> + if (ppc_md.progress)
> + ppc_md.progress("mach_mpc82xx_init:enter", 0);
> + ppc_sys_device_fixup = mach_mpc82xx_fixup;
> + return 0;
> +}
> +
> +postcore_initcall(mach_mpc82xx_init);
> diff --git a/arch/ppc/syslib/mpc82xx_sys.c
> b/arch/ppc/syslib/mpc82xx_sys.c
> new file mode 100644
> --- /dev/null
> +++ b/arch/ppc/syslib/mpc82xx_sys.c
> @@ -0,0 +1,200 @@
> +/*
> + * arch/ppc/syslib/mpc82xx_devices.c
> + *
> + * MPC82xx System descriptions
> + *
> + * Maintainer: Kumar Gala <kumar.gala@freescale.com>
> + *
> + * This file is licensed under the terms of the GNU General Public
> License
> + * version 2. This program is licensed "as is" without any warranty
> of any
> + * kind, whether express or implied.
> + */
> +
> +#include <linux/init.h>
> +#include <linux/module.h>
> +#include <linux/device.h>
> +
> +#include <asm/ppc_sys.h>
> +
> +struct ppc_sys_spec *cur_ppc_sys_spec;
> +struct ppc_sys_spec ppc_sys_specs[] = {
> + /* below is a list of the 8260 family of processors */
> + {
> + .ppc_sys_name = "8250",
> + .mask = 0x0000ff00,
> + .value = 0x00000000,
> + .num_devices = 12,
> + .device_list = (enum ppc_sys_devices[])
> + {
> + MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3,
> + MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3,
> + MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_SMC1,
> + MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C,
> + }
> + },
> + {
> + .ppc_sys_name = "8255",
> + .mask = 0x0000ff00,
> + .value = 0x00000000,
> + .num_devices = 11,
> + .device_list = (enum ppc_sys_devices[])
> + {
> + MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_SCC1,
> + MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3, MPC82xx_CPM_SCC4,
> + MPC82xx_CPM_MCC1, MPC82xx_CPM_SMC1, MPC82xx_CPM_SMC2,
> + MPC82xx_CPM_SPI, MPC82xx_CPM_I2C,
> + }
> + },
> + {
> + .ppc_sys_name = "8260",
> + .mask = 0x0000ff00,
> + .value = 0x00000000,
> + .num_devices = 12,
> + .device_list = (enum ppc_sys_devices[])
> + {
> + MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3,
> + MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3,
> + MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_SMC1,
> + MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C,
> + }
> + },
> + {
> + .ppc_sys_name = "8264",
> + .mask = 0x0000ff00,
> + .value = 0x00000000,
> + .num_devices = 12,
> + .device_list = (enum ppc_sys_devices[])
> + {
> + MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3,
> + MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3,
> + MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_SMC1,
> + MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C,
> + }
> + },
> + {
> + .ppc_sys_name = "8265",
> + .mask = 0x0000ff00,
> + .value = 0x00000000,
> + .num_devices = 12,
> + .device_list = (enum ppc_sys_devices[])
> + {
> + MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3,
> + MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3,
> + MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_SMC1,
> + MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C,
> + }
> + },
> + {
> + .ppc_sys_name = "8266",
> + .mask = 0x0000ff00,
> + .value = 0x00000000,
> + .num_devices = 12,
> + .device_list = (enum ppc_sys_devices[])
> + {
> + MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3,
> + MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3,
> + MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_SMC1,
> + MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C,
> + }
> + },
> + /* below is a list of the 8272 family of processors */
> + {
> + .ppc_sys_name = "8247",
> + .mask = 0x000fe000,
> + .value = 0x0000c000,
> + .num_devices = 10,
> + .device_list = (enum ppc_sys_devices[])
> + {
> + MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_SCC1,
> + MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3, MPC82xx_CPM_SMC1,
> + MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C,
> + MPC82xx_CPM_USB,
> + },
> + },
> + {
> + .ppc_sys_name = "8248",
> + .mask = 0x000fe000,
> + .value = 0x0000c000,
> + .num_devices = 11,
> + .device_list = (enum ppc_sys_devices[])
> + {
> + MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_SCC1,
> + MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3, MPC82xx_CPM_SMC1,
> + MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C,
> + MPC82xx_CPM_USB, MPC82xx_SEC1,
> + },
> + },
> + {
> + .ppc_sys_name = "8271",
> + .mask = 0x000fe000,
> + .value = 0x0000c000,
> + .num_devices = 10,
> + .device_list = (enum ppc_sys_devices[])
> + {
> + MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_SCC1,
> + MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3, MPC82xx_CPM_SMC1,
> + MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C,
> + MPC82xx_CPM_USB,
> + },
> + },
> + {
> + .ppc_sys_name = "8272",
> + .mask = 0x000fe000,
> + .value = 0x0000c000,
> + .num_devices = 11,
> + .device_list = (enum ppc_sys_devices[])
> + {
> + MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_SCC1,
> + MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3, MPC82xx_CPM_SMC1,
> + MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C,
> + MPC82xx_CPM_USB, MPC82xx_SEC1,
> + },
> + },
> + /* below is a list of the 8280 family of processors */
> + {
> + .ppc_sys_name = "8270",
> + .mask = 0x0000ff00,
> + .value = 0x00000a00,
> + .num_devices = 12,
> + .device_list = (enum ppc_sys_devices[])
> + {
> + MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3,
> + MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3,
> + MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_SMC1,
> + MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C,
> + },
> + },
> + {
> + .ppc_sys_name = "8275",
> + .mask = 0x0000ff00,
> + .value = 0x00000a00,
> + .num_devices = 12,
> + .device_list = (enum ppc_sys_devices[])
> + {
> + MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3,
> + MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3,
> + MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_SMC1,
> + MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C,
> + },
> + },
> + {
> + .ppc_sys_name = "8280",
> + .mask = 0x0000ff00,
> + .value = 0x00000a00,
> + .num_devices = 13,
> + .device_list = (enum ppc_sys_devices[])
> + {
> + MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3,
> + MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3,
> + MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_MCC2,
> + MPC82xx_CPM_SMC1, MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI,
> + MPC82xx_CPM_I2C,
> + },
> + },
> + {
> + /* default match */
> + .ppc_sys_name = "",
> + .mask = 0x00000000,
> + .value = 0x00000000,
> + },
> +};
> diff --git a/include/asm-ppc/irq.h b/include/asm-ppc/irq.h
> --- a/include/asm-ppc/irq.h
> +++ b/include/asm-ppc/irq.h
> @@ -331,6 +331,7 @@ static __inline__ int irq_canonicalize(i
> #define SIU_INT_IDMA3 ((uint)0x08 + CPM_IRQ_OFFSET)
> #define SIU_INT_IDMA4 ((uint)0x09 + CPM_IRQ_OFFSET)
> #define SIU_INT_SDMA ((uint)0x0a + CPM_IRQ_OFFSET)
> +#define SIU_INT_USB ((uint)0x0b + CPM_IRQ_OFFSET)
> #define SIU_INT_TIMER1 ((uint)0x0c + CPM_IRQ_OFFSET)
> #define SIU_INT_TIMER2 ((uint)0x0d + CPM_IRQ_OFFSET)
> #define SIU_INT_TIMER3 ((uint)0x0e + CPM_IRQ_OFFSET)
> diff --git a/include/asm-ppc/mpc8260.h b/include/asm-ppc/mpc8260.h
> --- a/include/asm-ppc/mpc8260.h
> +++ b/include/asm-ppc/mpc8260.h
> @@ -34,8 +34,7 @@
>
> #ifdef CONFIG_TQM8260
> #include <platforms/tqm8260.h>
> -#endif
> -
> +#endif
> #if defined(CONFIG_PQ2ADS) || defined (CONFIG_PQ2FADS)
> #include <platforms/pq2ads.h>
> #endif
> @@ -66,6 +65,24 @@
> #ifndef IO_VIRT_ADDR
> #define IO_VIRT_ADDR IO_PHYS_ADDR
> #endif
> +
> +enum ppc_sys_devices {
> + MPC82xx_CPM_FCC1,
> + MPC82xx_CPM_FCC2,
> + MPC82xx_CPM_FCC3,
> + MPC82xx_CPM_I2C,
> + MPC82xx_CPM_SCC1,
> + MPC82xx_CPM_SCC2,
> + MPC82xx_CPM_SCC3,
> + MPC82xx_CPM_SCC4,
> + MPC82xx_CPM_SPI,
> + MPC82xx_CPM_MCC1,
> + MPC82xx_CPM_MCC2,
> + MPC82xx_CPM_SMC1,
> + MPC82xx_CPM_SMC2,
> + MPC82xx_CPM_USB,
> + MPC82xx_SEC1,
> +};
>
> #ifndef __ASSEMBLY__
> /* The "residual" data board information structure the boot loader
> diff --git a/include/asm-ppc/ppc_sys.h b/include/asm-ppc/ppc_sys.h
> --- a/include/asm-ppc/ppc_sys.h
> +++ b/include/asm-ppc/ppc_sys.h
> @@ -21,7 +21,9 @@
> #include <linux/device.h>
> #include <linux/types.h>
>
> -#if defined(CONFIG_83xx)
> +#if defined(CONFIG_8260)
> +#include <asm/mpc8260.h>
> +#elif defined(CONFIG_83xx)
> #include <asm/mpc83xx.h>
> #elif defined(CONFIG_85xx)
> #include <asm/mpc85xx.h>
>
next prev parent reply other threads:[~2005-06-15 3:57 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-06-14 18:18 RFC: cpm2_devices.c Allen Curtis
2005-06-15 3:35 ` Kumar Gala
2005-06-15 3:57 ` Allen Curtis [this message]
2005-06-15 4:13 ` Kumar Gala
2005-06-15 4:41 ` Allen Curtis
2005-06-15 14:24 ` Jason McMullan
2005-06-15 15:06 ` Kumar Gala
2005-06-15 17:48 ` Allen Curtis
2005-06-15 18:05 ` Vitaly Bordug
2005-06-15 14:29 ` Kumar Gala
2005-06-15 14:30 ` Kumar Gala
2005-06-16 15:12 ` Dan Malek
2005-06-16 15:33 ` Kumar Gala
2005-06-16 15:42 ` Allen Curtis
2005-06-16 15:53 ` Kumar Gala
2005-06-16 16:39 ` Allen Curtis
2005-06-16 19:33 ` Dan Malek
2005-06-15 7:55 ` Vitaly Bordug
2005-06-15 14:25 ` Kumar Gala
2005-06-15 14:33 ` Jason McMullan
2005-06-15 15:01 ` Kumar Gala
2005-06-15 15:31 ` Vitaly Bordug
2005-06-15 15:41 ` Kumar Gala
2005-06-15 16:07 ` Vitaly Bordug
2005-06-16 6:42 ` Pantelis Antoniou
2005-06-16 9:33 ` Wolfgang Denk
2005-06-16 15:02 ` Kumar Gala
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=42eb0bacadb197b42502ac1828450843@onz.com \
--to=acurtis@onz.com \
--cc=galak@freescale.com \
--cc=linuxppc-embedded@ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).