Migrate ML300 reference design to the platform bus
PATCH 4/10 Migrate ML300 reference design to the platform bus
Signed-off-by Grant C. Likely <[email protected]>
---
arch/ppc/Kconfig.debug | 2 - arch/ppc/platforms/4xx/xilinx_ml300.c | 74 +++++++++++++++++++++++---------- arch/ppc/platforms/4xx/xilinx_ml300.h | 2 - arch/ppc/syslib/Makefile | 2 - arch/ppc/syslib/xilinx_pic.c | 10 ++-- 5 files changed, 60 insertions(+), 30 deletions(-)
a13976d8a19837c07e485ae3ae7179668b4b9986
arch/ppc/Kconfig.debug +1 -1
@@ -67,7 +67,7 @@ config SERIAL_TEXT_DEBUG config PPC_OCP bool - depends on IBM_OCP || XILINX_OCP + depends on IBM_OCP default y endmenu
arch/ppc/platforms/4xx/xilinx_ml300.c +52 -22
113 lines not on this page · raw message
arch/ppc/platforms/4xx/xilinx_ml300.h +1 -1
@@ -41,7 +41,7 @@ typedef struct board_info {#define PPC4xx_ONB_IO_VADDR 0u#define PPC4xx_ONB_IO_SIZE 0u -#define PPC4xx_MACHINE_NAME "Xilinx ML300" +#define PPC4xx_MACHINE_NAME "Xilinx ML300 Reference System"#endif /* __ASM_XILINX_ML300_H__ */ #endif /* __KERNEL__ */
arch/ppc/syslib/Makefile +1 -1
@@ -18,7 +18,7 @@ obj-$(CONFIG_440SP) += ibm440gx_common. obj-$(CONFIG_440SPE) += ibm440gx_common.o ibm440sp_common.o ppc440spe_pcie.o ifeq ($(CONFIG_4xx),y) ifeq ($(CONFIG_XILINX_VIRTEX),y) -obj-$(CONFIG_40x) += xilinx_pic.o +obj-$(CONFIG_40x) += xilinx_pic.o ppc_sys.o else ifeq ($(CONFIG_403),y) obj-$(CONFIG_40x) += ppc403_pic.o
arch/ppc/syslib/xilinx_pic.c +5 -5
@@ -120,14 +120,14 @@ ppc4xx_pic_init(void)#error NR_IRQS > 32 not supported#endif -#if XPAR_XINTC_USE_DCR ==0 - intc =ioremap (XPAR_INTC_0_BASEADDR ,32 ); +#if VIRTEX_XINTC_USE_DCR ==0 + intc =ioremap (VIRTEX_INTC_BASEADDR ,32 );printk (KERN_INFO "Xilinx INTC #0 at 0x%08lX mapped to 0x%08lX\n" , - (unsigned long )XPAR_INTC_0_BASEADDR , (unsigned long ) intc); + (unsigned long )VIRTEX_INTC_BASEADDR , (unsigned long ) intc);#else printk (KERN_INFO "Xilinx INTC #0 at 0x%08lX (DCR)\n" , - (unsigned long )XPAR_INTC_0_BASEADDR ); + (unsigned long )VIRTEX_INTC_BASEADDR );#endif /*
@@ -147,7 +147,7 @@ ppc4xx_pic_init(void)for (i =0 ; i <NR_IRQS ; ++i) { irq_desc[i].handler = &xilinx_intc; -if (XPAR_INTC_0_KIND_OF_INTR & (0x00000001 << i)) +if (VIRTEX_INTC_KIND_OF_INTR & (0x00000001 << i)) irq_desc[i].status &= ~IRQ_LEVEL ;else irq_desc[i].status |=IRQ_LEVEL ;
Signature · 1 line
1.1.2-g9e9b-dirty