cddd459140
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release which was tagged LSDK-20.04-V5.4. https://source.codeaurora.org/external/qoriq/qoriq-components/linux/ For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in LSDK, port the dts patches from 4.14. The patches are sorted into the following categories: 301-arch-xxxx 302-dts-xxxx 303-core-xxxx 701-net-xxxx 801-audio-xxxx 802-can-xxxx 803-clock-xxxx 804-crypto-xxxx 805-display-xxxx 806-dma-xxxx 807-gpio-xxxx 808-i2c-xxxx 809-jailhouse-xxxx 810-keys-xxxx 811-kvm-xxxx 812-pcie-xxxx 813-pm-xxxx 814-qe-xxxx 815-sata-xxxx 816-sdhc-xxxx 817-spi-xxxx 818-thermal-xxxx 819-uart-xxxx 820-usb-xxxx 821-vfio-xxxx Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
63 lines
1.5 KiB
Diff
63 lines
1.5 KiB
Diff
From f3a115bd1372e774979ecb81919664279b81810e Mon Sep 17 00:00:00 2001
|
|
From: Biwen Li <biwen.li@nxp.com>
|
|
Date: Fri, 28 Jun 2019 16:36:20 +0800
|
|
Subject: [PATCH] arm: dts: ls1021a: replace ftm0 with ftm_alarm0 DT node
|
|
|
|
The patch replaces ftm0 with ftm_alarm0 DT node
|
|
- remove old ftm0 node
|
|
- add rcpm node
|
|
- add ftm_alarm0 node
|
|
- aliases ftm_alarm0 as rtc1
|
|
|
|
Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
|
---
|
|
arch/arm/boot/dts/ls1021a.dtsi | 24 ++++++++++++++----------
|
|
1 file changed, 14 insertions(+), 10 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/ls1021a.dtsi
|
|
+++ b/arch/arm/boot/dts/ls1021a.dtsi
|
|
@@ -66,6 +66,7 @@
|
|
serial4 = &lpuart4;
|
|
serial5 = &lpuart5;
|
|
sysclk = &sysclk;
|
|
+ rtc1 = &ftm_alarm0;
|
|
};
|
|
|
|
cpus {
|
|
@@ -582,16 +583,6 @@
|
|
status = "disabled";
|
|
};
|
|
|
|
- ftm0: ftm0@29d0000 {
|
|
- compatible = "fsl,ftm-alarm";
|
|
- reg = <0x0 0x29d0000 0x0 0x10000>,
|
|
- <0x0 0x1ee2140 0x0 0x4>;
|
|
- reg-names = "ftm", "FlexTimer1";
|
|
- interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
|
|
- big-endian;
|
|
- status = "okay";
|
|
- };
|
|
-
|
|
pwm1: pwm@29e0000 {
|
|
compatible = "fsl,vf610-ftm-pwm";
|
|
#pwm-cells = <3>;
|
|
@@ -1003,5 +994,18 @@
|
|
big-endian;
|
|
};
|
|
|
|
+ rcpm: rcpm@1ee2140 {
|
|
+ compatible = "fsl,ls1021a-rcpm", "fsl,qoriq-rcpm-2.1+";
|
|
+ reg = <0x0 0x1ee2140 0x0 0x8>;
|
|
+ #fsl,rcpm-wakeup-cells = <2>;
|
|
+ };
|
|
+
|
|
+ ftm_alarm0: timer0@29d0000 {
|
|
+ compatible = "fsl,ls1021a-ftm-alarm";
|
|
+ reg = <0x0 0x29d0000 0x0 0x10000>;
|
|
+ fsl,rcpm-wakeup = <&rcpm 0x0 0x20000000>;
|
|
+ interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
|
|
+ big-endian;
|
|
+ };
|
|
};
|
|
};
|