mirror of https://github.com/armbian/build.git
further cleanup and fixes for rock-s0 board dts
* enable internal antenna by default * remove unnecessary nodes from device tree
This commit is contained in:
Paolo Sabatino
Igor
parent
d7dd448ab7
commit
998e540fad
|
|
@ -11,10 +11,10 @@ This is the consolidation of these two legacy patches:
|
|||
1 file changed, 74 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts
|
||||
index 8311af4c8689..2d102c482e3a 100644
|
||||
index 8311af4c8689..ea4b063cb7bd 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts
|
||||
@@ -34,6 +34,22 @@ led-green {
|
||||
@@ -34,6 +34,34 @@ led-green {
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -33,105 +33,93 @@ index 8311af4c8689..2d102c482e3a 100644
|
|||
+ sound-dai = <&codec>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ board_antenna: board-antenna {
|
||||
+ compatible = "regulator-fixed";
|
||||
+ enable-active-low;
|
||||
+ gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
|
||||
+ regulator-always-on;
|
||||
+ regulator-boot-on;
|
||||
+ pinctrl-0 = <&board_antenna_power>;
|
||||
+ pinctrl-names = "default";
|
||||
+ regulator-name = "board_antenna_power";
|
||||
+ status = "okay";
|
||||
+ };
|
||||
+
|
||||
vdd_log: regulator-1v04-vdd-log {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "vdd_log";
|
||||
@@ -74,10 +90,24 @@ vcc_io: regulator-3v3-vcc-io {
|
||||
@@ -74,23 +102,6 @@ vcc_io: regulator-3v3-vcc-io {
|
||||
vin-supply = <&vcc5v0_sys>;
|
||||
};
|
||||
|
||||
+ vcc5v0_otg: vcc5v0-otg {
|
||||
+ compatible = "regulator-fixed";
|
||||
+ enable-active-high;
|
||||
+ gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&otg_vbus_drv>;
|
||||
+ regulator-name = "vcc5v0_otg";
|
||||
+ regulator-always-on;
|
||||
+ vin-supply = <&vcc5v0_sys>;
|
||||
+ };
|
||||
+
|
||||
/*
|
||||
* HW revision prior to v1.2 must pull GPIO4_D6 low to access sdmmc.
|
||||
* This is modeled as an always-on active low fixed regulator.
|
||||
*/
|
||||
+ /*
|
||||
+ * Armbian: this has been commented out due to consolidation of this patch:
|
||||
+ * https://github.com/paolosabatino/armbian-build/blob/935149d2822cd2a2c63891ca6614563f5538b706/patch/kernel/archive/rockchip64-6.12/board-rocks0-0002-Revert-arm64-dts-rockchip-Fix-sdmmc-access-on-rk3308.patch
|
||||
vcc_sd: regulator-3v3-vcc-sd {
|
||||
compatible = "regulator-fixed";
|
||||
gpios = <&gpio4 RK_PD6 GPIO_ACTIVE_LOW>;
|
||||
@@ -90,6 +120,7 @@ vcc_sd: regulator-3v3-vcc-sd {
|
||||
regulator-max-microvolt = <3300000>;
|
||||
vin-supply = <&vcc_io>;
|
||||
};
|
||||
+ */
|
||||
|
||||
- /*
|
||||
- * HW revision prior to v1.2 must pull GPIO4_D6 low to access sdmmc.
|
||||
- * This is modeled as an always-on active low fixed regulator.
|
||||
- */
|
||||
- vcc_sd: regulator-3v3-vcc-sd {
|
||||
- compatible = "regulator-fixed";
|
||||
- gpios = <&gpio4 RK_PD6 GPIO_ACTIVE_LOW>;
|
||||
- pinctrl-names = "default";
|
||||
- pinctrl-0 = <&sdmmc_2030>;
|
||||
- regulator-name = "vcc_sd";
|
||||
- regulator-always-on;
|
||||
- regulator-boot-on;
|
||||
- regulator-min-microvolt = <3300000>;
|
||||
- regulator-max-microvolt = <3300000>;
|
||||
- vin-supply = <&vcc_io>;
|
||||
- };
|
||||
-
|
||||
vcc5v0_sys: regulator-5v0-vcc-sys {
|
||||
compatible = "regulator-fixed";
|
||||
@@ -120,6 +151,11 @@ sdio_pwrseq: sdio-pwrseq {
|
||||
regulator-name = "vcc5v0_sys";
|
||||
@@ -120,6 +131,11 @@ sdio_pwrseq: sdio-pwrseq {
|
||||
};
|
||||
};
|
||||
|
||||
+&codec {
|
||||
+ status = "okay";
|
||||
+ #sound-dai-cells = <0>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
&cpu0 {
|
||||
cpu-supply = <&vdd_core>;
|
||||
};
|
||||
@@ -158,6 +194,22 @@ rtl8201f: ethernet-phy@1 {
|
||||
@@ -158,6 +174,18 @@ rtl8201f: ethernet-phy@1 {
|
||||
};
|
||||
};
|
||||
|
||||
+&i2c1 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&i2s_8ch_0 {
|
||||
+ #sound-dai-cells = <0>;
|
||||
+ assigned-clocks = <&cru SCLK_I2S0_8CH_RX>;
|
||||
+ assigned-clock-parents = <&cru SCLK_I2S0_8CH_TX_MUX>;
|
||||
+ rockchip,clk-trcm = <1>;
|
||||
+ #sound-dai-cells = <0>;
|
||||
+};
|
||||
+
|
||||
+&i2s_8ch_2 {
|
||||
+ status = "okay";
|
||||
+ #sound-dai-cells = <0>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
&io_domains {
|
||||
vccio0-supply = <&vcc_io>;
|
||||
vccio1-supply = <&vcc_io>;
|
||||
@@ -172,6 +224,12 @@ &pinctrl {
|
||||
@@ -172,6 +200,14 @@ &pinctrl {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&rtc_32k>;
|
||||
|
||||
+ antenna {
|
||||
+ antenna_power: antenna-power {
|
||||
+
|
||||
+ board_antenna_power: board-antenna-power {
|
||||
+ rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_down>;
|
||||
+ };
|
||||
+
|
||||
+ };
|
||||
+
|
||||
bluetooth {
|
||||
bt_reg_on: bt-reg-on {
|
||||
rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
@@ -204,6 +262,12 @@ sdmmc_2030: sdmmc-2030 {
|
||||
};
|
||||
};
|
||||
|
||||
+ usb {
|
||||
+ otg_vbus_drv: otg-vbus-drv {
|
||||
+ rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
wifi {
|
||||
wifi_reg_on: wifi-reg-on {
|
||||
rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
@@ -213,6 +277,7 @@ wifi_wake_host: wifi-wake-host {
|
||||
@@ -213,6 +249,7 @@ wifi_wake_host: wifi-wake-host {
|
||||
rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
|
||||
};
|
||||
};
|
||||
|
|
@ -139,21 +127,12 @@ index 8311af4c8689..2d102c482e3a 100644
|
|||
};
|
||||
|
||||
&pwm0 {
|
||||
@@ -248,7 +313,7 @@ brcmf: wifi@1 {
|
||||
interrupts = <RK_PA0 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "host-wake";
|
||||
pinctrl-names = "default";
|
||||
- pinctrl-0 = <&wifi_wake_host>;
|
||||
+ pinctrl-0 = <&wifi_wake_host>, <&antenna_power>;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -256,7 +321,13 @@ &sdmmc {
|
||||
@@ -256,7 +293,13 @@ &sdmmc {
|
||||
cap-mmc-highspeed;
|
||||
cap-sd-highspeed;
|
||||
disable-wp;
|
||||
- vmmc-supply = <&vcc_sd>;
|
||||
+ vmmc-supply = <&vcc_io>; // See comment @vcc_sd node
|
||||
+ vmmc-supply = <&vcc_io>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
|
|
@ -163,14 +142,6 @@ index 8311af4c8689..2d102c482e3a 100644
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
@@ -265,6 +336,7 @@ &u2phy {
|
||||
};
|
||||
|
||||
&u2phy_host {
|
||||
+ phy-supply = <&vcc5v0_otg>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
--
|
||||
2.43.0
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue