From 4933be5957870c33b229cfe82a219e187f7da7bf Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 15 Apr 2019 20:19:05 +0200 Subject: [PATCH] 4.14-stable patches added patches: arm64-dts-rockchip-fix-vcc_host1_5v-gpio-polarity-on-rk3328-rock64.patch arm64-dts-rockchip-fix-vcc_host1_5v-pin-assign-on-rk3328-rock64.patch --- ...t1_5v-gpio-polarity-on-rk3328-rock64.patch | 35 +++++++++++++++ ...host1_5v-pin-assign-on-rk3328-rock64.patch | 43 +++++++++++++++++++ queue-4.14/series | 2 + 3 files changed, 80 insertions(+) create mode 100644 queue-4.14/arm64-dts-rockchip-fix-vcc_host1_5v-gpio-polarity-on-rk3328-rock64.patch create mode 100644 queue-4.14/arm64-dts-rockchip-fix-vcc_host1_5v-pin-assign-on-rk3328-rock64.patch diff --git a/queue-4.14/arm64-dts-rockchip-fix-vcc_host1_5v-gpio-polarity-on-rk3328-rock64.patch b/queue-4.14/arm64-dts-rockchip-fix-vcc_host1_5v-gpio-polarity-on-rk3328-rock64.patch new file mode 100644 index 0000000000..5ec480b21a --- /dev/null +++ b/queue-4.14/arm64-dts-rockchip-fix-vcc_host1_5v-gpio-polarity-on-rk3328-rock64.patch @@ -0,0 +1,35 @@ +From a8772e5d826d0f61f8aa9c284b3ab49035d5273d Mon Sep 17 00:00:00 2001 +From: Tomohiro Mayama +Date: Sun, 10 Mar 2019 01:10:12 +0900 +Subject: arm64: dts: rockchip: Fix vcc_host1_5v GPIO polarity on rk3328-rock64 + +From: Tomohiro Mayama + +commit a8772e5d826d0f61f8aa9c284b3ab49035d5273d upstream. + +This patch makes USB ports functioning again. + +Fixes: 955bebde057e ("arm64: dts: rockchip: add rk3328-rock64 board") +Cc: stable@vger.kernel.org +Suggested-by: Robin Murphy +Signed-off-by: Tomohiro Mayama +Tested-by: Katsuhiro Suzuki +Signed-off-by: Heiko Stuebner +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts +@@ -82,8 +82,7 @@ + + vcc_host1_5v: vcc_otg_5v: vcc-host1-5v-regulator { + compatible = "regulator-fixed"; +- enable-active-high; +- gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>; ++ gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&usb20_host_drv>; + regulator-name = "vcc_host1_5v"; diff --git a/queue-4.14/arm64-dts-rockchip-fix-vcc_host1_5v-pin-assign-on-rk3328-rock64.patch b/queue-4.14/arm64-dts-rockchip-fix-vcc_host1_5v-pin-assign-on-rk3328-rock64.patch new file mode 100644 index 0000000000..0a2335d3b6 --- /dev/null +++ b/queue-4.14/arm64-dts-rockchip-fix-vcc_host1_5v-pin-assign-on-rk3328-rock64.patch @@ -0,0 +1,43 @@ +From ef05bcb60c1a8841e38c91923ba998181117a87c Mon Sep 17 00:00:00 2001 +From: Katsuhiro Suzuki +Date: Fri, 7 Sep 2018 00:39:47 +0900 +Subject: arm64: dts: rockchip: fix vcc_host1_5v pin assign on rk3328-rock64 + +From: Katsuhiro Suzuki + +commit ef05bcb60c1a8841e38c91923ba998181117a87c upstream. + +This patch fixes pin assign of vcc_host1_5v. This regulator is +controlled by USB20_HOST_DRV signal. + +ROCK64 schematic says that GPIO0_A2 pin is used as USB20_HOST_DRV. +GPIO0_D3 pin is for SPDIF_TX_M0. + +Signed-off-by: Katsuhiro Suzuki +Signed-off-by: Heiko Stuebner +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts +@@ -83,7 +83,7 @@ + vcc_host1_5v: vcc_otg_5v: vcc-host1-5v-regulator { + compatible = "regulator-fixed"; + enable-active-high; +- gpio = <&gpio0 RK_PD3 GPIO_ACTIVE_HIGH>; ++ gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&usb20_host_drv>; + regulator-name = "vcc_host1_5v"; +@@ -275,7 +275,7 @@ + + usb2 { + usb20_host_drv: usb20-host-drv { +- rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>; ++ rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + diff --git a/queue-4.14/series b/queue-4.14/series index e674e230f4..f8decd1bc9 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -65,3 +65,5 @@ x86-perf-amd-resolve-nmi-latency-issues-for-active-pmcs.patch x86-perf-amd-remove-need-to-check-running-bit-in-nmi-handler.patch pci-add-function-1-dma-alias-quirk-for-marvell-9170-sata-controller.patch dm-table-propagate-bdi_cap_stable_writes-to-fix-sporadic-checksum-errors.patch +arm64-dts-rockchip-fix-vcc_host1_5v-pin-assign-on-rk3328-rock64.patch +arm64-dts-rockchip-fix-vcc_host1_5v-gpio-polarity-on-rk3328-rock64.patch -- 2.39.2