Commit ab98bbee authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'ax88796c-spi-ethernet-adapter' 

Łukasz Stelmach says:

====================
AX88796C SPI Ethernet Adapter

This is a driver for AX88796C Ethernet Adapter connected in SPI mode as
found on ARTIK5 evaluation board. The driver has been ported from a
v3.10.9 vendor kernel for ARTIK5 board.
====================

Link: https://lore.kernel.org/r/20211020182422.362647-1-l.stelmach@samsung.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 8e8c1bfc a97c69ba

Documentation/devicetree/bindings/net/asix,ax88796c.yaml

0 → 100644
+73 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause

%YAML 1.2

---

$id: http://devicetree.org/schemas/net/asix,ax88796c.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: ASIX AX88796C SPI Ethernet Adapter



maintainers:

  - Łukasz Stelmach <l.stelmach@samsung.com>



description: |

  ASIX AX88796C is an Ethernet controller with a built in PHY. This

  describes SPI mode of the chip.



  The node for this driver must be a child node of an SPI controller,

  hence all mandatory properties described in

  ../spi/spi-controller.yaml must be specified.



allOf:

  - $ref: ethernet-controller.yaml#



properties:

  compatible:

    const: asix,ax88796c



  reg:

    maxItems: 1



  spi-max-frequency:

    maximum: 40000000



  interrupts:

    maxItems: 1



  reset-gpios:

    description:

      A GPIO line handling reset of the chip. As the line is active low,

      it should be marked GPIO_ACTIVE_LOW.

    maxItems: 1



  local-mac-address: true



  mac-address: true



required:

  - compatible

  - reg

  - spi-max-frequency

  - interrupts

  - reset-gpios



additionalProperties: false



examples:

  # Artik5 eval board

  - |

    #include <dt-bindings/interrupt-controller/irq.h>

    #include <dt-bindings/gpio/gpio.h>

    spi0 {

        #address-cells = <1>;

        #size-cells = <0>;



        ethernet@0 {

            compatible = "asix,ax88796c";

            reg = <0x0>;

            local-mac-address = [00 00 00 00 00 00]; /* Filled in by a bootloader */

            interrupt-parent = <&gpx2>;

            interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

            spi-max-frequency = <40000000>;

            reset-gpios = <&gpe0 2 GPIO_ACTIVE_LOW>;

        };

    };

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -131,6 +131,8 @@ patternProperties: 
    description: Asahi Kasei Corp.

  "^asc,.*":

    description: All Sensors Corporation

  "^asix,.*":

    description: ASIX Electronics Corporation

  "^aspeed,.*":

    description: ASPEED Technology Inc.

  "^asus,.*":

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -2899,6 +2899,12 @@ S: Maintained 
F:	Documentation/hwmon/asc7621.rst

F:	drivers/hwmon/asc7621.c









ASIX AX88796C SPI ETHERNET ADAPTER









M:	Łukasz Stelmach <l.stelmach@samsung.com>









S:	Maintained









F:	Documentation/devicetree/bindings/net/asix,ax88796c.yaml









F:	drivers/net/ethernet/asix/ax88796c_*

















ASPEED PINCTRL DRIVERS









M:	Andrew Jeffery <andrew@aj.id.au>









L:	linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
































drivers/net/ethernet/Kconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -33,6 +33,7 @@ source "drivers/net/ethernet/apm/Kconfig"







source "drivers/net/ethernet/apple/Kconfig"









source "drivers/net/ethernet/aquantia/Kconfig"









source "drivers/net/ethernet/arc/Kconfig"









source "drivers/net/ethernet/asix/Kconfig"









source "drivers/net/ethernet/atheros/Kconfig"









source "drivers/net/ethernet/broadcom/Kconfig"









source "drivers/net/ethernet/brocade/Kconfig"
































drivers/net/ethernet/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -19,6 +19,7 @@ obj-$(CONFIG_NET_XGENE) += apm/







obj-$(CONFIG_NET_VENDOR_APPLE) += apple/









obj-$(CONFIG_NET_VENDOR_AQUANTIA) += aquantia/









obj-$(CONFIG_NET_VENDOR_ARC) += arc/









obj-$(CONFIG_NET_VENDOR_ASIX) += asix/









obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/









obj-$(CONFIG_NET_VENDOR_CADENCE) += cadence/









obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/