Skip to content

Commit 1c88995

Browse files
committed
Merge branch 'sms911x-dts'
Geert Uytterhoeven says: ==================== sms911x: DTS fixes and DT binding to json-schema conversion This patch series converts the Smart Mixed-Signal Connectivity (SMSC) LAN911x/912x Controller Device Tree binding documentation to json-schema, after fixing a few issues in DTS files. Changed compared to v1[1]: - Dropped applied patches, - Add Reviewed-by, - Drop bogus double quotes in compatible values, - Add comment explaining why "additionalProperties: true" is needed. [1] [PATCH 0/5] sms911x: DTS fixes and DT binding to json-schema conversion https://lore.kernel.org/r/[email protected] ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents 18a419b + 19373d0 commit 1c88995

File tree

4 files changed

+112
-47
lines changed

4 files changed

+112
-47
lines changed

Documentation/devicetree/bindings/net/gpmc-eth.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Documentation/devicetree/bindings/memory-controllers/omap-gpmc.txt
1313

1414
For the properties relevant to the ethernet controller connected to the GPMC
1515
refer to the binding documentation of the device. For example, the documentation
16-
for the SMSC 911x is Documentation/devicetree/bindings/net/smsc911x.txt
16+
for the SMSC 911x is Documentation/devicetree/bindings/net/smsc,lan9115.yaml
1717

1818
Child nodes need to specify the GPMC bus address width using the "bank-width"
1919
property but is possible that an ethernet controller also has a property to
Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/net/smsc,lan9115.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Smart Mixed-Signal Connectivity (SMSC) LAN911x/912x Controller
8+
9+
maintainers:
10+
- Shawn Guo <[email protected]>
11+
12+
allOf:
13+
- $ref: ethernet-controller.yaml#
14+
15+
properties:
16+
compatible:
17+
oneOf:
18+
- const: smsc,lan9115
19+
- items:
20+
- enum:
21+
- smsc,lan89218
22+
- smsc,lan9117
23+
- smsc,lan9118
24+
- smsc,lan9220
25+
- smsc,lan9221
26+
- const: smsc,lan9115
27+
28+
reg:
29+
maxItems: 1
30+
31+
reg-shift: true
32+
33+
reg-io-width:
34+
enum: [ 2, 4 ]
35+
default: 2
36+
37+
interrupts:
38+
minItems: 1
39+
items:
40+
- description:
41+
LAN interrupt line
42+
- description:
43+
Optional PME (power management event) interrupt that is able to wake
44+
up the host system with a 50ms pulse on network activity
45+
46+
clocks:
47+
maxItems: 1
48+
49+
phy-mode: true
50+
51+
smsc,irq-active-high:
52+
type: boolean
53+
description: Indicates the IRQ polarity is active-high
54+
55+
smsc,irq-push-pull:
56+
type: boolean
57+
description: Indicates the IRQ type is push-pull
58+
59+
smsc,force-internal-phy:
60+
type: boolean
61+
description: Forces SMSC LAN controller to use internal PHY
62+
63+
smsc,force-external-phy:
64+
type: boolean
65+
description: Forces SMSC LAN controller to use external PHY
66+
67+
smsc,save-mac-address:
68+
type: boolean
69+
description:
70+
Indicates that MAC address needs to be saved before resetting the
71+
controller
72+
73+
reset-gpios:
74+
maxItems: 1
75+
description:
76+
A GPIO line connected to the RESET (active low) signal of the device.
77+
On many systems this is wired high so the device goes out of reset at
78+
power-on, but if it is under program control, this optional GPIO can
79+
wake up in response to it.
80+
81+
vdd33a-supply:
82+
description: 3.3V analog power supply
83+
84+
vddvario-supply:
85+
description: IO logic power supply
86+
87+
required:
88+
- compatible
89+
- reg
90+
- interrupts
91+
92+
# There are lots of bus-specific properties ("qcom,*", "samsung,*", "fsl,*",
93+
# "gpmc,*", ...) to be found, that actually depend on the compatible value of
94+
# the parent node.
95+
additionalProperties: true
96+
97+
examples:
98+
- |
99+
#include <dt-bindings/gpio/gpio.h>
100+
101+
ethernet@f4000000 {
102+
compatible = "smsc,lan9220", "smsc,lan9115";
103+
reg = <0xf4000000 0x2000000>;
104+
phy-mode = "mii";
105+
interrupt-parent = <&gpio1>;
106+
interrupts = <31>, <32>;
107+
reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
108+
reg-io-width = <4>;
109+
smsc,irq-push-pull;
110+
};

Documentation/devicetree/bindings/net/smsc911x.txt

Lines changed: 0 additions & 43 deletions
This file was deleted.

arch/arm/boot/dts/qcom-apq8060-dragonboard.dts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@
581581
* EBI2. This has a 25MHz chrystal next to it, so no
582582
* clocking is needed.
583583
*/
584-
ethernet-ebi2@2,0 {
584+
ethernet@2,0 {
585585
compatible = "smsc,lan9221", "smsc,lan9115";
586586
reg = <2 0x0 0x100>;
587587
/*
@@ -598,8 +598,6 @@
598598
phy-mode = "mii";
599599
reg-io-width = <2>;
600600
smsc,force-external-phy;
601-
/* IRQ on edge falling = active low */
602-
smsc,irq-active-low;
603601
smsc,irq-push-pull;
604602

605603
/*

0 commit comments

Comments
 (0)