From a1ecde2c6f00825e3a6d90dc774cddc18cb0e247 Mon Sep 17 00:00:00 2001 From: "Yisen.Zhuang\\(Zhuangyuzeng\\)" Date: Thu, 28 Apr 2016 15:09:03 +0800 Subject: [PATCH] Documentation: Bindings: Update DT binding for hns dsaf node This patch changes property port-id to reg in dsaf port node, removes property cpld-ctrl-reg, and fixes some typos. Signed-off-by: Yisen Zhuang Signed-off-by: David S. Miller --- .../bindings/net/hisilicon-hns-dsaf.txt | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt b/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt index 5ccd4f002a67..d4b7f2e49984 100644 --- a/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt +++ b/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt @@ -13,10 +13,10 @@ Required properties: - interrupts: should contain the DSA Fabric and rcb interrupt. - reg: specifies base physical address(es) and size of the device registers. The first region is external interface control register base and size(optional, - only be used when subctrl-syscon is not exists). It is recommended using + only used when subctrl-syscon does not exist). It is recommended using subctrl-syscon rather than this address. - The second region is SerDes base register and size(optional, only be used when - serdes-syscon in port node is not exists. It is recommended using + The second region is SerDes base register and size(optional, only used when + serdes-syscon in port node does not exist). It is recommended using serdes-syscon rather than this address. The third region is the PPE register base and size. The fourth region is dsa fabric base register and size. It is not required for @@ -24,8 +24,8 @@ Required properties: - reg-names: may be ppe-base and(or) dsaf-base. It is used to find the corresponding reg's index. -- phy-handle: phy handle of physicl port, 0 if not any phy device. It is optional - attribute. If port node is exists, phy-handle in each port node will be used. +- phy-handle: phy handle of physical port, 0 if not any phy device. It is optional + attribute. If port node exists, phy-handle in each port node will be used. see ethernet.txt [1]. - subctrl-syscon: is syscon handle for external interface control register. - reset-field-offset: is offset of reset field. Its value depends on the hardware @@ -35,14 +35,12 @@ Required properties: - port: subnodes of dsaf. A dsaf node may contain several port nodes(Depending on mode of dsaf). Port node contain some attributes listed below: -- port-id: is physical port index in one dsaf. -- phy-handle: phy handle of physicl port. It is not required if there isn't +- reg: is physical port index in one dsaf. +- phy-handle: phy handle of physical port. It is not required if there isn't phy device. see ethernet.txt [1]. - serdes-syscon: is syscon handle for SerDes register. -- cpld-syscon: is syscon handle for cpld register. It is not required if there - isn't cpld device. -- cpld-ctrl-reg: is cpld register offset. It is not required if there isn't - cpld-syscon. +- cpld-syscon: is syscon handle + register offset pair for cpld register. It is + not required if there isn't cpld device. - port-rst-offset: is offset of reset field for each port in dsaf. Its value depends on the hardware user manual. - port-mode-offset: is offset of port mode field for each port in dsaf. Its @@ -72,14 +70,14 @@ dsaf0: dsa@c7000000 { desc-num = <1024>; dma-coherent; - prot@0 { - port-id = 0; + port@0 { + reg = 0; phy-handle = <&phy0>; serdes-syscon = <&serdes>; }; - prot@1 { - port-id = 1; + port@1 { + reg = 1; serdes-syscon = <&serdes>; }; }; -- 2.39.5