From 4ab06060a38df516dfc08fb155f447ed4449145d Mon Sep 17 00:00:00 2001 From: Oleg Date: Mon, 12 Apr 2021 23:23:15 +0300 Subject: [PATCH] fix firefly-rk3399 (#2758) --- .../zzzz-add-rk3399-firefly-dts.patch | 721 ++++++++++++++++++ 1 file changed, 721 insertions(+) create mode 100644 patch/kernel/archive/rockchip64-5.10/zzzz-add-rk3399-firefly-dts.patch diff --git a/patch/kernel/archive/rockchip64-5.10/zzzz-add-rk3399-firefly-dts.patch b/patch/kernel/archive/rockchip64-5.10/zzzz-add-rk3399-firefly-dts.patch new file mode 100644 index 0000000000..a0f0028ca8 --- /dev/null +++ b/patch/kernel/archive/rockchip64-5.10/zzzz-add-rk3399-firefly-dts.patch @@ -0,0 +1,721 @@ +--- a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts +@@ -1,77 +1,14 @@ + // SPDX-License-Identifier: (GPL-2.0+ OR MIT) + /* +- * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd. ++ * Copyright (c) 2017 T-Chip Intelligent Technology Co., Ltd + */ + + /dts-v1/; +-#include +-#include +-#include "rk3399.dtsi" +-#include "rk3399-opp.dtsi" ++#include "rk3399-roc-pc-mezzanine.dts" + + / { + model = "Firefly-RK3399 Board"; +- compatible = "firefly,firefly-rk3399", "rockchip,rk3399"; +- +- chosen { +- stdout-path = "serial2:1500000n8"; +- }; +- +- backlight: backlight { +- compatible = "pwm-backlight"; +- enable-gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>; +- pwms = <&pwm0 0 25000 0>; +- brightness-levels = < +- 0 1 2 3 4 5 6 7 +- 8 9 10 11 12 13 14 15 +- 16 17 18 19 20 21 22 23 +- 24 25 26 27 28 29 30 31 +- 32 33 34 35 36 37 38 39 +- 40 41 42 43 44 45 46 47 +- 48 49 50 51 52 53 54 55 +- 56 57 58 59 60 61 62 63 +- 64 65 66 67 68 69 70 71 +- 72 73 74 75 76 77 78 79 +- 80 81 82 83 84 85 86 87 +- 88 89 90 91 92 93 94 95 +- 96 97 98 99 100 101 102 103 +- 104 105 106 107 108 109 110 111 +- 112 113 114 115 116 117 118 119 +- 120 121 122 123 124 125 126 127 +- 128 129 130 131 132 133 134 135 +- 136 137 138 139 140 141 142 143 +- 144 145 146 147 148 149 150 151 +- 152 153 154 155 156 157 158 159 +- 160 161 162 163 164 165 166 167 +- 168 169 170 171 172 173 174 175 +- 176 177 178 179 180 181 182 183 +- 184 185 186 187 188 189 190 191 +- 192 193 194 195 196 197 198 199 +- 200 201 202 203 204 205 206 207 +- 208 209 210 211 212 213 214 215 +- 216 217 218 219 220 221 222 223 +- 224 225 226 227 228 229 230 231 +- 232 233 234 235 236 237 238 239 +- 240 241 242 243 244 245 246 247 +- 248 249 250 251 252 253 254 255>; +- default-brightness-level = <200>; +- }; +- +- clkin_gmac: external-gmac-clock { +- compatible = "fixed-clock"; +- clock-frequency = <125000000>; +- clock-output-names = "clkin_gmac"; +- #clock-cells = <0>; +- }; +- +- dc_12v: dc-12v { +- compatible = "regulator-fixed"; +- regulator-name = "dc_12v"; +- regulator-always-on; +- regulator-boot-on; +- regulator-min-microvolt = <12000000>; +- regulator-max-microvolt = <12000000>; +- }; ++ compatible = "firefly,roc-rk3399-pc", "rockchip,rk3399"; + + gpio-keys { + compatible = "gpio-keys"; +@@ -129,361 +66,26 @@ + }; + }; + +- sdio_pwrseq: sdio-pwrseq { +- compatible = "mmc-pwrseq-simple"; +- clocks = <&rk808 1>; +- clock-names = "ext_clock"; +- pinctrl-names = "default"; +- pinctrl-0 = <&wifi_enable_h>; +- +- /* +- * On the module itself this is one of these (depending +- * on the actual card populated): +- * - SDIO_RESET_L_WL_REG_ON +- * - PDN (power down when low) +- */ +- reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>; +- }; +- +- /* switched by pmic_sleep */ +- vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 { +- compatible = "regulator-fixed"; +- regulator-name = "vcc1v8_s3"; +- regulator-always-on; +- regulator-boot-on; +- regulator-min-microvolt = <1800000>; +- regulator-max-microvolt = <1800000>; +- vin-supply = <&vcc_1v8>; +- }; +- +- vcc3v3_pcie: vcc3v3-pcie-regulator { +- compatible = "regulator-fixed"; +- enable-active-high; +- gpio = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>; +- pinctrl-names = "default"; +- pinctrl-0 = <&pcie_pwr_en>; +- regulator-name = "vcc3v3_pcie"; +- regulator-always-on; +- regulator-boot-on; +- vin-supply = <&dc_12v>; +- }; +- +- vcc3v3_sys: vcc3v3-sys { +- compatible = "regulator-fixed"; +- regulator-name = "vcc3v3_sys"; +- regulator-always-on; +- regulator-boot-on; +- regulator-min-microvolt = <3300000>; +- regulator-max-microvolt = <3300000>; +- vin-supply = <&vcc_sys>; +- }; +- +- /* Actually 3 regulators (host0, 1, 2) controlled by the same gpio */ +- vcc5v0_host: vcc5v0-host-regulator { +- compatible = "regulator-fixed"; +- enable-active-high; +- gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>; +- pinctrl-names = "default"; +- pinctrl-0 = <&vcc5v0_host_en>; +- regulator-name = "vcc5v0_host"; +- regulator-always-on; +- vin-supply = <&vcc_sys>; +- }; +- +- vcc_sys: vcc-sys { +- compatible = "regulator-fixed"; +- regulator-name = "vcc_sys"; +- regulator-always-on; +- regulator-boot-on; +- regulator-min-microvolt = <5000000>; +- regulator-max-microvolt = <5000000>; +- vin-supply = <&dc_12v>; +- }; +- +- vdd_log: vdd-log { +- compatible = "pwm-regulator"; +- pwms = <&pwm2 0 25000 1>; +- regulator-name = "vdd_log"; +- regulator-always-on; +- regulator-boot-on; +- regulator-min-microvolt = <430000>; +- regulator-max-microvolt = <1400000>; +- vin-supply = <&vcc_sys>; +- }; +-}; +- +-&cpu_l0 { +- cpu-supply = <&vdd_cpu_l>; +-}; +- +-&cpu_l1 { +- cpu-supply = <&vdd_cpu_l>; +-}; +- +-&cpu_l2 { +- cpu-supply = <&vdd_cpu_l>; +-}; +- +-&cpu_l3 { +- cpu-supply = <&vdd_cpu_l>; +-}; +- +-&cpu_b0 { +- cpu-supply = <&vdd_cpu_b>; +-}; +- +-&cpu_b1 { +- cpu-supply = <&vdd_cpu_b>; +-}; +- +-&emmc_phy { +- status = "okay"; +-}; +- +-&gmac { +- assigned-clocks = <&cru SCLK_RMII_SRC>; +- assigned-clock-parents = <&clkin_gmac>; +- clock_in_out = "input"; +- phy-supply = <&vcc_lan>; +- phy-mode = "rgmii"; +- pinctrl-names = "default"; +- pinctrl-0 = <&rgmii_pins>; +- snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>; +- snps,reset-active-low; +- snps,reset-delays-us = <0 10000 50000>; +- tx_delay = <0x28>; +- rx_delay = <0x11>; +- status = "okay"; +-}; +- +-&hdmi { +- ddc-i2c-bus = <&i2c3>; +- pinctrl-names = "default"; +- pinctrl-0 = <&hdmi_cec>; +- status = "okay"; ++}; ++ ++&rk808{ ++ rtc { ++ compatible = "rk808-rtc"; ++ status = "disabled"; ++ }; + }; + + &i2c0 { +- clock-frequency = <400000>; +- i2c-scl-rising-time-ns = <168>; +- i2c-scl-falling-time-ns = <4>; +- status = "okay"; +- +- rk808: pmic@1b { +- compatible = "rockchip,rk808"; +- reg = <0x1b>; +- interrupt-parent = <&gpio1>; +- interrupts = <21 IRQ_TYPE_LEVEL_LOW>; +- #clock-cells = <1>; +- clock-output-names = "xin32k", "rk808-clkout2"; +- pinctrl-names = "default"; +- pinctrl-0 = <&pmic_int_l>; +- rockchip,system-power-controller; +- wakeup-source; +- +- vcc1-supply = <&vcc_sys>; +- vcc2-supply = <&vcc_sys>; +- vcc3-supply = <&vcc_sys>; +- vcc4-supply = <&vcc_sys>; +- vcc6-supply = <&vcc_sys>; +- vcc7-supply = <&vcc_sys>; +- vcc8-supply = <&vcc3v3_sys>; +- vcc9-supply = <&vcc_sys>; +- vcc10-supply = <&vcc_sys>; +- vcc11-supply = <&vcc_sys>; +- vcc12-supply = <&vcc3v3_sys>; +- vddio-supply = <&vcc1v8_pmu>; +- +- regulators { +- vdd_center: DCDC_REG1 { +- regulator-name = "vdd_center"; +- regulator-always-on; +- regulator-boot-on; +- regulator-min-microvolt = <750000>; +- regulator-max-microvolt = <1350000>; +- regulator-ramp-delay = <6001>; +- regulator-state-mem { +- regulator-off-in-suspend; +- }; +- }; +- +- vdd_cpu_l: DCDC_REG2 { +- regulator-name = "vdd_cpu_l"; +- regulator-always-on; +- regulator-boot-on; +- regulator-min-microvolt = <750000>; +- regulator-max-microvolt = <1350000>; +- regulator-ramp-delay = <6001>; +- regulator-state-mem { +- regulator-off-in-suspend; +- }; +- }; +- +- vcc_ddr: DCDC_REG3 { +- regulator-name = "vcc_ddr"; +- regulator-always-on; +- regulator-boot-on; +- regulator-state-mem { +- regulator-on-in-suspend; +- }; +- }; +- +- vcc_1v8: DCDC_REG4 { +- regulator-name = "vcc_1v8"; +- regulator-always-on; +- regulator-boot-on; +- regulator-min-microvolt = <1800000>; +- regulator-max-microvolt = <1800000>; +- regulator-state-mem { +- regulator-on-in-suspend; +- regulator-suspend-microvolt = <1800000>; +- }; +- }; +- +- vcc1v8_dvp: LDO_REG1 { +- regulator-name = "vcc1v8_dvp"; +- regulator-always-on; +- regulator-boot-on; +- regulator-min-microvolt = <1800000>; +- regulator-max-microvolt = <1800000>; +- regulator-state-mem { +- regulator-off-in-suspend; +- }; +- }; +- +- vcc2v8_dvp: LDO_REG2 { +- regulator-name = "vcc2v8_dvp"; +- regulator-always-on; +- regulator-boot-on; +- regulator-min-microvolt = <2800000>; +- regulator-max-microvolt = <2800000>; +- regulator-state-mem { +- regulator-off-in-suspend; +- }; +- }; +- +- vcc1v8_pmu: LDO_REG3 { +- regulator-name = "vcc1v8_pmu"; +- regulator-always-on; +- regulator-boot-on; +- regulator-min-microvolt = <1800000>; +- regulator-max-microvolt = <1800000>; +- regulator-state-mem { +- regulator-on-in-suspend; +- regulator-suspend-microvolt = <1800000>; +- }; +- }; +- +- vcc_sdio: LDO_REG4 { +- regulator-name = "vcc_sdio"; +- regulator-always-on; +- regulator-boot-on; +- regulator-min-microvolt = <1800000>; +- regulator-max-microvolt = <3000000>; +- regulator-state-mem { +- regulator-on-in-suspend; +- regulator-suspend-microvolt = <3000000>; +- }; +- }; +- +- vcca3v0_codec: LDO_REG5 { +- regulator-name = "vcca3v0_codec"; +- regulator-always-on; +- regulator-boot-on; +- regulator-min-microvolt = <3000000>; +- regulator-max-microvolt = <3000000>; +- regulator-state-mem { +- regulator-off-in-suspend; +- }; +- }; +- +- vcc_1v5: LDO_REG6 { +- regulator-name = "vcc_1v5"; +- regulator-always-on; +- regulator-boot-on; +- regulator-min-microvolt = <1500000>; +- regulator-max-microvolt = <1500000>; +- regulator-state-mem { +- regulator-on-in-suspend; +- regulator-suspend-microvolt = <1500000>; +- }; +- }; +- +- vcca1v8_codec: LDO_REG7 { +- regulator-name = "vcca1v8_codec"; +- regulator-always-on; +- regulator-boot-on; +- regulator-min-microvolt = <1800000>; +- regulator-max-microvolt = <1800000>; +- regulator-state-mem { +- regulator-off-in-suspend; +- }; +- }; +- +- vcc_3v0: LDO_REG8 { +- regulator-name = "vcc_3v0"; +- regulator-always-on; +- regulator-boot-on; +- regulator-min-microvolt = <3000000>; +- regulator-max-microvolt = <3000000>; +- regulator-state-mem { +- regulator-on-in-suspend; +- regulator-suspend-microvolt = <3000000>; +- }; +- }; +- +- vcc3v3_s3: vcc_lan: SWITCH_REG1 { +- regulator-name = "vcc3v3_s3"; +- regulator-always-on; +- regulator-boot-on; +- regulator-state-mem { +- regulator-off-in-suspend; +- }; +- }; +- +- vcc3v3_s0: SWITCH_REG2 { +- regulator-name = "vcc3v3_s0"; +- regulator-always-on; +- regulator-boot-on; +- regulator-state-mem { +- regulator-off-in-suspend; +- }; +- }; +- }; +- }; +- +- vdd_cpu_b: regulator@40 { +- compatible = "silergy,syr827"; +- reg = <0x40>; +- fcs,suspend-voltage-selector = <0>; +- regulator-name = "vdd_cpu_b"; +- regulator-min-microvolt = <712500>; +- regulator-max-microvolt = <1500000>; +- regulator-ramp-delay = <1000>; +- regulator-always-on; +- regulator-boot-on; +- vin-supply = <&vcc_sys>; +- +- regulator-state-mem { +- regulator-off-in-suspend; +- }; +- }; +- +- vdd_gpu: regulator@41 { +- compatible = "silergy,syr828"; +- reg = <0x41>; +- fcs,suspend-voltage-selector = <1>; +- regulator-name = "vdd_gpu"; +- regulator-min-microvolt = <712500>; +- regulator-max-microvolt = <1500000>; +- regulator-ramp-delay = <1000>; +- regulator-always-on; +- regulator-boot-on; +- vin-supply = <&vcc_sys>; +- +- regulator-state-mem { +- regulator-off-in-suspend; +- }; ++ status = "okay"; ++ hym8563: hym8563@51 { ++ compatible = "haoyu,hym8563"; ++ reg = <0x51>; ++ interrupt-parent = <&gpio0>; ++ interrupts = <5 IRQ_TYPE_EDGE_FALLING>; ++ pinctrl-names = "default"; ++ #clock-cells = <0>; ++ clock-frequency = <32768>; ++ clock-output-names = "xin32k"; + }; + }; + +@@ -504,12 +106,6 @@ + }; + }; + +-&i2c3 { +- i2c-scl-rising-time-ns = <450>; +- i2c-scl-falling-time-ns = <15>; +- status = "okay"; +-}; +- + &i2c4 { + i2c-scl-rising-time-ns = <600>; + i2c-scl-falling-time-ns = <20>; +@@ -523,48 +119,6 @@ + }; + }; + +-&i2s0 { +- rockchip,playback-channels = <8>; +- rockchip,capture-channels = <8>; +- status = "okay"; +-}; +- +-&i2s1 { +- rockchip,playback-channels = <2>; +- rockchip,capture-channels = <2>; +- status = "okay"; +-}; +- +-&i2s2 { +- status = "okay"; +-}; +- +-&io_domains { +- status = "okay"; +- +- bt656-supply = <&vcc1v8_dvp>; +- audio-supply = <&vcca1v8_codec>; +- sdmmc-supply = <&vcc_sdio>; +- gpio1830-supply = <&vcc_3v0>; +-}; +- +-&pcie_phy { +- status = "okay"; +-}; +- +-&pcie0 { +- ep-gpios = <&gpio4 RK_PD1 GPIO_ACTIVE_HIGH>; +- num-lanes = <4>; +- pinctrl-names = "default"; +- pinctrl-0 = <&pcie_clkreqn_cpm>; +- status = "okay"; +-}; +- +-&pmu_io_domains { +- pmu1830-supply = <&vcc_3v0>; +- status = "okay"; +-}; +- + &pinctrl { + bt { + bt_host_wake_l: bt-host-wake-l { +@@ -642,12 +196,6 @@ + }; + }; + +- wifi { +- wifi_host_wake_l: wifi-host-wake-l { +- rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; +- }; +- }; +- + leds { + work_led_pin: work-led-pin { + rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>; +@@ -659,50 +207,6 @@ + }; + }; + +-&pwm0 { +- status = "okay"; +-}; +- +-&pwm2 { +- status = "okay"; +-}; +- +-&saradc { +- vref-supply = <&vcca1v8_s3>; +- status = "okay"; +-}; +- +-&sdio0 { +- /* WiFi & BT combo module Ampak AP6356S */ +- bus-width = <4>; +- cap-sdio-irq; +- cap-sd-highspeed; +- keep-power-in-suspend; +- mmc-pwrseq = <&sdio_pwrseq>; +- non-removable; +- pinctrl-names = "default"; +- pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>; +- sd-uhs-sdr104; +- +- /* Power supply */ +- vqmmc-supply = &vcc1v8_s3; /* IO line */ +- vmmc-supply = &vcc_sdio; /* card's power */ +- +- #address-cells = <1>; +- #size-cells = <0>; +- status = "okay"; +- +- brcmf: wifi@1 { +- reg = <1>; +- compatible = "brcm,bcm4329-fmac"; +- interrupt-parent = <&gpio0>; +- interrupts = ; +- interrupt-names = "host-wake"; +- brcm,drive-strength = <5>; +- pinctrl-names = "default"; +- pinctrl-0 = <&wifi_host_wake_l>; +- }; +-}; + + &sdio0 { + /* WiFi & BT combo module Ampak AP6356S */ +@@ -734,68 +238,6 @@ + }; + }; + +-&sdmmc { +- bus-width = <4>; +- cap-mmc-highspeed; +- cap-sd-highspeed; +- cd-gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; +- disable-wp; +- max-frequency = <150000000>; +- pinctrl-names = "default"; +- pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>; +- status = "okay"; +-}; +- +-&sdhci { +- bus-width = <8>; +- mmc-hs400-1_8v; +- mmc-hs400-enhanced-strobe; +- non-removable; +- status = "okay"; +-}; +- +-&tcphy0 { +- status = "okay"; +-}; +- +-&tcphy1 { +- status = "okay"; +-}; +- +-&tsadc { +- /* tshut mode 0:CRU 1:GPIO */ +- rockchip,hw-tshut-mode = <1>; +- /* tshut polarity 0:LOW 1:HIGH */ +- rockchip,hw-tshut-polarity = <1>; +- status = "okay"; +-}; +- +-&u2phy0 { +- status = "okay"; +- +- u2phy0_otg: otg-port { +- status = "okay"; +- }; +- +- u2phy0_host: host-port { +- phy-supply = <&vcc5v0_host>; +- status = "okay"; +- }; +-}; +- +-&u2phy1 { +- status = "okay"; +- +- u2phy1_otg: otg-port { +- status = "okay"; +- }; +- +- u2phy1_host: host-port { +- phy-supply = <&vcc5v0_host>; +- status = "okay"; +- }; +-}; +- + &uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_xfer &uart0_rts &uart0_cts>; +@@ -815,62 +257,3 @@ + vddio-supply = <&vcc_1v8>; + }; + }; +- +-&uart2 { +- status = "okay"; +-}; +- +-&usb_host0_ehci { +- status = "okay"; +-}; +- +-&usb_host0_ohci { +- status = "okay"; +-}; +- +-&usb_host1_ehci { +- status = "okay"; +-}; +- +-&usb_host1_ohci { +- status = "okay"; +-}; +- +-&usbdrd3_0 { +- status = "okay"; +-}; +- +-&usbdrd_dwc3_0 { +- status = "okay"; +- dr_mode = "otg"; +-}; +- +-&usbdrd3_1 { +- status = "okay"; +-}; +- +-&usbdrd_dwc3_1 { +- status = "okay"; +- dr_mode = "host"; +-}; +- +-&vopb { +- status = "okay"; +-}; +- +-&vopb_mmu { +- status = "okay"; +-}; +- +-&vopl { +- status = "okay"; +-}; +- +-&vopl_mmu { +- status = "okay"; +-}; +- +-&gpu { +- mali-supply = <&vdd_gpu>; +- status = "okay"; +-}; +