diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-05 21:22:41 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-05 21:22:41 +0100 |
| commit | a567500598961a487f6c9a78b61d419c8df90c8b (patch) | |
| tree | 8a47c2962e5cb640e794a216e9abf4de6fac5566 /Documentation/kernel-parameters.txt | |
| parent | USB: core: let USB device know device node (diff) | |
| parent | phy: Fix armada375 compile test build on UM (diff) | |
| download | linux-a567500598961a487f6c9a78b61d419c8df90c8b.tar.xz linux-a567500598961a487f6c9a78b61d419c8df90c8b.zip | |
Merge tag 'phy-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-testing
Kishon writes:
phy: for 4.6
*) Add driver for rockchip Display Port PHY
*) Add driver for the Rockchip SoC internal eMMC PHY
*) Add usb-uart functionality in rockchip-usb
*) cleanup rcar usb2 PHY driver
*) Fix for randconfig error
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 9a53c929f017..8a6c6c02f916 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -3491,6 +3491,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted. ro [KNL] Mount root device read-only on boot + rockchip.usb_uart + Enable the uart passthrough on the designated usb port + on Rockchip SoCs. When active, the signals of the + debug-uart get routed to the D+ and D- pins of the usb + port and the regular usb controller gets disabled. + root= [KNL] Root filesystem See name_to_dev_t comment in init/do_mounts.c. |