On Sun, Jun 14, 2020 at 10:32:05PM +0800, Biwen Li wrote:
> From: Biwen Li <biwen.li@xxxxxxx>
>
> The patch adds ftm_alarm0 DT node
> - add new rcpm node
> - add ftm_alarm0 node
> - aliases ftm_alarm0 as rtc1
>
> Signed-off-by: Biwen Li <biwen.li@xxxxxxx>
> ---
> Change in v2:
> - use generic name
> - use definition
>
> arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 15 +++++++++++++++
> arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 14 ++++++++++++++
> arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 15 +++++++++++++++
> arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 14 ++++++++++++++
> arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 14 ++++++++++++++
> 5 files changed, 72 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
> index 006e544..4742efe 100644
> --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
> +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
> @@ -22,6 +22,7 @@
> rtic-c = &rtic_c;
> rtic-d = &rtic_d;
> sec-mon = &sec_mon;
> + rtc1 = &ftm_alarm0;
Sorry. I did not catch it during v1 review. But we want to keep them
sort alphabetically.
Shawn
> };
>
> cpus {
> @@ -512,6 +513,20 @@
> <0000 0 0 4 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>;
> status = "disabled";
> };
> +
> + rcpm: power-controller@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 = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
> + big-endian;
> + };
> };
>
> firmware {
> diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
> index 3b641bd..55ceae7 100644
> --- 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 {
> @@ -829,6 +830,19 @@
> big-endian;
> };
>
> + rcpm: power-controller@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 = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
> + big-endian;
> + };
> };
>
> firmware {
> diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
> index d4c1da3..3c92c21 100644
> --- 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 {
> @@ -765,6 +766,20 @@
> queue-sizes = <64 64>;
> big-endian;
> };
> +
> + rcpm: power-controller@1ee2140 {
> + compatible = "fsl,ls1046a-rcpm", "fsl,qoriq-rcpm-2.1+";
> + reg = <0x0 0x1ee2140 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 {
> diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
> index 36a7995..169f474 100644
> --- 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 {
> @@ -781,6 +782,19 @@
> };
> };
> };
> +
> + rcpm: power-controller@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 = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
> + };
> };
>
> firmware {
> diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
> index 3944ef1..0c74021 100644
> --- 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 {
> @@ -763,6 +764,19 @@
> reg = <0x0 0x04000000 0x0 0x01000000>;
> interrupts = <0 12 4>;
> };
> +
> + rcpm: power-controller@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 = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
> + };
> };
>
> ddr1: memory-controller@1080000 {
> --
> 2.7.4
>
