Skip to content

Commit 1865678

Browse files
torvaldstorvalds
committed
Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC driver updates from Olof Johansson: "These are changes for drivers that are intimately tied to some SoC and for some reason could not get merged through the respective subsystem maintainer tree. This time around, much of this is for at91, with the bulk of it being syscon and udc drivers. Also, there's: - coupled cpuidle support for Samsung Exynos4210 - Renesas 73A0 common-clk work - of/platform changes to tear down DMA mappings on device destruction - a few updates to the TI Keystone knav code" * tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (26 commits) cpuidle: exynos: add coupled cpuidle support for exynos4210 ARM: EXYNOS: apply S5P_CENTRAL_SEQ_OPTION fix only when necessary soc: ti: knav_qmss_queue: change knav_range_setup_acc_irq to static soc: ti: knav_qmss_queue: makefile tweak to build as dynamic module pcmcia: at91_cf: depend on !ARCH_MULTIPLATFORM soc: ti: knav_qmss_queue: export API calls for use by user driver of/platform: teardown DMA mappings on device destruction usb: gadget: at91_udc: Allocate udc instance usb: gadget: at91_udc: Update DT binding documentation usb: gadget: at91_udc: Rework for multi-platform kernel support usb: gadget: at91_udc: Simplify probe and remove functions usb: gadget: at91_udc: Remove non-DT handling code usb: gadget: at91_udc: Document DT clocks and clock-names property usb: gadget: at91_udc: Drop uclk clock usb: gadget: at91_udc: Fix clock names mfd: syscon: Add Atmel SMC binding doc mfd: syscon: Add atmel-smc registers definition mfd: syscon: Add Atmel Matrix bus DT binding documentation mfd: syscon: Add atmel-matrix registers definition clk: shmobile: fix sparse NULL pointer warning ...
2 parents a233bb7 + 6f4554b commit 1865678

File tree

28 files changed

+1570
-268
lines changed

28 files changed

+1570
-268
lines changed

‎Documentation/devicetree/bindings/clock/renesas,sh73a0-cpg-clocks.txt

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
These bindings should be considered EXPERIMENTAL for now.
2+
3+
* Renesas SH73A0 Clock Pulse Generator (CPG)
4+
5+
The CPG generates core clocks for the SH73A0 SoC. It includes four PLLs
6+
and several fixed ratio dividers.
7+
8+
Required Properties:
9+
10+
- compatible: Must be "renesas,sh73a0-cpg-clocks"
11+
12+
- reg: Base address and length of the memory resource used by the CPG
13+
14+
- clocks: Reference to the parent clocks ("extal1" and "extal2")
15+
16+
- #clock-cells: Must be 1
17+
18+
- clock-output-names: The names of the clocks. Supported clocks are "main",
19+
"pll0", "pll1", "pll2", "pll3", "dsi0phy", "dsi1phy", "zg", "m3", "b",
20+
"m1", "m2", "z", "zx", and "hp".
21+
22+
23+
Example
24+
-------
25+
26+
cpg_clocks: cpg_clocks@e6150000 {
27+
compatible = "renesas,sh73a0-cpg-clocks";
28+
reg = <0 0xe6150000 0 0x10000>;
29+
clocks = <&extal1_clk>, <&extal2_clk>;
30+
#clock-cells = <1>;
31+
clock-output-names = "main", "pll0", "pll1", "pll2",
32+
"pll3", "dsi0phy", "dsi1phy",
33+
"zg", "m3", "b", "m1", "m2",
34+
"z", "zx", "hp";
35+
};

‎Documentation/devicetree/bindings/mfd/atmel-matrix.txt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
* Device tree bindings for Atmel Bus Matrix
2+
3+
The Bus Matrix registers are used to configure Atmel SoCs internal bus
4+
behavior (master/slave priorities, undefined burst length type, ...)
5+
6+
Required properties:
7+
- compatible: Should be one of the following
8+
"atmel,at91sam9260-matrix", "syscon"
9+
"atmel,at91sam9261-matrix", "syscon"
10+
"atmel,at91sam9263-matrix", "syscon"
11+
"atmel,at91sam9rl-matrix", "syscon"
12+
"atmel,at91sam9g45-matrix", "syscon"
13+
"atmel,at91sam9n12-matrix", "syscon"
14+
"atmel,at91sam9x5-matrix", "syscon"
15+
"atmel,sama5d3-matrix", "syscon"
16+
- reg: Contains offset/length value of the Bus Matrix
17+
memory region.
18+
19+
Example:
20+
21+
matrix: matrix@ffffec00 {
22+
compatible = "atmel,sama5d3-matrix", "syscon";
23+
reg = <0xffffec00 0x200>;
24+
};

‎Documentation/devicetree/bindings/mfd/atmel-smc.txt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
* Device tree bindings for Atmel SMC (Static Memory Controller)
2+
3+
The SMC registers are used to configure Atmel EBI (External Bus Interface)
4+
to interface with standard memory devices (NAND, NOR, SRAM or specialized
5+
devices like FPGAs).
6+
7+
Required properties:
8+
- compatible: Should be one of the following
9+
"atmel,at91sam9260-smc", "syscon"
10+
"atmel,sama5d3-smc", "syscon"
11+
- reg: Contains offset/length value of the SMC memory
12+
region.
13+
14+
Example:
15+
16+
smc: smc@ffffc000 {
17+
compatible = "atmel,sama5d3-smc", "syscon";
18+
reg = <0xffffc000 0x1000>;
19+
};

‎Documentation/devicetree/bindings/usb/atmel-usb.txt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,17 @@ usb1: ehci@00800000 {
3333
AT91 USB device controller
3434

3535
Required properties:
36-
- compatible: Should be "atmel,at91rm9200-udc"
36+
- compatible: Should be one of the following
37+
"atmel,at91rm9200-udc"
38+
"atmel,at91sam9260-udc"
39+
"atmel,at91sam9261-udc"
40+
"atmel,at91sam9263-udc"
3741
- reg: Address and length of the register set for the device
3842
- interrupts: Should contain macb interrupt
43+
- clocks: Should reference the peripheral and the AHB clocks
44+
- clock-names: Should contains two strings
45+
"pclk" for the peripheral clock
46+
"hclk" for the AHB clock
3947

4048
Optional properties:
4149
- atmel,vbus-gpio: If present, specifies a gpio that needs to be

‎arch/arm/boot/dts/sh73a0-kzm9g-reference.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,10 @@
182182
status = "okay";
183183
};
184184

185+
&extal2_clk {
186+
clock-frequency = <48000000>;
187+
};
188+
185189
&i2c0 {
186190
status = "okay";
187191
as3711@40 {

0 commit comments

Comments
 (0)