at91: drivers for 3.3
Arnd, Olof,
This is a first "drivers" part of our material for 3.3 merge window. It collects Ethernet drivers changes.
One thing to note is that the macb.c driver is modified to support device tree. We agreed with David to drag those modifications into arm-soc git tree because they go on top of Jamie's work on macb-gem driver already in your drivers/macb-gem branch.
This pull request goes on top of Linus' 3.2-rc5 commit but with additional dependencies with two of your branches:
1/ fixes (which seems already included in 3.2-rc5)
2/ drivers/macb-gem
I had to resolve a conflict while merging the macb-gem branche with current 3.2-rc5. The resolution is commited into this branch.
Tell me if you need more precision.
The following changes since commit 6d69370e2b4a1e04e9ba0095d60aec7736fa1a99:
Merge remote-tracking branch 'armsoc/drivers/macb-gem' into for-3.3on32rc5-drivers (2011-12-15 15:55:59 +0100)
are available in the git repository at:
git://github.com/at91linux/linux-at91.git for-arnd-3.3-drivers
Jean-Christophe PLAGNIOL-VILLARD (1):
net/macb: add DT support for Cadence macb/gem driver
Nicolas Ferre (2):
ARM: at91/net: add macb ethernet controller in 9g45/9g20 DT net/at91_ether: use gpio_is_valid for phy IRQ line
Documentation/devicetree/bindings/net/macb.txt | 25 ++++++++ arch/arm/boot/dts/at91sam9g20.dtsi | 7 ++ arch/arm/boot/dts/at91sam9g45.dtsi | 7 ++ arch/arm/boot/dts/at91sam9m10g45ek.dts | 5 ++ arch/arm/boot/dts/usb_a9g20.dts | 5 ++ drivers/net/ethernet/cadence/at91_ether.c | 23 ++++--- drivers/net/ethernet/cadence/macb.c | 73 +++++++++++++++++++++--- drivers/net/ethernet/cadence/macb.h | 2 + 8 files changed, 129 insertions(+), 18 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/macb.txt
Thanks, bye,
Signature · 1 line
Nicolas Ferre
Hi,
Quoted 9 lines · Nicolas Ferre
Arnd, Olof,
This is a first "drivers" part of our material for 3.3 merge window. It collects Ethernet drivers changes.
One thing to note is that themacb.cdriver is modified to support device tree. We agreed with David to drag those modifications into arm-soc git tree because they go on top of Jamie's work on macb-gem driver already in yourdrivers/macb-gembranch.
Quoted 8 lines
This pull request goes on top of Linus' 3.2-rc5 commit but with additional dependencies with two of your branches:
1/ fixes (which seems already included in 3.2-rc5)
2/drivers/macb-gemI had to resolve a conflict while merging the macb-gem branche with current 3.2-rc5. The resolution is commited into this branch.
Tell me if you need more precision.
The history of this branch due to the double dependencies gets a bit awkward. Also, it seems like you in one of your merges kept the 'default y' in NET_CADENCE that should have been removed.
Would you mind trying this instead?
* Base this new branch on the previous macb-gem branch
* Cherry-pick the fixes from 'fixes' into the new branch if truly needed -- I tested here and all of the patches applied cleanly.
* Then apply these patches
* For build testing before sending, merge into for-next to aggregate with the rest of the 'fixes' changes -- it's OK that we have to do a fixup here.
That should give a clean branch with neat history for just these changes. About 'fixes': Since they are in for-next, and will be in 3.2, that dependency will be taken care of that way.
Then send a fresh pull request for that new branch, please.
Thanks!
-Olof
On 12/16/2011 06:53 AM, Olof Johansson :
Quoted 17 lines
Hi,
Quoted 14 lines · Nicolas Ferre
Arnd, Olof,
This is a first "drivers" part of our material for 3.3 merge window. It collects Ethernet drivers changes.
One thing to note is that themacb.cdriver is modified to support device tree. We agreed with David to drag those modifications into arm-soc git tree because they go on top of Jamie's work on macb-gem driver already in yourdrivers/macb-gembranch.This pull request goes on top of Linus' 3.2-rc5 commit but with additional dependencies with two of your branches:
1/ fixes (which seems already included in 3.2-rc5)
2/drivers/macb-gem
Quoted 7 lines
Quoted 3 lines
I had to resolve a conflict while merging the macb-gem branche with current 3.2-rc5. The resolution is commited into this branch.
Tell me if you need more precision.The history of this branch due to the double dependencies gets a bit awkward. Also, it seems like you in one of your merges kept the 'default y' in
NET_CADENCEthat should have been removed.
Well, no, this line has been added into "eccab1ec" and is in mainline since 3.2-rc3.
This line have to be kept and the merge conflict is triggered during the merge of macb-gem on top of Linus' tree. BTW, this merge is already performed properly in linux-next.
Quoted 10 lines
Would you mind trying this instead?
* Base this new branch on the previous macb-gem branch
* Cherry-pick the fixes from 'fixes' into the new branch if truly needed -- I tested here and all of the patches applied cleanly.
* Then apply these patches
* For build testing before sending, merge into for-next to aggregate with the rest of the 'fixes' changes -- it's OK that we have to do a fixup here.
Quoted 5 lines
That should give a clean branch with neat history for just these changes. About 'fixes': Since they are in for-next, and will be in 3.2, that dependency will be taken care of that way.
Then send a fresh pull request for that new branch, please.
Ok, I will base my "drivers" branch on top of macb-gem one and send you another pull request.
Thanks, bye,
Signature · 1 line
Nicolas Ferre
Quoted 10 lines · Nicolas Ferre
This is the version 2 of the pull request related to Ethernet drivers for AT91. As you requested, it is based on arm-soc/drivers/macb-gem branch:
The following changes since commit
0116da4fcc1ae8a80d9002441e98768f2a6fa2fe:macb: allow GEM to have configurable receive buffer size (2011-11-22 15:21:20 +0000)
are available in the git repository at:
git://github.com/at91linux/linux-at91.gitfor-arnd-3.3-driversV2
Quoted 6 lines
Jean-Christophe PLAGNIOL-VILLARD (1):
net/macb: add DT support for Cadence macb/gem driverNicolas Ferre (2):
ARM: at91/net: add macb ethernet controller in 9g45/9g20 DTnet/at91_ether: usegpio_is_validfor phy IRQ line
Pulled into next/drivers, thanks for the quick update!
Arnd
Nicolas, Jean-Christophe,
Quoted 2 lines · Nicolas Ferre
Jean-Christophe PLAGNIOL-VILLARD (1):
? ? ?net/macb: add DT support for Cadence macb/gem driver
This patch breaks build for non-OF configs. I hit this at least with afeb9260_defconfig, at91cap9_defconfig and at91sam9263_defconfig. Still building other defconfigs:
drivers/net/ethernet/cadence/macb.c:1503: error: implicit declaration of function 'of_match_ptr' drivers/net/ethernet/cadence/macb.c:1503: error: 'macb_dt_ids' undeclared here (not in a function) drivers/net/ethernet/cadence/macb.c:1503: error: initializer element is not constantdrivers/net/ethernet/cadence/macb.c:1503: error: (near initialization for 'macb_driver.driver.of_match_table')
-Olof