Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
d71b4823
Commit
d71b4823
authored
Dec 30, 2019
by
Tony Lindgren
Browse files
Options
Browse Files
Download
Plain Diff
Merge tag 'sdma-dts' into omap-for-v5.6/ti-sysc-dt
parents
a6c8056d
bfab07ee
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
83 additions
and
23 deletions
+83
-23
arch/arm/boot/dts/dra7-l4.dtsi
arch/arm/boot/dts/dra7-l4.dtsi
+1
-1
arch/arm/boot/dts/omap2.dtsi
arch/arm/boot/dts/omap2.dtsi
+32
-10
arch/arm/boot/dts/omap2430.dtsi
arch/arm/boot/dts/omap2430.dtsi
+4
-0
arch/arm/boot/dts/omap3-n900.dts
arch/arm/boot/dts/omap3-n900.dts
+5
-0
arch/arm/boot/dts/omap3.dtsi
arch/arm/boot/dts/omap3.dtsi
+35
-10
arch/arm/boot/dts/omap36xx.dtsi
arch/arm/boot/dts/omap36xx.dtsi
+4
-0
arch/arm/boot/dts/omap4-l4.dtsi
arch/arm/boot/dts/omap4-l4.dtsi
+1
-1
arch/arm/boot/dts/omap5-l4.dtsi
arch/arm/boot/dts/omap5-l4.dtsi
+1
-1
No files found.
arch/arm/boot/dts/dra7-l4.dtsi
View file @
d71b4823
...
...
@@ -212,7 +212,7 @@ SYSC_OMAP2_SOFTRESET |
ranges = <0x0 0x56000 0x1000>;
sdma: dma-controller@0 {
compatible = "ti,omap4430-sdma";
compatible = "ti,omap4430-sdma"
, "ti,omap-sdma"
;
reg = <0x0 0x1000>;
interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
...
...
arch/arm/boot/dts/omap2.dtsi
View file @
d71b4823
...
...
@@ -8,6 +8,7 @@
* kind, whether express or implied.
*/
#include <dt-bindings/bus/ti-sysc.h>
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/omap.h>
...
...
@@ -79,10 +80,30 @@ intc: interrupt-controller@1 {
reg = <0x480FE000 0x1000>;
};
sdma: dma-controller
@48056000 {
compatible = "ti,
omap2430-sdma", "ti,omap2420-sdma
";
target-module
@48056000 {
compatible = "ti,
sysc-omap2", "ti,sysc
";
ti,hwmods = "dma";
reg = <0x48056000 0x1000>;
reg = <0x48056000 0x4>,
<0x4805602c 0x4>,
<0x48056028 0x4>;
reg-names = "rev", "sysc", "syss";
ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY |
SYSC_OMAP2_EMUFREE |
SYSC_OMAP2_SOFTRESET |
SYSC_OMAP2_AUTOIDLE)>;
ti,sysc-midle = <SYSC_IDLE_FORCE>,
<SYSC_IDLE_NO>,
<SYSC_IDLE_SMART>;
ti,syss-mask = <1>;
clocks = <&core_l3_ck>;
clock-names = "fck";
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 0x48056000 0x1000>;
sdma: dma-controller@0 {
compatible = "ti,omap2420-sdma", "ti,omap-sdma";
reg = <0 0x1000>;
interrupts = <12>,
<13>,
<14>,
...
...
@@ -91,6 +112,7 @@ sdma: dma-controller@48056000 {
dma-channels = <32>;
dma-requests = <64>;
};
};
i2c1: i2c@48070000 {
compatible = "ti,omap2-i2c";
...
...
arch/arm/boot/dts/omap2430.dtsi
View file @
d71b4823
...
...
@@ -309,6 +309,10 @@ wd_timer2: wdt@49016000 {
};
};
&sdma {
compatible = "ti,omap2430-sdma", "ti,omap-sdma";
};
&i2c1 {
compatible = "ti,omap2430-i2c";
};
...
...
arch/arm/boot/dts/omap3-n900.dts
View file @
d71b4823
...
...
@@ -482,6 +482,11 @@ &vintdig {
regulator
-
always
-
on
;
};
/*
First
two
dma
channels
are
reserved
on
secure
omap3
*/
&
sdma
{
dma
-
channel
-
mask
=
<
0xfffffffc
>;
};
&
twl
{
twl_audio
:
audio
{
compatible
=
"ti,twl4030-audio"
;
...
...
arch/arm/boot/dts/omap3.dtsi
View file @
d71b4823
...
...
@@ -206,9 +206,34 @@ intc: interrupt-controller@48200000 {
reg = <0x48200000 0x1000>;
};
sdma: dma-controller@48056000 {
compatible = "ti,omap3630-sdma", "ti,omap3430-sdma";
reg = <0x48056000 0x1000>;
target-module@48056000 {
compatible = "ti,sysc-omap2", "ti,sysc";
ti,hwmods = "dma";
reg = <0x48056000 0x4>,
<0x4805602c 0x4>,
<0x48056028 0x4>;
reg-names = "rev", "sysc", "syss";
ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY |
SYSC_OMAP2_EMUFREE |
SYSC_OMAP2_SOFTRESET |
SYSC_OMAP2_AUTOIDLE)>;
ti,sysc-midle = <SYSC_IDLE_FORCE>,
<SYSC_IDLE_NO>,
<SYSC_IDLE_SMART>;
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
<SYSC_IDLE_NO>,
<SYSC_IDLE_SMART>;
ti,syss-mask = <1>;
/* Domains (V, P, C): core, core_pwrdm, core_l3_clkdm */
clocks = <&core_l3_ick>;
clock-names = "ick";
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 0x48056000 0x1000>;
sdma: dma-controller@0 {
compatible = "ti,omap3430-sdma", "ti,omap-sdma";
reg = <0x0 0x1000>;
interrupts = <12>,
<13>,
<14>,
...
...
@@ -216,7 +241,7 @@ sdma: dma-controller@48056000 {
#dma-cells = <1>;
dma-channels = <32>;
dma-requests = <96>;
ti,hwmods = "dma"
;
}
;
};
gpio1: gpio@48310000 {
...
...
arch/arm/boot/dts/omap36xx.dtsi
View file @
d71b4823
...
...
@@ -223,6 +223,10 @@ thermal_zones: thermal-zones {
};
};
&sdma {
compatible = "ti,omap3630-sdma", "ti,omap-sdma";
};
/* OMAP3630 needs dss_96m_fck for VENC */
&venc {
clocks = <&dss_tv_fck>, <&dss_96m_fck>;
...
...
arch/arm/boot/dts/omap4-l4.dtsi
View file @
d71b4823
...
...
@@ -160,7 +160,7 @@ SYSC_OMAP2_SOFTRESET |
ranges = <0x0 0x56000 0x1000>;
sdma: dma-controller@0 {
compatible = "ti,omap4430-sdma";
compatible = "ti,omap4430-sdma"
, "ti,omap-sdma"
;
reg = <0x0 0x1000>;
interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
...
...
arch/arm/boot/dts/omap5-l4.dtsi
View file @
d71b4823
...
...
@@ -237,7 +237,7 @@ SYSC_OMAP2_SOFTRESET |
ranges = <0x0 0x56000 0x1000>;
sdma: dma-controller@0 {
compatible = "ti,omap4430-sdma";
compatible = "ti,omap4430-sdma"
, "ti,omap-sdma"
;
reg = <0x0 0x1000>;
interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment