Commit 56626f33 authored by Anton Vorontsov's avatar Anton Vorontsov Committed by Kumar Gala

[POWERPC] QE: UCC nodes cleanup

- get rid of `model = "UCC"' in the ucc nodes
  It isn't used anywhere, so remove it. If we'll ever need something
  like this, we'll use compatible property instead.
- replace last occurrences of device-id with cell-index.
  Drivers are modified for backward compatibility's sake.
Signed-off-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: default avatarTimur Tabi <timur@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent e24e788a
...@@ -1645,8 +1645,7 @@ platforms are moved over to use the flattened-device-tree model. ...@@ -1645,8 +1645,7 @@ platforms are moved over to use the flattened-device-tree model.
- device_type : should be "network", "hldc", "uart", "transparent" - device_type : should be "network", "hldc", "uart", "transparent"
"bisync", "atm", or "serial". "bisync", "atm", or "serial".
- compatible : could be "ucc_geth" or "fsl_atm" and so on. - compatible : could be "ucc_geth" or "fsl_atm" and so on.
- model : should be "UCC". - cell-index : the ucc number(1-8), corresponding to UCCx in UM.
- device-id : the ucc number(1-8), corresponding to UCCx in UM.
- reg : Offset and length of the register set for the device - reg : Offset and length of the register set for the device
- interrupts : <a b> where a is the interrupt number and b is a - interrupts : <a b> where a is the interrupt number and b is a
field that represents an encoding of the sense and level field that represents an encoding of the sense and level
...@@ -1699,8 +1698,7 @@ platforms are moved over to use the flattened-device-tree model. ...@@ -1699,8 +1698,7 @@ platforms are moved over to use the flattened-device-tree model.
ucc@2000 { ucc@2000 {
device_type = "network"; device_type = "network";
compatible = "ucc_geth"; compatible = "ucc_geth";
model = "UCC"; cell-index = <1>;
device-id = <1>;
reg = <2000 200>; reg = <2000 200>;
interrupts = <a0 0>; interrupts = <a0 0>;
interrupt-parent = <700>; interrupt-parent = <700>;
......
...@@ -255,9 +255,7 @@ usb@6c0 { ...@@ -255,9 +255,7 @@ usb@6c0 {
enet0: ucc@2200 { enet0: ucc@2200 {
device_type = "network"; device_type = "network";
compatible = "ucc_geth"; compatible = "ucc_geth";
model = "UCC";
cell-index = <3>; cell-index = <3>;
device-id = <3>;
reg = <0x2200 0x200>; reg = <0x2200 0x200>;
interrupts = <34>; interrupts = <34>;
interrupt-parent = <&qeic>; interrupt-parent = <&qeic>;
...@@ -271,9 +269,7 @@ enet0: ucc@2200 { ...@@ -271,9 +269,7 @@ enet0: ucc@2200 {
enet1: ucc@3200 { enet1: ucc@3200 {
device_type = "network"; device_type = "network";
compatible = "ucc_geth"; compatible = "ucc_geth";
model = "UCC";
cell-index = <4>; cell-index = <4>;
device-id = <4>;
reg = <0x3200 0x200>; reg = <0x3200 0x200>;
interrupts = <35>; interrupts = <35>;
interrupt-parent = <&qeic>; interrupt-parent = <&qeic>;
...@@ -287,8 +283,7 @@ enet1: ucc@3200 { ...@@ -287,8 +283,7 @@ enet1: ucc@3200 {
ucc@2400 { ucc@2400 {
device_type = "serial"; device_type = "serial";
compatible = "ucc_uart"; compatible = "ucc_uart";
model = "UCC"; cell-index = <5>; /* The UCC number, 1-7*/
device-id = <5>; /* The UCC number, 1-7*/
port-number = <0>; /* Which ttyQEx device */ port-number = <0>; /* Which ttyQEx device */
soft-uart; /* We need Soft-UART */ soft-uart; /* We need Soft-UART */
reg = <0x2400 0x200>; reg = <0x2400 0x200>;
......
...@@ -208,9 +208,7 @@ spi@500 { ...@@ -208,9 +208,7 @@ spi@500 {
enet0: ucc@3000 { enet0: ucc@3000 {
device_type = "network"; device_type = "network";
compatible = "ucc_geth"; compatible = "ucc_geth";
model = "UCC";
cell-index = <2>; cell-index = <2>;
device-id = <2>;
reg = <0x3000 0x200>; reg = <0x3000 0x200>;
interrupts = <33>; interrupts = <33>;
interrupt-parent = <&qeic>; interrupt-parent = <&qeic>;
...@@ -224,9 +222,7 @@ enet0: ucc@3000 { ...@@ -224,9 +222,7 @@ enet0: ucc@3000 {
enet1: ucc@2200 { enet1: ucc@2200 {
device_type = "network"; device_type = "network";
compatible = "ucc_geth"; compatible = "ucc_geth";
model = "UCC";
cell-index = <3>; cell-index = <3>;
device-id = <3>;
reg = <0x2200 0x200>; reg = <0x2200 0x200>;
interrupts = <34>; interrupts = <34>;
interrupt-parent = <&qeic>; interrupt-parent = <&qeic>;
......
...@@ -257,9 +257,7 @@ usb@6c0 { ...@@ -257,9 +257,7 @@ usb@6c0 {
enet0: ucc@2000 { enet0: ucc@2000 {
device_type = "network"; device_type = "network";
compatible = "ucc_geth"; compatible = "ucc_geth";
model = "UCC";
cell-index = <1>; cell-index = <1>;
device-id = <1>;
reg = <0x2000 0x200>; reg = <0x2000 0x200>;
interrupts = <32>; interrupts = <32>;
interrupt-parent = <&qeic>; interrupt-parent = <&qeic>;
...@@ -274,9 +272,7 @@ enet0: ucc@2000 { ...@@ -274,9 +272,7 @@ enet0: ucc@2000 {
enet1: ucc@3000 { enet1: ucc@3000 {
device_type = "network"; device_type = "network";
compatible = "ucc_geth"; compatible = "ucc_geth";
model = "UCC";
cell-index = <2>; cell-index = <2>;
device-id = <2>;
reg = <0x3000 0x200>; reg = <0x3000 0x200>;
interrupts = <33>; interrupts = <33>;
interrupt-parent = <&qeic>; interrupt-parent = <&qeic>;
......
...@@ -324,9 +324,7 @@ spi@500 { ...@@ -324,9 +324,7 @@ spi@500 {
enet2: ucc@2000 { enet2: ucc@2000 {
device_type = "network"; device_type = "network";
compatible = "ucc_geth"; compatible = "ucc_geth";
model = "UCC";
cell-index = <1>; cell-index = <1>;
device-id = <1>;
reg = <2000 200>; reg = <2000 200>;
interrupts = <20>; interrupts = <20>;
interrupt-parent = <&qeic>; interrupt-parent = <&qeic>;
...@@ -341,9 +339,7 @@ enet2: ucc@2000 { ...@@ -341,9 +339,7 @@ enet2: ucc@2000 {
enet3: ucc@3000 { enet3: ucc@3000 {
device_type = "network"; device_type = "network";
compatible = "ucc_geth"; compatible = "ucc_geth";
model = "UCC";
cell-index = <2>; cell-index = <2>;
device-id = <2>;
reg = <3000 200>; reg = <3000 200>;
interrupts = <21>; interrupts = <21>;
interrupt-parent = <&qeic>; interrupt-parent = <&qeic>;
......
...@@ -3852,7 +3852,13 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma ...@@ -3852,7 +3852,13 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
ugeth_vdbg("%s: IN", __FUNCTION__); ugeth_vdbg("%s: IN", __FUNCTION__);
prop = of_get_property(np, "device-id", NULL); prop = of_get_property(np, "cell-index", NULL);
if (!prop) {
prop = of_get_property(np, "device-id", NULL);
if (!prop)
return -ENODEV;
}
ucc_num = *prop - 1; ucc_num = *prop - 1;
if ((ucc_num < 0) || (ucc_num > 7)) if ((ucc_num < 0) || (ucc_num > 7))
return -ENODEV; return -ENODEV;
......
...@@ -203,9 +203,14 @@ static int uec_mdio_probe(struct of_device *ofdev, const struct of_device_id *ma ...@@ -203,9 +203,14 @@ static int uec_mdio_probe(struct of_device *ofdev, const struct of_device_id *ma
if ((res.start >= tempres.start) && if ((res.start >= tempres.start) &&
(res.end <= tempres.end)) { (res.end <= tempres.end)) {
/* set this UCC to be the MII master */ /* set this UCC to be the MII master */
const u32 *id = of_get_property(tempnp, "device-id", NULL); const u32 *id;
if (id == NULL)
goto bus_register_fail; id = of_get_property(tempnp, "cell-index", NULL);
if (!id) {
id = of_get_property(tempnp, "device-id", NULL);
if (!id)
goto bus_register_fail;
}
ucc_set_qe_mux_mii_mng(*id - 1); ucc_set_qe_mux_mii_mng(*id - 1);
......
...@@ -1270,10 +1270,18 @@ static int ucc_uart_probe(struct of_device *ofdev, ...@@ -1270,10 +1270,18 @@ static int ucc_uart_probe(struct of_device *ofdev,
/* Get the UCC number (device ID) */ /* Get the UCC number (device ID) */
/* UCCs are numbered 1-7 */ /* UCCs are numbered 1-7 */
iprop = of_get_property(np, "device-id", NULL); iprop = of_get_property(np, "cell-index", NULL);
if (!iprop || (*iprop < 1) || (*iprop > UCC_MAX_NUM)) { if (!iprop) {
dev_err(&ofdev->dev, iprop = of_get_property(np, "device-id", NULL);
"missing or invalid UCC specified in device tree\n"); if (!iprop) {
dev_err(&ofdev->dev, "UCC is unspecified in "
"device tree\n");
return -EINVAL;
}
}
if ((*iprop < 1) || (*iprop > UCC_MAX_NUM)) {
dev_err(&ofdev->dev, "no support for UCC%u\n", *iprop);
kfree(qe_port); kfree(qe_port);
return -ENODEV; return -ENODEV;
} }
......
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