93 lines
2.3 KiB
Diff
93 lines
2.3 KiB
Diff
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
|
||
|
|
index 880976849..a7ecfb188 100644
|
||
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
|
||
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
|
||
|
|
@@ -192,13 +192,9 @@ &cpu0 {
|
||
|
|
};
|
||
|
|
|
||
|
|
&emmc {
|
||
|
|
- bus-width = <4>; // Confirm if right value - <8>
|
||
|
|
+ bus-width = <4>;
|
||
|
|
cap-mmc-highspeed;
|
||
|
|
- mmc-hs200-1_8v;
|
||
|
|
- /* supports-sd; */
|
||
|
|
- /* disable-wp; */
|
||
|
|
non-removable;
|
||
|
|
- /* num-slots = <1>; */
|
||
|
|
/* please provide actual vmmc and vqmmc supplies
|
||
|
|
vin is not a valid supply for emmcs */
|
||
|
|
vin-supply = <&vcc_io>;
|
||
|
|
@@ -210,13 +206,9 @@ &i2c1 {
|
||
|
|
};
|
||
|
|
|
||
|
|
&sdmmc {
|
||
|
|
- /* bus-width = <4>; */
|
||
|
|
cap-mmc-highspeed;
|
||
|
|
cap-sd-highspeed;
|
||
|
|
- /* max-frequency = <150000000>; */
|
||
|
|
- /* supports-sd; */
|
||
|
|
disable-wp;
|
||
|
|
- /* num-slots = <1>; */
|
||
|
|
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_det &sdmmc_bus4>;
|
||
|
|
card-detect-delay = <800>; // Confirm if right value - <200>
|
||
|
|
status = "okay";
|
||
|
|
@@ -233,6 +225,16 @@ &gmac {
|
||
|
|
status = "okay";
|
||
|
|
};
|
||
|
|
|
||
|
|
+&io_domains {
|
||
|
|
+ vccio0-supply = <&vcc_io>;
|
||
|
|
+ vccio1-supply = <&vcc_io>;
|
||
|
|
+ vccio2-supply = <&vcc_io>;
|
||
|
|
+ vccio3-supply = <&vcc_io>;
|
||
|
|
+ vccio4-supply = <&vcc_1v8>;
|
||
|
|
+ vccio5-supply = <&vcc_io>;
|
||
|
|
+ status = "okay";
|
||
|
|
+};
|
||
|
|
+
|
||
|
|
&i2s_8ch_0 {
|
||
|
|
assigned-clocks = <&cru SCLK_I2S0_8CH_RX>;
|
||
|
|
assigned-clock-parents = <&cru SCLK_I2S0_8CH_TX_MUX>;
|
||
|
|
@@ -246,7 +248,7 @@ &i2s_8ch_2 {
|
||
|
|
};
|
||
|
|
|
||
|
|
&spi2 {
|
||
|
|
- status = "okay";
|
||
|
|
+// status = "okay"; //conflicts with UART2
|
||
|
|
max-freq = <10000000>;
|
||
|
|
};
|
||
|
|
|
||
|
|
@@ -296,15 +298,12 @@ &saradc {
|
||
|
|
&sdio {
|
||
|
|
#address-cells = <1>;
|
||
|
|
#size-cells = <0>;
|
||
|
|
- /* bus-width = <4>; */
|
||
|
|
- max-frequency = <1000000>;
|
||
|
|
cap-sd-highspeed;
|
||
|
|
cap-sdio-irq;
|
||
|
|
- /* supports-sdio; */
|
||
|
|
keep-power-in-suspend;
|
||
|
|
mmc-pwrseq = <&sdio_pwrseq>;
|
||
|
|
non-removable;
|
||
|
|
- sd-uhs-sdr104;
|
||
|
|
+ no-mmc;
|
||
|
|
status = "okay";
|
||
|
|
|
||
|
|
rtl8723ds: wifi@1 {
|
||
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
|
||
|
|
index fd8685d7c..b1cf9fa77 100644
|
||
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi
|
||
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
|
||
|
|
@@ -216,6 +216,11 @@ grf: grf@ff000000 {
|
||
|
|
compatible = "rockchip,rk3308-grf", "syscon", "simple-mfd";
|
||
|
|
reg = <0x0 0xff000000 0x0 0x08000>;
|
||
|
|
|
||
|
|
+ io_domains: io-domains {
|
||
|
|
+ compatible = "rockchip,rk3308-io-voltage-domain";
|
||
|
|
+ status = "disabled";
|
||
|
|
+ };
|
||
|
|
+
|
||
|
|
reboot-mode {
|
||
|
|
compatible = "syscon-reboot-mode";
|
||
|
|
offset = <0x500>;
|