From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752843AbbLEHuI (ORCPT ); Sat, 5 Dec 2015 02:50:08 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:4712 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752296AbbLEHuG (ORCPT ); Sat, 5 Dec 2015 02:50:06 -0500 From: yankejian To: , , , , , , , , , , , , , , , CC: , , , , , Subject: [PATCH net-next 0/2] net: hns: enet specisies a reference to dsaf Date: Sat, 5 Dec 2015 15:59:14 +0800 Message-ID: <1449302356-54658-1-git-send-email-yankejian@huawei.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.67.212.75] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020204.566295C5.0016,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=512, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 2ed8a476724b2c89e5049cccc120920f Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org in this patchset, enet specifies a reference to dsaf. and delete the ae-name in enet, and adds parsing the ae-handle from DT to set the associating with dsaf. the patchset updates the dtsi and bindings documents as well. yankejian (2): net: hns: enet specisies a reference to dsaf net: hns: enet specisies a reference to dsaf (config and documents) .../devicetree/bindings/net/hisilicon-hns-dsaf.txt | 5 +---- .../devicetree/bindings/net/hisilicon-hns-nic.txt | 7 ++++--- arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi | 19 +++++++++---------- drivers/net/ethernet/hisilicon/hns/hnae.c | 17 +++++++---------- drivers/net/ethernet/hisilicon/hns/hnae.h | 7 +++++-- drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 4 ++++ drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 10 +--------- drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 1 + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 13 +++++++++---- drivers/net/ethernet/hisilicon/hns/hns_enet.h | 2 +- 10 files changed, 42 insertions(+), 43 deletions(-) -- 1.9.1