mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 10:08:59 +00:00
14940aee45
Removed upstreamed: target/linux/mvebu/patches-5.4/001-PCI-aardvark-Wait-for-endpoint-to-be-ready-before-tr.patch target/linux/mvebu/patches-5.4/016-PCI-aardvark-Train-link-immediately-after-enabling-t.patch target/linux/mvebu/patches-5.4/017-PCI-aardvark-Improve-link-training.patch target/linux/mvebu/patches-5.4/018-PCI-aardvark-Issue-PERST-via-GPIO.patch target/linux/mvebu/patches-5.4/020-arm64-dts-marvell-armada-37xx-Set-pcie_reset_pin-to-.patch The following patch does not apply to upstream any more and needs some more work to make it work fully again. I am not sure if we are still able to set the UART to a none standard baud rate. target/linux/ath79/patches-5.4/921-serial-core-add-support-for-boot-console-with-arbitr.patch These patches needed manually changes: target/linux/generic/pending-5.4/110-ehci_hcd_ignore_oc.patch target/linux/ipq806x/patches-5.4/0065-arm-override-compiler-flags.patch target/linux/layerscape/patches-5.4/804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch target/linux/mvebu/patches-5.4/019-PCI-aardvark-Add-PHY-support.patch target/linux/octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch All others updated automatically. Compile-tested on: malta/le, armvirt/64, lantiq/xrx200 Runtime-tested on: malta/le, armvirt/64, lantiq/xrx200 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
64 lines
1.5 KiB
Diff
64 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 {
|
|
@@ -549,16 +550,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>;
|
|
@@ -970,6 +961,19 @@
|
|
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;
|
|
+ };
|
|
};
|
|
|
|
thermal-zones {
|