Skip to content

L
linux-davinci
Commit e00c5498 authored by Scott Wood's avatar Scott Wood Committed by Kumar Gala
Browse files
Options

[POWERPC] mpc82xx: Update mpc8272ads, and factor out PCI and reset. 

1. PCI and reset are factored out into pq2.c.  I renamed them from m82xx
to pq2 because they won't work on the Integrated Host Processor line of
82xx chips (i.e. 8240, 8245, and such).

2. The PCI PIC, which is nominally board-specific, is used on multiple
boards, and thus is used into pq2ads-pci-pic.c.

3. The new CPM binding is used.

4. General cleanup.
Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 11c146cc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 757 additions and 776 deletions
arch/powerpc/Kconfig
View file @ e00c5498
...@@ -484,7 +484,7 @@ config PCI_8260 ...@@ -484,7 +484,7 @@ config PCI_8260
config 8260_PCI9 config 8260_PCI9
bool "Enable workaround for MPC826x erratum PCI 9" bool "Enable workaround for MPC826x erratum PCI 9"
depends on PCI_8260 && !ADS8272 depends on PCI_8260 && !8272
default y default y
choice choice
......
arch/powerpc/boot/dts/mpc8272ads.dts
View file @ e00c5498
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
/ { / {
model = "MPC8272ADS"; model = "MPC8272ADS";
compatible = "MPC8260ADS"; compatible = "fsl,mpc8272ads";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
...@@ -22,187 +22,208 @@ ...@@ -22,187 +22,208 @@
PowerPC,8272@0 { PowerPC,8272@0 {
device_type = "cpu"; device_type = "cpu";
reg = <0>; reg = <0>;
d-cache-line-size = <20>; // 32 bytes d-cache-line-size = <d#32>;
i-cache-line-size = <20>; // 32 bytes i-cache-line-size = <d#32>;
d-cache-size = <4000>; // L1, 16K d-cache-size = <d#16384>;
i-cache-size = <4000>; // L1, 16K i-cache-size = <d#16384>;
timebase-frequency = <0>; timebase-frequency = <0>;
bus-frequency = <0>; bus-frequency = <0>;
clock-frequency = <0>; clock-frequency = <0>;
}; };
}; };
pci_pic: interrupt-controller@f8200000 {
#address-cells = <0>;
#interrupt-cells = <2>;
interrupt-controller;
reg = <f8200000 f8200004>;
device_type = "pci-pic";
};
memory { memory {
device_type = "memory"; device_type = "memory";
reg = <00000000 4000000 f4500000 00000020>; reg = <0 0>;
};
chosen {
name = "chosen";
linux,platform = <0>;
interrupt-controller = <&Cpm_pic>;
}; };
soc8272@f0000000 { localbus@f0010100 {
#address-cells = <1>; compatible = "fsl,mpc8272-localbus",
"fsl,pq2-localbus";
#address-cells = <2>;
#size-cells = <1>; #size-cells = <1>;
device_type = "soc"; reg = <f0010100 40>;
ranges = <00000000 f0000000 00053000>;
reg = <f0000000 10000>;
mdio@0 { ranges = <0 0 fe000000 02000000
device_type = "mdio"; 1 0 f4500000 00008000
compatible = "fs_enet"; 3 0 f8200000 00008000>;
reg = <0 0>;
#address-cells = <1>;
#size-cells = <0>;
phy0:ethernet-phy@0 {
interrupt-parent = <&Cpm_pic>;
interrupts = <17 4>;
reg = <0>;
bitbang = [ 12 12 13 02 02 01 ];
device_type = "ethernet-phy";
};
phy1:ethernet-phy@1 { flash@0,0 {
interrupt-parent = <&Cpm_pic>; compatible = "jedec-flash";
interrupts = <17 4>; reg = <0 0 2000000>;
bitbang = [ 12 12 13 02 02 01 ]; bank-width = <4>;
reg = <3>; device-width = <1>;
device_type = "ethernet-phy";
};
}; };
ethernet@24000 { board-control@1,0 {
#address-cells = <1>; reg = <1 0 20>;
#size-cells = <0>; compatible = "fsl,mpc8272ads-bcsr";
device_type = "network";
device-id = <1>;
compatible = "fs_enet";
model = "FCC";
reg = <11300 20 8400 100 11380 30>;
mac-address = [ 00 11 2F 99 43 54 ];
interrupts = <20 2>;
interrupt-parent = <&Cpm_pic>;
phy-handle = <&Phy0>;
rx-clock = <13>;
tx-clock = <12>;
}; };
ethernet@25000 { PCI_PIC: interrupt-controller@3,0 {
device_type = "network"; compatible = "fsl,mpc8272ads-pci-pic",
device-id = <2>; "fsl,pq2ads-pci-pic";
compatible = "fs_enet"; #interrupt-cells = <1>;
model = "FCC"; interrupt-controller;
reg = <11320 20 8500 100 113b0 30>; reg = <3 0 8>;
mac-address = [ 00 11 2F 99 44 54 ]; interrupt-parent = <&PIC>;
interrupts = <21 2>; interrupts = <14 8>;
interrupt-parent = <&Cpm_pic>;
phy-handle = <&Phy1>;
rx-clock = <17>;
tx-clock = <18>;
}; };
};
pci@f0010800 {
device_type = "pci";
reg = <f0010800 10c f00101ac 8 f00101c4 8>;
compatible = "fsl,mpc8272-pci", "fsl,pq2-pci";
#interrupt-cells = <1>;
#size-cells = <2>;
#address-cells = <3>;
clock-frequency = <d#66666666>;
interrupt-map-mask = <f800 0 0 7>;
interrupt-map = <
/* IDSEL 0x16 */
b000 0 0 1 &PCI_PIC 0
b000 0 0 2 &PCI_PIC 1
b000 0 0 3 &PCI_PIC 2
b000 0 0 4 &PCI_PIC 3
/* IDSEL 0x17 */
b800 0 0 1 &PCI_PIC 4
b800 0 0 2 &PCI_PIC 5
b800 0 0 3 &PCI_PIC 6
b800 0 0 4 &PCI_PIC 7
/* IDSEL 0x18 */
c000 0 0 1 &PCI_PIC 8
c000 0 0 2 &PCI_PIC 9
c000 0 0 3 &PCI_PIC a
c000 0 0 4 &PCI_PIC b>;
interrupt-parent = <&PIC>;
interrupts = <12 8>;
ranges = <42000000 0 80000000 80000000 0 20000000
02000000 0 a0000000 a0000000 0 20000000
01000000 0 00000000 f6000000 0 02000000>;
};
soc@f0000000 {
#address-cells = <1>;
#size-cells = <1>;
device_type = "soc";
compatible = "fsl,mpc8272", "fsl,pq2-soc";
ranges = <00000000 f0000000 00053000>;
// Temporary -- will go away once kernel uses ranges for get_immrbase().
reg = <f0000000 00053000>;
cpm@f0000000 { cpm@119c0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
device_type = "cpm"; compatible = "fsl,mpc8272-cpm", "fsl,cpm2";
model = "CPM2"; reg = <119c0 30 0 2000>;
ranges = <00000000 00000000 20000>; ranges;
reg = <0 20000>;
command-proc = <119c0>; brg@119f0 {
brg-frequency = <17D7840>; compatible = "fsl,mpc8272-brg",
cpm_clk = <BEBC200>; "fsl,cpm2-brg",
"fsl,cpm-brg";
scc@11a00 { reg = <119f0 10 115f0 10>;
};
serial@11a00 {
device_type = "serial"; device_type = "serial";
compatible = "cpm_uart"; compatible = "fsl,mpc8272-scc-uart",
model = "SCC"; "fsl,cpm2-scc-uart";
device-id = <1>;
reg = <11a00 20 8000 100>; reg = <11a00 20 8000 100>;
current-speed = <1c200>; interrupts = <28 8>;
interrupts = <28 2>; interrupt-parent = <&PIC>;
interrupt-parent = <&Cpm_pic>; fsl,cpm-brg = <1>;
clock-setup = <0 00ffffff>; fsl,cpm-command = <00800000>;
rx-clock = <1>;
tx-clock = <1>;
}; };
scc@11a60 { serial@11a60 {
device_type = "serial"; device_type = "serial";
compatible = "cpm_uart"; compatible = "fsl,mpc8272-scc-uart",
model = "SCC"; "fsl,cpm2-scc-uart";
device-id = <4>;
reg = <11a60 20 8300 100>; reg = <11a60 20 8300 100>;
current-speed = <1c200>; interrupts = <2b 8>;
interrupts = <2b 2>; interrupt-parent = <&PIC>;
interrupt-parent = <&Cpm_pic>; fsl,cpm-brg = <4>;
clock-setup = <1b ffffff00>; fsl,cpm-command = <0ce00000>;
rx-clock = <4>; };
tx-clock = <4>;
mdio@10d40 {
device_type = "mdio";
compatible = "fsl,mpc8272ads-mdio-bitbang",
"fsl,mpc8272-mdio-bitbang",
"fsl,cpm2-mdio-bitbang";
reg = <10d40 14>;
#address-cells = <1>;
#size-cells = <0>;
fsl,mdio-pin = <12>;
fsl,mdc-pin = <13>;
PHY0: ethernet-phy@0 {
interrupt-parent = <&PIC>;
interrupts = <17 8>;
reg = <0>;
device_type = "ethernet-phy";
};
PHY1: ethernet-phy@1 {
interrupt-parent = <&PIC>;
interrupts = <17 8>;
reg = <3>;
device_type = "ethernet-phy";
};
};
ethernet@11300 {
device_type = "network";
compatible = "fsl,mpc8272-fcc-enet",
"fsl,cpm2-fcc-enet";
reg = <11300 20 8400 100 11390 1>;
local-mac-address = [ 00 00 00 00 00 00 ];
interrupts = <20 8>;
interrupt-parent = <&PIC>;
phy-handle = <&PHY0>;
linux,network-index = <0>;
fsl,cpm-command = <12000300>;
};
ethernet@11320 {
device_type = "network";
compatible = "fsl,mpc8272-fcc-enet",
"fsl,cpm2-fcc-enet";
reg = <11320 20 8500 100 113b0 1>;
local-mac-address = [ 00 00 00 00 00 00 ];
interrupts = <21 8>;
interrupt-parent = <&PIC>;
phy-handle = <&PHY1>;
linux,network-index = <1>;
fsl,cpm-command = <16200300>;
}; };
}; };
cpm_pic:interrupt-controller@10c00 { PIC: interrupt-controller@10c00 {
#address-cells = <0>;
#interrupt-cells = <2>; #interrupt-cells = <2>;
interrupt-controller; interrupt-controller;
reg = <10c00 80>; reg = <10c00 80>;
device_type = "cpm-pic"; compatible = "fsl,mpc8272-pic", "fsl,cpm2-pic";
compatible = "CPM2";
};
pci@0500 {
#interrupt-cells = <1>;
#size-cells = <2>;
#address-cells = <3>;
compatible = "8272";
device_type = "pci";
reg = <10430 4dc>;
clock-frequency = <3f940aa>;
interrupt-map-mask = <f800 0 0 7>;
interrupt-map = <
/* IDSEL 0x16 */
b000 0 0 1 f8200000 40 8
b000 0 0 2 f8200000 41 8
b000 0 0 3 f8200000 42 8
b000 0 0 4 f8200000 43 8
/* IDSEL 0x17 */
b800 0 0 1 f8200000 43 8
b800 0 0 2 f8200000 40 8
b800 0 0 3 f8200000 41 8
b800 0 0 4 f8200000 42 8
/* IDSEL 0x18 */
c000 0 0 1 f8200000 42 8
c000 0 0 2 f8200000 43 8
c000 0 0 3 f8200000 40 8
c000 0 0 4 f8200000 41 8>;
interrupt-parent = <&Cpm_pic>;
interrupts = <14 8>;
bus-range = <0 0>;
ranges = <02000000 0 80000000 80000000 0 40000000
01000000 0 00000000 f6000000 0 02000000>;
}; };
/* May need to remove if on a part without crypto engine */ /* May need to remove if on a part without crypto engine */
crypto@30000 { crypto@30000 {
device_type = "crypto"; device_type = "crypto";
model = "SEC2"; model = "SEC2";
compatible = "talitos"; compatible = "fsl,mpc8272-talitos-sec2",
"fsl,talitos-sec2",
"fsl,talitos",
"talitos";
reg = <30000 10000>; reg = <30000 10000>;
interrupts = <b 2>; interrupts = <b 8>;
interrupt-parent = <&Cpm_pic>; interrupt-parent = <&PIC>;
num-channels = <4>; num-channels = <4>;
channel-fifo-len = <18>; channel-fifo-len = <18>;
exec-units-mask = <0000007e>; exec-units-mask = <0000007e>;
...@@ -210,4 +231,8 @@ ...@@ -210,4 +231,8 @@
descriptor-types-mask = <01010ebf>; descriptor-types-mask = <01010ebf>;
}; };
}; };
chosen {
linux,stdout-path = "/soc/cpm/serial@11a00";
};
}; };
arch/powerpc/configs/mpc8272_ads_defconfig
View file @ e00c5498
This diff is collapsed.
arch/powerpc/platforms/82xx/Kconfig
View file @ e00c5498
...@@ -10,6 +10,8 @@ config MPC8272_ADS ...@@ -10,6 +10,8 @@ config MPC8272_ADS
select 8272 select 8272
select 8260 select 8260
select FSL_SOC select FSL_SOC
select PQ2_ADS_PCI_PIC if PCI
select PPC_CPM_NEW_BINDING
help help
This option enables support for the MPC8272 ADS board This option enables support for the MPC8272 ADS board
...@@ -34,3 +36,6 @@ config 8272 ...@@ -34,3 +36,6 @@ config 8272
help help
The MPC8272 CPM has a different internal dpram setup than other CPM2 The MPC8272 CPM has a different internal dpram setup than other CPM2
devices devices
config PQ2_ADS_PCI_PIC
bool
arch/powerpc/platforms/82xx/Makefile
View file @ e00c5498
...@@ -2,3 +2,5 @@ ...@@ -2,3 +2,5 @@
# Makefile for the PowerPC 82xx linux kernel. # Makefile for the PowerPC 82xx linux kernel.
# #
obj-$(CONFIG_MPC8272_ADS) += mpc8272_ads.o obj-$(CONFIG_MPC8272_ADS) += mpc8272_ads.o
obj-$(CONFIG_CPM2) += pq2.o
obj-$(CONFIG_PQ2_ADS_PCI_PIC) += pq2ads-pci-pic.o
arch/powerpc/platforms/82xx/mpc8272_ads.c
View file @ e00c5498
This diff is collapsed.
arch/powerpc/platforms/82xx/pq2.c 0 → 100644
View file @ e00c5498
/*
* Common PowerQUICC II code.
*
* Author: Scott Wood <scottwood@freescale.com>
* Copyright (c) 2007 Freescale Semiconductor
*
* Based on code by Vitaly Bordug <vbordug@ru.mvista.com>
* pq2_restart fix by Wade Farnsworth <wfarnsworth@mvista.com>
* Copyright (c) 2006 MontaVista Software, Inc.
*
* 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 <asm/cpm2.h>
#include <asm/io.h>
#include <asm/pci-bridge.h>
#include <asm/system.h>
#include <platforms/82xx/pq2.h>
#define RMR_CSRE 0x00000001
void pq2_restart(char *cmd)
{
local_irq_disable();
setbits32(&cpm2_immr->im_clkrst.car_rmr, RMR_CSRE);
/* Clear the ME,EE,IR & DR bits in MSR to cause checkstop */
mtmsr(mfmsr() & ~(MSR_ME | MSR_EE | MSR_IR | MSR_DR));
in_8(&cpm2_immr->im_clkrst.res[0]);
panic("Restart failed\n");
}
#ifdef CONFIG_PCI
static int pq2_pci_exclude_device(struct pci_controller *hose,
u_char bus, u8 devfn)
{
if (bus == 0 && PCI_SLOT(devfn) == 0)
return PCIBIOS_DEVICE_NOT_FOUND;
else
return PCIBIOS_SUCCESSFUL;
}
static void __init pq2_pci_add_bridge(struct device_node *np)
{
struct pci_controller *hose;
struct resource r;
if (of_address_to_resource(np, 0, &r) || r.end - r.start < 0x10b)
goto err;
pci_assign_all_buses = 1;
hose = pcibios_alloc_controller(np);
if (!hose)
return;
hose->arch_data = np;
setup_indirect_pci(hose, r.start + 0x100, r.start + 0x104, 0);
pci_process_bridge_OF_ranges(hose, np, 1);
return;
err:
printk(KERN_ERR "No valid PCI reg property in device tree\n");
}
void __init pq2_init_pci(void)
{
struct device_node *np = NULL;
ppc_md.pci_exclude_device = pq2_pci_exclude_device;
while ((np = of_find_compatible_node(np, NULL, "fsl,pq2-pci")))
pq2_pci_add_bridge(np);
}
#endif
arch/powerpc/platforms/82xx/pq2.h 0 → 100644
View file @ e00c5498
#ifndef _PQ2_H
#define _PQ2_H
void pq2_restart(char *cmd);
#ifdef CONFIG_PCI
int pq2ads_pci_init_irq(void);
void pq2_init_pci(void);
#else
static inline int pq2ads_pci_init_irq(void)
{
return 0;
}
static inline void pq2_init_pci(void)
{
}
#endif
#endif
arch/powerpc/platforms/82xx/pq2ads-pci-pic.c 0 → 100644
View file @ e00c5498
/*
* PQ2 ADS-style PCI interrupt controller
*
* Copyright 2007 Freescale Semiconductor, Inc.
* Author: Scott Wood <scottwood@freescale.com>
*
* Loosely based on mpc82xx ADS support by Vitaly Bordug <vbordug@ru.mvista.com>
* Copyright (c) 2006 MontaVista Software, Inc.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 as published
* by the Free Software Foundation.
*/
#include <linux/init.h>
#include <linux/spinlock.h>
#include <linux/irq.h>
#include <linux/types.h>
#include <linux/bootmem.h>
#include <asm/io.h>
#include <asm/prom.h>
#include <asm/cpm2.h>
#include "pq2.h"
static DEFINE_SPINLOCK(pci_pic_lock);
struct pq2ads_pci_pic {
struct device_node *node;
struct irq_host *host;
struct {
u32 stat;
u32 mask;
} __iomem *regs;
};
#define NUM_IRQS 32
static void pq2ads_pci_mask_irq(unsigned int virq)
{
struct pq2ads_pci_pic *priv = get_irq_chip_data(virq);
int irq = NUM_IRQS - virq_to_hw(virq) - 1;
if (irq != -1) {
unsigned long flags;
spin_lock_irqsave(&pci_pic_lock, flags);
setbits32(&priv->regs->mask, 1 << irq);
mb();
spin_unlock_irqrestore(&pci_pic_lock, flags);
}
}
static void pq2ads_pci_unmask_irq(unsigned int virq)
{
struct pq2ads_pci_pic *priv = get_irq_chip_data(virq);
int irq = NUM_IRQS - virq_to_hw(virq) - 1;
if (irq != -1) {
unsigned long flags;
spin_lock_irqsave(&pci_pic_lock, flags);
clrbits32(&priv->regs->mask, 1 << irq);
spin_unlock_irqrestore(&pci_pic_lock, flags);
}
}
static struct irq_chip pq2ads_pci_ic = {
.typename = "PQ2 ADS PCI",
.name = "PQ2 ADS PCI",
.end = pq2ads_pci_unmask_irq,
.mask = pq2ads_pci_mask_irq,
.mask_ack = pq2ads_pci_mask_irq,
.ack = pq2ads_pci_mask_irq,
.unmask = pq2ads_pci_unmask_irq,
.enable = pq2ads_pci_unmask_irq,
.disable = pq2ads_pci_mask_irq
};
static void pq2ads_pci_irq_demux(unsigned int irq, struct irq_desc *desc)
{
struct pq2ads_pci_pic *priv = desc->handler_data;
u32 stat, mask, pend;
int bit;
for (;;) {
stat = in_be32(&priv->regs->stat);
mask = in_be32(&priv->regs->mask);
pend = stat & ~mask;
if (!pend)
break;
for (bit = 0; pend != 0; ++bit, pend <<= 1) {
if (pend & 0x80000000) {
int virq = irq_linear_revmap(priv->host, bit);
generic_handle_irq(virq);
}
}
}
}
static int pci_pic_host_map(struct irq_host *h, unsigned int virq,
irq_hw_number_t hw)
{
get_irq_desc(virq)->status |= IRQ_LEVEL;
set_irq_chip_data(virq, h->host_data);
set_irq_chip(virq, &pq2ads_pci_ic);
return 0;
}
static void pci_host_unmap(struct irq_host *h, unsigned int virq)
{
/* remove chip and handler */
set_irq_chip_data(virq, NULL);
set_irq_chip(virq, NULL);
}
static struct irq_host_ops pci_pic_host_ops = {
.map = pci_pic_host_map,
.unmap = pci_host_unmap,
};
int __init pq2ads_pci_init_irq(void)
{
struct pq2ads_pci_pic *priv;
struct irq_host *host;
struct device_node *np;
int ret = -ENODEV;
int irq;
np = of_find_compatible_node(NULL, NULL, "fsl,pq2ads-pci-pic");
if (!np) {
printk(KERN_ERR "No pci pic node in device tree.\n");
of_node_put(np);
goto out;
}
irq = irq_of_parse_and_map(np, 0);
if (irq == NO_IRQ) {
printk(KERN_ERR "No interrupt in pci pic node.\n");
of_node_put(np);
goto out;
}
priv = alloc_bootmem(sizeof(struct pq2ads_pci_pic));
if (!priv) {
of_node_put(np);
ret = -ENOMEM;
goto out_unmap_irq;
}
/* PCI interrupt controller registers: status and mask */
priv->regs = of_iomap(np, 0);
if (!priv->regs) {
printk(KERN_ERR "Cannot map PCI PIC registers.\n");
goto out_free_bootmem;
}
/* mask all PCI interrupts */
out_be32(&priv->regs->mask, ~0);
mb();
host = irq_alloc_host(np, IRQ_HOST_MAP_LINEAR, NUM_IRQS,
&pci_pic_host_ops, NUM_IRQS);
if (!host) {
ret = -ENOMEM;
goto out_unmap_regs;
}
host->host_data = priv;
priv->host = host;
host->host_data = priv;
set_irq_data(irq, priv);
set_irq_chained_handler(irq, pq2ads_pci_irq_demux);
of_node_put(np);
return 0;
out_unmap_regs:
iounmap(priv->regs);
out_free_bootmem:
free_bootmem((unsigned long)priv,
sizeof(sizeof(struct pq2ads_pci_pic)));
of_node_put(np);
out_unmap_irq:
irq_dispose_mapping(irq);
out:
return ret;
}
arch/powerpc/platforms/82xx/pq2ads.h
View file @ e00c5498
...@@ -53,7 +53,5 @@ ...@@ -53,7 +53,5 @@
#define SIU_INT_SCC3 ((uint)0x2a+CPM_IRQ_OFFSET) #define SIU_INT_SCC3 ((uint)0x2a+CPM_IRQ_OFFSET)
#define SIU_INT_SCC4 ((uint)0x2b+CPM_IRQ_OFFSET) #define SIU_INT_SCC4 ((uint)0x2b+CPM_IRQ_OFFSET)
void m82xx_pci_init_irq(void);
#endif /* __MACH_ADS8260_DEFS */ #endif /* __MACH_ADS8260_DEFS */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment