Merge branch 'hix5hd2_gmac-compatible-string'
Dongpo Li says: ==================== net: hix5hd2_gmac: keep the compatible string not changed This patch series fix the patch: d0fb6ba7 ("net: hix5hd2_gmac: add generic compatible string") The SoC hix5hd2 compatible string has the suffix "-gmac" and we should not change its compatible string. So we should name all the compatible string with the suffix "-gmac". Creating a new name suffix "-gemac" is unnecessary. ==================== Signed-off-by:David S. Miller <davem@davemloft.net>
Showing
- Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt 8 additions, 5 deletions...tation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
- arch/arm/boot/dts/hisi-x5hd2.dtsi 2 additions, 2 deletionsarch/arm/boot/dts/hisi-x5hd2.dtsi
- drivers/net/ethernet/hisilicon/hix5hd2_gmac.c 7 additions, 6 deletionsdrivers/net/ethernet/hisilicon/hix5hd2_gmac.c
Loading
Please register or sign in to comment