diff options
| author | Boris BREZILLON <boris.brezillon@free-electrons.com> | 2015-03-07 01:23:29 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-07 22:31:21 -0500 |
| commit | 9c348d45d829be10bea4cb8e675f14a1baf9bab1 (patch) | |
| tree | 232a214bc09db2e9fbceedfde7610f2d5193aa0e | |
| parent | 1b5ef07e3dd3972d9111650fb6e0f5a566c741d8 (diff) | |
ARM: at91/dt: fix macb compatible strings
Some at91 SoCs embed a 10/100 Mbit Ethernet IP, that is based on the
at91sam9260 SoC.
Fix at91 DTs accordingly.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Reviewed-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | arch/arm/boot/dts/at91sam9260.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/at91sam9263.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/at91sam9g45.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/at91sam9x5_macb0.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/at91sam9x5_macb1.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/sama5d3_emac.dtsi | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi index fff0ee69aab4..9f7c7376f2cf 100644 --- a/arch/arm/boot/dts/at91sam9260.dtsi +++ b/arch/arm/boot/dts/at91sam9260.dtsi | |||
| @@ -842,7 +842,7 @@ | |||
| 842 | }; | 842 | }; |
| 843 | 843 | ||
| 844 | macb0: ethernet@fffc4000 { | 844 | macb0: ethernet@fffc4000 { |
| 845 | compatible = "cdns,at32ap7000-macb", "cdns,macb"; | 845 | compatible = "cdns,at91sam9260-macb", "cdns,macb"; |
| 846 | reg = <0xfffc4000 0x100>; | 846 | reg = <0xfffc4000 0x100>; |
| 847 | interrupts = <21 IRQ_TYPE_LEVEL_HIGH 3>; | 847 | interrupts = <21 IRQ_TYPE_LEVEL_HIGH 3>; |
| 848 | pinctrl-names = "default"; | 848 | pinctrl-names = "default"; |
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi index 1f67bb4c144e..340179ef6ba0 100644 --- a/arch/arm/boot/dts/at91sam9263.dtsi +++ b/arch/arm/boot/dts/at91sam9263.dtsi | |||
| @@ -845,7 +845,7 @@ | |||
| 845 | }; | 845 | }; |
| 846 | 846 | ||
| 847 | macb0: ethernet@fffbc000 { | 847 | macb0: ethernet@fffbc000 { |
| 848 | compatible = "cdns,at32ap7000-macb", "cdns,macb"; | 848 | compatible = "cdns,at91sam9260-macb", "cdns,macb"; |
| 849 | reg = <0xfffbc000 0x100>; | 849 | reg = <0xfffbc000 0x100>; |
| 850 | interrupts = <21 IRQ_TYPE_LEVEL_HIGH 3>; | 850 | interrupts = <21 IRQ_TYPE_LEVEL_HIGH 3>; |
| 851 | pinctrl-names = "default"; | 851 | pinctrl-names = "default"; |
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi index ee80aa9c0759..586eab7b653d 100644 --- a/arch/arm/boot/dts/at91sam9g45.dtsi +++ b/arch/arm/boot/dts/at91sam9g45.dtsi | |||
| @@ -956,7 +956,7 @@ | |||
| 956 | }; | 956 | }; |
| 957 | 957 | ||
| 958 | macb0: ethernet@fffbc000 { | 958 | macb0: ethernet@fffbc000 { |
| 959 | compatible = "cdns,at32ap7000-macb", "cdns,macb"; | 959 | compatible = "cdns,at91sam9260-macb", "cdns,macb"; |
| 960 | reg = <0xfffbc000 0x100>; | 960 | reg = <0xfffbc000 0x100>; |
| 961 | interrupts = <25 IRQ_TYPE_LEVEL_HIGH 3>; | 961 | interrupts = <25 IRQ_TYPE_LEVEL_HIGH 3>; |
| 962 | pinctrl-names = "default"; | 962 | pinctrl-names = "default"; |
diff --git a/arch/arm/boot/dts/at91sam9x5_macb0.dtsi b/arch/arm/boot/dts/at91sam9x5_macb0.dtsi index 57e89d1d0325..73d7e30965ba 100644 --- a/arch/arm/boot/dts/at91sam9x5_macb0.dtsi +++ b/arch/arm/boot/dts/at91sam9x5_macb0.dtsi | |||
| @@ -53,7 +53,7 @@ | |||
| 53 | }; | 53 | }; |
| 54 | 54 | ||
| 55 | macb0: ethernet@f802c000 { | 55 | macb0: ethernet@f802c000 { |
| 56 | compatible = "cdns,at32ap7000-macb", "cdns,macb"; | 56 | compatible = "cdns,at91sam9260-macb", "cdns,macb"; |
| 57 | reg = <0xf802c000 0x100>; | 57 | reg = <0xf802c000 0x100>; |
| 58 | interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>; | 58 | interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>; |
| 59 | pinctrl-names = "default"; | 59 | pinctrl-names = "default"; |
diff --git a/arch/arm/boot/dts/at91sam9x5_macb1.dtsi b/arch/arm/boot/dts/at91sam9x5_macb1.dtsi index 663676c02861..d81980c40c7d 100644 --- a/arch/arm/boot/dts/at91sam9x5_macb1.dtsi +++ b/arch/arm/boot/dts/at91sam9x5_macb1.dtsi | |||
| @@ -41,7 +41,7 @@ | |||
| 41 | }; | 41 | }; |
| 42 | 42 | ||
| 43 | macb1: ethernet@f8030000 { | 43 | macb1: ethernet@f8030000 { |
| 44 | compatible = "cdns,at32ap7000-macb", "cdns,macb"; | 44 | compatible = "cdns,at91sam9260-macb", "cdns,macb"; |
| 45 | reg = <0xf8030000 0x100>; | 45 | reg = <0xf8030000 0x100>; |
| 46 | interrupts = <27 IRQ_TYPE_LEVEL_HIGH 3>; | 46 | interrupts = <27 IRQ_TYPE_LEVEL_HIGH 3>; |
| 47 | pinctrl-names = "default"; | 47 | pinctrl-names = "default"; |
diff --git a/arch/arm/boot/dts/sama5d3_emac.dtsi b/arch/arm/boot/dts/sama5d3_emac.dtsi index fe2af9276312..b4544cf11bad 100644 --- a/arch/arm/boot/dts/sama5d3_emac.dtsi +++ b/arch/arm/boot/dts/sama5d3_emac.dtsi | |||
| @@ -41,7 +41,7 @@ | |||
| 41 | }; | 41 | }; |
| 42 | 42 | ||
| 43 | macb1: ethernet@f802c000 { | 43 | macb1: ethernet@f802c000 { |
| 44 | compatible = "cdns,at32ap7000-macb", "cdns,macb"; | 44 | compatible = "cdns,at91sam9260-macb", "cdns,macb"; |
| 45 | reg = <0xf802c000 0x100>; | 45 | reg = <0xf802c000 0x100>; |
| 46 | interrupts = <35 IRQ_TYPE_LEVEL_HIGH 3>; | 46 | interrupts = <35 IRQ_TYPE_LEVEL_HIGH 3>; |
| 47 | pinctrl-names = "default"; | 47 | pinctrl-names = "default"; |