mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-29 18:21:27 +00:00
[ rockchip64-dev ] update patchset, disable some broken ones
This commit is contained in:
parent
63be3732ea
commit
cf5d6d3a08
6 changed files with 0 additions and 116 deletions
|
@ -1,73 +0,0 @@
|
|||
From 97c28fba89441a919376ff288efad9288c9937d1 Mon Sep 17 00:00:00 2001
|
||||
From: Levin Du <djw@t-chip.com.cn>
|
||||
Date: Tue, 31 Jul 2018 13:59:22 +0800
|
||||
Subject: [PATCH] arm64: dts: rockchip: add sdmmc UHS support for roc-rk3328-cc
|
||||
|
||||
In roc-rk3328-cc board, the signal voltage of sdmmc is supplied by the
|
||||
vcc_sdio regulator, which is a mux between 1.8V and 3.3V, controlled by
|
||||
a special output only gpio pin labeled "gpiomut_pmuio_iout",
|
||||
corresponding bit 1 of the syscon GRF_SOC_CON10.
|
||||
|
||||
This special pin can now be reference as <&grf_gpio 0>, thanks to the
|
||||
gpio-syscon driver, which makes writing regulator-gpio possible.
|
||||
|
||||
If the signal voltage changes, the io domain needs to change
|
||||
correspondingly.
|
||||
|
||||
To use this feature, the following options are required in kernel config:
|
||||
- CONFIG_GPIO_SYSCON=y
|
||||
- CONFIG_POWER_AVS=y
|
||||
- CONFIG_ROCKCHIP_IODOMAIN=y
|
||||
|
||||
Signed-off-by: Levin Du <djw@t-chip.com.cn>
|
||||
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
||||
---
|
||||
.../arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 20 ++++++++++++++++++-
|
||||
1 file changed, 19 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
|
||||
index b983abd3d9c8..99d0d9912950 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
|
||||
@@ -41,6 +41,19 @@
|
||||
vin-supply = <&vcc_io>;
|
||||
};
|
||||
|
||||
+ vcc_sdio: sdmmcio-regulator {
|
||||
+ compatible = "regulator-gpio";
|
||||
+ gpios = <&grf_gpio 0 GPIO_ACTIVE_HIGH>;
|
||||
+ states = <1800000 0x1
|
||||
+ 3300000 0x0>;
|
||||
+ regulator-name = "vcc_sdio";
|
||||
+ regulator-type = "voltage";
|
||||
+ regulator-min-microvolt = <1800000>;
|
||||
+ regulator-max-microvolt = <3300000>;
|
||||
+ regulator-always-on;
|
||||
+ vin-supply = <&vcc_sys>;
|
||||
+ };
|
||||
+
|
||||
vcc_host1_5v: vcc_otg_5v: vcc-host1-5v-regulator {
|
||||
compatible = "regulator-fixed";
|
||||
enable-active-high;
|
||||
@@ -213,7 +226,7 @@
|
||||
|
||||
vccio1-supply = <&vcc_io>;
|
||||
vccio2-supply = <&vcc18_emmc>;
|
||||
- vccio3-supply = <&vcc_io>;
|
||||
+ vccio3-supply = <&vcc_sdio>;
|
||||
vccio4-supply = <&vcc_18>;
|
||||
vccio5-supply = <&vcc_io>;
|
||||
vccio6-supply = <&vcc_io>;
|
||||
@@ -242,7 +255,12 @@
|
||||
max-frequency = <150000000>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_dectn &sdmmc0_bus4>;
|
||||
+ sd-uhs-sdr12;
|
||||
+ sd-uhs-sdr25;
|
||||
+ sd-uhs-sdr50;
|
||||
+ sd-uhs-sdr104;
|
||||
vmmc-supply = <&vcc_sd>;
|
||||
+ vqmmc-supply = <&vcc_sdio>;
|
||||
status = "okay";
|
||||
};
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
From 47c0aa6d12f5fde27e9a673deabf814a4c6caf76 Mon Sep 17 00:00:00 2001
|
||||
From: Levin Du <djw@t-chip.com.cn>
|
||||
Date: Tue, 31 Jul 2018 13:59:20 +0800
|
||||
Subject: [PATCH] arm64: dts: rockchip: add GRF GPIO controller to rk3328
|
||||
|
||||
Adding a GRF GPIO controller labled "grf_gpio" to rk3328, currently
|
||||
providing access to the GPIO_MUTE pin, which is manupulated by the
|
||||
GRF_SOC_CON10 register.
|
||||
|
||||
The GPIO_MUTE pin is referred to as <&grf_gpio 0>.
|
||||
|
||||
Signed-off-by: Levin Du <djw@t-chip.com.cn>
|
||||
[dropped default-status disabled]
|
||||
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
||||
---
|
||||
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
|
||||
index 3f5a2944300f..d3ef6566325e 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
|
||||
@@ -249,6 +249,12 @@
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
+ grf_gpio: grf-gpio {
|
||||
+ compatible = "rockchip,rk3328-grf-gpio";
|
||||
+ gpio-controller;
|
||||
+ #gpio-cells = <2>;
|
||||
+ };
|
||||
+
|
||||
power: power-controller {
|
||||
compatible = "rockchip,rk3328-power-controller";
|
||||
#power-domain-cells = <1>;
|
||||
@@ -274,7 +280,6 @@
|
||||
mode-bootloader = <BOOT_FASTBOOT>;
|
||||
mode-loader = <BOOT_BL_DOWNLOAD>;
|
||||
};
|
||||
-
|
||||
};
|
||||
|
||||
uart0: serial@ff110000 {
|
Loading…
Add table
Reference in a new issue