aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/302-dts-0071-arm-dts-ls1021a-replace-ftm0-with-ftm_alarm0-DT-node.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-11-27 15:40:46 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2021-11-28 16:32:45 +0100
commit81995a5e77c0cc5bf5b59ef4bec78b969c020013 (patch)
treea8bb8c23ad03ec3f8de366e5ce550810ea61a4d0 /target/linux/layerscape/patches-5.4/302-dts-0071-arm-dts-ls1021a-replace-ftm0-with-ftm_alarm0-DT-node.patch
parentbbdc13b15b383b8b8d5492575e0a83cbe2af139b (diff)
downloadupstream-81995a5e77c0cc5bf5b59ef4bec78b969c020013.tar.gz
upstream-81995a5e77c0cc5bf5b59ef4bec78b969c020013.tar.bz2
upstream-81995a5e77c0cc5bf5b59ef4bec78b969c020013.zip
kernel: bump 5.4 to 5.4.162
All patches automatically rebased. Build system: x86_64 Build-tested: ramips/mt7621* *I am hit with the binutils 2.37 bug so I had to revert 7f1edbd41295dff9f2127b169fbc086c0fb2c14e in order to downgrade to 2.35.1 Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/302-dts-0071-arm-dts-ls1021a-replace-ftm0-with-ftm_alarm0-DT-node.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/302-dts-0071-arm-dts-ls1021a-replace-ftm0-with-ftm_alarm0-DT-node.patch7
1 files changed, 4 insertions, 3 deletions
diff --git a/target/linux/layerscape/patches-5.4/302-dts-0071-arm-dts-ls1021a-replace-ftm0-with-ftm_alarm0-DT-node.patch b/target/linux/layerscape/patches-5.4/302-dts-0071-arm-dts-ls1021a-replace-ftm0-with-ftm_alarm0-DT-node.patch
index d8412c2b50..2d63cc0b55 100644
--- a/target/linux/layerscape/patches-5.4/302-dts-0071-arm-dts-ls1021a-replace-ftm0-with-ftm_alarm0-DT-node.patch
+++ b/target/linux/layerscape/patches-5.4/302-dts-0071-arm-dts-ls1021a-replace-ftm0-with-ftm_alarm0-DT-node.patch
@@ -24,7 +24,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
};
cpus {
-@@ -582,16 +583,6 @@
+@@ -549,16 +550,6 @@
status = "disabled";
};
@@ -41,7 +41,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
pwm1: pwm@29e0000 {
compatible = "fsl,vf610-ftm-pwm";
#pwm-cells = <3>;
-@@ -1003,5 +994,18 @@
+@@ -970,6 +961,19 @@
big-endian;
};
@@ -59,4 +59,5 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
+ big-endian;
+ };
};
- };
+
+ thermal-zones {