Skip to content

L
linux
Commit b45e0ed4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge tag 'at91-soc' of git://github.com/at91linux/linux-at91 into late/cleanup 

From Nicolas Ferre <nicolas.ferre@atmel.com>:

DT modifications for generic slave DMA binding.
Addition of MCI and I2C DMA bindings.
A little DT machine compatibility removal for SAMA5.

* tag 'at91-soc' of git://github.com/at91linux/linux-at91:
  ARM: at91/sama5d34ek.dts: remove not needed compatibility string
  ARM: at91: dts: add MCI DMA support
  ARM: at91: dts: add i2c dma support
  ARM: at91: dts: set #dma-cells to the correct value
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents aabdd290 a6268b86
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 3 deletions
arch/arm/boot/dts/at91sam9g45.dtsi
View file @ b45e0ed4
...@@ -108,6 +108,7 @@ dma: dma-controller@ffffec00 { ...@@ -108,6 +108,7 @@ dma: dma-controller@ffffec00 {
compatible = "atmel,at91sam9g45-dma"; compatible = "atmel,at91sam9g45-dma";
reg = <0xffffec00 0x200>; reg = <0xffffec00 0x200>;
interrupts = <21 4 0>; interrupts = <21 4 0>;
#dma-cells = <2>;
}; };
pinctrl@fffff200 { pinctrl@fffff200 {
...@@ -512,6 +513,8 @@ mmc0: mmc@fff80000 { ...@@ -512,6 +513,8 @@ mmc0: mmc@fff80000 {
compatible = "atmel,hsmci"; compatible = "atmel,hsmci";
reg = <0xfff80000 0x600>; reg = <0xfff80000 0x600>;
interrupts = <11 4 0>; interrupts = <11 4 0>;
dmas = <&dma 1 0>;
dma-names = "rxtx";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";
...@@ -521,6 +524,8 @@ mmc1: mmc@fffd0000 { ...@@ -521,6 +524,8 @@ mmc1: mmc@fffd0000 {
compatible = "atmel,hsmci"; compatible = "atmel,hsmci";
reg = <0xfffd0000 0x600>; reg = <0xfffd0000 0x600>;
interrupts = <29 4 0>; interrupts = <29 4 0>;
dmas = <&dma 1 13>;
dma-names = "rxtx";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";
......
arch/arm/boot/dts/at91sam9n12.dtsi
View file @ b45e0ed4
...@@ -89,6 +89,8 @@ mmc0: mmc@f0008000 { ...@@ -89,6 +89,8 @@ mmc0: mmc@f0008000 {
compatible = "atmel,hsmci"; compatible = "atmel,hsmci";
reg = <0xf0008000 0x600>; reg = <0xf0008000 0x600>;
interrupts = <12 4 0>; interrupts = <12 4 0>;
dmas = <&dma 1 0>;
dma-names = "rxtx";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";
...@@ -110,6 +112,7 @@ dma: dma-controller@ffffec00 { ...@@ -110,6 +112,7 @@ dma: dma-controller@ffffec00 {
compatible = "atmel,at91sam9g45-dma"; compatible = "atmel,at91sam9g45-dma";
reg = <0xffffec00 0x200>; reg = <0xffffec00 0x200>;
interrupts = <20 4 0>; interrupts = <20 4 0>;
#dma-cells = <2>;
}; };
pinctrl@fffff400 { pinctrl@fffff400 {
...@@ -360,6 +363,9 @@ i2c0: i2c@f8010000 { ...@@ -360,6 +363,9 @@ i2c0: i2c@f8010000 {
compatible = "atmel,at91sam9x5-i2c"; compatible = "atmel,at91sam9x5-i2c";
reg = <0xf8010000 0x100>; reg = <0xf8010000 0x100>;
interrupts = <9 4 6>; interrupts = <9 4 6>;
dmas = <&dma 1 13>,
<&dma 1 14>;
dma-names = "tx", "rx";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";
...@@ -369,6 +375,9 @@ i2c1: i2c@f8014000 { ...@@ -369,6 +375,9 @@ i2c1: i2c@f8014000 {
compatible = "atmel,at91sam9x5-i2c"; compatible = "atmel,at91sam9x5-i2c";
reg = <0xf8014000 0x100>; reg = <0xf8014000 0x100>;
interrupts = <10 4 6>; interrupts = <10 4 6>;
dmas = <&dma 1 15>,
<&dma 1 16>;
dma-names = "tx", "rx";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";
......
arch/arm/boot/dts/at91sam9x5.dtsi
View file @ b45e0ed4
...@@ -104,12 +104,14 @@ dma0: dma-controller@ffffec00 { ...@@ -104,12 +104,14 @@ dma0: dma-controller@ffffec00 {
compatible = "atmel,at91sam9g45-dma"; compatible = "atmel,at91sam9g45-dma";
reg = <0xffffec00 0x200>; reg = <0xffffec00 0x200>;
interrupts = <20 4 0>; interrupts = <20 4 0>;
#dma-cells = <2>;
}; };
dma1: dma-controller@ffffee00 { dma1: dma-controller@ffffee00 {
compatible = "atmel,at91sam9g45-dma"; compatible = "atmel,at91sam9g45-dma";
reg = <0xffffee00 0x200>; reg = <0xffffee00 0x200>;
interrupts = <21 4 0>; interrupts = <21 4 0>;
#dma-cells = <2>;
}; };
pinctrl@fffff400 { pinctrl@fffff400 {
...@@ -399,6 +401,8 @@ mmc0: mmc@f0008000 { ...@@ -399,6 +401,8 @@ mmc0: mmc@f0008000 {
compatible = "atmel,hsmci"; compatible = "atmel,hsmci";
reg = <0xf0008000 0x600>; reg = <0xf0008000 0x600>;
interrupts = <12 4 0>; interrupts = <12 4 0>;
dmas = <&dma0 1 0>;
dma-names = "rxtx";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";
...@@ -408,6 +412,8 @@ mmc1: mmc@f000c000 { ...@@ -408,6 +412,8 @@ mmc1: mmc@f000c000 {
compatible = "atmel,hsmci"; compatible = "atmel,hsmci";
reg = <0xf000c000 0x600>; reg = <0xf000c000 0x600>;
interrupts = <26 4 0>; interrupts = <26 4 0>;
dmas = <&dma1 1 0>;
dma-names = "rxtx";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";
...@@ -469,6 +475,9 @@ i2c0: i2c@f8010000 { ...@@ -469,6 +475,9 @@ i2c0: i2c@f8010000 {
compatible = "atmel,at91sam9x5-i2c"; compatible = "atmel,at91sam9x5-i2c";
reg = <0xf8010000 0x100>; reg = <0xf8010000 0x100>;
interrupts = <9 4 6>; interrupts = <9 4 6>;
dmas = <&dma0 1 7>,
<&dma0 1 8>;
dma-names = "tx", "rx";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";
...@@ -478,6 +487,9 @@ i2c1: i2c@f8014000 { ...@@ -478,6 +487,9 @@ i2c1: i2c@f8014000 {
compatible = "atmel,at91sam9x5-i2c"; compatible = "atmel,at91sam9x5-i2c";
reg = <0xf8014000 0x100>; reg = <0xf8014000 0x100>;
interrupts = <10 4 6>; interrupts = <10 4 6>;
dmas = <&dma1 1 5>,
<&dma1 1 6>;
dma-names = "tx", "rx";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";
...@@ -487,6 +499,9 @@ i2c2: i2c@f8018000 { ...@@ -487,6 +499,9 @@ i2c2: i2c@f8018000 {
compatible = "atmel,at91sam9x5-i2c"; compatible = "atmel,at91sam9x5-i2c";
reg = <0xf8018000 0x100>; reg = <0xf8018000 0x100>;
interrupts = <11 4 6>; interrupts = <11 4 6>;
dmas = <&dma0 1 9>,
<&dma0 1 10>;
dma-names = "tx", "rx";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";
......
arch/arm/boot/dts/sama5d3.dtsi
View file @ b45e0ed4
...@@ -60,6 +60,8 @@ mmc0: mmc@f0000000 { ...@@ -60,6 +60,8 @@ mmc0: mmc@f0000000 {
compatible = "atmel,hsmci"; compatible = "atmel,hsmci";
reg = <0xf0000000 0x600>; reg = <0xf0000000 0x600>;
interrupts = <21 4 0>; interrupts = <21 4 0>;
dmas = <&dma0 2 0>;
dma-names = "rxtx";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3 &pinctrl_mmc0_dat4_7>; pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3 &pinctrl_mmc0_dat4_7>;
status = "disabled"; status = "disabled";
...@@ -111,6 +113,9 @@ i2c0: i2c@f0014000 { ...@@ -111,6 +113,9 @@ i2c0: i2c@f0014000 {
compatible = "atmel,at91sam9x5-i2c"; compatible = "atmel,at91sam9x5-i2c";
reg = <0xf0014000 0x4000>; reg = <0xf0014000 0x4000>;
interrupts = <18 4 6>; interrupts = <18 4 6>;
dmas = <&dma0 2 7>,
<&dma0 2 8>;
dma-names = "tx", "rx";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c0>; pinctrl-0 = <&pinctrl_i2c0>;
#address-cells = <1>; #address-cells = <1>;
...@@ -122,6 +127,9 @@ i2c1: i2c@f0018000 { ...@@ -122,6 +127,9 @@ i2c1: i2c@f0018000 {
compatible = "atmel,at91sam9x5-i2c"; compatible = "atmel,at91sam9x5-i2c";
reg = <0xf0018000 0x4000>; reg = <0xf0018000 0x4000>;
interrupts = <19 4 6>; interrupts = <19 4 6>;
dmas = <&dma0 2 9>,
<&dma0 2 10>;
dma-names = "tx", "rx";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c1>; pinctrl-0 = <&pinctrl_i2c1>;
#address-cells = <1>; #address-cells = <1>;
...@@ -167,6 +175,8 @@ mmc1: mmc@f8000000 { ...@@ -167,6 +175,8 @@ mmc1: mmc@f8000000 {
compatible = "atmel,hsmci"; compatible = "atmel,hsmci";
reg = <0xf8000000 0x600>; reg = <0xf8000000 0x600>;
interrupts = <22 4 0>; interrupts = <22 4 0>;
dmas = <&dma1 2 0>;
dma-names = "rxtx";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3>; pinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3>;
status = "disabled"; status = "disabled";
...@@ -178,6 +188,8 @@ mmc2: mmc@f8004000 { ...@@ -178,6 +188,8 @@ mmc2: mmc@f8004000 {
compatible = "atmel,hsmci"; compatible = "atmel,hsmci";
reg = <0xf8004000 0x600>; reg = <0xf8004000 0x600>;
interrupts = <23 4 0>; interrupts = <23 4 0>;
dmas = <&dma1 2 1>;
dma-names = "rxtx";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_mmc2_clk_cmd_dat0 &pinctrl_mmc2_dat1_3>; pinctrl-0 = <&pinctrl_mmc2_clk_cmd_dat0 &pinctrl_mmc2_dat1_3>;
status = "disabled"; status = "disabled";
...@@ -294,6 +306,9 @@ i2c2: i2c@f801c000 { ...@@ -294,6 +306,9 @@ i2c2: i2c@f801c000 {
compatible = "atmel,at91sam9x5-i2c"; compatible = "atmel,at91sam9x5-i2c";
reg = <0xf801c000 0x4000>; reg = <0xf801c000 0x4000>;
interrupts = <20 4 6>; interrupts = <20 4 6>;
dmas = <&dma1 2 11>,
<&dma1 2 12>;
dma-names = "tx", "rx";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";
...@@ -348,14 +363,14 @@ dma0: dma-controller@ffffe600 { ...@@ -348,14 +363,14 @@ dma0: dma-controller@ffffe600 {
compatible = "atmel,at91sam9g45-dma"; compatible = "atmel,at91sam9g45-dma";
reg = <0xffffe600 0x200>; reg = <0xffffe600 0x200>;
interrupts = <30 4 0>; interrupts = <30 4 0>;
#dma-cells = <1>; #dma-cells = <2>;
}; };
dma1: dma-controller@ffffe800 { dma1: dma-controller@ffffe800 {
compatible = "atmel,at91sam9g45-dma"; compatible = "atmel,at91sam9g45-dma";
reg = <0xffffe800 0x200>; reg = <0xffffe800 0x200>;
interrupts = <31 4 0>; interrupts = <31 4 0>;
#dma-cells = <1>; #dma-cells = <2>;
}; };
ramc0: ramc@ffffea00 { ramc0: ramc@ffffea00 {
......
arch/arm/boot/dts/sama5d34ek.dts
View file @ b45e0ed4
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
/ { / {
model = "Atmel SAMA5D34-EK"; model = "Atmel SAMA5D34-EK";
compatible = "atmel,sama5d34ek", "atmel,sama5ek", "atmel,sama5d3xmb", "atmel,sama5d3xcm", "atmel,sama5d3", "atmel,sama5"; compatible = "atmel,sama5d34ek", "atmel,sama5d3xmb", "atmel,sama5d3xcm", "atmel,sama5d3", "atmel,sama5";
ahb { ahb {
apb { apb {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7