diff options
| author | John Crispin <john@phrozen.org> | 2018-05-07 12:07:32 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2018-05-24 22:11:55 +0200 |
| commit | 050da2107a7eb2a571a8a3d0cee21cc6a44b72b8 (patch) | |
| tree | 147c3b85ccae12e4b1659acd86ac93b13ecfa15d /target/linux/mediatek/patches-4.14/0134-dt-bindings-usb-mtk-xhci-remove-dummy-clocks-and-add.patch | |
| parent | 4f67c1522d92bc4512c3ecf58c38ff9886530b48 (diff) | |
| download | upstream-050da2107a7eb2a571a8a3d0cee21cc6a44b72b8.tar.gz upstream-050da2107a7eb2a571a8a3d0cee21cc6a44b72b8.tar.bz2 upstream-050da2107a7eb2a571a8a3d0cee21cc6a44b72b8.zip | |
mediatek: backport upstream mediatek patches
Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target/linux/mediatek/patches-4.14/0134-dt-bindings-usb-mtk-xhci-remove-dummy-clocks-and-add.patch')
| -rw-r--r-- | target/linux/mediatek/patches-4.14/0134-dt-bindings-usb-mtk-xhci-remove-dummy-clocks-and-add.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/target/linux/mediatek/patches-4.14/0134-dt-bindings-usb-mtk-xhci-remove-dummy-clocks-and-add.patch b/target/linux/mediatek/patches-4.14/0134-dt-bindings-usb-mtk-xhci-remove-dummy-clocks-and-add.patch new file mode 100644 index 0000000000..9d196ab498 --- /dev/null +++ b/target/linux/mediatek/patches-4.14/0134-dt-bindings-usb-mtk-xhci-remove-dummy-clocks-and-add.patch @@ -0,0 +1,63 @@ +From a96468412cac8abd66667c322fbcda756cc3abc9 Mon Sep 17 00:00:00 2001 +From: Chunfeng Yun <chunfeng.yun@mediatek.com> +Date: Fri, 13 Oct 2017 16:26:41 +0800 +Subject: [PATCH 134/224] dt-bindings: usb: mtk-xhci: remove dummy clocks and + add optional ones + +Remove dummy clocks for usb wakeup and add optional ones for +MCU_BUS_CK and DMA_BUS_CK. + +Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> +Acked-by: Rob Herring <robh@kernel.org> +Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + .../devicetree/bindings/usb/mediatek,mtk-xhci.txt | 18 ++++++++---------- + 1 file changed, 8 insertions(+), 10 deletions(-) + +diff --git a/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.txt b/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.txt +index 2d9b459bd890..30595964876a 100644 +--- a/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.txt ++++ b/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.txt +@@ -26,10 +26,11 @@ Required properties: + - clocks : a list of phandle + clock-specifier pairs, one for each + entry in clock-names + - clock-names : must contain +- "sys_ck": for clock of xHCI MAC +- "ref_ck": for reference clock of xHCI MAC +- "wakeup_deb_p0": for USB wakeup debounce clock of port0 +- "wakeup_deb_p1": for USB wakeup debounce clock of port1 ++ "sys_ck": controller clock used by normal mode, ++ the following ones are optional: ++ "ref_ck": reference clock used by low power mode etc, ++ "mcu_ck": mcu_bus clock for register access, ++ "dma_ck": dma_bus clock for data transfer by DMA + + - phys : a list of phandle + phy specifier pairs + +@@ -57,9 +58,7 @@ usb30: usb@11270000 { + clocks = <&topckgen CLK_TOP_USB30_SEL>, <&clk26m>, + <&pericfg CLK_PERI_USB0>, + <&pericfg CLK_PERI_USB1>; +- clock-names = "sys_ck", "ref_ck", +- "wakeup_deb_p0", +- "wakeup_deb_p1"; ++ clock-names = "sys_ck", "ref_ck"; + phys = <&phy_port0 PHY_TYPE_USB3>, + <&phy_port1 PHY_TYPE_USB2>; + vusb33-supply = <&mt6397_vusb_reg>; +@@ -91,9 +90,8 @@ Required properties: + + - clocks : a list of phandle + clock-specifier pairs, one for each + entry in clock-names +- - clock-names : must be +- "sys_ck": for clock of xHCI MAC +- "ref_ck": for reference clock of xHCI MAC ++ - clock-names : must contain "sys_ck", and the following ones are optional: ++ "ref_ck", "mcu_ck" and "dma_ck" + + Optional properties: + - vbus-supply : reference to the VBUS regulator; +-- +2.11.0 + |