From 81a85f9ebca5713a99c827e446768b9223f63a25 Mon Sep 17 00:00:00 2001 From: "Lily.Li" Date: Tue, 28 Jul 2015 15:17:43 +0800 Subject: [PATCH 01/10] ARM: dts: atlas7: add lost jpeg node this patch adds lost jpeg node, and also fix the ranges of its parent node. Signed-off-by: Lily.Li Signed-off-by: Barry Song --- arch/arm/boot/dts/atlas7.dtsi | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/arm/boot/dts/atlas7.dtsi b/arch/arm/boot/dts/atlas7.dtsi index 3e21311f9514..d590b829e715 100644 --- a/arch/arm/boot/dts/atlas7.dtsi +++ b/arch/arm/boot/dts/atlas7.dtsi @@ -1350,6 +1350,7 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x16000000 0x16000000 0x00200000>, + <0x17000000 0x17000000 0x10000>, <0x17020000 0x17020000 0x1000>, <0x17030000 0x17030000 0x1000>, <0x17040000 0x17040000 0x1000>, @@ -1416,6 +1417,14 @@ bus-width = <8>; }; + jpeg@17000000 { + compatible = "sirf,atlas7-jpeg"; + reg = <0x17000000 0x10000>; + interrupts = <0 72 0>, + <0 73 0>; + clocks = <&car 103>; + }; + usb0: usb@17060000 { cell-index = <0>; compatible = "sirf,atlas7-usb"; From c95c621157c53f890f55983cd57c128255091f1f Mon Sep 17 00:00:00 2001 From: Ye He Date: Tue, 28 Jul 2015 15:26:59 +0800 Subject: [PATCH 02/10] ARM: dts: atlas7: add performance monitor unit node Signed-off-by: Ye He Signed-off-by: Barry Song --- arch/arm/boot/dts/atlas7.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/boot/dts/atlas7.dtsi b/arch/arm/boot/dts/atlas7.dtsi index d590b829e715..3caa2ccdaa7b 100644 --- a/arch/arm/boot/dts/atlas7.dtsi +++ b/arch/arm/boot/dts/atlas7.dtsi @@ -53,6 +53,11 @@ }; }; + arm-pmu { + compatible = "arm,cortex-a7-pmu"; + interrupts = <0 29 4>, <0 82 4>; + }; + noc { compatible = "simple-bus"; #address-cells = <1>; From 153645b3e0373e276e3641e8b784f186bcc18b7e Mon Sep 17 00:00:00 2001 From: Ye He Date: Tue, 28 Jul 2015 15:31:34 +0800 Subject: [PATCH 03/10] ARM: dts: atlas7: add lost gmac node this patch adds lost ethernet gmac node, and also fix the ranges of its parent node. Signed-off-by: Ye He Signed-off-by: Barry Song --- arch/arm/boot/dts/atlas7.dtsi | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/arm/boot/dts/atlas7.dtsi b/arch/arm/boot/dts/atlas7.dtsi index 3caa2ccdaa7b..cc9db08dbfe3 100644 --- a/arch/arm/boot/dts/atlas7.dtsi +++ b/arch/arm/boot/dts/atlas7.dtsi @@ -1236,6 +1236,7 @@ <0x18040000 0x18040000 0x1000>, <0x18050000 0x18050000 0x1000>, <0x18060000 0x18060000 0x1000>, + <0x180b0000 0x180b0000 0x4000>, <0x18100000 0x18100000 0x3000>, <0x18250000 0x18250000 0x10000>, <0x18200000 0x18200000 0x1000>; @@ -1319,6 +1320,18 @@ dma-names = "rx", "tx"; status = "disabled"; }; + gmac: eth@180b0000 { + compatible = "snps, dwc-eth-qos"; + reg = <0x180b0000 0x4000>; + interrupts = <0 59 0>, <0 70 0>; + interrupt-names = "macirq", "macpmt"; + clocks = <&car 39>, <&car 45>, + <&car 86>, <&car 87>; + clock-names = "gnssm_rgmii", "gnssm_gmac", + "rgmii", "gmac"; + local-mac-address = [00 00 00 00 00 00]; + phy-mode = "rgmii"; + }; dspub@18250000 { compatible = "dx,cc44p"; reg = <0x18250000 0x10000>; From d015642e124ec3a90d1699293bbd2514f9b525ea Mon Sep 17 00:00:00 2001 From: Qipan Li Date: Mon, 9 Feb 2015 14:29:46 +0800 Subject: [PATCH 04/10] ARM: dts: atlas7: add alias name for spi device spi framework can use alias name of spi device to retrieve the bus id, so bus id will not be dynamical but statical and it will be easier for test for a specified spi device with a fixed name like use spidev. Signed-off-by: Qipan Li Signed-off-by: Barry Song --- arch/arm/boot/dts/atlas7.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/atlas7.dtsi b/arch/arm/boot/dts/atlas7.dtsi index cc9db08dbfe3..b872d129a311 100644 --- a/arch/arm/boot/dts/atlas7.dtsi +++ b/arch/arm/boot/dts/atlas7.dtsi @@ -21,6 +21,10 @@ serial5 = &uart5; serial6 = &uart6; serial9 = &usp2; + spi1 = &spi1; + spi2 = &usp1; + spi3 = &usp2; + spi4 = &usp3; }; cpus { #address-cells = <1>; From f3a19caa52ec8a5d27583a094f957d71e66b9afe Mon Sep 17 00:00:00 2001 From: Xiaofeng Fei Date: Tue, 28 Jul 2015 15:40:37 +0800 Subject: [PATCH 05/10] ARM: dts: atlas7: add multimedia codec node this patch adds multimedia video codec node, and also fixes the ranges of its parent node. Signed-off-by: Xiaofeng Fei Signed-off-by: Barry Song --- arch/arm/boot/dts/atlas7.dtsi | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/atlas7.dtsi b/arch/arm/boot/dts/atlas7.dtsi index b872d129a311..5a98485a2f21 100644 --- a/arch/arm/boot/dts/atlas7.dtsi +++ b/arch/arm/boot/dts/atlas7.dtsi @@ -1371,7 +1371,8 @@ compatible = "arteris, flexnoc", "simple-bus"; #address-cells = <1>; #size-cells = <1>; - ranges = <0x16000000 0x16000000 0x00200000>, + ranges = <0x15000000 0x15000000 0x00600000>, + <0x16000000 0x16000000 0x00200000>, <0x17000000 0x17000000 0x10000>, <0x17020000 0x17020000 0x1000>, <0x17030000 0x17030000 0x1000>, @@ -1383,6 +1384,13 @@ <0x17070200 0x17070200 0x100>, <0x170A0000 0x170A0000 0x3000>; + multimedia@15000000 { + compatible = "sirf,atlas7-video-codec"; + reg = <0x15000000 0x10000>; + interrupts = <0 5 0>; + clocks = <&car 102>; + }; + mediam@170A0000 { compatible = "sirf,nocfw-mediam"; reg = <0x170A0000 0x3000>; From d9615f8bf5d93afcd6cce35c81d06030a82e93ef Mon Sep 17 00:00:00 2001 From: Dongli Li Date: Tue, 28 Jul 2015 15:48:22 +0800 Subject: [PATCH 06/10] ARM: dts: atlas7: add lost G2D node this patch adds lost G2D node, and also fixes the range of its parent node. Signed-off-by: Dongli Li Signed-off-by: Barry Song --- arch/arm/boot/dts/atlas7.dtsi | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/atlas7.dtsi b/arch/arm/boot/dts/atlas7.dtsi index 5a98485a2f21..9bad559cb86e 100644 --- a/arch/arm/boot/dts/atlas7.dtsi +++ b/arch/arm/boot/dts/atlas7.dtsi @@ -1865,7 +1865,8 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x13100000 0x13100000 0x20000>, - <0x10e10000 0x10e10000 0x10000>; + <0x10e10000 0x10e10000 0x10000>, + <0x17010000 0x17010000 0x10000>; lcd@13100000 { compatible = "sirf,atlas7-lcdc"; @@ -1887,6 +1888,12 @@ clocks = <&car 54>; resets = <&car 29>; }; + g2d@17010000 { + compatible = "sirf, atlas7-g2d"; + reg = <0x17010000 0x10000>; + interrupts = <0 61 0>; + clocks = <&car 104>; + }; }; From 5e3773b2b8c576c48aac8c2e59f88fc73803677e Mon Sep 17 00:00:00 2001 From: Guo Zeng Date: Tue, 28 Jul 2015 15:56:34 +0800 Subject: [PATCH 07/10] ARM: dts: atlas7: add lost PWM node this patch adds lost PWM node, and also fixes the ranges of its parent node. Signed-off-by: Guo Zeng Signed-off-by: Barry Song --- arch/arm/boot/dts/atlas7.dtsi | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/atlas7.dtsi b/arch/arm/boot/dts/atlas7.dtsi index 9bad559cb86e..456cf811d5c2 100644 --- a/arch/arm/boot/dts/atlas7.dtsi +++ b/arch/arm/boot/dts/atlas7.dtsi @@ -1214,7 +1214,8 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x18641000 0x18641000 0x3000>, - <0x18620000 0x18620000 0x1000>; + <0x18620000 0x18620000 0x1000>, + <0x18630000 0x18630000 0x10000>; cgum@18641000 { compatible = "sirf,nocfw-cgum"; @@ -1227,6 +1228,15 @@ #clock-cells = <1>; #reset-cells = <1>; }; + pwm: pwm@18630000 { + compatible = "sirf,prima2-pwm"; + #pwm-cells = <2>; + reg = <0x18630000 0x10000>; + clocks = <&car 138>, <&car 139>, <&car 237>, + <&car 240>, <&car 140>, <&car 246>; + clock-names = "pwmc", "sigsrc0", "sigsrc1", + "sigsrc2", "sigsrc3", "sigsrc4"; + }; }; gnssm { From 4e881aa890391140af4a03e2d116b68723efe61a Mon Sep 17 00:00:00 2001 From: Yonghui Zhang Date: Tue, 28 Jul 2015 15:59:41 +0800 Subject: [PATCH 08/10] ARM: dts: atlas7: add software digital radio nodes and its DMA channels this patch adds SDR(software digital raio) nodes and the DMA channels for it. Signed-off-by: Yonghui Zhang Signed-off-by: Barry Song --- arch/arm/boot/dts/atlas7.dtsi | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/atlas7.dtsi b/arch/arm/boot/dts/atlas7.dtsi index 456cf811d5c2..de38bc98b9c0 100644 --- a/arch/arm/boot/dts/atlas7.dtsi +++ b/arch/arm/boot/dts/atlas7.dtsi @@ -1370,11 +1370,42 @@ compatible = "arteris, flexnoc", "simple-bus"; #address-cells = <1>; #size-cells = <1>; - ranges = <0x13000000 0x13000000 0x3000>; + ranges = <0x13000000 0x13000000 0x3000>, + <0x13010000 0x13010000 0x1400>, + <0x13010800 0x13010800 0x100>, + <0x13011000 0x13011000 0x100>; gpum@0x13000000 { compatible = "sirf,nocfw-gpum"; reg = <0x13000000 0x3000>; }; + dmacsdrr: dma-controller@13010800 { + cell-index = <5>; + compatible = "sirf,atlas7-dmac-v2"; + reg = <0x13010800 0x100>; + interrupts = <0 8 0>; + clocks = <&car 127>; + #dma-cells = <1>; + #dma-channels = <1>; + }; + dmacsdrw: dma-controller@13011000 { + cell-index = <6>; + compatible = "sirf,atlas7-dmac-v2"; + reg = <0x13011000 0x100>; + interrupts = <0 9 0>; + clocks = <&car 127>; + #dma-cells = <1>; + #dma-channels = <1>; + }; + sdr@0x13010000 { + compatible = "sirf,atlas7-sdr"; + reg = <0x13010000 0x1400>; + interrupts = <0 7 0>, + <0 8 0>, + <0 9 0>; + clocks = <&car 127>; + dmas = <&dmacsdrr 0>, <&dmacsdrw 0>; + dma-names = "tx", "rx"; + }; }; mediam { From 627830756dcf647349c25f4212e777e2146465d4 Mon Sep 17 00:00:00 2001 From: Huayi Li Date: Tue, 28 Jul 2015 16:03:38 +0800 Subject: [PATCH 09/10] ARM: dts: atlas7: put pinctl property to get pinmux for NAND Nand controller often share some pins with sd/mmc controller on atlas and prima series, nand node can be disabled if the pins are used by sd/mmc controller. Signed-off-by: Huayi Li Signed-off-by: Barry Song --- arch/arm/boot/dts/atlas7.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/atlas7.dtsi b/arch/arm/boot/dts/atlas7.dtsi index de38bc98b9c0..83449b33de6b 100644 --- a/arch/arm/boot/dts/atlas7.dtsi +++ b/arch/arm/boot/dts/atlas7.dtsi @@ -1458,6 +1458,8 @@ nand@17050000 { compatible = "sirf,atlas7-nand"; reg = <0x17050000 0x10000>; + pinctrl-names = "default"; + pinctrl-0 = <&nd_df_pmx>; interrupts = <0 41 0>; clocks = <&car 108>, <&car 112>; clock-names = "nand_io", "nand_nand"; From 2cd212427fa9cbf19c1f353d6e14b959e8f112f7 Mon Sep 17 00:00:00 2001 From: Andy Sun Date: Tue, 28 Jul 2015 16:38:39 +0800 Subject: [PATCH 10/10] ARM: dts: atlas7: add a GPIO key for rearview button Touching this key will trigger a camera event for rearview. Signed-off-by: Andy Sun Signed-off-by: Barry Song --- arch/arm/boot/dts/atlas7-evb.dts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/arch/arm/boot/dts/atlas7-evb.dts b/arch/arm/boot/dts/atlas7-evb.dts index 49cf59a95572..1e9cd1a8508e 100644 --- a/arch/arm/boot/dts/atlas7-evb.dts +++ b/arch/arm/boot/dts/atlas7-evb.dts @@ -10,6 +10,9 @@ /include/ "atlas7.dtsi" +#include +#include + / { model = "CSR SiRFatlas7 Evaluation Board"; compatible = "sirf,atlas7-cb", "sirf,atlas7"; @@ -106,5 +109,20 @@ }; }; }; + + gpio_keys { + compatible = "gpio-keys"; + status = "okay"; + #address-cells = <1>; + #size-cells = <0>; + + rearview_key { + label = "rearview key"; + linux,code = ; + gpios = <&gpio_1 3 GPIO_ACTIVE_LOW>; + debounce_interval = <100>; + }; + }; + }; };