-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/k…
…ernel/git/arm/arm-soc Pull ARM SoC driver specific changes from Arnd Bergmann: "These changes are all driver specific and cross over between arm-soc contents and some other subsystem, in these cases cpufreq, crypto, dma, pinctrl, mailbox and usb, and the subsystem owners agreed to have these changes merged through arm-soc. As we proceed to untangle the dependencies between platform code and driver code, the amount of changes in this category is fortunately shrinking, for 3.11 we have 16 branches here and 101 non-merge changesets, the majority of which are for the stedma40 dma engine driver used in the ux500 platform. Cleaning up that code touches multiple subsystems, but gets rid of the dependency in the end. The mailbox code moved out from mach-omap2 to drivers/mailbox is an intermediate step and is still omap specific at the moment. Patches exist to generalize the subsystem and add other drivers with the same API, but those did not make it for 3.11." * tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (101 commits) crypto: ux500: use dmaengine_submit API crypto: ux500: use dmaengine_prep_slave_sg API crypto: ux500: use dmaengine_device_control API crypto: ux500/crypt: add missing __iomem qualifiers crypto: ux500/hash: add missing static qualifiers crypto: ux500/hash: use readl on iomem addresses dmaengine: ste_dma40: Declare memcpy config as static ARM: ux500: Remove mop500_snowball_ethernet_clock_enable() ARM: ux500: Correct the EN_3v3 regulator's on/off GPIO ARM: ux500: Provide a AB8500 GPIO Device Tree node gpio: rcar: fix gpio_rcar_of_table gpio-rcar: Remove #ifdef CONFIG_OF around OF-specific sections gpio-rcar: Reference core gpio documentation in the DT bindings clk: exynos5250: Add enum entries for divider clock of i2s1 and i2s2 ARM: dts: Update Samsung I2S documentation ARM: dts: add clock provider information for i2s controllers in Exynos5250 ARM: dts: add Exynos audio subsystem clock controller node clk: samsung: register audio subsystem clocks using common clock framework ARM: dts: use #include for all device trees for Samsung pinctrl: s3c24xx: use correct header for chained_irq functions ...
- Loading branch information
Showing
112 changed files
with
3,168 additions
and
1,651 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
Documentation/devicetree/bindings/clock/clk-exynos-audss.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| * Samsung Audio Subsystem Clock Controller | ||
|
|
||
| The Samsung Audio Subsystem clock controller generates and supplies clocks | ||
| to Audio Subsystem block available in the S5PV210 and Exynos SoCs. The clock | ||
| binding described here is applicable to all SoC's in Exynos family. | ||
|
|
||
| Required Properties: | ||
|
|
||
| - compatible: should be one of the following: | ||
| - "samsung,exynos4210-audss-clock" - controller compatible with all Exynos4 SoCs. | ||
| - "samsung,exynos5250-audss-clock" - controller compatible with all Exynos5 SoCs. | ||
|
|
||
| - reg: physical base address and length of the controller's register set. | ||
|
|
||
| - #clock-cells: should be 1. | ||
|
|
||
| The following is the list of clocks generated by the controller. Each clock is | ||
| assigned an identifier and client nodes use this identifier to specify the | ||
| clock which they consume. Some of the clocks are available only on a particular | ||
| Exynos4 SoC and this is specified where applicable. | ||
|
|
||
| Provided clocks: | ||
|
|
||
| Clock ID SoC (if specific) | ||
| ----------------------------------------------- | ||
|
|
||
| mout_audss 0 | ||
| mout_i2s 1 | ||
| dout_srp 2 | ||
| dout_aud_bus 3 | ||
| dout_i2s 4 | ||
| srp_clk 5 | ||
| i2s_bus 6 | ||
| sclk_i2s 7 | ||
| pcm_bus 8 | ||
| sclk_pcm 9 | ||
|
|
||
| Example 1: An example of a clock controller node is listed below. | ||
|
|
||
| clock_audss: audss-clock-controller@3810000 { | ||
| compatible = "samsung,exynos5250-audss-clock"; | ||
| reg = <0x03810000 0x0C>; | ||
| #clock-cells = <1>; | ||
| }; | ||
|
|
||
| Example 2: I2S controller node that consumes the clock generated by the clock | ||
| controller. Refer to the standard clock bindings for information | ||
| about 'clocks' and 'clock-names' property. | ||
|
|
||
| i2s0: i2s@03830000 { | ||
| compatible = "samsung,i2s-v5"; | ||
| reg = <0x03830000 0x100>; | ||
| dmas = <&pdma0 10 | ||
| &pdma0 9 | ||
| &pdma0 8>; | ||
| dma-names = "tx", "rx", "tx-sec"; | ||
| clocks = <&clock_audss EXYNOS_I2S_BUS>, | ||
| <&clock_audss EXYNOS_I2S_BUS>, | ||
| <&clock_audss EXYNOS_SCLK_I2S>, | ||
| <&clock_audss EXYNOS_MOUT_AUDSS>, | ||
| <&clock_audss EXYNOS_MOUT_I2S>; | ||
| clock-names = "iis", "i2s_opclk0", "i2s_opclk1", | ||
| "mout_audss", "mout_i2s"; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| * DMA40 DMA Controller | ||
|
|
||
| Required properties: | ||
| - compatible: "stericsson,dma40" | ||
| - reg: Address range of the DMAC registers | ||
| - reg-names: Names of the above areas to use during resource look-up | ||
| - interrupt: Should contain the DMAC interrupt number | ||
| - #dma-cells: must be <3> | ||
| - memcpy-channels: Channels to be used for memcpy | ||
|
|
||
| Optional properties: | ||
| - dma-channels: Number of channels supported by hardware - if not present | ||
| the driver will attempt to obtain the information from H/W | ||
| - disabled-channels: Channels which can not be used | ||
|
|
||
| Example: | ||
|
|
||
| dma: dma-controller@801C0000 { | ||
| compatible = "stericsson,db8500-dma40", "stericsson,dma40"; | ||
| reg = <0x801C0000 0x1000 0x40010000 0x800>; | ||
| reg-names = "base", "lcpa"; | ||
| interrupt-parent = <&intc>; | ||
| interrupts = <0 25 0x4>; | ||
|
|
||
| #dma-cells = <2>; | ||
| memcpy-channels = <56 57 58 59 60>; | ||
| disabled-channels = <12>; | ||
| dma-channels = <8>; | ||
| }; | ||
|
|
||
| Clients | ||
| Required properties: | ||
| - dmas: Comma separated list of dma channel requests | ||
| - dma-names: Names of the aforementioned requested channels | ||
|
|
||
| Each dmas request consists of 4 cells: | ||
| 1. A phandle pointing to the DMA controller | ||
| 2. Device Type | ||
| 3. The DMA request line number (only when 'use fixed channel' is set) | ||
| 4. A 32bit mask specifying; mode, direction and endianess [NB: This list will grow] | ||
| 0x00000001: Mode: | ||
| Logical channel when unset | ||
| Physical channel when set | ||
| 0x00000002: Direction: | ||
| Memory to Device when unset | ||
| Device to Memory when set | ||
| 0x00000004: Endianess: | ||
| Little endian when unset | ||
| Big endian when set | ||
| 0x00000008: Use fixed channel: | ||
| Use automatic channel selection when unset | ||
| Use DMA request line number when set | ||
|
|
||
| Example: | ||
|
|
||
| uart@80120000 { | ||
| compatible = "arm,pl011", "arm,primecell"; | ||
| reg = <0x80120000 0x1000>; | ||
| interrupts = <0 11 0x4>; | ||
|
|
||
| dmas = <&dma 13 0 0x2>, /* Logical - DevToMem */ | ||
| <&dma 13 0 0x0>; /* Logical - MemToDev */ | ||
| dma-names = "rx", "rx"; | ||
|
|
||
| status = "disabled"; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 46 additions & 0 deletions
46
Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| * Renesas R-Car GPIO Controller | ||
|
|
||
| Required Properties: | ||
|
|
||
| - compatible: should be one of the following. | ||
| - "renesas,gpio-r8a7778": for R8A7778 (R-Mobile M1) compatible GPIO controller. | ||
| - "renesas,gpio-r8a7779": for R8A7779 (R-Car H1) compatible GPIO controller. | ||
| - "renesas,gpio-r8a7790": for R8A7790 (R-Car H2) compatible GPIO controller. | ||
| - "renesas,gpio-rcar": for generic R-Car GPIO controller. | ||
|
|
||
| - reg: Base address and length of each memory resource used by the GPIO | ||
| controller hardware module. | ||
|
|
||
| - interrupt-parent: phandle of the parent interrupt controller. | ||
| - interrupts: Interrupt specifier for the controllers interrupt. | ||
|
|
||
| - gpio-controller: Marks the device node as a gpio controller. | ||
| - #gpio-cells: Should be 2. The first cell is the GPIO number and the second | ||
| cell specifies GPIO flags, as defined in <dt-bindings/gpio/gpio.h>. Only the | ||
| GPIO_ACTIVE_HIGH and GPIO_ACTIVE_LOW flags are supported. | ||
| - gpio-ranges: Range of pins managed by the GPIO controller. | ||
|
|
||
| Please refer to gpio.txt in this directory for details of gpio-ranges property | ||
| and the common GPIO bindings used by client devices. | ||
|
|
||
| Example: R8A7779 (R-Car H1) GPIO controller nodes | ||
|
|
||
| gpio0: gpio@ffc40000 { | ||
| compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; | ||
| reg = <0xffc40000 0x2c>; | ||
| interrupt-parent = <&gic>; | ||
| interrupts = <0 141 0x4>; | ||
| #gpio-cells = <2>; | ||
| gpio-controller; | ||
| gpio-ranges = <&pfc 0 0 32>; | ||
| }; | ||
| ... | ||
| gpio6: gpio@ffc46000 { | ||
| compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; | ||
| reg = <0xffc46000 0x2c>; | ||
| interrupt-parent = <&gic>; | ||
| interrupts = <0 147 0x4>; | ||
| #gpio-cells = <2>; | ||
| gpio-controller; | ||
| gpio-ranges = <&pfc 0 192 9>; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.