From 25e0f1633467c020f6ae68d09964a522fbfbe613 Mon Sep 17 00:00:00 2001 From: Piotr Szczepanik Date: Mon, 18 Jan 2021 23:21:40 +0100 Subject: [PATCH] Adjusted power and pmic configuration for Station M1 in current/dev --- .../add-board-rk3328-roc-pc.patch | 26 +++++++------------ .../add-board-rk3328-roc-pc.patch | 26 +++++++------------ 2 files changed, 20 insertions(+), 32 deletions(-) diff --git a/patch/kernel/rockchip64-current/add-board-rk3328-roc-pc.patch b/patch/kernel/rockchip64-current/add-board-rk3328-roc-pc.patch index d8fe14fb5e..3ab4d75e08 100644 --- a/patch/kernel/rockchip64-current/add-board-rk3328-roc-pc.patch +++ b/patch/kernel/rockchip64-current/add-board-rk3328-roc-pc.patch @@ -2,7 +2,7 @@ new file mode 100644 index 000000000000..b85508c12742 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts -@@ -0,0 +1,447 @@ +@@ -0,0 +1,441 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2017 T-Chip Intelligent Technology Co., Ltd @@ -36,7 +36,7 @@ index 000000000000..b85508c12742 + + vcc_sdio: sdmmcio-regulator { + compatible = "regulator-gpio"; -+ gpios = <&grf_gpio 0 GPIO_ACTIVE_HIGH>; ++ gpios = <&gpio0 RK_PD3 GPIO_ACTIVE_HIGH>; + states = <1800000 0x1 + 3300000 0x0>; + regulator-name = "vcc_sdio"; @@ -52,7 +52,7 @@ index 000000000000..b85508c12742 + enable-active-high; + gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; -+ pinctrl-0 = <&usb30_host_drv>; ++ pinctrl-0 = <&usb_drv>; + regulator-name = "vcc_host_5v"; + regulator-always-on; + regulator-boot-on; @@ -62,9 +62,9 @@ index 000000000000..b85508c12742 + 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_PA0 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; -+ pinctrl-0 = <&usb20_host_drv>; ++ pinctrl-0 = <&usb_drv>; + regulator-name = "vcc_host1_5v"; + regulator-always-on; + regulator-boot-on; @@ -202,8 +202,8 @@ index 000000000000..b85508c12742 + rk805: pmic@18 { + compatible = "rockchip,rk805"; + reg = <0x18>; -+ interrupt-parent = <&gpio1>; -+ interrupts = <24 IRQ_TYPE_LEVEL_LOW>; ++ interrupt-parent = <&gpio0>; ++ interrupts = <2 IRQ_TYPE_LEVEL_LOW>; + #clock-cells = <1>; + clock-output-names = "xin32k", "rk805-clkout2"; + gpio-controller; @@ -342,7 +342,7 @@ index 000000000000..b85508c12742 + + pmic { + pmic_int_l: pmic-int-l { -+ rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>; ++ rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + @@ -355,14 +355,8 @@ index 000000000000..b85508c12742 + }; + }; + -+ usb2 { -+ usb20_host_drv: usb20-host-drv { -+ rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ }; -+ -+ usb3 { -+ usb30_host_drv: usb30-host-drv { ++ usb { ++ usb_drv: usb20-host-drv { + rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; diff --git a/patch/kernel/rockchip64-dev/add-board-rk3328-roc-pc.patch b/patch/kernel/rockchip64-dev/add-board-rk3328-roc-pc.patch index d8fe14fb5e..3ab4d75e08 100644 --- a/patch/kernel/rockchip64-dev/add-board-rk3328-roc-pc.patch +++ b/patch/kernel/rockchip64-dev/add-board-rk3328-roc-pc.patch @@ -2,7 +2,7 @@ new file mode 100644 index 000000000000..b85508c12742 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts -@@ -0,0 +1,447 @@ +@@ -0,0 +1,441 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2017 T-Chip Intelligent Technology Co., Ltd @@ -36,7 +36,7 @@ index 000000000000..b85508c12742 + + vcc_sdio: sdmmcio-regulator { + compatible = "regulator-gpio"; -+ gpios = <&grf_gpio 0 GPIO_ACTIVE_HIGH>; ++ gpios = <&gpio0 RK_PD3 GPIO_ACTIVE_HIGH>; + states = <1800000 0x1 + 3300000 0x0>; + regulator-name = "vcc_sdio"; @@ -52,7 +52,7 @@ index 000000000000..b85508c12742 + enable-active-high; + gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; -+ pinctrl-0 = <&usb30_host_drv>; ++ pinctrl-0 = <&usb_drv>; + regulator-name = "vcc_host_5v"; + regulator-always-on; + regulator-boot-on; @@ -62,9 +62,9 @@ index 000000000000..b85508c12742 + 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_PA0 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; -+ pinctrl-0 = <&usb20_host_drv>; ++ pinctrl-0 = <&usb_drv>; + regulator-name = "vcc_host1_5v"; + regulator-always-on; + regulator-boot-on; @@ -202,8 +202,8 @@ index 000000000000..b85508c12742 + rk805: pmic@18 { + compatible = "rockchip,rk805"; + reg = <0x18>; -+ interrupt-parent = <&gpio1>; -+ interrupts = <24 IRQ_TYPE_LEVEL_LOW>; ++ interrupt-parent = <&gpio0>; ++ interrupts = <2 IRQ_TYPE_LEVEL_LOW>; + #clock-cells = <1>; + clock-output-names = "xin32k", "rk805-clkout2"; + gpio-controller; @@ -342,7 +342,7 @@ index 000000000000..b85508c12742 + + pmic { + pmic_int_l: pmic-int-l { -+ rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>; ++ rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + @@ -355,14 +355,8 @@ index 000000000000..b85508c12742 + }; + }; + -+ usb2 { -+ usb20_host_drv: usb20-host-drv { -+ rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ }; -+ -+ usb3 { -+ usb30_host_drv: usb30-host-drv { ++ usb { ++ usb_drv: usb20-host-drv { + rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; + }; + };