diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-11-28 11:02:14 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-11-28 11:06:44 +0100 |
| commit | 2e9cce8fb1f577088e2b20ae2f461130e13ad190 (patch) | |
| tree | f82ae53e88d36e07608be1b3159da296ed025ef1 /dts/Bindings/net/can | |
| parent | c68d466d263827692aa809e6b34abb90a1cab515 (diff) | |
| download | barebox-2e9cce8fb1f577088e2b20ae2f461130e13ad190.tar.gz barebox-2e9cce8fb1f577088e2b20ae2f461130e13ad190.tar.xz | |
dts: update to v4.15-rc1
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/Bindings/net/can')
| -rw-r--r-- | dts/Bindings/net/can/m_can.txt | 2 | ||||
| -rw-r--r-- | dts/Bindings/net/can/sun4i_can.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/dts/Bindings/net/can/m_can.txt b/dts/Bindings/net/can/m_can.txt index 78138333ff..63e90421d0 100644 --- a/dts/Bindings/net/can/m_can.txt +++ b/dts/Bindings/net/can/m_can.txt @@ -45,7 +45,7 @@ Required properties: Example: SoC dtsi: -m_can1: can@020e8000 { +m_can1: can@20e8000 { compatible = "bosch,m_can"; reg = <0x020e8000 0x4000>, <0x02298000 0x4000>; reg-names = "m_can", "message_ram"; diff --git a/dts/Bindings/net/can/sun4i_can.txt b/dts/Bindings/net/can/sun4i_can.txt index 84ed1909df..f69845e6fe 100644 --- a/dts/Bindings/net/can/sun4i_can.txt +++ b/dts/Bindings/net/can/sun4i_can.txt @@ -19,7 +19,7 @@ SoC common .dtsi file: allwinner,pull = <0>; }; ... - can0: can@01c2bc00 { + can0: can@1c2bc00 { compatible = "allwinner,sun4i-a10-can"; reg = <0x01c2bc00 0x400>; interrupts = <0 26 4>; @@ -29,7 +29,7 @@ SoC common .dtsi file: Board specific .dts file: - can0: can@01c2bc00 { + can0: can@1c2bc00 { pinctrl-names = "default"; pinctrl-0 = <&can0_pins_a>; status = "okay"; |