From e6067f29afd122bab8402e086a61324ef11521fe Mon Sep 17 00:00:00 2001 From: Rongjun Ying Date: Tue, 25 Nov 2014 18:46:42 +0800 Subject: [PATCH 1/8] ARM: dts: prima2: add I2S 2ch, 6ch, nodin, mclk groups we have done that for atlas6 in commit ed36c1a, 086b8904 etc. here we do same things for prima2. Signed-off-by: Rongjun Ying Signed-off-by: Barry Song Acked-by: Linus Walleij --- arch/arm/boot/dts/prima2.dtsi | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/arch/arm/boot/dts/prima2.dtsi b/arch/arm/boot/dts/prima2.dtsi index 963b7e54ab15..bc6e61195f12 100644 --- a/arch/arm/boot/dts/prima2.dtsi +++ b/arch/arm/boot/dts/prima2.dtsi @@ -524,12 +524,36 @@ sirf,function = "sdmmc5"; }; }; + i2s_mclk_pins_a: i2s_mclk@0 { + i2s_mclk { + sirf,pins = "i2smclkgrp"; + sirf,function = "i2s_mclk"; + }; + }; + i2s_ext_clk_input_pins_a: i2s_ext_clk_input@0 { + i2s_ext_clk_input { + sirf,pins = "i2s_ext_clk_inputgrp"; + sirf,function = "i2s_ext_clk_input"; + }; + }; i2s_pins_a: i2s@0 { i2s { sirf,pins = "i2sgrp"; sirf,function = "i2s"; }; }; + i2s_no_din_pins_a: i2s_no_din@0 { + i2s_no_din { + sirf,pins = "i2s_no_dingrp"; + sirf,function = "i2s_no_din"; + }; + }; + i2s_6chn_pins_a: i2s_6chn@0 { + i2s_6chn { + sirf,pins = "i2s_6chngrp"; + sirf,function = "i2s_6chn"; + }; + }; ac97_pins_a: ac97@0 { ac97 { sirf,pins = "ac97grp"; From 5427b0d2bf8865abf5df46d7736cd60a0dc5f9d8 Mon Sep 17 00:00:00 2001 From: Rongjun Ying Date: Tue, 25 Nov 2014 18:46:42 +0800 Subject: [PATCH 2/8] ARM: dts: atlas6: add a separate pingroup for i2s mclk output The I2S controller can output mclk to external audio codec. But by hardware design, some codecs need mclk and some codecs do not need mclk. So the mclk pin can be an independent pinctrl group, and the card driver can get it or not based on boards. Signed-off-by: Rongjun Ying Signed-off-by: Barry Song Acked-by: Linus Walleij --- arch/arm/boot/dts/atlas6.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/boot/dts/atlas6.dtsi b/arch/arm/boot/dts/atlas6.dtsi index bb22842a0826..d3de7a35825b 100644 --- a/arch/arm/boot/dts/atlas6.dtsi +++ b/arch/arm/boot/dts/atlas6.dtsi @@ -522,6 +522,12 @@ sirf,function = "sdmmc5"; }; }; + i2s_mclk_pins_a: i2s_mclk@0 { + i2s_mclk { + sirf,pins = "i2smclkgrp"; + sirf,function = "i2s_mclk"; + }; + }; i2s_pins_a: i2s@0 { i2s { sirf,pins = "i2sgrp"; From 110afb8b42ea68439b352a87e06563a3a85df6c6 Mon Sep 17 00:00:00 2001 From: Rongjun Ying Date: Tue, 25 Nov 2014 18:46:43 +0800 Subject: [PATCH 3/8] ARM: dts: atlas6: Add I2S external clock input pingroup The I2S controller can use the external clock as reference clock with master mode. But based on different hardware or software design, this external clock might be needed or not needed. So the external input pin can be an independent pinctrl group, and the card driver can decice to get it or not. Signed-off-by: Rongjun Ying Signed-off-by: Barry Song Acked-by: Linus Walleij --- arch/arm/boot/dts/atlas6.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/boot/dts/atlas6.dtsi b/arch/arm/boot/dts/atlas6.dtsi index d3de7a35825b..1eb83c84d9dc 100644 --- a/arch/arm/boot/dts/atlas6.dtsi +++ b/arch/arm/boot/dts/atlas6.dtsi @@ -528,6 +528,12 @@ sirf,function = "i2s_mclk"; }; }; + i2s_ext_clk_input_pins_a: i2s_ext_clk_input@0 { + i2s_ext_clk_input { + sirf,pins = "i2s_ext_clk_inputgrp"; + sirf,function = "i2s_ext_clk_input"; + }; + }; i2s_pins_a: i2s@0 { i2s { sirf,pins = "i2sgrp"; From 64a7507a7496f5adb88a55e572c659a82997f9c9 Mon Sep 17 00:00:00 2001 From: Ye He Date: Tue, 25 Nov 2014 18:46:43 +0800 Subject: [PATCH 4/8] ARM: dts: prima2: add node for Performance Monitor Unit It enables Performance Monitor Unit on CSR SiRFprimaII. Signed-off-by: Ye He Signed-off-by: Barry Song --- arch/arm/boot/dts/prima2.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/boot/dts/prima2.dtsi b/arch/arm/boot/dts/prima2.dtsi index bc6e61195f12..3bb1b4ab55de 100644 --- a/arch/arm/boot/dts/prima2.dtsi +++ b/arch/arm/boot/dts/prima2.dtsi @@ -41,6 +41,11 @@ }; }; + arm-pmu { + compatible = "arm,cortex-a9-pmu"; + interrupts = <29>; + }; + axi { compatible = "simple-bus"; #address-cells = <1>; From 1f634d7415441f723791d822fcde12dd50838d51 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Tue, 25 Nov 2014 18:46:43 +0800 Subject: [PATCH 5/8] ARM: dts: prima2: add resets property for GPS nodes this patch adds missed resets property for CSR SiRFprimaII GPS related nodes. Signed-off-by: Tao Huang Signed-off-by: Barry Song --- arch/arm/boot/dts/prima2.dtsi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/boot/dts/prima2.dtsi b/arch/arm/boot/dts/prima2.dtsi index 3bb1b4ab55de..70b2ad5d837e 100644 --- a/arch/arm/boot/dts/prima2.dtsi +++ b/arch/arm/boot/dts/prima2.dtsi @@ -178,6 +178,7 @@ compatible = "sirf,prima2-dspif"; reg = <0xa8000000 0x10000>; interrupts = <9>; + resets = <&rstc 1>; }; gps@a8010000 { @@ -185,6 +186,7 @@ reg = <0xa8010000 0x10000>; interrupts = <7>; clocks = <&clks 9>; + resets = <&rstc 2>; }; dsp@a9000000 { @@ -192,6 +194,7 @@ reg = <0xa9000000 0x1000000>; interrupts = <8>; clocks = <&clks 8>; + resets = <&rstc 0>; }; }; From f97b1a1de44fbd39c8a992afc0f322f3d0ff8d11 Mon Sep 17 00:00:00 2001 From: Renwei Wu Date: Tue, 25 Nov 2014 18:46:43 +0800 Subject: [PATCH 6/8] ARM: dts: prima2: add resets property for VPP nodes this patch adds missed resets property for CSR SiRFprimaII Video Post Processor(VPP) node. Signed-off-by: Renwei Wu Signed-off-by: Barry Song --- arch/arm/boot/dts/prima2.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/prima2.dtsi b/arch/arm/boot/dts/prima2.dtsi index 70b2ad5d837e..1ca1a9aa953f 100644 --- a/arch/arm/boot/dts/prima2.dtsi +++ b/arch/arm/boot/dts/prima2.dtsi @@ -137,6 +137,7 @@ reg = <0x90020000 0x10000>; interrupts = <31>; clocks = <&clks 35>; + resets = <&rstc 6>; }; }; From f17352ca9a241208671f8f725e88e1dded486460 Mon Sep 17 00:00:00 2001 From: Renwei Wu Date: Tue, 25 Nov 2014 18:46:43 +0800 Subject: [PATCH 7/8] ARM: dts: atlas6: add resets property for VPP nodes this patch adds missed resets property for CSR SiRFatlasVI Video Post Processor(VPP) node. Signed-off-by: Renwei Wu Signed-off-by: Barry Song --- arch/arm/boot/dts/atlas6.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/atlas6.dtsi b/arch/arm/boot/dts/atlas6.dtsi index 1eb83c84d9dc..c12d13908b2d 100644 --- a/arch/arm/boot/dts/atlas6.dtsi +++ b/arch/arm/boot/dts/atlas6.dtsi @@ -131,6 +131,7 @@ reg = <0x90020000 0x10000>; interrupts = <31>; clocks = <&clks 35>; + resets = <&rstc 6>; }; }; From 294a212faa5bf7cb48fabccec5ee13e836e29ecb Mon Sep 17 00:00:00 2001 From: Qipan Li Date: Tue, 25 Nov 2014 18:46:43 +0800 Subject: [PATCH 8/8] ARM: dts: atlas6: add resets property for SPI nodes this patch adds missed resets property for CSR SiRFatlasVI SPI nodes. Signed-off-by: Qipan Li Signed-off-by: Barry Song --- arch/arm/boot/dts/atlas6.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/atlas6.dtsi b/arch/arm/boot/dts/atlas6.dtsi index c12d13908b2d..29598667420b 100644 --- a/arch/arm/boot/dts/atlas6.dtsi +++ b/arch/arm/boot/dts/atlas6.dtsi @@ -313,6 +313,7 @@ #address-cells = <1>; #size-cells = <0>; clocks = <&clks 19>; + resets = <&rstc 26>; status = "disabled"; }; @@ -328,6 +329,7 @@ #address-cells = <1>; #size-cells = <0>; clocks = <&clks 20>; + resets = <&rstc 27>; status = "disabled"; };