AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-01-19 08:46:18 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

mvebu dt64 for 4.15 (part 2)

Browse Source 
Add the extended UART support on Armada 3700
 -----BEGIN PGP SIGNATURE-----
 
 iIEEABECAEEWIQQYqXDMF3cvSLY+g9cLBhiOFHI71QUCWgHNayMcZ3JlZ29yeS5j
 bGVtZW50QGZyZWUtZWxlY3Ryb25zLmNvbQAKCRALBhiOFHI71bHpAJ0QFOqPb3Et
 NHXbvRjusO7ZZ+B6+wCff8at95p9E8X5ULnGpR7qINZHKh8=
 =CdWu
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-dt64-4.15-2' of git://git.infradead.org/linux-mvebu into next/dt

Pull "mvebu dt64 for 4.15 (part 2)" from Gregory CLEMENT:

Add the extended UART support on Armada 3700

* tag 'mvebu-dt64-4.15-2' of git://git.infradead.org/linux-mvebu:
  arm64: dts: marvell: armada-3720-espressobin: fill UART nodes
  arm64: dts: marvell: armada-3720-db: enable second UART port
  arm64: dts: marvell: armada-37xx: add second UART port
  arm64: dts: marvell: armada-37xx: add UART clock
This commit is contained in:
Arnd Bergmann 2017-11-07 16:18:56 +01:00
commit 2cdc614b07
3 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm64/boot/dts/marvell/armada-3720-db.dts
View File

@ -227,7 +227,7 @@ partition@210000 {
/*
* Exported on the micro USB connector CON30(V2.0)/CON32(V1.4) through
* an FTDI
* an FTDI (also on CON24(V2.0)/CON26(V1.4)).
*/
&uart0 {
pinctrl-names = "default";
@ -235,6 +235,13 @@ &uart0 {
status = "okay";
};
/* CON26(V2.0)/CON28(V1.4) */
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&uart2_pins>;
status = "okay";
};
/* CON27(V2.0)/CON29(V1.4) */
&usb2 {
status = "okay";

12
arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
View File

@ -98,9 +98,21 @@ &sdhci1 {
/* Exported on the micro USB connector J5 through an FTDI */
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins>;
status = "okay";
};
/*
* Connector J17 and J18 expose a number of different features. Some pins are
* multiplexed. This is the case for instance for the following features:
* - UART1 (pin 24 = RX, pin 26 = TX). See armada-3720-db.dts for an example of
* how to enable it. Beware that the signals are 1.8V TTL.
* - I2C
* - SPI
* - MMC
*/
/* J7 */
&usb3 {
status = "okay";

19
arch/arm64/boot/dts/marvell/armada-37xx.dtsi
View File

@ -55,6 +55,7 @@ / {
aliases {
serial0 = &uart0;
serial1 = &uart1;
};
cpus {
@ -135,7 +136,23 @@ i2c1: i2c@11080 {
uart0: serial@12000 {
compatible = "marvell,armada-3700-uart";
reg = <0x12000 0x200>;
interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&xtalclk>;
interrupts =
<GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "uart-sum", "uart-tx", "uart-rx";
status = "disabled";
};
uart1: serial@12200 {
compatible = "marvell,armada-3700-uart-ext";
reg = <0x12200 0x30>;
clocks = <&xtalclk>;
interrupts =
<GIC_SPI 30 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 31 IRQ_TYPE_EDGE_RISING>;
interrupt-names = "uart-tx", "uart-rx";
status = "disabled";
};