-
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 branch 'samsung/cleanup' into next/boards
Conflicts: arch/arm/mach-imx/mach-imx6q.c arch/arm/mach-omap2/board-ti8168evm.c arch/arm/mach-s3c64xx/Kconfig arch/arm/mach-tegra/Makefile arch/arm/mach-tegra/board-dt-tegra20.c arch/arm/mach-tegra/common.c Lots of relatively simple conflicts between the board changes and stuff from the arm tree. This pulls in the resolution from the samsung/cleanup tree, so we don't get conflicting merges. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
- Loading branch information
Showing
1,104 changed files
with
12,816 additions
and
12,914 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| * Insignal's Exynos4210 based Origen evaluation board | ||
|
|
||
| Origen low-cost evaluation board is based on Samsung's Exynos4210 SoC. | ||
|
|
||
| Required root node properties: | ||
| - compatible = should be one or more of the following. | ||
| (a) "samsung,smdkv310" - for Samsung's SMDKV310 eval board. | ||
| (b) "samsung,exynos4210" - for boards based on Exynos4210 SoC. |
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,8 @@ | ||
| * Samsung's Exynos4210 based SMDKV310 evaluation board | ||
|
|
||
| SMDKV310 evaluation board is based on Samsung's Exynos4210 SoC. | ||
|
|
||
| Required root node properties: | ||
| - compatible = should be one or more of the following. | ||
| (a) "samsung,smdkv310" - for Samsung's SMDKV310 eval board. | ||
| (b) "samsung,exynos4210" - for boards based on Exynos4210 SoC. |
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,30 @@ | ||
| * ARM PrimeCell PL330 DMA Controller | ||
|
|
||
| The ARM PrimeCell PL330 DMA controller can move blocks of memory contents | ||
| between memory and peripherals or memory to memory. | ||
|
|
||
| Required properties: | ||
| - compatible: should include both "arm,pl330" and "arm,primecell". | ||
| - reg: physical base address of the controller and length of memory mapped | ||
| region. | ||
| - interrupts: interrupt number to the cpu. | ||
|
|
||
| Example: | ||
|
|
||
| pdma0: pdma@12680000 { | ||
| compatible = "arm,pl330", "arm,primecell"; | ||
| reg = <0x12680000 0x1000>; | ||
| interrupts = <99>; | ||
| }; | ||
|
|
||
| Client drivers (device nodes requiring dma transfers from dev-to-mem or | ||
| mem-to-dev) should specify the DMA channel numbers using a two-value pair | ||
| as shown below. | ||
|
|
||
| [property name] = <[phandle of the dma controller] [dma request id]>; | ||
|
|
||
| where 'dma request id' is the dma request number which is connected | ||
| to the client controller. The 'property name' is recommended to be | ||
| of the form <name>-dma-channel. | ||
|
|
||
| Example: tx-dma-channel = <&pdma0 12>; |
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,40 @@ | ||
| Samsung Exynos4 GPIO Controller | ||
|
|
||
| Required properties: | ||
| - compatible: Compatible property value should be "samsung,exynos4-gpio>". | ||
|
|
||
| - reg: Physical base address of the controller and length of memory mapped | ||
| region. | ||
|
|
||
| - #gpio-cells: Should be 4. The syntax of the gpio specifier used by client nodes | ||
| should be the following with values derived from the SoC user manual. | ||
| <[phandle of the gpio controller node] | ||
| [pin number within the gpio controller] | ||
| [mux function] | ||
| [pull up/down] | ||
| [drive strength]> | ||
|
|
||
| Values for gpio specifier: | ||
| - Pin number: is a value between 0 to 7. | ||
| - Pull Up/Down: 0 - Pull Up/Down Disabled. | ||
| 1 - Pull Down Enabled. | ||
| 3 - Pull Up Enabled. | ||
| - Drive Strength: 0 - 1x, | ||
| 1 - 3x, | ||
| 2 - 2x, | ||
| 3 - 4x | ||
|
|
||
| - gpio-controller: Specifies that the node is a gpio controller. | ||
| - #address-cells: should be 1. | ||
| - #size-cells: should be 1. | ||
|
|
||
| Example: | ||
|
|
||
| gpa0: gpio-controller@11400000 { | ||
| #address-cells = <1>; | ||
| #size-cells = <1>; | ||
| compatible = "samsung,exynos4-gpio"; | ||
| reg = <0x11400000 0x20>; | ||
| #gpio-cells = <4>; | ||
| gpio-controller; | ||
| }; |
88 changes: 88 additions & 0 deletions
88
Documentation/devicetree/bindings/input/samsung-keypad.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,88 @@ | ||
| * Samsung's Keypad Controller device tree bindings | ||
|
|
||
| Samsung's Keypad controller is used to interface a SoC with a matrix-type | ||
| keypad device. The keypad controller supports multiple row and column lines. | ||
| A key can be placed at each intersection of a unique row and a unique column. | ||
| The keypad controller can sense a key-press and key-release and report the | ||
| event using a interrupt to the cpu. | ||
|
|
||
| Required SoC Specific Properties: | ||
| - compatible: should be one of the following | ||
| - "samsung,s3c6410-keypad": For controllers compatible with s3c6410 keypad | ||
| controller. | ||
| - "samsung,s5pv210-keypad": For controllers compatible with s5pv210 keypad | ||
| controller. | ||
|
|
||
| - reg: physical base address of the controller and length of memory mapped | ||
| region. | ||
|
|
||
| - interrupts: The interrupt number to the cpu. | ||
|
|
||
| Required Board Specific Properties: | ||
| - samsung,keypad-num-rows: Number of row lines connected to the keypad | ||
| controller. | ||
|
|
||
| - samsung,keypad-num-columns: Number of column lines connected to the | ||
| keypad controller. | ||
|
|
||
| - row-gpios: List of gpios used as row lines. The gpio specifier for | ||
| this property depends on the gpio controller to which these row lines | ||
| are connected. | ||
|
|
||
| - col-gpios: List of gpios used as column lines. The gpio specifier for | ||
| this property depends on the gpio controller to which these column | ||
| lines are connected. | ||
|
|
||
| - Keys represented as child nodes: Each key connected to the keypad | ||
| controller is represented as a child node to the keypad controller | ||
| device node and should include the following properties. | ||
| - keypad,row: the row number to which the key is connected. | ||
| - keypad,column: the column number to which the key is connected. | ||
| - linux,code: the key-code to be reported when the key is pressed | ||
| and released. | ||
|
|
||
| Optional Properties specific to linux: | ||
| - linux,keypad-no-autorepeat: do no enable autorepeat feature. | ||
| - linux,keypad-wakeup: use any event on keypad as wakeup event. | ||
|
|
||
|
|
||
| Example: | ||
| keypad@100A0000 { | ||
| compatible = "samsung,s5pv210-keypad"; | ||
| reg = <0x100A0000 0x100>; | ||
| interrupts = <173>; | ||
| samsung,keypad-num-rows = <2>; | ||
| samsung,keypad-num-columns = <8>; | ||
| linux,input-no-autorepeat; | ||
| linux,input-wakeup; | ||
|
|
||
| row-gpios = <&gpx2 0 3 3 0 | ||
| &gpx2 1 3 3 0>; | ||
|
|
||
| col-gpios = <&gpx1 0 3 0 0 | ||
| &gpx1 1 3 0 0 | ||
| &gpx1 2 3 0 0 | ||
| &gpx1 3 3 0 0 | ||
| &gpx1 4 3 0 0 | ||
| &gpx1 5 3 0 0 | ||
| &gpx1 6 3 0 0 | ||
| &gpx1 7 3 0 0>; | ||
|
|
||
| key_1 { | ||
| keypad,row = <0>; | ||
| keypad,column = <3>; | ||
| linux,code = <2>; | ||
| }; | ||
|
|
||
| key_2 { | ||
| keypad,row = <0>; | ||
| keypad,column = <4>; | ||
| linux,code = <3>; | ||
| }; | ||
|
|
||
| key_3 { | ||
| keypad,row = <0>; | ||
| keypad,column = <5>; | ||
| linux,code = <4>; | ||
| }; | ||
| }; |
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,20 @@ | ||
| * Samsung's S3C Real Time Clock controller | ||
|
|
||
| Required properties: | ||
| - compatible: should be one of the following. | ||
| * "samsung,s3c2410-rtc" - for controllers compatible with s3c2410 rtc. | ||
| * "samsung,s3c6410-rtc" - for controllers compatible with s3c6410 rtc. | ||
| - reg: physical base address of the controller and length of memory mapped | ||
| region. | ||
| - interrupts: Two interrupt numbers to the cpu should be specified. First | ||
| interrupt number is the rtc alarm interupt and second interrupt number | ||
| is the rtc tick interrupt. The number of cells representing a interrupt | ||
| depends on the parent interrupt controller. | ||
|
|
||
| Example: | ||
|
|
||
| rtc@10070000 { | ||
| compatible = "samsung,s3c6410-rtc"; | ||
| reg = <0x10070000 0x100>; | ||
| interrupts = <44 0 45 0>; | ||
| }; |
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,14 @@ | ||
| * Samsung's UART Controller | ||
|
|
||
| The Samsung's UART controller is used for interfacing SoC with serial communicaion | ||
| devices. | ||
|
|
||
| Required properties: | ||
| - compatible: should be | ||
| - "samsung,exynos4210-uart", for UART's compatible with Exynos4210 uart ports. | ||
|
|
||
| - reg: base physical address of the controller and length of memory mapped | ||
| region. | ||
|
|
||
| - interrupts: interrupt number to the cpu. The interrupt specifier format depends | ||
| on the interrupt controller parent. |
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.