forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'for-linus' into for-next
- Loading branch information
Showing
256 changed files
with
2,819 additions
and
1,457 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
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
File renamed without changes.
19 changes: 19 additions & 0 deletions
19
Documentation/devicetree/bindings/serial/axis,etraxfs-uart.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,19 @@ | ||
ETRAX FS UART | ||
|
||
Required properties: | ||
- compatible : "axis,etraxfs-uart" | ||
- reg: offset and length of the register set for the device. | ||
- interrupts: device interrupt | ||
|
||
Optional properties: | ||
- {dtr,dsr,ri,cd}-gpios: specify a GPIO for DTR/DSR/RI/CD | ||
line respectively. | ||
|
||
Example: | ||
|
||
serial@b00260000 { | ||
compatible = "axis,etraxfs-uart"; | ||
reg = <0xb0026000 0x1000>; | ||
interrupts = <68>; | ||
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,6 +12,9 @@ I. For patch submitters | |
|
||
[email protected] | ||
|
||
and Cc: the DT maintainers. Use scripts/get_maintainer.pl to identify | ||
all of the DT maintainers. | ||
|
||
3) The Documentation/ portion of the patch should come in the series before | ||
the code implementing the binding. | ||
|
||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1030,6 +1030,16 @@ F: arch/arm/mach-mxs/ | |
F: arch/arm/boot/dts/imx* | ||
F: arch/arm/configs/imx*_defconfig | ||
|
||
ARM/FREESCALE VYBRID ARM ARCHITECTURE | ||
M: Shawn Guo <[email protected]> | ||
M: Sascha Hauer <[email protected]> | ||
R: Stefan Agner <[email protected]> | ||
L: [email protected] (moderated for non-subscribers) | ||
S: Maintained | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git | ||
F: arch/arm/mach-imx/*vf610* | ||
F: arch/arm/boot/dts/vf* | ||
|
||
ARM/GLOMATION GESBC9312SX MACHINE SUPPORT | ||
M: Lennert Buytenhek <[email protected]> | ||
L: [email protected] (moderated for non-subscribers) | ||
|
@@ -1188,6 +1198,7 @@ ARM/Marvell Dove/MV78xx0/Orion SOC support | |
M: Jason Cooper <[email protected]> | ||
M: Andrew Lunn <[email protected]> | ||
M: Sebastian Hesselbarth <[email protected]> | ||
M: Gregory Clement <[email protected]> | ||
L: [email protected] (moderated for non-subscribers) | ||
S: Maintained | ||
F: arch/arm/mach-dove/ | ||
|
@@ -2107,7 +2118,6 @@ F: drivers/net/ethernet/broadcom/bnx2x/ | |
|
||
BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE | ||
M: Christian Daudt <[email protected]> | ||
M: Matt Porter <[email protected]> | ||
M: Florian Fainelli <[email protected]> | ||
L: [email protected] | ||
T: git git://github.com/broadcom/mach-bcm | ||
|
@@ -2369,8 +2379,9 @@ F: arch/x86/include/asm/tce.h | |
|
||
CAN NETWORK LAYER | ||
M: Oliver Hartkopp <[email protected]> | ||
M: Marc Kleine-Budde <[email protected]> | ||
L: [email protected] | ||
W: http://gitorious.org/linux-can | ||
W: https://github.com/linux-can | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git | ||
S: Maintained | ||
|
@@ -2386,7 +2397,7 @@ CAN NETWORK DRIVERS | |
M: Wolfgang Grandegger <[email protected]> | ||
M: Marc Kleine-Budde <[email protected]> | ||
L: [email protected] | ||
W: http://gitorious.org/linux-can | ||
W: https://github.com/linux-can | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git | ||
S: Maintained | ||
|
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
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 |
---|---|---|
|
@@ -24,11 +24,3 @@ | |
&mmc1 { | ||
vmmc-supply = <&ldo3_reg>; | ||
}; | ||
|
||
&sham { | ||
status = "okay"; | ||
}; | ||
|
||
&aes { | ||
status = "okay"; | ||
}; |
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
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.