From 40fbe14b54bac16d5ec2fcf077b8aa54fb9de6b2 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Fri, 27 Nov 2015 01:04:41 +0000 Subject: arm64: renesas: salvator-x: set ak4613 In/Out pin as single-end Signed-off-by: Kuninori Morimoto Signed-off-by: Simon Horman --- arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'arch/arm64/boot') diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts index c5f709e7c0ba..beeacfaf18d0 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts +++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts @@ -141,6 +141,15 @@ #sound-dai-cells = <0>; reg = <0x10>; clocks = <&rcar_sound 3>; + + asahi-kasei,in1-single-end; + asahi-kasei,in2-single-end; + asahi-kasei,out1-single-end; + asahi-kasei,out2-single-end; + asahi-kasei,out3-single-end; + asahi-kasei,out4-single-end; + asahi-kasei,out5-single-end; + asahi-kasei,out6-single-end; }; }; -- cgit v1.2.3-59-g8ed1b From 8a8f181d2cfdbff772ff2cc895f59bb28beafbdf Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Tue, 1 Dec 2015 05:36:34 +0000 Subject: arm64: renesas: salvator-x: use CS2000 as AUDIO_CLK_B CS2000 needs AUDIO_CLKOUT as master clock which is generated by Renesas sound, and Renesas sound needs CS2000 as ADUIO_CLK_B. Because of this relationship, it will be dead-lock when driver probe. cs2000: clk_multiplier@4f { ... clocks = <&rcar_sound 0>, <&x12_clk>; ... }; &rcar_sound { ... assigned-clocks = <&cs2000>; ... }; This patch is using dummy audio_clkout to avoid this issue. Signed-off-by: Kuninori Morimoto Signed-off-by: Simon Horman --- arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'arch/arm64/boot') diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts index beeacfaf18d0..75af5ec5a4d4 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts +++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts @@ -61,6 +61,16 @@ clock-frequency = <24576000>; }; + audio_clkout: audio_clkout { + /* + * This is same as <&rcar_sound 0> + * but needed to avoid cs2000/rcar_sound probe dead-lock + */ + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <11289600>; + }; + rsnd_ak4613: sound { compatible = "simple-audio-card"; @@ -151,6 +161,17 @@ asahi-kasei,out5-single-end; asahi-kasei,out6-single-end; }; + + cs2000: clk_multiplier@4f { + #clock-cells = <0>; + compatible = "cirrus,cs2000-cp"; + reg = <0x4f>; + clocks = <&audio_clkout>, <&x12_clk>; + clock-names = "clk_in", "ref_clk"; + + assigned-clocks = <&cs2000>; + assigned-clock-rates = <24576000>; /* 1/1 divide */ + }; }; &rcar_sound { @@ -166,6 +187,23 @@ status = "okay"; + /* update to */ + clocks = <&cpg CPG_MOD 1005>, + <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>, + <&cpg CPG_MOD 1008>, <&cpg CPG_MOD 1009>, + <&cpg CPG_MOD 1010>, <&cpg CPG_MOD 1011>, + <&cpg CPG_MOD 1012>, <&cpg CPG_MOD 1013>, + <&cpg CPG_MOD 1014>, <&cpg CPG_MOD 1015>, + <&cpg CPG_MOD 1022>, <&cpg CPG_MOD 1023>, + <&cpg CPG_MOD 1024>, <&cpg CPG_MOD 1025>, + <&cpg CPG_MOD 1026>, <&cpg CPG_MOD 1027>, + <&cpg CPG_MOD 1028>, <&cpg CPG_MOD 1029>, + <&cpg CPG_MOD 1030>, <&cpg CPG_MOD 1031>, + <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>, + <&audio_clk_a>, <&cs2000>, + <&audio_clk_c>, + <&cpg CPG_CORE R8A7795_CLK_S0D4>; + rcar_sound,dai { dai0 { playback = <&ssi0 &src0 &dvc0>; -- cgit v1.2.3-59-g8ed1b From 12e5155783bfdd50d93f9868b2209db190df8b68 Mon Sep 17 00:00:00 2001 From: Gaku Inami Date: Fri, 4 Dec 2015 14:38:51 +0100 Subject: arm64: dts: r8a7795: Add PSCI node Add PSCI node for r8a7795 SoC, and cpu node enable-method property is set to "psci". Signed-off-by: Gaku Inami Signed-off-by: Takeshi Kihara Signed-off-by: Dirk Behme Signed-off-by: Simon Horman --- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'arch/arm64/boot') diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi index b1902ea1dae4..051ff143506e 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi @@ -26,6 +26,11 @@ i2c6 = &i2c6; }; + psci { + compatible = "arm,psci-0.2"; + method = "smc"; + }; + cpus { #address-cells = <1>; #size-cells = <0>; @@ -35,6 +40,7 @@ compatible = "arm,cortex-a57", "arm,armv8"; reg = <0x0>; device_type = "cpu"; + enable-method = "psci"; }; }; -- cgit v1.2.3-59-g8ed1b From 0ed1a79ed0c17631fb41d336a4eddb9bbd299b64 Mon Sep 17 00:00:00 2001 From: Gaku Inami Date: Fri, 4 Dec 2015 14:38:52 +0100 Subject: arm64: dts: r8a7795: Add Cortex-A57 CPU cores Add Cortex-A57 CPU cores to r8a7795 SoC for a total of 4 x Cortex-A57. Signed-off-by: Gaku Inami Signed-off-by: Takeshi Kihara Sigend-off-by: Dirk Behme Signed-off-by: Simon Horman --- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) (limited to 'arch/arm64/boot') diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi index 051ff143506e..4d43cf31418f 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi @@ -35,13 +35,31 @@ #address-cells = <1>; #size-cells = <0>; - /* 1 core only at this point */ a57_0: cpu@0 { compatible = "arm,cortex-a57", "arm,armv8"; reg = <0x0>; device_type = "cpu"; enable-method = "psci"; }; + + a57_1: cpu@1 { + compatible = "arm,cortex-a57","arm,armv8"; + reg = <0x1>; + device_type = "cpu"; + enable-method = "psci"; + }; + a57_2: cpu@2 { + compatible = "arm,cortex-a57","arm,armv8"; + reg = <0x2>; + device_type = "cpu"; + enable-method = "psci"; + }; + a57_3: cpu@3 { + compatible = "arm,cortex-a57","arm,armv8"; + reg = <0x3>; + device_type = "cpu"; + enable-method = "psci"; + }; }; extal_clk: extal { @@ -84,6 +102,7 @@ soc { compatible = "simple-bus"; interrupt-parent = <&gic>; + #address-cells = <2>; #size-cells = <2>; ranges; @@ -96,7 +115,7 @@ reg = <0x0 0xf1010000 0 0x1000>, <0x0 0xf1020000 0 0x2000>; interrupts = ; + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; }; gpio0: gpio@e6050000 { @@ -214,13 +233,13 @@ timer { compatible = "arm,armv8-timer"; interrupts = , + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, , + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, , + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, ; + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; }; cpg: clock-controller@e6150000 { -- cgit v1.2.3-59-g8ed1b From a6b6b478459be0c5614626ba6ac95df05a7fc5e9 Mon Sep 17 00:00:00 2001 From: Yoshifumi Hosoya Date: Fri, 4 Dec 2015 14:38:53 +0100 Subject: arm64: dts: r8a7795: Add pmu device nodes Enabling the performance monitor unit on r8a7795. Signed-off-by: Masaru Nagai Signed-off-by: Yoshifumi Hosoya Signed-off-by: Dirk Behme Signed-off-by: Simon Horman --- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'arch/arm64/boot') diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi index 4d43cf31418f..b9229a49dabc 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi @@ -230,6 +230,18 @@ power-domains = <&cpg>; }; + pmu { + compatible = "arm,armv8-pmuv3"; + interrupts = , + , + , + ; + interrupt-affinity = <&a57_0>, + <&a57_1>, + <&a57_2>, + <&a57_3>; + }; + timer { compatible = "arm,armv8-timer"; interrupts = Date: Tue, 8 Dec 2015 10:37:53 +0100 Subject: arm64: renesas: r8a7795: add internal delay for i2c IPs Signed-off-by: Wolfram Sang Signed-off-by: Simon Horman --- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'arch/arm64/boot') diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi index b9229a49dabc..e14251164480 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi @@ -526,6 +526,7 @@ interrupts = ; clocks = <&cpg CPG_MOD 931>; power-domains = <&cpg>; + i2c-scl-internal-delay-ns = <110>; status = "disabled"; }; @@ -537,6 +538,7 @@ interrupts = ; clocks = <&cpg CPG_MOD 930>; power-domains = <&cpg>; + i2c-scl-internal-delay-ns = <6>; status = "disabled"; }; @@ -548,6 +550,7 @@ interrupts = ; clocks = <&cpg CPG_MOD 929>; power-domains = <&cpg>; + i2c-scl-internal-delay-ns = <6>; status = "disabled"; }; @@ -559,6 +562,7 @@ interrupts = ; clocks = <&cpg CPG_MOD 928>; power-domains = <&cpg>; + i2c-scl-internal-delay-ns = <110>; status = "disabled"; }; @@ -570,6 +574,7 @@ interrupts = ; clocks = <&cpg CPG_MOD 927>; power-domains = <&cpg>; + i2c-scl-internal-delay-ns = <110>; status = "disabled"; }; @@ -581,6 +586,7 @@ interrupts = ; clocks = <&cpg CPG_MOD 919>; power-domains = <&cpg>; + i2c-scl-internal-delay-ns = <110>; status = "disabled"; }; @@ -592,6 +598,7 @@ interrupts = ; clocks = <&cpg CPG_MOD 918>; power-domains = <&cpg>; + i2c-scl-internal-delay-ns = <6>; status = "disabled"; }; -- cgit v1.2.3-59-g8ed1b From 4c13472b8cc4a326041584b88c534663bb829102 Mon Sep 17 00:00:00 2001 From: Kouei Abe Date: Mon, 14 Dec 2015 16:42:34 +0100 Subject: arm64: dts: r8a7795: Add SATA controller node This adds SATA device node to r8a7795.dtsi. Signed-off-by: Kouei Abe [uli: adjusted for new MSTP clock scheme] Signed-off-by: Ulrich Hecht Signed-off-by: Simon Horman --- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'arch/arm64/boot') diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi index e14251164480..9ce6a5ea6629 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi @@ -767,5 +767,13 @@ }; }; }; + + sata: sata@ee300000 { + compatible = "renesas,sata-r8a7795"; + reg = <0 0xee300000 0 0x1fff>; + interrupts = ; + clocks = <&cpg CPG_MOD 915>; + status = "disabled"; + }; }; }; -- cgit v1.2.3-59-g8ed1b From 52ee9fb34aa4b839b784e2e224a7c525cc51c955 Mon Sep 17 00:00:00 2001 From: Kouei Abe Date: Mon, 14 Dec 2015 16:42:35 +0100 Subject: arm64: dts: salvator-x: Enable SATA controller This enables SATA device in r8a7795-salvator-x.dts. Signed-off-by: Kouei Abe Signed-off-by: Simon Horman --- arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'arch/arm64/boot') diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts index 75af5ec5a4d4..265d12ff6022 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts +++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts @@ -212,6 +212,10 @@ }; }; +&sata { + status = "okay"; +}; + &ssi1 { shared-pin; }; -- cgit v1.2.3-59-g8ed1b From 2eb2b5066197eab00c55dcd1132f17836e4975b2 Mon Sep 17 00:00:00 2001 From: Ulrich Hecht Date: Wed, 16 Dec 2015 11:34:21 +0100 Subject: arm64: renesas: r8a7795: fix SATA clock assignment SATA clock is 815, not 915. Signed-off-by: Ulrich Hecht Acked-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm64/boot') diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi index 9ce6a5ea6629..bb353cde1253 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi @@ -772,7 +772,7 @@ compatible = "renesas,sata-r8a7795"; reg = <0 0xee300000 0 0x1fff>; interrupts = ; - clocks = <&cpg CPG_MOD 915>; + clocks = <&cpg CPG_MOD 815>; status = "disabled"; }; }; -- cgit v1.2.3-59-g8ed1b