Commit 5be661a2 authored by Paul Mackerras's avatar Paul Mackerras

Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc

parents fbe543b4 b17b8181
...@@ -21,6 +21,7 @@ aliases { ...@@ -21,6 +21,7 @@ aliases {
serial1 = &serial1; serial1 = &serial1;
pci0 = &pci0; pci0 = &pci0;
pci1 = &pci1; pci1 = &pci1;
pci2 = &pci2;
}; };
cpus { cpus {
...@@ -105,7 +106,7 @@ serial1: serial@4600 { ...@@ -105,7 +106,7 @@ serial1: serial@4600 {
compatible = "ns16550"; compatible = "ns16550";
reg = <0x4600 0x100>; reg = <0x4600 0x100>;
clock-frequency = <0>; clock-frequency = <0>;
interrupts = <28 2>; interrupts = <42 2>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
}; };
...@@ -322,4 +323,24 @@ uli1575@0 { ...@@ -322,4 +323,24 @@ uli1575@0 {
}; };
}; };
}; };
pci2: pcie@e0009000 {
#address-cells = <3>;
#size-cells = <2>;
#interrupt-cells = <1>;
device_type = "pci";
compatible = "fsl,mpc8641-pcie";
reg = <0xe0009000 0x00001000>;
ranges = <0x02000000 0 0x90000000 0x90000000 0 0x10000000
0x01000000 0 0x00000000 0xe2000000 0 0x00100000>;
bus-range = <0 255>;
interrupt-map-mask = <0xf800 0 0 7>;
interrupt-map = <0x0000 0 0 1 &mpic 4 1
0x0000 0 0 2 &mpic 5 1
0x0000 0 0 3 &mpic 6 1
0x0000 0 0 4 &mpic 7 1>;
interrupt-parent = <&mpic>;
interrupts = <25 2>;
clock-frequency = <33333333>;
};
}; };
...@@ -176,6 +176,7 @@ struct rio_priv { ...@@ -176,6 +176,7 @@ struct rio_priv {
/** /**
* fsl_rio_doorbell_send - Send a MPC85xx doorbell message * fsl_rio_doorbell_send - Send a MPC85xx doorbell message
* @mport: RapidIO master port info
* @index: ID of RapidIO interface * @index: ID of RapidIO interface
* @destid: Destination ID of target device * @destid: Destination ID of target device
* @data: 16-bit info field of RapidIO doorbell message * @data: 16-bit info field of RapidIO doorbell message
...@@ -211,6 +212,7 @@ static int fsl_rio_doorbell_send(struct rio_mport *mport, ...@@ -211,6 +212,7 @@ static int fsl_rio_doorbell_send(struct rio_mport *mport,
/** /**
* fsl_local_config_read - Generate a MPC85xx local config space read * fsl_local_config_read - Generate a MPC85xx local config space read
* @mport: RapidIO master port info
* @index: ID of RapdiIO interface * @index: ID of RapdiIO interface
* @offset: Offset into configuration space * @offset: Offset into configuration space
* @len: Length (in bytes) of the maintenance transaction * @len: Length (in bytes) of the maintenance transaction
...@@ -232,6 +234,7 @@ static int fsl_local_config_read(struct rio_mport *mport, ...@@ -232,6 +234,7 @@ static int fsl_local_config_read(struct rio_mport *mport,
/** /**
* fsl_local_config_write - Generate a MPC85xx local config space write * fsl_local_config_write - Generate a MPC85xx local config space write
* @mport: RapidIO master port info
* @index: ID of RapdiIO interface * @index: ID of RapdiIO interface
* @offset: Offset into configuration space * @offset: Offset into configuration space
* @len: Length (in bytes) of the maintenance transaction * @len: Length (in bytes) of the maintenance transaction
...@@ -254,6 +257,7 @@ static int fsl_local_config_write(struct rio_mport *mport, ...@@ -254,6 +257,7 @@ static int fsl_local_config_write(struct rio_mport *mport,
/** /**
* fsl_rio_config_read - Generate a MPC85xx read maintenance transaction * fsl_rio_config_read - Generate a MPC85xx read maintenance transaction
* @mport: RapidIO master port info
* @index: ID of RapdiIO interface * @index: ID of RapdiIO interface
* @destid: Destination ID of transaction * @destid: Destination ID of transaction
* @hopcount: Number of hops to target device * @hopcount: Number of hops to target device
...@@ -295,6 +299,7 @@ fsl_rio_config_read(struct rio_mport *mport, int index, u16 destid, ...@@ -295,6 +299,7 @@ fsl_rio_config_read(struct rio_mport *mport, int index, u16 destid,
/** /**
* fsl_rio_config_write - Generate a MPC85xx write maintenance transaction * fsl_rio_config_write - Generate a MPC85xx write maintenance transaction
* @mport: RapidIO master port info
* @index: ID of RapdiIO interface * @index: ID of RapdiIO interface
* @destid: Destination ID of transaction * @destid: Destination ID of transaction
* @hopcount: Number of hops to target device * @hopcount: Number of hops to target device
...@@ -985,8 +990,8 @@ static inline void fsl_rio_info(struct device *dev, u32 ccsr) ...@@ -985,8 +990,8 @@ static inline void fsl_rio_info(struct device *dev, u32 ccsr)
} }
/** /**
* fsl_rio_setup - Setup MPC85xx RapidIO interface * fsl_rio_setup - Setup Freescale PowerPC RapidIO interface
* @fsl_rio_setup - Setup Freescale PowerPC RapidIO interface * @dev: of_device pointer
* *
* Initializes MPC85xx RapidIO hardware interface, configures * Initializes MPC85xx RapidIO hardware interface, configures
* master port with system-specific info, and registers the * master port with system-specific info, and registers the
......
...@@ -389,8 +389,8 @@ static int __init gfar_of_init(void) ...@@ -389,8 +389,8 @@ static int __init gfar_of_init(void)
} }
gfar_data.phy_id = *id; gfar_data.phy_id = *id;
snprintf(gfar_data.bus_id, MII_BUS_ID_SIZE, "%x", snprintf(gfar_data.bus_id, MII_BUS_ID_SIZE, "%llx",
res.start); (unsigned long long)res.start);
of_node_put(phy); of_node_put(phy);
of_node_put(mdio); of_node_put(mdio);
......
...@@ -107,7 +107,7 @@ xilinx_intc_init(struct device_node *np) ...@@ -107,7 +107,7 @@ xilinx_intc_init(struct device_node *np)
} }
regs = ioremap(res.start, 32); regs = ioremap(res.start, 32);
printk(KERN_INFO "Xilinx intc at 0x%08X mapped to 0x%p\n", printk(KERN_INFO "Xilinx intc at 0x%08LX mapped to 0x%p\n",
res.start, regs); res.start, regs);
/* Setup interrupt controller */ /* Setup interrupt controller */
......
...@@ -623,8 +623,8 @@ static int __devinit hwicap_setup(struct device *dev, int id, ...@@ -623,8 +623,8 @@ static int __devinit hwicap_setup(struct device *dev, int id,
if (!request_mem_region(drvdata->mem_start, if (!request_mem_region(drvdata->mem_start,
drvdata->mem_size, DRIVER_NAME)) { drvdata->mem_size, DRIVER_NAME)) {
dev_err(dev, "Couldn't lock memory region at %p\n", dev_err(dev, "Couldn't lock memory region at %Lx\n",
(void *)regs_res->start); regs_res->start);
retval = -EBUSY; retval = -EBUSY;
goto failed1; goto failed1;
} }
...@@ -643,7 +643,7 @@ static int __devinit hwicap_setup(struct device *dev, int id, ...@@ -643,7 +643,7 @@ static int __devinit hwicap_setup(struct device *dev, int id,
mutex_init(&drvdata->sem); mutex_init(&drvdata->sem);
drvdata->is_open = 0; drvdata->is_open = 0;
dev_info(dev, "ioremap %lx to %p with size %x\n", dev_info(dev, "ioremap %lx to %p with size %Lx\n",
(unsigned long int)drvdata->mem_start, (unsigned long int)drvdata->mem_start,
drvdata->base_address, drvdata->mem_size); drvdata->base_address, drvdata->mem_size);
......
...@@ -163,6 +163,8 @@ enum rio_phy_type { ...@@ -163,6 +163,8 @@ enum rio_phy_type {
* @ops: configuration space functions * @ops: configuration space functions
* @id: Port ID, unique among all ports * @id: Port ID, unique among all ports
* @index: Port index, unique among all port interfaces of the same type * @index: Port index, unique among all port interfaces of the same type
* @sys_size: RapidIO common transport system size
* @phy_type: RapidIO phy type
* @name: Port name string * @name: Port name string
* @priv: Master port private data * @priv: Master port private data
*/ */
......
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