Skip to content

L
linux
Commit c60c41e8 authored by Olof Johansson's avatar Olof Johansson
Browse files
Options

Merge tag 'at91-ab-4.10-dt1' of... 

Merge tag 'at91-ab-4.10-dt1' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt

DT changes for 4.10:

 - Many additions for sama5d2
 - few non urgent fixes for sam9260ek, sama5d4 and sama5d2

* tag 'at91-ab-4.10-dt1' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: dts: at91: replace gpio-key,wakeup with wakeup-source for sam9260ek
  ARM: dts: at91: sama5d2: Add securam node
  ARM: dts: at91: sama5d2: Add secumod node
  ARM: dts: at91: sama5d2: use correct sckc compatible
  ARM: dts: at91: sama5d4: use proper sckc compatible
  ARM: dts: at91: fixes dbgu pinctrl, set pullup on rx, clear pullup on tx
  dt-bindings: usb: atmel: fix a couple of copy-paste style typos
  ARM: dts: at91: sama5d2: enable FIFOs for high-speed i2c controllers
  ARM: dts: at91: sama5d4: Add new MA5D4EVK manufacturer compat
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 964971c8 b662a9dd
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 76 deletions
Documentation/devicetree/bindings/usb/atmel-usb.txt
View file @ c60c41e8
...@@ -6,9 +6,9 @@ Required properties: ...@@ -6,9 +6,9 @@ Required properties:
- compatible: Should be "atmel,at91rm9200-ohci" for USB controllers - compatible: Should be "atmel,at91rm9200-ohci" for USB controllers
used in host mode. used in host mode.
- reg: Address and length of the register set for the device - reg: Address and length of the register set for the device
- interrupts: Should contain ehci interrupt - interrupts: Should contain ohci interrupt
- clocks: Should reference the peripheral, host and system clocks - clocks: Should reference the peripheral, host and system clocks
- clock-names: Should contains two strings - clock-names: Should contain three strings
"ohci_clk" for the peripheral clock "ohci_clk" for the peripheral clock
"hclk" for the host clock "hclk" for the host clock
"uhpck" for the system clock "uhpck" for the system clock
...@@ -35,7 +35,7 @@ Required properties: ...@@ -35,7 +35,7 @@ Required properties:
- reg: Address and length of the register set for the device - reg: Address and length of the register set for the device
- interrupts: Should contain ehci interrupt - interrupts: Should contain ehci interrupt
- clocks: Should reference the peripheral and the UTMI clocks - clocks: Should reference the peripheral and the UTMI clocks
- clock-names: Should contains two strings - clock-names: Should contain two strings
"ehci_clk" for the peripheral clock "ehci_clk" for the peripheral clock
"usb_clk" for the UTMI clock "usb_clk" for the UTMI clock
...@@ -58,7 +58,7 @@ Required properties: ...@@ -58,7 +58,7 @@ Required properties:
- reg: Address and length of the register set for the device - reg: Address and length of the register set for the device
- interrupts: Should contain macb interrupt - interrupts: Should contain macb interrupt
- clocks: Should reference the peripheral and the AHB clocks - clocks: Should reference the peripheral and the AHB clocks
- clock-names: Should contains two strings - clock-names: Should contain two strings
"pclk" for the peripheral clock "pclk" for the peripheral clock
"hclk" for the AHB clock "hclk" for the AHB clock
...@@ -85,7 +85,7 @@ Required properties: ...@@ -85,7 +85,7 @@ Required properties:
- reg: Address and length of the register set for the device - reg: Address and length of the register set for the device
- interrupts: Should contain usba interrupt - interrupts: Should contain usba interrupt
- clocks: Should reference the peripheral and host clocks - clocks: Should reference the peripheral and host clocks
- clock-names: Should contains two strings - clock-names: Should contain two strings
"pclk" for the peripheral clock "pclk" for the peripheral clock
"hclk" for the host clock "hclk" for the host clock
- ep childnode: To specify the number of endpoints and their properties. - ep childnode: To specify the number of endpoints and their properties.
......
arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi
View file @ c60c41e8
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
#include "sama5d4.dtsi" #include "sama5d4.dtsi"
/ { / {
model = "DENX MA5D4"; model = "Aries/DENX MA5D4";
compatible = "denx,ma5d4", "atmel,sama5d4", "atmel,sama5"; compatible = "aries,ma5d4", "denx,ma5d4", "atmel,sama5d4", "atmel,sama5";
memory { memory {
reg = <0x20000000 0x10000000>; reg = <0x20000000 0x10000000>;
......
arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts
View file @ c60c41e8
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
#include "at91-sama5d4_ma5d4.dtsi" #include "at91-sama5d4_ma5d4.dtsi"
/ { / {
model = "DENX MA5D4EVK"; model = "Aries/DENX MA5D4EVK";
compatible = "denx,ma5d4evk", "atmel,sama5d4", "atmel,sama5"; compatible = "aries,ma5d4evk", "denx,ma5d4evk", "atmel,sama5d4", "atmel,sama5";
chosen { chosen {
stdout-path = "serial3:115200n8"; stdout-path = "serial3:115200n8";
......
arch/arm/boot/dts/at91rm9200.dtsi
View file @ c60c41e8
...@@ -481,8 +481,8 @@ pinctrl@fffff400 { ...@@ -481,8 +481,8 @@ pinctrl@fffff400 {
dbgu { dbgu {
pinctrl_dbgu: dbgu-0 { pinctrl_dbgu: dbgu-0 {
atmel,pins = atmel,pins =
<AT91_PIOA 30 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA30 periph A */ <AT91_PIOA 30 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
AT91_PIOA 31 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA31 periph with pullup */ AT91_PIOA 31 AT91_PERIPH_A AT91_PINCTRL_NONE>;
}; };
}; };
......
arch/arm/boot/dts/at91sam9260.dtsi
View file @ c60c41e8
...@@ -412,8 +412,8 @@ pinctrl@fffff400 { ...@@ -412,8 +412,8 @@ pinctrl@fffff400 {
dbgu { dbgu {
pinctrl_dbgu: dbgu-0 { pinctrl_dbgu: dbgu-0 {
atmel,pins = atmel,pins =
<AT91_PIOB 14 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB14 periph A */ <AT91_PIOB 14 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
AT91_PIOB 15 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PB15 periph with pullup */ AT91_PIOB 15 AT91_PERIPH_A AT91_PINCTRL_NONE>;
}; };
}; };
......
arch/arm/boot/dts/at91sam9260ek.dts
View file @ c60c41e8
...@@ -174,14 +174,14 @@ btn3 { ...@@ -174,14 +174,14 @@ btn3 {
label = "Button 3"; label = "Button 3";
gpios = <&pioA 30 GPIO_ACTIVE_LOW>; gpios = <&pioA 30 GPIO_ACTIVE_LOW>;
linux,code = <0x103>; linux,code = <0x103>;
gpio-key,wakeup; wakeup-source;
}; };
btn4 { btn4 {
label = "Button 4"; label = "Button 4";
gpios = <&pioA 31 GPIO_ACTIVE_LOW>; gpios = <&pioA 31 GPIO_ACTIVE_LOW>;
linux,code = <0x104>; linux,code = <0x104>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/at91sam9261.dtsi
View file @ c60c41e8
...@@ -302,8 +302,8 @@ pinctrl@fffff400 { ...@@ -302,8 +302,8 @@ pinctrl@fffff400 {
dbgu { dbgu {
pinctrl_dbgu: dbgu-0 { pinctrl_dbgu: dbgu-0 {
atmel,pins = atmel,pins =
<AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_NONE>, <AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
<AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; <AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_NONE>;
}; };
}; };
......
arch/arm/boot/dts/at91sam9263.dtsi
View file @ c60c41e8
...@@ -412,8 +412,8 @@ pinctrl@fffff200 { ...@@ -412,8 +412,8 @@ pinctrl@fffff200 {
dbgu { dbgu {
pinctrl_dbgu: dbgu-0 { pinctrl_dbgu: dbgu-0 {
atmel,pins = atmel,pins =
<AT91_PIOC 30 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC30 periph A */ <AT91_PIOC 30 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
AT91_PIOC 31 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PC31 periph with pullup */ AT91_PIOC 31 AT91_PERIPH_A AT91_PINCTRL_NONE>;
}; };
}; };
......
arch/arm/boot/dts/at91sam9g45.dtsi
View file @ c60c41e8
...@@ -478,8 +478,8 @@ pinctrl_adc0_ad7: adc0_ad7 { ...@@ -478,8 +478,8 @@ pinctrl_adc0_ad7: adc0_ad7 {
dbgu { dbgu {
pinctrl_dbgu: dbgu-0 { pinctrl_dbgu: dbgu-0 {
atmel,pins = atmel,pins =
<AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB12 periph A */ <AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB13 periph A */ AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_NONE>;
}; };
}; };
......
arch/arm/boot/dts/at91sam9n12.dtsi
View file @ c60c41e8
...@@ -500,8 +500,8 @@ pinctrl@fffff400 { ...@@ -500,8 +500,8 @@ pinctrl@fffff400 {
dbgu { dbgu {
pinctrl_dbgu: dbgu-0 { pinctrl_dbgu: dbgu-0 {
atmel,pins = atmel,pins =
<AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA9 periph A */ <AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA10 periph with pullup */ AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_NONE>;
}; };
}; };
......
arch/arm/boot/dts/at91sam9rl.dtsi
View file @ c60c41e8
...@@ -438,8 +438,8 @@ pinctrl_adc0_adtrg: adc0_adtrg-0 { ...@@ -438,8 +438,8 @@ pinctrl_adc0_adtrg: adc0_adtrg-0 {
dbgu { dbgu {
pinctrl_dbgu: dbgu-0 { pinctrl_dbgu: dbgu-0 {
atmel,pins = atmel,pins =
<AT91_PIOA 21 AT91_PERIPH_A AT91_PINCTRL_NONE>, <AT91_PIOA 21 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
<AT91_PIOA 22 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; <AT91_PIOA 22 AT91_PERIPH_A AT91_PINCTRL_NONE>;
}; };
}; };
......
arch/arm/boot/dts/at91sam9x5.dtsi
View file @ c60c41e8
...@@ -460,8 +460,8 @@ pinctrl@fffff400 { ...@@ -460,8 +460,8 @@ pinctrl@fffff400 {
dbgu { dbgu {
pinctrl_dbgu: dbgu-0 { pinctrl_dbgu: dbgu-0 {
atmel,pins = atmel,pins =
<AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA9 periph A */ <AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA10 periph A with pullup */ AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_NONE>;
}; };
}; };
......
arch/arm/boot/dts/sama5d2.dtsi
View file @ c60c41e8
...@@ -735,6 +735,11 @@ pdmic_clk: pdmic_clk { ...@@ -735,6 +735,11 @@ pdmic_clk: pdmic_clk {
atmel,clk-output-range = <0 83000000>; atmel,clk-output-range = <0 83000000>;
}; };
securam_clk: securam_clk {
#clock-cells = <0>;
reg = <51>;
};
i2s0_clk: i2s0_clk { i2s0_clk: i2s0_clk {
#clock-cells = <0>; #clock-cells = <0>;
reg = <54>; reg = <54>;
...@@ -1030,6 +1035,7 @@ AT91_XDMAC_DT_PERID(0))>, ...@@ -1030,6 +1035,7 @@ AT91_XDMAC_DT_PERID(0))>,
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
clocks = <&twi0_clk>; clocks = <&twi0_clk>;
atmel,fifo-size = <16>;
status = "disabled"; status = "disabled";
}; };
...@@ -1058,6 +1064,15 @@ flx1: flexcom@f8038000 { ...@@ -1058,6 +1064,15 @@ flx1: flexcom@f8038000 {
status = "disabled"; status = "disabled";
}; };
securam: sram@f8044000 {
compatible = "atmel,sama5d2-securam", "mmio-sram";
reg = <0xf8044000 0x1420>;
clocks = <&securam_clk>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 0xf8044000 0x1420>;
};
rstc@f8048000 { rstc@f8048000 {
compatible = "atmel,sama5d3-rstc"; compatible = "atmel,sama5d3-rstc";
reg = <0xf8048000 0x10>; reg = <0xf8048000 0x10>;
...@@ -1088,30 +1103,12 @@ watchdog@f8048040 { ...@@ -1088,30 +1103,12 @@ watchdog@f8048040 {
status = "disabled"; status = "disabled";
}; };
sckc@f8048050 { clk32k: sckc@f8048050 {
compatible = "atmel,at91sam9x5-sckc"; compatible = "atmel,sama5d4-sckc";
reg = <0xf8048050 0x4>; reg = <0xf8048050 0x4>;
slow_rc_osc: slow_rc_osc { clocks = <&slow_xtal>;
compatible = "atmel,at91sam9x5-clk-slow-rc-osc"; #clock-cells = <0>;
#clock-cells = <0>;
clock-frequency = <32768>;
clock-accuracy = <250000000>;
atmel,startup-time-usec = <75>;
};
slow_osc: slow_osc {
compatible = "atmel,at91sam9x5-clk-slow-osc";
#clock-cells = <0>;
clocks = <&slow_xtal>;
atmel,startup-time-usec = <1200000>;
};
clk32k: slowck {
compatible = "atmel,at91sam9x5-clk-slow";
#clock-cells = <0>;
clocks = <&slow_rc_osc &slow_osc>;
};
}; };
rtc@f80480b0 { rtc@f80480b0 {
...@@ -1231,6 +1228,7 @@ AT91_XDMAC_DT_PERID(2))>, ...@@ -1231,6 +1228,7 @@ AT91_XDMAC_DT_PERID(2))>,
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
clocks = <&twi1_clk>; clocks = <&twi1_clk>;
atmel,fifo-size = <16>;
status = "disabled"; status = "disabled";
}; };
...@@ -1260,6 +1258,11 @@ pioA: pinctrl@fc038000 { ...@@ -1260,6 +1258,11 @@ pioA: pinctrl@fc038000 {
clocks = <&pioA_clk>; clocks = <&pioA_clk>;
}; };
secumod@fc040000 {
compatible = "atmel,sama5d2-secumod", "syscon";
reg = <0xfc040000 0x100>;
};
tdes@fc044000 { tdes@fc044000 {
compatible = "atmel,at91sam9g46-tdes"; compatible = "atmel,at91sam9g46-tdes";
reg = <0xfc044000 0x100>; reg = <0xfc044000 0x100>;
......
arch/arm/boot/dts/sama5d3.dtsi
View file @ c60c41e8
...@@ -549,8 +549,8 @@ pinctrl_adc0_ad11: adc0_ad11 { ...@@ -549,8 +549,8 @@ pinctrl_adc0_ad11: adc0_ad11 {
dbgu { dbgu {
pinctrl_dbgu: dbgu-0 { pinctrl_dbgu: dbgu-0 {
atmel,pins = atmel,pins =
<AT91_PIOB 30 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB30 periph A */ <AT91_PIOB 30 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
AT91_PIOB 31 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PB31 periph A with pullup */ AT91_PIOB 31 AT91_PERIPH_A AT91_PINCTRL_NONE>;
}; };
}; };
......
arch/arm/boot/dts/sama5d4.dtsi
View file @ c60c41e8
...@@ -1314,30 +1314,11 @@ watchdog@fc068640 { ...@@ -1314,30 +1314,11 @@ watchdog@fc068640 {
status = "disabled"; status = "disabled";
}; };
sckc@fc068650 { clk32k: sckc@fc068650 {
compatible = "atmel,at91sam9x5-sckc"; compatible = "atmel,sama5d4-sckc";
reg = <0xfc068650 0x4>; reg = <0xfc068650 0x4>;
#clock-cells = <0>;
slow_rc_osc: slow_rc_osc { clocks = <&slow_xtal>;
compatible = "atmel,at91sam9x5-clk-slow-rc-osc";
#clock-cells = <0>;
clock-frequency = <32768>;
clock-accuracy = <250000000>;
atmel,startup-time-usec = <75>;
};
slow_osc: slow_osc {
compatible = "atmel,at91sam9x5-clk-slow-osc";
#clock-cells = <0>;
clocks = <&slow_xtal>;
atmel,startup-time-usec = <1200000>;
};
clk32k: slowck {
compatible = "atmel,at91sam9x5-clk-slow";
#clock-cells = <0>;
clocks = <&slow_rc_osc &slow_osc>;
};
}; };
rtc@fc0686b0 { rtc@fc0686b0 {
...@@ -1461,8 +1442,8 @@ pinctrl_adc0_ad4: adc0_ad4 { ...@@ -1461,8 +1442,8 @@ pinctrl_adc0_ad4: adc0_ad4 {
dbgu { dbgu {
pinctrl_dbgu: dbgu-0 { pinctrl_dbgu: dbgu-0 {
atmel,pins = atmel,pins =
<AT91_PIOB 24 AT91_PERIPH_A AT91_PINCTRL_NONE>, /* conflicts with D14 and TDI */ <AT91_PIOB 24 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* conflicts with D14 and TDI */
<AT91_PIOB 25 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* conflicts with D15 and TDO */ AT91_PIOB 25 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* conflicts with D15 and TDO */
}; };
}; };
......
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