On Thu, Mar 13, 2014 at 02:44:24PM -0700, Tim Harvey wrote: > Properly add the PCI device node for the 2nd GigE port so that the device > driver can get its MAC from DT. Note that the Ventana bootloader uses > the ethernet1 alias to populate the MAC address by adding the > local-mac-address > property. Also remove the unnecesssary 'sky2' alias. > > This is based on Shawn's for-next branch
This line shouldn't be necessarily in the commit log. > > Signed-off-by: Tim Harvey <[email protected]> > --- > arch/arm/boot/dts/imx6q-gw5400-a.dts | 40 > +++++++++++++++++++++++++++++++---- > arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 39 ++++++++++++++++++++++++++++++---- > arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 39 ++++++++++++++++++++++++++++++---- > 3 files changed, 106 insertions(+), 12 deletions(-) > > diff --git a/arch/arm/boot/dts/imx6q-gw5400-a.dts > b/arch/arm/boot/dts/imx6q-gw5400-a.dts > index 902f983..5d2b912 100644 > --- a/arch/arm/boot/dts/imx6q-gw5400-a.dts > +++ b/arch/arm/boot/dts/imx6q-gw5400-a.dts > @@ -16,7 +16,7 @@ > model = "Gateworks Ventana GW5400-A"; > compatible = "gw,imx6q-gw5400-a", "gw,ventana", "fsl,imx6q"; > > - /* these are used by bootloader for disabling nodes */ > + /* these are used by bootloader for configuring nodes */ > aliases { > ethernet0 = &fec; > ethernet1 = ð1; > @@ -26,7 +26,7 @@ > led0 = &led0; > led1 = &led1; > led2 = &led2; > - sky2 = ð1; > + No need to add a new line. > ssi0 = &ssi1; > spi0 = &ecspi1; > usb0 = &usbh1; > @@ -496,8 +496,40 @@ > reset-gpio = <&gpio1 29 0>; > status = "okay"; > > - eth1: sky2@8 { /* MAC/PHY on bus 8 */ > - compatible = "marvell,sky2"; So this was just a placeholder and did not actually work in any way, right? > + pcie@0,0 { Is this whole bridge/switch hierarchy binding documented somewhere or is this just something that work for you? > + /* 00:00.0 host-bridge */ > + #address-cells = <3>; > + #size-cells = <2>; > + device_type = "pci"; > + reg = <0x0 0 0 0 0>; > + > + /* > + * GigE PCI dev node needs to be defined so that enet driver > + * can use it to obtain its boot-loader specified MAC > + */ > + pcie@0,0 { > + /* 01:00.0 PCIe switch */ > + #address-cells = <3>; > + #size-cells = <2>; > + device_type = "pci"; > + reg = <0x0 0 0 0 0>; > + > + pcie@8,0 { What's the naming schema for all these pcie nodes? Generally, we should have the numbers encoded in the node name coming from the address cells in 'reg' property. Shawn > + /* 02:08.0 PCIe switch port */ > + #address-cells = <3>; > + #size-cells = <2>; > + device_type = "pci"; > + reg = <0x4000 0 0 0 0>; > + eth1: pcie@0,0 { > + /* 08:00.0 GigE */ > + #address-cells = <3>; > + #size-cells = <2>; > + device_type = "pci"; > + reg = <0x0 0 0 0 0>; > + compatible = "marvell,sky2"; > + }; > + }; > + }; > }; > }; > > diff --git a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi > b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi > index c8e5ae0..46a8582 100644 > --- a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi > +++ b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi > @@ -10,7 +10,7 @@ > */ > > / { > - /* these are used by bootloader for disabling nodes */ > + /* these are used by bootloader for configuring nodes */ > aliases { > can0 = &can1; > ethernet0 = &fec; > @@ -19,7 +19,6 @@ > led1 = &led1; > led2 = &led2; > nand = &gpmi; > - sky2 = ð1; > ssi0 = &ssi1; > usb0 = &usbh1; > usb1 = &usbotg; > @@ -503,8 +502,40 @@ > reset-gpio = <&gpio1 29 0>; > status = "okay"; > > - eth1: sky2@8 { /* MAC/PHY on bus 8 */ > - compatible = "marvell,sky2"; > + /* > + * GigE PCI dev node needs to be defined so that enet driver > + * can use it to obtain its boot-loader specified MAC > + */ > + pcie@0,0 { > + /* 00:00.0 root host-bridge */ > + #address-cells = <3>; > + #size-cells = <2>; > + device_type = "pci"; > + reg = <0x0 0 0 0 0>; > + > + pcie@0,0 { > + /* 01:00.0 PCIe switch */ > + #address-cells = <3>; > + #size-cells = <2>; > + device_type = "pci"; > + reg = <0x0 0 0 0 0>; > + > + pcie@4,0 { > + /* 02:04.0 PCIe switch port */ > + #address-cells = <3>; > + #size-cells = <2>; > + device_type = "pci"; > + reg = <0x2000 0 0 0 0>; > + eth1: pcie@0,0 { > + /* 04:00.0 GigE */ > + #address-cells = <3>; > + #size-cells = <2>; > + device_type = "pci"; > + reg = <0x0 0 0 0 0>; > + compatible = "marvell,sky2"; > + }; > + }; > + }; > }; > }; > > diff --git a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi > b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi > index 2795dfc..697aa67 100644 > --- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi > +++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi > @@ -10,7 +10,7 @@ > */ > > / { > - /* these are used by bootloader for disabling nodes */ > + /* these are used by bootloader for configuring nodes */ > aliases { > can0 = &can1; > ethernet0 = &fec; > @@ -19,7 +19,6 @@ > led1 = &led1; > led2 = &led2; > nand = &gpmi; > - sky2 = ð1; > ssi0 = &ssi1; > usb0 = &usbh1; > usb1 = &usbotg; > @@ -525,8 +524,40 @@ > reset-gpio = <&gpio1 29 0>; > status = "okay"; > > - eth1: sky2@8 { /* MAC/PHY on bus 8 */ > - compatible = "marvell,sky2"; > + /* > + * GigE PCI dev node needs to be defined so that enet driver > + * can use it to obtain its boot-loader specified MAC > + */ > + pcie@0,0 { > + /* 00:00.0 root host-bridge */ > + #address-cells = <3>; > + #size-cells = <2>; > + device_type = "pci"; > + reg = <0x0 0 0 0 0>; > + > + pcie@0,0 { > + /* 01:00.0 PCIe switch */ > + #address-cells = <3>; > + #size-cells = <2>; > + device_type = "pci"; > + reg = <0x0 0 0 0 0>; > + > + pcie@8,0 { > + /* 02:08.0 PCIe switch port */ > + #address-cells = <3>; > + #size-cells = <2>; > + device_type = "pci"; > + reg = <0x4000 0 0 0 0>; > + eth1: pcie@0,0 { > + /* 08:00.0 GigE */ > + #address-cells = <3>; > + #size-cells = <2>; > + device_type = "pci"; > + reg = <0x0 0 0 0 0>; > + compatible = "marvell,sky2"; > + }; > + }; > + }; > }; > }; > > -- > 1.8.3.2 > > > _______________________________________________ > linux-arm-kernel mailing list > [email protected] > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
