mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 09:12:39 +00:00
3da861ccca
Refreshed all patches. The following patches were manually changed: * 610-netfilter_match_bypass_default_checks.patch * 611-netfilter_match_bypass_default_table.patch * 802-can-0002-can-rx-offload-fix-long-lines.patch * 802-can-0003-can-rx-offload-can_rx_offload_compare-fix-typo.patch * 802-can-0004-can-rx-offload-can_rx_offload_irq_offload_timestamp-.patch * 802-can-0005-can-rx-offload-can_rx_offload_reset-remove-no-op-fun.patch * 802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch * 802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch The can-dev.ko model was moved in the upstream kernel. Compile-tested on: x86/64, armvirt/64, ath79/generic Runtime-tested on: x86/64, armvirt/64, ath79/generic Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
106 lines
4.0 KiB
Diff
106 lines
4.0 KiB
Diff
From b3e78e4a087922566bc18171190e2eed8a9b7797 Mon Sep 17 00:00:00 2001
|
|
From: Alison Wang <alison.wang@nxp.com>
|
|
Date: Thu, 12 Dec 2019 15:35:32 +0800
|
|
Subject: [PATCH] LF-403 ARM64: dts: fsl: Add clock-names mclk0 for SAI nodes
|
|
|
|
This patch adds clock-names "mclk0" to match with the current SAI
|
|
driver.
|
|
|
|
Signed-off-by: Alison Wang <alison.wang@nxp.com>
|
|
---
|
|
arch/arm/boot/dts/ls1021a.dtsi | 10 ++++++----
|
|
arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 10 ++++++----
|
|
arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 15 +++++++++------
|
|
3 files changed, 21 insertions(+), 14 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/ls1021a.dtsi
|
|
+++ b/arch/arm/boot/dts/ls1021a.dtsi
|
|
@@ -682,8 +682,9 @@
|
|
reg = <0x0 0x2b50000 0x0 0x10000>;
|
|
interrupts = <GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH>;
|
|
clocks = <&clockgen 4 1>, <&clockgen 4 1>,
|
|
- <&clockgen 4 1>, <&clockgen 4 1>;
|
|
- clock-names = "bus", "mclk1", "mclk2", "mclk3";
|
|
+ <&clockgen 4 1>, <&clockgen 4 1>,
|
|
+ <&clockgen 4 1>;
|
|
+ clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
|
|
dma-names = "tx", "rx";
|
|
dmas = <&edma0 1 47>,
|
|
<&edma0 1 46>;
|
|
@@ -696,8 +697,9 @@
|
|
reg = <0x0 0x2b60000 0x0 0x10000>;
|
|
interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
|
|
clocks = <&clockgen 4 1>, <&clockgen 4 1>,
|
|
- <&clockgen 4 1>, <&clockgen 4 1>;
|
|
- clock-names = "bus", "mclk1", "mclk2", "mclk3";
|
|
+ <&clockgen 4 1>, <&clockgen 4 1>,
|
|
+ <&clockgen 4 1>;
|
|
+ clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
|
|
dma-names = "tx", "rx";
|
|
dmas = <&edma0 1 45>,
|
|
<&edma0 1 44>;
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
|
|
@@ -405,8 +405,9 @@
|
|
reg = <0x0 0x2b50000 0x0 0x10000>;
|
|
interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
|
|
clocks = <&clockgen 4 3>, <&clockgen 4 3>,
|
|
- <&clockgen 4 3>, <&clockgen 4 3>;
|
|
- clock-names = "bus", "mclk1", "mclk2", "mclk3";
|
|
+ <&clockgen 4 3>, <&clockgen 4 3>,
|
|
+ <&clockgen 4 3>;
|
|
+ clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
|
|
dma-names = "tx", "rx";
|
|
dmas = <&edma0 1 47>,
|
|
<&edma0 1 46>;
|
|
@@ -419,8 +420,9 @@
|
|
reg = <0x0 0x2b60000 0x0 0x10000>;
|
|
interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
|
|
clocks = <&clockgen 4 3>, <&clockgen 4 3>,
|
|
- <&clockgen 4 3>, <&clockgen 4 3>;
|
|
- clock-names = "bus", "mclk1", "mclk2", "mclk3";
|
|
+ <&clockgen 4 3>, <&clockgen 4 3>,
|
|
+ <&clockgen 4 3>;
|
|
+ clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
|
|
dma-names = "tx", "rx";
|
|
dmas = <&edma0 1 45>,
|
|
<&edma0 1 44>;
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
|
@@ -544,8 +544,9 @@
|
|
reg = <0x0 0xf100000 0x0 0x10000>;
|
|
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
|
|
clocks = <&clockgen 4 1>, <&clockgen 4 1>,
|
|
- <&clockgen 4 1>, <&clockgen 4 1>;
|
|
- clock-names = "bus", "mclk1", "mclk2", "mclk3";
|
|
+ <&clockgen 4 1>, <&clockgen 4 1>,
|
|
+ <&clockgen 4 1>;
|
|
+ clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
|
|
dma-names = "tx", "rx";
|
|
dmas = <&edma0 1 4>,
|
|
<&edma0 1 3>;
|
|
@@ -558,8 +559,9 @@
|
|
reg = <0x0 0xf110000 0x0 0x10000>;
|
|
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
|
|
clocks = <&clockgen 4 1>, <&clockgen 4 1>,
|
|
- <&clockgen 4 1>, <&clockgen 4 1>;
|
|
- clock-names = "bus", "mclk1", "mclk2", "mclk3";
|
|
+ <&clockgen 4 1>, <&clockgen 4 1>,
|
|
+ <&clockgen 4 1>;
|
|
+ clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
|
|
dma-names = "tx", "rx";
|
|
dmas = <&edma0 1 6>,
|
|
<&edma0 1 5>;
|
|
@@ -572,8 +574,9 @@
|
|
reg = <0x0 0xf130000 0x0 0x10000>;
|
|
interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
|
|
clocks = <&clockgen 4 1>, <&clockgen 4 1>,
|
|
- <&clockgen 4 1>, <&clockgen 4 1>;
|
|
- clock-names = "bus", "mclk1", "mclk2", "mclk3";
|
|
+ <&clockgen 4 1>, <&clockgen 4 1>,
|
|
+ <&clockgen 4 1>;
|
|
+ clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
|
|
dma-names = "tx", "rx";
|
|
dmas = <&edma0 1 10>,
|
|
<&edma0 1 9>;
|