aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/302-dts-0070-arm64-dts-ls1012a-ls1043a-ls1046a-ls1088a-ls208xa-re.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/layerscape/patches-5.4/302-dts-0070-arm64-dts-ls1012a-ls1043a-ls1046a-ls1088a-ls208xa-re.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/302-dts-0070-arm64-dts-ls1012a-ls1043a-ls1046a-ls1088a-ls208xa-re.patch297
1 files changed, 0 insertions, 297 deletions
diff --git a/target/linux/layerscape/patches-5.4/302-dts-0070-arm64-dts-ls1012a-ls1043a-ls1046a-ls1088a-ls208xa-re.patch b/target/linux/layerscape/patches-5.4/302-dts-0070-arm64-dts-ls1012a-ls1043a-ls1046a-ls1088a-ls208xa-re.patch
deleted file mode 100644
index 78713d778e..0000000000
--- a/target/linux/layerscape/patches-5.4/302-dts-0070-arm64-dts-ls1012a-ls1043a-ls1046a-ls1088a-ls208xa-re.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-From c97c6ebf6fd6a6ff72bd7d58a12de0c07f14953e Mon Sep 17 00:00:00 2001
-From: Biwen Li <biwen.li@nxp.com>
-Date: Thu, 27 Jun 2019 15:02:44 +0800
-Subject: [PATCH] arm64: dts: ls1012a/ls1043a/ls1046a/ls1088a/ls208xa: replace
- ftm0 with ftm_alarm0
-
-The patch replaces ftm0 with ftm_alarm0 DT node
- - replace ftm0 with ftm_alarm0
- - add new rcpm node
- - remove old rcpm node
- - aliases ftm_alarm0 as rtc1
-
-Signed-off-by: Biwen Li <biwen.li@nxp.com>
----
- arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 23 +++++++++++----------
- .../boot/dts/freescale/fsl-ls1043a-qds-sdk.dts | 2 +-
- .../boot/dts/freescale/fsl-ls1043a-rdb-sdk.dts | 2 +-
- arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 24 +++++++++++++---------
- .../boot/dts/freescale/fsl-ls1046a-frwy-sdk.dts | 2 +-
- .../boot/dts/freescale/fsl-ls1046a-qds-sdk.dts | 2 +-
- .../boot/dts/freescale/fsl-ls1046a-rdb-sdk.dts | 2 +-
- arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 24 ++++++++++++++--------
- arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 20 ++++++++++++------
- arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 12 +++++++++--
- 10 files changed, 70 insertions(+), 43 deletions(-)
-
---- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
-+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
-@@ -23,6 +23,7 @@
- rtic-c = &rtic_c;
- rtic-d = &rtic_d;
- sec-mon = &sec_mon;
-+ rtc1 = &ftm_alarm0;
- };
-
- cpus {
-@@ -290,15 +291,21 @@
- #thermal-sensor-cells = <1>;
- };
-
-- ftm0: ftm0@29d0000 {
-- compatible = "fsl,ftm-alarm";
-- reg = <0x0 0x29d0000 0x0 0x10000>,
-- <0x0 0x1ee2140 0x0 0x4>;
-- reg-names = "ftm", "FlexTimer1";
-+ rcpm: rcpm@1ee2140 {
-+ compatible = "fsl,ls1012a-rcpm", "fsl,qoriq-rcpm-2.1+";
-+ reg = <0x0 0x1ee2140 0x0 0x4>;
-+ #fsl,rcpm-wakeup-cells = <1>;
-+ };
-+
-+ ftm_alarm0: timer@29d0000 {
-+ compatible = "fsl,ls1012a-ftm-alarm";
-+ reg = <0x0 0x29d0000 0x0 0x10000>;
-+ fsl,rcpm-wakeup = <&rcpm 0x20000>;
- interrupts = <0 86 0x4>;
- big-endian;
- };
-
-+
- i2c0: i2c@2180000 {
- compatible = "fsl,vf610-i2c", "fsl,ls1012a-vf610-i2c";
- #address-cells = <1>;
-@@ -497,12 +504,6 @@
- <0000 0 0 4 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>;
- status = "disabled";
- };
--
-- rcpm: rcpm@1ee2000 {
-- compatible = "fsl,ls1012a-rcpm", "fsl,qoriq-rcpm-2.1";
-- reg = <0x0 0x1ee2000 0x0 0x1000>;
-- fsl,#rcpm-wakeup-cells = <1>;
-- };
- };
-
- reserved-memory {
---- a/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds-sdk.dts
-+++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds-sdk.dts
-@@ -226,7 +226,7 @@ pcie@3600000 {
- dma-coherent;
- };
-
--&ftm0 {
-+&ftm_alarm0 {
- dma-coherent;
- };
-
---- a/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb-sdk.dts
-+++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb-sdk.dts
-@@ -221,7 +221,7 @@ pcie@3600000 {
- dma-coherent;
- };
-
--&ftm0 {
-+&ftm_alarm0 {
- dma-coherent;
- };
-
---- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
-+++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
-@@ -27,6 +27,7 @@
- ethernet4 = &enet4;
- ethernet5 = &enet5;
- ethernet6 = &enet6;
-+ rtc1 = &ftm_alarm0;
- };
-
- cpus {
-@@ -661,16 +662,6 @@
- status = "disabled";
- };
-
-- ftm0: ftm0@29d0000 {
-- compatible = "fsl,ftm-alarm";
-- reg = <0x0 0x29d0000 0x0 0x10000>,
-- <0x0 0x1ee2140 0x0 0x4>;
-- reg-names = "ftm", "FlexTimer1";
-- interrupts = <0 86 0x4>;
-- big-endian;
-- status = "okay";
-- };
--
- wdog0: wdog@2ad0000 {
- compatible = "fsl,ls1043a-wdt", "fsl,imx21-wdt";
- reg = <0x0 0x2ad0000 0x0 0x10000>;
-@@ -875,6 +866,19 @@
- big-endian;
- };
-
-+ rcpm: rcpm@1ee2140 {
-+ compatible = "fsl,ls1043a-rcpm", "fsl,qoriq-rcpm-2.1+";
-+ reg = <0x0 0x1ee2140 0x0 0x4>;
-+ #fsl,rcpm-wakeup-cells = <1>;
-+ };
-+
-+ ftm_alarm0: timer@29d0000 {
-+ compatible = "fsl,ls1043a-ftm-alarm";
-+ reg = <0x0 0x29d0000 0x0 0x10000>;
-+ fsl,rcpm-wakeup = <&rcpm 0x20000>;
-+ interrupts = <0 86 0x4>;
-+ big-endian;
-+ };
- };
-
- firmware {
---- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy-sdk.dts
-+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy-sdk.dts
-@@ -196,7 +196,7 @@
- dma-coherent;
- };
-
--&ftm0 {
-+&ftm_alarm0 {
- dma-coherent;
- };
-
---- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds-sdk.dts
-+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds-sdk.dts
-@@ -223,7 +223,7 @@ pcie@3600000 {
- dma-coherent;
- };
-
--&ftm0 {
-+&ftm_alarm0 {
- dma-coherent;
- };
-
---- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb-sdk.dts
-+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb-sdk.dts
-@@ -228,7 +228,7 @@ pcie@3600000 {
- dma-coherent;
- };
-
--&ftm0 {
-+&ftm_alarm0 {
- dma-coherent;
- };
-
---- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
-+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
-@@ -28,6 +28,7 @@
- ethernet5 = &enet5;
- ethernet6 = &enet6;
- ethernet7 = &enet7;
-+ rtc1 = &ftm_alarm0;
- };
-
- cpus {
-@@ -561,15 +562,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 86 IRQ_TYPE_LEVEL_HIGH>;
-- big-endian;
-- };
--
- wdog0: watchdog@2ad0000 {
- compatible = "fsl,imx21-wdt";
- reg = <0x0 0x2ad0000 0x0 0x10000>;
-@@ -811,6 +803,20 @@
- queue-sizes = <64 64>;
- big-endian;
- };
-+
-+ rcpm: rcpm@1ee208c {
-+ compatible = "fsl,ls1046a-rcpm", "fsl,qoriq-rcpm-2.1+";
-+ reg = <0x0 0x1ee208c 0x0 0x4>;
-+ #fsl,rcpm-wakeup-cells = <1>;
-+ };
-+
-+ ftm_alarm0: timer@29d0000 {
-+ compatible = "fsl,ls1046a-ftm-alarm";
-+ reg = <0x0 0x29d0000 0x0 0x10000>;
-+ fsl,rcpm-wakeup = <&rcpm 0x20000>;
-+ interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
-+ big-endian;
-+ };
- };
-
- reserved-memory {
---- a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
-+++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
-@@ -18,6 +18,7 @@
-
- aliases {
- crypto = &crypto;
-+ rtc1 = &ftm_alarm0;
- };
-
- cpus {
-@@ -339,12 +340,6 @@
- status = "disabled";
- };
-
-- ftm0: ftm0@2800000 {
-- compatible = "fsl,ftm-alarm";
-- reg = <0x0 0x2800000 0x0 0x10000>;
-- interrupts = <0 44 4>;
-- };
--
- i2c0: i2c@2000000 {
- compatible = "fsl,vf610-i2c", "fsl,ls1088a-vf610-i2c";
- #address-cells = <1>;
-@@ -792,6 +787,19 @@
- };
- };
- };
-+
-+ rcpm: rcpm@1e34040 {
-+ compatible = "fsl,ls1088a-rcpm", "fsl,qoriq-rcpm-2.1+";
-+ reg = <0x0 0x1e34040 0x0 0x18>;
-+ #fsl,rcpm-wakeup-cells = <6>;
-+ };
-+
-+ ftm_alarm0: timer@2800000 {
-+ compatible = "fsl,ls1088a-ftm-alarm";
-+ reg = <0x0 0x2800000 0x0 0x10000>;
-+ fsl,rcpm-wakeup = <&rcpm 0x0 0x0 0x0 0x0 0x4000 0x0>;
-+ interrupts = <0 44 4>;
-+ };
- };
-
- firmware {
---- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
-+++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
-@@ -24,6 +24,7 @@
- serial1 = &serial1;
- serial2 = &serial2;
- serial3 = &serial3;
-+ rtc1 = &ftm_alarm0;
- };
-
- cpu: cpus {
-@@ -756,9 +757,16 @@
- interrupts = <0 12 4>;
- };
-
-- ftm0: ftm0@2800000 {
-- compatible = "fsl,ftm-alarm";
-+ rcpm: rcpm@1e34040 {
-+ compatible = "fsl,ls208xa-rcpm", "fsl,qoriq-rcpm-2.1+";
-+ reg = <0x0 0x1e34040 0x0 0x18>;
-+ #fsl,rcpm-wakeup-cells = <6>;
-+ };
-+
-+ ftm_alarm0: timer@2800000 {
-+ compatible = "fsl,ls208xa-ftm-alarm";
- reg = <0x0 0x2800000 0x0 0x10000>;
-+ fsl,rcpm-wakeup = <&rcpm 0x0 0x0 0x0 0x0 0x4000 0x0>;
- interrupts = <0 44 4>;
- };
- };