* Re: [PATCH v2] ARM: dts: add rk3288-firefly-reload [not found] <1549971.ctkvOGm2xW@diego> @ 2016-07-18 15:32 ` Randy Li 2016-07-18 15:32 ` [PATCH] " Randy Li 0 siblings, 1 reply; 23+ messages in thread From: Randy Li @ 2016-07-18 15:32 UTC (permalink / raw) To: devicetree Cc: linux-rockchip, linux-arm-kernel, linux-kernel, linux, mark.rutland, robh+dt, heiko, Randy Li Hi Heiko: I use GPLv2 because of it looks more shorter, anyway I am back to allow X11 now. The modification request of io-domain have been included. Thank you for reviewing. Randy Li (1): ARM: dts: add rk3288-firefly-reload Documentation/devicetree/bindings/arm/rockchip.txt | 4 + arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 339 ++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly-reload.dts | 356 +++++++++++++++++++++ 4 files changed, 700 insertions(+) create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload.dts -- 2.7.4 ^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH] ARM: dts: add rk3288-firefly-reload 2016-07-18 15:32 ` [PATCH v2] ARM: dts: add rk3288-firefly-reload Randy Li @ 2016-07-18 15:32 ` Randy Li 2016-07-18 19:46 ` Heiko Stübner 0 siblings, 1 reply; 23+ messages in thread From: Randy Li @ 2016-07-18 15:32 UTC (permalink / raw) To: devicetree Cc: linux-rockchip, linux-arm-kernel, linux-kernel, linux, mark.rutland, robh+dt, heiko, Randy Li The Firefly RK3288 Reload is a combination Firefly rk3288 core board with the Reload baseboard. Add a dtsi for the Firefly rk3288 core which can be included into the dts for the various baseboards in the future and dts for Reload base board. Currently supported are serial console, wired networking, eMMC and SD storage, SPFIF, IR receiver, LEDs, SDIO wifi and USB. But only the OTG could work on the host mode now, the other USB host can't work now, additional patches are required. Signed-off-by: Randy Li <ayaka@soulik.info> Acked-by: Rob Herring <robh@kernel.org> --- Documentation/devicetree/bindings/arm/rockchip.txt | 4 + arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 339 ++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly-reload.dts | 356 +++++++++++++++++++++ 4 files changed, 700 insertions(+) create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload.dts diff --git a/Documentation/devicetree/bindings/arm/rockchip.txt b/Documentation/devicetree/bindings/arm/rockchip.txt index 715d960..3380212c 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.txt +++ b/Documentation/devicetree/bindings/arm/rockchip.txt @@ -31,6 +31,10 @@ Rockchip platforms device tree bindings or - compatible = "firefly,firefly-rk3288-beta", "rockchip,rk3288"; +- Firefly Firefly-RK3288 Reload board: + Required root node properties: + - compatible = "firefly,firefly-rk3288-reload", "rockchip,rk3288"; + - ChipSPARK PopMetal-RK3288 board: Required root node properties: - compatible = "chipspark,popmetal-rk3288", "rockchip,rk3288"; diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 414b427..8173e77 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -606,6 +606,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rk3288-evb-rk808.dtb \ rk3288-firefly-beta.dtb \ rk3288-firefly.dtb \ + rk3288-firefly-reload.dtb \ rk3288-miqi.dtb \ rk3288-popmetal.dtb \ rk3288-r89.dtb \ diff --git a/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi b/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi new file mode 100644 index 0000000..5e5a348 --- /dev/null +++ b/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi @@ -0,0 +1,339 @@ +/* + * Device tree file for Firefly Rockchip RK3288 Core board + * Copyright (c) 2016 Randy Li <ayaka@soulik.info> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively, + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +#include <dt-bindings/input/input.h> +#include "rk3288.dtsi" + +/ { + memory { + device_type = "memory"; + reg = <0 0x80000000>; + }; + + dovdd_1v8: dovdd-1v8-regulator { + compatible = "regulator-fixed"; + regulator-name = "dovdd_1v8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + vin-supply = <&vcc28_dvp>; + }; + + ext_gmac: external-gmac-clock { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <125000000>; + clock-output-names = "ext_gmac"; + }; + + vbat_wl: vcc_sys: vsys-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc_sys"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + regulator-boot-on; + }; + + vcc_flash: flash-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc_flash"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + vin-supply = <&vcc_io>; + }; + + vcc_5v: usb-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc_5v"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + regulator-boot-on; + vin-supply = <&vcc_sys>; + }; + +}; + +&cpu0 { + cpu0-supply = <&vdd_cpu>; +}; + +&emmc { + bus-width = <8>; + cap-mmc-highspeed; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + disable-wp; + non-removable; + num-slots = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&emmc_clk>, <&emmc_cmd>, <&emmc_pwr>, <&emmc_bus8>; + vmmc-supply = <&vcc_io>; + vqmmc-supply = <&vcc_flash>; + status = "okay"; +}; + +&gmac { + assigned-clocks = <&cru SCLK_MAC>; + assigned-clock-parents = <&ext_gmac>; + clock_in_out = "input"; + pinctrl-names = "default"; + pinctrl-0 = <&rgmii_pins>, <&phy_rst>, <&phy_pmeb>, <&phy_int>; + phy-supply = <&vcc_lan>; + phy-mode = "rgmii"; + snps,reset-active-low; + snps,reset-delays-us = <0 10000 1000000>; + snps,reset-gpio = <&gpio4 8 GPIO_ACTIVE_LOW>; + tx_delay = <0x30>; + rx_delay = <0x10>; + status = "ok"; +}; + +&i2c0 { + clock-frequency = <400000>; + status = "okay"; + + vdd_cpu: syr827@40 { + compatible = "silergy,syr827"; + fcs,suspend-voltage-selector = <1>; + reg = <0x40>; + regulator-name = "vdd_cpu"; + regulator-min-microvolt = <850000>; + regulator-max-microvolt = <1350000>; + regulator-always-on; + regulator-boot-on; + regulator-enable-ramp-delay = <300>; + regulator-ramp-delay = <8000>; + vin-supply = <&vcc_sys>; + }; + + vdd_gpu: syr828@41 { + compatible = "silergy,syr828"; + fcs,suspend-voltage-selector = <1>; + reg = <0x41>; + regulator-name = "vdd_gpu"; + regulator-min-microvolt = <850000>; + regulator-max-microvolt = <1350000>; + regulator-always-on; + vin-supply = <&vcc_sys>; + }; + + act8846: act8846@5a { + compatible = "active-semi,act8846"; + reg = <0x5a>; + pinctrl-names = "default"; + pinctrl-0 = <&pmic_vsel>, <&pwr_hold>; + system-power-controller; + + vp1-supply = <&vcc_sys>; + vp2-supply = <&vcc_sys>; + vp3-supply = <&vcc_sys>; + vp4-supply = <&vcc_sys>; + inl1-supply = <&vcc_sys>; + inl2-supply = <&vcc_sys>; + inl3-supply = <&vcc_20>; + + regulators { + vcc_ddr: REG1 { + regulator-name = "vcc_ddr"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-always-on; + }; + + vcc_io: REG2 { + regulator-name = "vcc_io"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vdd_log: REG3 { + regulator-name = "vdd_log"; + regulator-min-microvolt = <1100000>; + regulator-max-microvolt = <1100000>; + regulator-always-on; + }; + + vcc_20: REG4 { + regulator-name = "vcc_20"; + regulator-min-microvolt = <2000000>; + regulator-max-microvolt = <2000000>; + regulator-always-on; + }; + + vccio_sd: REG5 { + regulator-name = "vccio_sd"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vdd10_lcd: REG6 { + regulator-name = "vdd10_lcd"; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + regulator-always-on; + }; + + vcca_33: REG7 { + regulator-name = "vcca_33"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + + vcc_lan: REG8 { + regulator-name = "vcca_lan"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + + vccio_pmu: REG9 { + regulator-name = "vccio_pmu"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + + vdd_10: REG10 { + regulator-name = "vdd_10"; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + regulator-always-on; + }; + + vccio_wl: vcc_18: REG11 { + regulator-name = "vcc_18"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + }; + + vcc18_lcd: REG12 { + regulator-name = "vcc18_lcd"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + }; + }; + }; +}; + +&pinctrl { + pcfg_output_high: pcfg-output-high { + output-high; + }; + + pcfg_output_low: pcfg-output-low { + output-low; + }; + + pcfg_pull_up_drv_12ma: pcfg-pull-up-drv-12ma { + bias-pull-up; + drive-strength = <12>; + }; + + act8846 { + pwr_hold: pwr-hold { + rockchip,pins = <0 1 RK_FUNC_GPIO &pcfg_output_high>; + }; + + pmic_vsel: pmic-vsel { + rockchip,pins = <7 14 RK_FUNC_GPIO &pcfg_output_low>; + }; + }; + + gmac { + phy_int: phy-int { + rockchip,pins = <0 9 RK_FUNC_GPIO &pcfg_pull_up>; + }; + + phy_pmeb: phy-pmeb { + rockchip,pins = <0 8 RK_FUNC_GPIO &pcfg_pull_up>; + }; + + phy_rst: phy-rst { + rockchip,pins = <4 8 RK_FUNC_GPIO &pcfg_output_high>; + }; + }; +}; + +&tsadc { + rockchip,hw-tshut-mode = <0>; + rockchip,hw-tshut-polarity = <0>; + status = "okay"; +}; + +&vopb { + status = "okay"; +}; + +&vopb_mmu { + status = "okay"; +}; + +&vopl { + status = "okay"; +}; + +&vopl_mmu { + status = "okay"; +}; + +&wdt { + status = "okay"; +}; + +&io_domains { + status = "okay"; + + audio-supply = <&vcca_33>; + bb-supply = <&vcc_io>; + dvp-supply = <&dovdd_1v8>; + flash0-supply = <&vcc_flash>; + flash1-supply = <&vcc_lan>; + gpio30-supply = <&vcc_io>; + gpio1830-supply = <&vcc_io>; + lcdc-supply = <&vcc_io>; + sdcard-supply = <&vccio_sd>; + wifi-supply = <&vccio_wl>; +}; diff --git a/arch/arm/boot/dts/rk3288-firefly-reload.dts b/arch/arm/boot/dts/rk3288-firefly-reload.dts new file mode 100644 index 0000000..43145d1 --- /dev/null +++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts @@ -0,0 +1,356 @@ +/* + * Device tree file for Firefly Rockchip RK3288 Core board + * Copyright (c) 2016 Randy Li <ayaka@soulik.info> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively, + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/dts-v1/; +#include "rk3288-firefly-reload-core.dtsi" + +/ { + model = "Firefly-RK3288-reload"; + compatible = "firefly,firefly-rk3288-reload", "rockchip,rk3288"; + + leds { + compatible = "gpio-leds"; + + power { + gpios = <&gpio8 2 GPIO_ACTIVE_LOW>; + label = "firefly:blue:power"; + pinctrl-names = "default"; + pinctrl-0 = <&power_led>; + panic-indicator; + }; + + work { + gpios = <&gpio8 1 GPIO_ACTIVE_LOW>; + label = "firefly:blue:user"; + linux,default-trigger = "rc-feedback"; + pinctrl-names = "default"; + pinctrl-0 = <&work_led>; + }; + }; + + vcc_sd: sdmmc-regulator { + compatible = "regulator-fixed"; + gpio = <&gpio7 11 GPIO_ACTIVE_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc_pwr>; + regulator-name = "vcc_sd"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + startup-delay-us = <100000>; + vin-supply = <&vcc_io>; + }; + + sdio_pwrseq: sdio-pwrseq { + compatible = "mmc-pwrseq-simple"; + clocks = <&hym8563>; + clock-names = "ext_clock"; + pinctrl-names = "default"; + pinctrl-0 = <&wifi_enable>; + reset-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>; + }; + + vcc_host_5v: usb-host-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio0 14 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&host_vbus_drv>; + regulator-name = "vcc_host_5v"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + vin-supply = <&vcc_5v>; + }; + + vcc_otg_5v: usb-otg-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio0 12 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&otg_vbus_drv>; + regulator-name = "vcc_otg_5v"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + vin-supply = <&vcc_5v>; + }; + + /* + * A TT8142 creates both dovdd_1v8 and vcc28_dvp, controlled + * by the dvp_pwr pin. + */ + vcc28_dvp: vcc28-dvp-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&dvp_pwr>; + regulator-name = "vcc28_dvp"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-always-on; + vin-supply = <&vcc_io>; + }; + + ir-receiver { + compatible = "gpio-ir-receiver"; + gpios = <&gpio7 0 GPIO_ACTIVE_LOW>; + }; + + gpio-keys { + compatible = "gpio-keys"; + + power { + wakeup-source; + gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; + label = "GPIO Power"; + linux,code = <KEY_POWER>; + pinctrl-names = "default"; + pinctrl-0 = <&pwr_key>; + }; + }; + + sound { + compatible = "simple-audio-card"; + simple-audio-card,name = "SPDIF"; + simple-audio-card,dai-link@1 { /* S/PDIF - S/PDIF */ + cpu { sound-dai = <&spdif>; }; + codec { sound-dai = <&spdif_out>; }; + }; + }; + + spdif_out: spdif-out { + compatible = "linux,spdif-dit"; + #sound-dai-cells = <0>; + }; +}; + +&i2c0 { + hym8563: hym8563@51 { + compatible = "haoyu,hym8563"; + reg = <0x51>; + #clock-cells = <0>; + clock-frequency = <32768>; + clock-output-names = "xin32k"; + interrupt-parent = <&gpio7>; + interrupts = <4 IRQ_TYPE_EDGE_FALLING>; + pinctrl-names = "default"; + pinctrl-0 = <&rtc_int>; + }; +}; + +&i2c2 { + status = "okay"; + + codec: es8328@10 { + compatible = "everest,es8328"; + DVDD-supply = <&vcca_33>; + AVDD-supply = <&vcca_33>; + PVDD-supply = <&vcca_33>; + HPVDD-supply = <&vcca_33>; + clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>; + clock-names = "i2s_hclk", "i2s_clk"; + reg = <0x10>; + }; +}; + +&i2s { + status = "okay"; +}; + +&sdmmc { + bus-width = <4>; + cap-mmc-highspeed; + cap-sd-highspeed; + sd-uhs-sdr12; + sd-uhs-sdr25; + sd-uhs-sdr50; + sd-uhs-sdr104; + sd-uhs-ddr50; + card-detect-delay = <200>; + disable-wp; + num-slots = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc_clk>, <&sdmmc_cmd>, <&sdmmc_cd>, <&sdmmc_bus4>; + vmmc-supply = <&vcc_sd>; + vqmmc-supply = <&vccio_sd>; + status = "okay"; +}; + +&sdio0 { + bus-width = <4>; + cap-sd-highspeed; + sd-uhs-sdr12; + sd-uhs-sdr25; + sd-uhs-sdr50; + sd-uhs-ddr50; + cap-sdio-irq; + disable-wp; + mmc-pwrseq = <&sdio_pwrseq>; + non-removable; + num-slots = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&sdio0_bus4>, <&sdio0_cmd>, <&sdio0_clk>, <&sdio0_int>; + vmmc-supply = <&vbat_wl>; + vqmmc-supply = <&vccio_wl>; + status = "okay"; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_xfer>, <&uart0_cts>, <&uart0_rts>; + status = "okay"; +}; + +&uart1 { + status = "okay"; +}; + +&uart2 { + status = "okay"; +}; + +&uart3 { + status = "okay"; +}; + +&usbphy { + status = "okay"; +}; + +&usb_host1 { + pinctrl-names = "default"; + pinctrl-0 = <&usbhub_rst>; + status = "okay"; +}; + +&usb_otg { + status = "okay"; +}; + +&spdif { + status = "okay"; +}; + +&pinctrl { + ir { + ir_int: ir-int { + rockchip,pins = <7 0 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + + dvp { + dvp_pwr: dvp-pwr { + rockchip,pins = <0 11 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + hym8563 { + rtc_int: rtc-int { + rockchip,pins = <7 4 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + + keys { + pwr_key: pwr-key { + rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + + leds { + power_led: power-led { + rockchip,pins = <8 2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + work_led: work-led { + rockchip,pins = <8 1 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + sdmmc { + /* + * Default drive strength isn't enough to achieve even + * high-speed mode on firefly board so bump up to 12ma. + */ + sdmmc_bus4: sdmmc-bus4 { + rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up_drv_12ma>, + <6 17 RK_FUNC_1 &pcfg_pull_up_drv_12ma>, + <6 18 RK_FUNC_1 &pcfg_pull_up_drv_12ma>, + <6 19 RK_FUNC_1 &pcfg_pull_up_drv_12ma>; + }; + + sdmmc_clk: sdmmc-clk { + rockchip,pins = <6 20 RK_FUNC_1 &pcfg_pull_none_12ma>; + }; + + sdmmc_cmd: sdmmc-cmd { + rockchip,pins = <6 21 RK_FUNC_1 &pcfg_pull_up_drv_12ma>; + }; + + sdmmc_pwr: sdmmc-pwr { + rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + sdio { + wifi_enable: wifi-enable { + rockchip,pins = <4 28 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + usb_host { + host_vbus_drv: host-vbus-drv { + rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + usbhub_rst: usbhub-rst { + rockchip,pins = <8 3 RK_FUNC_GPIO &pcfg_output_high>; + }; + }; + + usb_otg { + otg_vbus_drv: otg-vbus-drv { + rockchip,pins = <0 12 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; +}; -- 2.7.4 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH] ARM: dts: add rk3288-firefly-reload 2016-07-18 15:32 ` [PATCH] " Randy Li @ 2016-07-18 19:46 ` Heiko Stübner 2016-08-07 3:40 ` Shawn Lin 0 siblings, 1 reply; 23+ messages in thread From: Heiko Stübner @ 2016-07-18 19:46 UTC (permalink / raw) To: Randy Li Cc: devicetree, linux-rockchip, linux-arm-kernel, linux-kernel, linux, mark.rutland, robh+dt Am Montag, 18. Juli 2016, 23:32:32 schrieb Randy Li: > The Firefly RK3288 Reload is a combination Firefly rk3288 core board > with the Reload baseboard. Add a dtsi for the Firefly rk3288 core > which can be included into the dts for the various baseboards > in the future and dts for Reload base board. > > Currently supported are serial console, wired networking, eMMC and > SD storage, SPFIF, IR receiver, LEDs, SDIO wifi and USB. But only > the OTG could work on the host mode now, the other USB host can't > work now, additional patches are required. > > Signed-off-by: Randy Li <ayaka@soulik.info> > Acked-by: Rob Herring <robh@kernel.org> applied [0], after some minor reordering - please double check. Also, while the branch is named 4.8 this will only go into 4.9, as the merge- window supposedly opens on the weekend. Heiko [0] https://git.kernel.org/cgit/linux/kernel/git/mmind/linux-rockchip.git/commit/?id=e00fdd4931ea4c47f53cba59b7a3800677546bea ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] ARM: dts: add rk3288-firefly-reload 2016-07-18 19:46 ` Heiko Stübner @ 2016-08-07 3:40 ` Shawn Lin 2016-08-07 14:44 ` Heiko Stuebner 0 siblings, 1 reply; 23+ messages in thread From: Shawn Lin @ 2016-08-07 3:40 UTC (permalink / raw) To: Heiko Stübner, Randy Li Cc: shawn.lin, mark.rutland, devicetree, linux, linux-kernel, linux-rockchip, robh+dt, linux-arm-kernel On 2016/7/19 3:46, Heiko Stübner wrote: > Am Montag, 18. Juli 2016, 23:32:32 schrieb Randy Li: >> The Firefly RK3288 Reload is a combination Firefly rk3288 core board >> with the Reload baseboard. Add a dtsi for the Firefly rk3288 core >> which can be included into the dts for the various baseboards >> in the future and dts for Reload base board. >> >> Currently supported are serial console, wired networking, eMMC and >> SD storage, SPFIF, IR receiver, LEDs, SDIO wifi and USB. But only >> the OTG could work on the host mode now, the other USB host can't >> work now, additional patches are required. >> >> Signed-off-by: Randy Li <ayaka@soulik.info> >> Acked-by: Rob Herring <robh@kernel.org> > > applied [0], after some minor reordering - please double check. > > Also, while the branch is named 4.8 this will only go into 4.9, as the merge- > window supposedly opens on the weekend. Sorry for the noise here:), but I find there is some mmc stuff which confuse me. Maybe Randy could elaborate more? Your sdmmc claims to support UHS-I mode like sd-uhs-sdr104, etc, which will ask dw_mmc to switch vqmmc from 3V3 to 1V8 after sending CMD11. But the vqmmc is vccio_sd which is fixed as 3V3? :) > > > Heiko > > [0] https://git.kernel.org/cgit/linux/kernel/git/mmind/linux-rockchip.git/commit/?id=e00fdd4931ea4c47f53cba59b7a3800677546bea > > > _______________________________________________ > Linux-rockchip mailing list > Linux-rockchip@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-rockchip > -- Best Regards Shawn Lin ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] ARM: dts: add rk3288-firefly-reload 2016-08-07 3:40 ` Shawn Lin @ 2016-08-07 14:44 ` Heiko Stuebner 2016-08-08 2:29 ` Shawn Lin 2016-08-09 9:28 ` 陈豪 0 siblings, 2 replies; 23+ messages in thread From: Heiko Stuebner @ 2016-08-07 14:44 UTC (permalink / raw) To: Shawn Lin Cc: Randy Li, mark.rutland, devicetree, linux, linux-kernel, linux-rockchip, robh+dt, linux-arm-kernel Hi Shawn, Am Sonntag, 7. August 2016, 11:40:21 schrieb Shawn Lin: > On 2016/7/19 3:46, Heiko Stübner wrote: > > Am Montag, 18. Juli 2016, 23:32:32 schrieb Randy Li: > >> The Firefly RK3288 Reload is a combination Firefly rk3288 core board > >> with the Reload baseboard. Add a dtsi for the Firefly rk3288 core > >> which can be included into the dts for the various baseboards > >> in the future and dts for Reload base board. > >> > >> Currently supported are serial console, wired networking, eMMC and > >> SD storage, SPFIF, IR receiver, LEDs, SDIO wifi and USB. But only > >> the OTG could work on the host mode now, the other USB host can't > >> work now, additional patches are required. > >> > >> Signed-off-by: Randy Li <ayaka@soulik.info> > >> Acked-by: Rob Herring <robh@kernel.org> > > > > applied [0], after some minor reordering - please double check. > > > > Also, while the branch is named 4.8 this will only go into 4.9, as the > > merge- window supposedly opens on the weekend. > > Sorry for the noise here:), but I find there is some mmc stuff > which confuse me. Maybe Randy could elaborate more? > > Your sdmmc claims to support UHS-I mode like sd-uhs-sdr104, etc, which > will ask dw_mmc to switch vqmmc from 3V3 to 1V8 after sending CMD11. > > But the vqmmc is vccio_sd which is fixed as 3V3? :) so far we have only been able to achieve UHS speeds on devices based on the rk808 pmic (I had sucess on veyron and popmetal). The act8846-based boards seem to have some issue when trying to do the switch to 1.8V, resulting in mmc errors and the mmc-core switching back to 3.3V. I think this might be caused by a bug in the act8846 driver or some dts mistake. But so far nobody had the time and enthusiasm to investigate :-) Heiko ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] ARM: dts: add rk3288-firefly-reload 2016-08-07 14:44 ` Heiko Stuebner @ 2016-08-08 2:29 ` Shawn Lin 2016-08-09 9:28 ` 陈豪 1 sibling, 0 replies; 23+ messages in thread From: Shawn Lin @ 2016-08-08 2:29 UTC (permalink / raw) To: Heiko Stuebner Cc: shawn.lin, mark.rutland, devicetree, Randy Li, linux, linux-kernel, linux-rockchip, robh+dt, linux-arm-kernel 在 2016/8/7 22:44, Heiko Stuebner 写道: > Hi Shawn, > > Am Sonntag, 7. August 2016, 11:40:21 schrieb Shawn Lin: >> On 2016/7/19 3:46, Heiko Stübner wrote: >>> Am Montag, 18. Juli 2016, 23:32:32 schrieb Randy Li: >>>> The Firefly RK3288 Reload is a combination Firefly rk3288 core board >>>> with the Reload baseboard. Add a dtsi for the Firefly rk3288 core >>>> which can be included into the dts for the various baseboards >>>> in the future and dts for Reload base board. >>>> >>>> Currently supported are serial console, wired networking, eMMC and >>>> SD storage, SPFIF, IR receiver, LEDs, SDIO wifi and USB. But only >>>> the OTG could work on the host mode now, the other USB host can't >>>> work now, additional patches are required. >>>> >>>> Signed-off-by: Randy Li <ayaka@soulik.info> >>>> Acked-by: Rob Herring <robh@kernel.org> >>> >>> applied [0], after some minor reordering - please double check. >>> >>> Also, while the branch is named 4.8 this will only go into 4.9, as the >>> merge- window supposedly opens on the weekend. >> >> Sorry for the noise here:), but I find there is some mmc stuff >> which confuse me. Maybe Randy could elaborate more? >> >> Your sdmmc claims to support UHS-I mode like sd-uhs-sdr104, etc, which >> will ask dw_mmc to switch vqmmc from 3V3 to 1V8 after sending CMD11. >> >> But the vqmmc is vccio_sd which is fixed as 3V3? :) > > so far we have only been able to achieve UHS speeds on devices based on the > rk808 pmic (I had sucess on veyron and popmetal). The act8846-based boards > seem to have some issue when trying to do the switch to 1.8V, resulting in > mmc errors and the mmc-core switching back to 3.3V. Interesting.... I will have a look at it this weekend with Randy face 2 face.... > > I think this might be caused by a bug in the act8846 driver or some dts > mistake. But so far nobody had the time and enthusiasm to investigate :-) > > > Heiko > > _______________________________________________ > Linux-rockchip mailing list > Linux-rockchip@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-rockchip > -- Best Regards Shawn Lin ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] ARM: dts: add rk3288-firefly-reload 2016-08-07 14:44 ` Heiko Stuebner 2016-08-08 2:29 ` Shawn Lin @ 2016-08-09 9:28 ` 陈豪 2016-08-09 10:02 ` 陈豪 1 sibling, 1 reply; 23+ messages in thread From: 陈豪 @ 2016-08-09 9:28 UTC (permalink / raw) To: Heiko Stuebner Cc: Shawn Lin, Randy Li, mark.rutland, devicetree, linux, linux-kernel, linux-rockchip, robh+dt, linux-arm-kernel 2016-08-07 22:44 GMT+08:00 Heiko Stuebner <heiko@sntech.de>: > Hi Shawn, > > Am Sonntag, 7. August 2016, 11:40:21 schrieb Shawn Lin: >> On 2016/7/19 3:46, Heiko Stübner wrote: >> > Am Montag, 18. Juli 2016, 23:32:32 schrieb Randy Li: >> >> The Firefly RK3288 Reload is a combination Firefly rk3288 core board >> >> with the Reload baseboard. Add a dtsi for the Firefly rk3288 core >> >> which can be included into the dts for the various baseboards >> >> in the future and dts for Reload base board. >> >> >> >> Currently supported are serial console, wired networking, eMMC and >> >> SD storage, SPFIF, IR receiver, LEDs, SDIO wifi and USB. But only >> >> the OTG could work on the host mode now, the other USB host can't >> >> work now, additional patches are required. >> >> >> >> Signed-off-by: Randy Li <ayaka@soulik.info> >> >> Acked-by: Rob Herring <robh@kernel.org> >> > >> > applied [0], after some minor reordering - please double check. >> > >> > Also, while the branch is named 4.8 this will only go into 4.9, as the >> > merge- window supposedly opens on the weekend. >> >> Sorry for the noise here:), but I find there is some mmc stuff >> which confuse me. Maybe Randy could elaborate more? >> >> Your sdmmc claims to support UHS-I mode like sd-uhs-sdr104, etc, which >> will ask dw_mmc to switch vqmmc from 3V3 to 1V8 after sending CMD11. >> >> But the vqmmc is vccio_sd which is fixed as 3V3? :) > > so far we have only been able to achieve UHS speeds on devices based on the > rk808 pmic (I had sucess on veyron and popmetal). The act8846-based boards > seem to have some issue when trying to do the switch to 1.8V, resulting in > mmc errors and the mmc-core switching back to 3.3V. > > I think this might be caused by a bug in the act8846 driver or some dts > mistake. But so far nobody had the time and enthusiasm to investigate :-) > > > Heiko Hi all, sdcard-supply must be specifed in io-domains node to enable uhs. io-domains { compatible = "rockchip,rk3288-io-voltage-domain"; rockchip,grf = <&grf>; sdcard-supply = <&vccio_sd>; wifi-supply = <&vcc_18>; }; ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] ARM: dts: add rk3288-firefly-reload 2016-08-09 9:28 ` 陈豪 @ 2016-08-09 10:02 ` 陈豪 2016-08-09 10:06 ` Randy Li 0 siblings, 1 reply; 23+ messages in thread From: 陈豪 @ 2016-08-09 10:02 UTC (permalink / raw) To: Heiko Stuebner Cc: Shawn Lin, Randy Li, mark.rutland, devicetree, linux, linux-kernel, linux-rockchip, robh+dt, linux-arm-kernel well，it has already been added.... The root cause is not act8846. Firefly have a bug with sdmmc and it seems they didn't fix it in firefly-reload. http://bbs.t-firefly.com/forum.php?mod=viewthread&tid=256 ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] ARM: dts: add rk3288-firefly-reload 2016-08-09 10:02 ` 陈豪 @ 2016-08-09 10:06 ` Randy Li 2016-08-09 10:58 ` Heiko Stübner 0 siblings, 1 reply; 23+ messages in thread From: Randy Li @ 2016-08-09 10:06 UTC (permalink / raw) To: 陈豪 Cc: Heiko Stuebner, Shawn Lin, mark.rutland, devicetree, linux, linux-kernel, linux-rockchip, robh+dt, linux-arm-kernel 從我的 iPad 傳送 > 陈豪 <jacobchen110@gmail.com> 於 2016年8月9日 下午6:02 寫道： > > well，it has already been added.... > > The root cause is not act8846. Firefly have a bug with sdmmc and it > seems they didn't fix it in firefly-reload. > > http://bbs.t-firefly.com/forum.php?mod=viewthread&tid=256 Yes, Jacob is right. Those high speed options need the voltage down to 1.8v. They should be removed. ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] ARM: dts: add rk3288-firefly-reload 2016-08-09 10:06 ` Randy Li @ 2016-08-09 10:58 ` Heiko Stübner 2016-08-10 1:12 ` Randy Li 0 siblings, 1 reply; 23+ messages in thread From: Heiko Stübner @ 2016-08-09 10:58 UTC (permalink / raw) To: Randy Li Cc: 陈豪, Shawn Lin, mark.rutland, devicetree, linux, linux-kernel, linux-rockchip, robh+dt, linux-arm-kernel Am Dienstag, 9. August 2016, 18:06:33 schrieb Randy Li: > 從我的 iPad 傳送 > > > 陈豪 <jacobchen110@gmail.com> 於 2016年8月9日 下午6:02 寫道： > > > > well，it has already been added.... > > > > The root cause is not act8846. Firefly have a bug with sdmmc and it > > seems they didn't fix it in firefly-reload. > > > > http://bbs.t-firefly.com/forum.php?mod=viewthread&tid=256 Thanks Jacob for pointing out this issue - I was always wondering why it wasn't working :-) . > Yes, Jacob is right. Those high speed options need the voltage down to 1.8v. > They should be removed. Randy, can you provide a follow-up patch that removes these excess properties please? Thanks Heiko ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] ARM: dts: add rk3288-firefly-reload 2016-08-09 10:58 ` Heiko Stübner @ 2016-08-10 1:12 ` Randy Li 2016-08-14 11:27 ` [PATCH 0/2] ARM: dts: rockchip: correct the regulators in firefly reload Randy Li 0 siblings, 1 reply; 23+ messages in thread From: Randy Li @ 2016-08-10 1:12 UTC (permalink / raw) To: Heiko Stübner Cc: 陈豪, Shawn Lin, mark.rutland, devicetree, linux, linux-kernel, linux-rockchip, robh+dt, linux-arm-kernel, ayaka On 08/09/2016 06:58 PM, Heiko Stübner wrote: > Am Dienstag, 9. August 2016, 18:06:33 schrieb Randy Li: >> 從我的 iPad 傳送 >> >>> 陈豪 <jacobchen110@gmail.com> 於 2016年8月9日 下午6:02 寫道： >>> >>> well，it has already been added.... >>> >>> The root cause is not act8846. Firefly have a bug with sdmmc and it >>> seems they didn't fix it in firefly-reload. >>> >>> http://bbs.t-firefly.com/forum.php?mod=viewthread&tid=256 > Thanks Jacob for pointing out this issue - I was always wondering why it > wasn't working :-) . > > >> Yes, Jacob is right. Those high speed options need the voltage down to 1.8v. >> They should be removed. > Randy, can you provide a follow-up patch that removes these excess properties > please? I will send a patch in weekend. I need some time to confirm whether the sdio wifi would meet the same problem in firefly reload. I found those patches are not been merged yet, should I just send a new version or just a patch remove those incorrect excess properties? > > > Thanks > Heiko > -- Randy Li The third produce department ^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH 0/2] ARM: dts: rockchip: correct the regulators in firefly reload 2016-08-10 1:12 ` Randy Li @ 2016-08-14 11:27 ` Randy Li 2016-08-14 11:27 ` [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for " Randy Li 2016-08-14 11:27 ` Randy Li 0 siblings, 2 replies; 23+ messages in thread From: Randy Li @ 2016-08-14 11:27 UTC (permalink / raw) To: devicetree Cc: linux-kernel, linux-rockchip, linux-arm-kernel, linux, mark.rutland, heiko, Randy Li I double check the regulators settings in dts after the sdcard issue, I found I didn't make them match the hardware of firefly reload board. Randy Li (2): ARM: dts: rockchip: remove excess sd properties for firefly reload ARM: dts: rockchip: add missing regulators for firefly reload board arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 29 +-------- arch/arm/boot/dts/rk3288-firefly-reload.dts | 71 +++++++++++++++++++---- 2 files changed, 60 insertions(+), 40 deletions(-) -- 2.7.4 ^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for firefly reload 2016-08-14 11:27 ` [PATCH 0/2] ARM: dts: rockchip: correct the regulators in firefly reload Randy Li @ 2016-08-14 11:27 ` Randy Li 2016-08-14 12:30 ` Heiko Stuebner 2016-08-14 11:27 ` Randy Li 1 sibling, 1 reply; 23+ messages in thread From: Randy Li @ 2016-08-14 11:27 UTC (permalink / raw) To: devicetree Cc: linux-kernel, linux-rockchip, linux-arm-kernel, linux, mark.rutland, heiko, Randy Li Because of a bug in hardware design, the sdcard at firefly rk3288 reload board can't switch the io voltage level to 1.8v. Signed-off-by: Randy Li <ayaka@soulik.info> --- arch/arm/boot/dts/rk3288-firefly-reload.dts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/rk3288-firefly-reload.dts b/arch/arm/boot/dts/rk3288-firefly-reload.dts index 43145d1..a2b1f14 100644 --- a/arch/arm/boot/dts/rk3288-firefly-reload.dts +++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts @@ -202,18 +202,13 @@ bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; - sd-uhs-sdr12; - sd-uhs-sdr25; - sd-uhs-sdr50; - sd-uhs-sdr104; - sd-uhs-ddr50; card-detect-delay = <200>; disable-wp; num-slots = <1>; pinctrl-names = "default"; pinctrl-0 = <&sdmmc_clk>, <&sdmmc_cmd>, <&sdmmc_cd>, <&sdmmc_bus4>; vmmc-supply = <&vcc_sd>; - vqmmc-supply = <&vccio_sd>; + vqmmc-supply = <&vcc_sd>; status = "okay"; }; -- 2.7.4 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for firefly reload 2016-08-14 11:27 ` [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for " Randy Li @ 2016-08-14 12:30 ` Heiko Stuebner 2016-08-14 12:38 ` ayaka 0 siblings, 1 reply; 23+ messages in thread From: Heiko Stuebner @ 2016-08-14 12:30 UTC (permalink / raw) To: Randy Li Cc: devicetree, linux-kernel, linux-rockchip, linux-arm-kernel, linux, mark.rutland Am Sonntag, 14. August 2016, 19:27:23 CEST schrieb Randy Li: > Because of a bug in hardware design, the sdcard at firefly > rk3288 reload board can't switch the io voltage level to 1.8v. > > Signed-off-by: Randy Li <ayaka@soulik.info> > --- > arch/arm/boot/dts/rk3288-firefly-reload.dts | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > diff --git a/arch/arm/boot/dts/rk3288-firefly-reload.dts > b/arch/arm/boot/dts/rk3288-firefly-reload.dts index 43145d1..a2b1f14 100644 > --- a/arch/arm/boot/dts/rk3288-firefly-reload.dts > +++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts > @@ -202,18 +202,13 @@ > bus-width = <4>; > cap-mmc-highspeed; > cap-sd-highspeed; > - sd-uhs-sdr12; > - sd-uhs-sdr25; > - sd-uhs-sdr50; > - sd-uhs-sdr104; > - sd-uhs-ddr50; > card-detect-delay = <200>; > disable-wp; > num-slots = <1>; > pinctrl-names = "default"; > pinctrl-0 = <&sdmmc_clk>, <&sdmmc_cmd>, <&sdmmc_cd>, <&sdmmc_bus4>; > vmmc-supply = <&vcc_sd>; > - vqmmc-supply = <&vccio_sd>; > + vqmmc-supply = <&vcc_sd>; that looks wrong. vccio_sd is still the vqmmc supply in the schematics even though we don't want to switch to 1.8V . But that regulator should still be controllable without needing a regulator-always-on in the future. Heiko ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for firefly reload 2016-08-14 12:30 ` Heiko Stuebner @ 2016-08-14 12:38 ` ayaka 2016-08-17 14:10 ` Heiko Stübner 0 siblings, 1 reply; 23+ messages in thread From: ayaka @ 2016-08-14 12:38 UTC (permalink / raw) To: Heiko Stuebner Cc: devicetree, linux-kernel, linux-rockchip, linux-arm-kernel, linux, mark.rutland On 08/14/2016 08:30 PM, Heiko Stuebner wrote: > Am Sonntag, 14. August 2016, 19:27:23 CEST schrieb Randy Li: >> Because of a bug in hardware design, the sdcard at firefly >> rk3288 reload board can't switch the io voltage level to 1.8v. >> >> Signed-off-by: Randy Li <ayaka@soulik.info> >> --- >> arch/arm/boot/dts/rk3288-firefly-reload.dts | 7 +------ >> 1 file changed, 1 insertion(+), 6 deletions(-) >> >> diff --git a/arch/arm/boot/dts/rk3288-firefly-reload.dts >> b/arch/arm/boot/dts/rk3288-firefly-reload.dts index 43145d1..a2b1f14 100644 >> --- a/arch/arm/boot/dts/rk3288-firefly-reload.dts >> +++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts >> @@ -202,18 +202,13 @@ >> bus-width = <4>; >> cap-mmc-highspeed; >> cap-sd-highspeed; >> - sd-uhs-sdr12; >> - sd-uhs-sdr25; >> - sd-uhs-sdr50; >> - sd-uhs-sdr104; >> - sd-uhs-ddr50; >> card-detect-delay = <200>; >> disable-wp; >> num-slots = <1>; >> pinctrl-names = "default"; >> pinctrl-0 = <&sdmmc_clk>, <&sdmmc_cmd>, <&sdmmc_cd>, <&sdmmc_bus4>; >> vmmc-supply = <&vcc_sd>; >> - vqmmc-supply = <&vccio_sd>; >> + vqmmc-supply = <&vcc_sd>; > that looks wrong. vccio_sd is still the vqmmc supply in the schematics even > though we don't want to switch to 1.8V . But that regulator should still be I think the vccio_sd is just the one connected to the io_domains, but the voltage source for the pull up register is not vccio_sd but vcc_io. > controllable without needing a regulator-always-on in the future. > > > Heiko ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for firefly reload 2016-08-14 12:38 ` ayaka @ 2016-08-17 14:10 ` Heiko Stübner 2016-08-17 17:03 ` [PATCH 0/2 v2] ARM: dts: rockchip: correct the regulators in " Randy Li 0 siblings, 1 reply; 23+ messages in thread From: Heiko Stübner @ 2016-08-17 14:10 UTC (permalink / raw) To: ayaka Cc: devicetree, linux-kernel, linux-rockchip, linux-arm-kernel, linux, mark.rutland Am Sonntag, 14. August 2016, 20:38:59 schrieb ayaka: > On 08/14/2016 08:30 PM, Heiko Stuebner wrote: > > Am Sonntag, 14. August 2016, 19:27:23 CEST schrieb Randy Li: > >> Because of a bug in hardware design, the sdcard at firefly > >> rk3288 reload board can't switch the io voltage level to 1.8v. > >> > >> Signed-off-by: Randy Li <ayaka@soulik.info> > >> --- > >> > >> arch/arm/boot/dts/rk3288-firefly-reload.dts | 7 +------ > >> 1 file changed, 1 insertion(+), 6 deletions(-) > >> > >> diff --git a/arch/arm/boot/dts/rk3288-firefly-reload.dts > >> b/arch/arm/boot/dts/rk3288-firefly-reload.dts index 43145d1..a2b1f14 > >> 100644 > >> --- a/arch/arm/boot/dts/rk3288-firefly-reload.dts > >> +++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts > >> @@ -202,18 +202,13 @@ > >> > >> bus-width = <4>; > >> cap-mmc-highspeed; > >> cap-sd-highspeed; > >> > >> - sd-uhs-sdr12; > >> - sd-uhs-sdr25; > >> - sd-uhs-sdr50; > >> - sd-uhs-sdr104; > >> - sd-uhs-ddr50; > >> > >> card-detect-delay = <200>; > >> disable-wp; > >> num-slots = <1>; > >> pinctrl-names = "default"; > >> pinctrl-0 = <&sdmmc_clk>, <&sdmmc_cmd>, <&sdmmc_cd>, <&sdmmc_bus4>; > >> vmmc-supply = <&vcc_sd>; > >> > >> - vqmmc-supply = <&vccio_sd>; > >> + vqmmc-supply = <&vcc_sd>; > > > > that looks wrong. vccio_sd is still the vqmmc supply in the schematics > > even > > though we don't want to switch to 1.8V . But that regulator should still > > be > > I think the vccio_sd is just the one connected to the io_domains, but > the voltage source for the > pull up register is not vccio_sd but vcc_io. vqmmc-supply is the so called io-voltage according to the code and also the jedec spec (VCCQ). And the sdmmc0_vdd that vccio_sd is connected to is exactly that ... according to the rk3288 datasheet the "SDMMC0 Digital IO Power Supply", so that connection is not only meaningful for the iodomains, but _is_ an actual supply and if you turn off vccio_sd, you probably won't get any sdmmc transfers at all ;-) . So yes, due to the resistor misheap vccio_sd should stay limited to 3.3V, but its connection as vqmmc should stay. ^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH 0/2 v2] ARM: dts: rockchip: correct the regulators in firefly reload 2016-08-17 14:10 ` Heiko Stübner @ 2016-08-17 17:03 ` Randy Li 2016-08-17 17:03 ` [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for " Randy Li 2016-08-17 17:03 ` [PATCH 2/2] ARM: dts: rockchip: add missing regulators for firefly reload board Randy Li 0 siblings, 2 replies; 23+ messages in thread From: Randy Li @ 2016-08-17 17:03 UTC (permalink / raw) To: devicetree Cc: heiko, linux-kernel, linux-rockchip, linux-arm-kernel, linux, mark.rutland, Randy Li The last version forget to check the regulators in PMU. This verison would fix them. I have remove regualtor-always-on as much as possible. Randy Li (2): ARM: dts: rockchip: remove excess sd properties for firefly reload ARM: dts: rockchip: add missing regulators for firefly reload board arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 49 ++++------------ arch/arm/boot/dts/rk3288-firefly-reload.dts | 69 +++++++++++++++++++---- 2 files changed, 68 insertions(+), 50 deletions(-) -- 2.7.4 ^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for firefly reload 2016-08-17 17:03 ` [PATCH 0/2 v2] ARM: dts: rockchip: correct the regulators in " Randy Li @ 2016-08-17 17:03 ` Randy Li 2016-08-18 13:35 ` Heiko Stübner 2016-08-17 17:03 ` [PATCH 2/2] ARM: dts: rockchip: add missing regulators for firefly reload board Randy Li 1 sibling, 1 reply; 23+ messages in thread From: Randy Li @ 2016-08-17 17:03 UTC (permalink / raw) To: devicetree Cc: heiko, linux-kernel, linux-rockchip, linux-arm-kernel, linux, mark.rutland, Randy Li Because of a bug in hardware design, the sdcard at firefly rk3288 reload board can't switch the io voltage level to 1.8v. Signed-off-by: Randy Li <ayaka@soulik.info> --- arch/arm/boot/dts/rk3288-firefly-reload.dts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/arm/boot/dts/rk3288-firefly-reload.dts b/arch/arm/boot/dts/rk3288-firefly-reload.dts index 43145d1..b86419b 100644 --- a/arch/arm/boot/dts/rk3288-firefly-reload.dts +++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts @@ -202,11 +202,6 @@ bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; - sd-uhs-sdr12; - sd-uhs-sdr25; - sd-uhs-sdr50; - sd-uhs-sdr104; - sd-uhs-ddr50; card-detect-delay = <200>; disable-wp; num-slots = <1>; -- 2.7.4 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for firefly reload 2016-08-17 17:03 ` [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for " Randy Li @ 2016-08-18 13:35 ` Heiko Stübner 2016-08-18 14:20 ` ayaka 0 siblings, 1 reply; 23+ messages in thread From: Heiko Stübner @ 2016-08-18 13:35 UTC (permalink / raw) To: Randy Li Cc: devicetree, linux-kernel, linux-rockchip, linux-arm-kernel, linux, mark.rutland Am Donnerstag, 18. August 2016, 01:03:10 schrieb Randy Li: > Because of a bug in hardware design, the sdcard at firefly > rk3288 reload board can't switch the io voltage level to 1.8v. > > Signed-off-by: Randy Li <ayaka@soulik.info> applied to my dts32 branch for 4.9 In the future, please try to base your patches either on the correct dts branch in my repo [0] or simply on linux-next which does contain these too, as I did reorder some things when applying your initial firefly-reload patch. Thanks Heiko [0] https://git.kernel.org/cgit/linux/kernel/git/mmind/linux-rockchip.git/ [dts patches v4.x-armsoc/dts32 and v.x-armsoc/dts64 depending on what board you're working on] ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for firefly reload 2016-08-18 13:35 ` Heiko Stübner @ 2016-08-18 14:20 ` ayaka 0 siblings, 0 replies; 23+ messages in thread From: ayaka @ 2016-08-18 14:20 UTC (permalink / raw) To: Heiko Stübner Cc: devicetree, linux-kernel, linux-rockchip, linux-arm-kernel, linux, mark.rutland On 08/18/2016 09:35 PM, Heiko Stübner wrote: > Am Donnerstag, 18. August 2016, 01:03:10 schrieb Randy Li: >> Because of a bug in hardware design, the sdcard at firefly >> rk3288 reload board can't switch the io voltage level to 1.8v. >> >> Signed-off-by: Randy Li <ayaka@soulik.info> > applied to my dts32 branch for 4.9 > > In the future, please try to base your patches either on the correct dts > branch in my repo [0] or simply on linux-next which does contain these too, OK, I would based on linux-next time. > as I did reorder some things when applying your initial firefly-reload patch. Thank you for guide > > Thanks > Heiko > > > [0] https://git.kernel.org/cgit/linux/kernel/git/mmind/linux-rockchip.git/ > [dts patches v4.x-armsoc/dts32 and v.x-armsoc/dts64 depending on what board > you're working on] ^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH 2/2] ARM: dts: rockchip: add missing regulators for firefly reload board 2016-08-17 17:03 ` [PATCH 0/2 v2] ARM: dts: rockchip: correct the regulators in " Randy Li 2016-08-17 17:03 ` [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for " Randy Li @ 2016-08-17 17:03 ` Randy Li 2016-08-18 16:47 ` Heiko Stübner 1 sibling, 1 reply; 23+ messages in thread From: Randy Li @ 2016-08-17 17:03 UTC (permalink / raw) To: devicetree Cc: heiko, linux-kernel, linux-rockchip, linux-arm-kernel, linux, mark.rutland, Randy Li There are many regulators are missed in previous commit, this commit complete most of them. It also fix some mistakes in the regulator properties. The VDD_10(REG10) and VCC_18(REG11) had better to keep in always-on state, as it is used as the USB PHY supply, corretly we have no way to assign power supply to a USB PHY. The VCCA_33(REG8) should be enabled or the GMAC won't work. It also fix the wrong properties for audio in io-domains, the supply connected to APIO4_VDD is different to firefly release version. Signed-off-by: Randy Li <ayaka@soulik.info> --- arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 49 ++++------------- arch/arm/boot/dts/rk3288-firefly-reload.dts | 64 ++++++++++++++++++++--- 2 files changed, 68 insertions(+), 45 deletions(-) diff --git a/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi b/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi index 5e5a348..de315e8 100644 --- a/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi +++ b/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi @@ -50,14 +50,6 @@ reg = <0 0x80000000>; }; - dovdd_1v8: dovdd-1v8-regulator { - compatible = "regulator-fixed"; - regulator-name = "dovdd_1v8"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - vin-supply = <&vcc28_dvp>; - }; - ext_gmac: external-gmac-clock { compatible = "fixed-clock"; #clock-cells = <0>; @@ -65,14 +57,6 @@ clock-output-names = "ext_gmac"; }; - vbat_wl: vcc_sys: vsys-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc_sys"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - regulator-always-on; - regulator-boot-on; - }; vcc_flash: flash-regulator { compatible = "regulator-fixed"; @@ -81,17 +65,6 @@ regulator-max-microvolt = <1800000>; vin-supply = <&vcc_io>; }; - - vcc_5v: usb-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc_5v"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - regulator-always-on; - regulator-boot-on; - vin-supply = <&vcc_sys>; - }; - }; &cpu0 { @@ -206,34 +179,34 @@ regulator-name = "vccio_sd"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - regulator-always-on; }; vdd10_lcd: REG6 { regulator-name = "vdd10_lcd"; regulator-min-microvolt = <1000000>; regulator-max-microvolt = <1000000>; + }; + + vcca_18: REG7 { + regulator-name = "vcca_18"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; regulator-always-on; }; - vcca_33: REG7 { + vcca_33: REG8 { regulator-name = "vcca_33"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; + regulator-always-on; }; - vcc_lan: REG8 { + vcc_lan: REG9 { regulator-name = "vcca_lan"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; }; - vccio_pmu: REG9 { - regulator-name = "vccio_pmu"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - }; - vdd_10: REG10 { regulator-name = "vdd_10"; regulator-min-microvolt = <1000000>; @@ -245,14 +218,12 @@ regulator-name = "vcc_18"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; - regulator-always-on; }; vcc18_lcd: REG12 { regulator-name = "vcc18_lcd"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; - regulator-always-on; }; }; }; @@ -326,7 +297,7 @@ &io_domains { status = "okay"; - audio-supply = <&vcca_33>; + audio-supply = <&vccio_wl>; bb-supply = <&vcc_io>; dvp-supply = <&dovdd_1v8>; flash0-supply = <&vcc_flash>; diff --git a/arch/arm/boot/dts/rk3288-firefly-reload.dts b/arch/arm/boot/dts/rk3288-firefly-reload.dts index b86419b..7b710ea 100644 --- a/arch/arm/boot/dts/rk3288-firefly-reload.dts +++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts @@ -67,7 +67,16 @@ pinctrl-0 = <&work_led>; }; }; - + + vcc_5v: vcc_sys: vsys-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc_5v"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + regulator-boot-on; + }; + vcc_sd: sdmmc-regulator { compatible = "regulator-fixed"; gpio = <&gpio7 11 GPIO_ACTIVE_LOW>; @@ -115,10 +124,18 @@ vin-supply = <&vcc_5v>; }; - /* - * A TT8142 creates both dovdd_1v8 and vcc28_dvp, controlled - * by the dvp_pwr pin. - */ + dovdd_1v8: dovdd-1v8-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&dvp_pwr>; + regulator-name = "dovdd_1v8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + vin-supply = <&vcc_io>; + }; + vcc28_dvp: vcc28-dvp-regulator { compatible = "regulator-fixed"; enable-active-high; @@ -128,7 +145,38 @@ regulator-name = "vcc28_dvp"; regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; - regulator-always-on; + vin-supply = <&vcc_io>; + }; + + af_28: af_28-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&dvp_pwr>; + regulator-name = "af_28"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + vin-supply = <&vcc_io>; + }; + + dvdd_1v2: af_28-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&cif_pwr>; + regulator-name = "dvdd_1v2"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + vin-supply = <&vcc_io>; + }; + + vbat_wl: wifi-regulator { + compatible = "regulator-fixed"; + regulator-name = "vbat_wl"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; vin-supply = <&vcc_io>; }; @@ -278,6 +326,10 @@ dvp_pwr: dvp-pwr { rockchip,pins = <0 11 RK_FUNC_GPIO &pcfg_pull_none>; }; + + cif_pwr: cif-pwr { + rockchip,pins = <7 12 RK_FUNC_GPIO &pcfg_pull_none>; + }; }; hym8563 { -- 2.7.4 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH 2/2] ARM: dts: rockchip: add missing regulators for firefly reload board 2016-08-17 17:03 ` [PATCH 2/2] ARM: dts: rockchip: add missing regulators for firefly reload board Randy Li @ 2016-08-18 16:47 ` Heiko Stübner 0 siblings, 0 replies; 23+ messages in thread From: Heiko Stübner @ 2016-08-18 16:47 UTC (permalink / raw) To: Randy Li Cc: devicetree, linux-kernel, linux-rockchip, linux-arm-kernel, linux, mark.rutland Am Donnerstag, 18. August 2016, 01:03:11 schrieb Randy Li: > There are many regulators are missed in previous commit, this > commit complete most of them. It also fix some mistakes in the > regulator properties. The VDD_10(REG10) and VCC_18(REG11) had better > to keep in always-on state, as it is used as the USB PHY supply, > corretly we have no way to assign power supply to a USB PHY. > The VCCA_33(REG8) should be enabled or the GMAC won't work. > > It also fix the wrong properties for audio in io-domains, the supply > connected to APIO4_VDD is different to firefly release version. > > Signed-off-by: Randy Li <ayaka@soulik.info> applied to my dts32 branch for 4.9 Thanks Heiko ^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH 2/2] ARM: dts: rockchip: add missing regulators for firefly reload board 2016-08-14 11:27 ` [PATCH 0/2] ARM: dts: rockchip: correct the regulators in firefly reload Randy Li 2016-08-14 11:27 ` [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for " Randy Li @ 2016-08-14 11:27 ` Randy Li 1 sibling, 0 replies; 23+ messages in thread From: Randy Li @ 2016-08-14 11:27 UTC (permalink / raw) To: devicetree Cc: linux-kernel, linux-rockchip, linux-arm-kernel, linux, mark.rutland, heiko, Randy Li There are many regulators are missed in previous commit, this commit complete most of them. It also fix some mistakes in the regulator properties. It also fix the wrong properties for audio in io-domains, the supply connected to APIO4_VDD is different to firefly release version. Signed-off-by: Randy Li <ayaka@soulik.info> --- arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 29 +--------- arch/arm/boot/dts/rk3288-firefly-reload.dts | 64 ++++++++++++++++++++--- 2 files changed, 59 insertions(+), 34 deletions(-) diff --git a/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi b/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi index 5e5a348..33999d3 100644 --- a/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi +++ b/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi @@ -50,14 +50,6 @@ reg = <0 0x80000000>; }; - dovdd_1v8: dovdd-1v8-regulator { - compatible = "regulator-fixed"; - regulator-name = "dovdd_1v8"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - vin-supply = <&vcc28_dvp>; - }; - ext_gmac: external-gmac-clock { compatible = "fixed-clock"; #clock-cells = <0>; @@ -65,14 +57,6 @@ clock-output-names = "ext_gmac"; }; - vbat_wl: vcc_sys: vsys-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc_sys"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - regulator-always-on; - regulator-boot-on; - }; vcc_flash: flash-regulator { compatible = "regulator-fixed"; @@ -81,17 +65,6 @@ regulator-max-microvolt = <1800000>; vin-supply = <&vcc_io>; }; - - vcc_5v: usb-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc_5v"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - regulator-always-on; - regulator-boot-on; - vin-supply = <&vcc_sys>; - }; - }; &cpu0 { @@ -326,7 +299,7 @@ &io_domains { status = "okay"; - audio-supply = <&vcca_33>; + audio-supply = <&vccio_wl>; bb-supply = <&vcc_io>; dvp-supply = <&dovdd_1v8>; flash0-supply = <&vcc_flash>; diff --git a/arch/arm/boot/dts/rk3288-firefly-reload.dts b/arch/arm/boot/dts/rk3288-firefly-reload.dts index a2b1f14..0f5a7c1 100644 --- a/arch/arm/boot/dts/rk3288-firefly-reload.dts +++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts @@ -67,7 +67,16 @@ pinctrl-0 = <&work_led>; }; }; - + + vcc_5v: vcc_sys: vsys-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc_5v"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + regulator-boot-on; + }; + vcc_sd: sdmmc-regulator { compatible = "regulator-fixed"; gpio = <&gpio7 11 GPIO_ACTIVE_LOW>; @@ -115,10 +124,18 @@ vin-supply = <&vcc_5v>; }; - /* - * A TT8142 creates both dovdd_1v8 and vcc28_dvp, controlled - * by the dvp_pwr pin. - */ + dovdd_1v8: dovdd-1v8-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&dvp_pwr>; + regulator-name = "dovdd_1v8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + vin-supply = <&vcc_io>; + }; + vcc28_dvp: vcc28-dvp-regulator { compatible = "regulator-fixed"; enable-active-high; @@ -128,7 +145,38 @@ regulator-name = "vcc28_dvp"; regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; - regulator-always-on; + vin-supply = <&vcc_io>; + }; + + af_28: af_28-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&dvp_pwr>; + regulator-name = "af_28"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + vin-supply = <&vcc_io>; + }; + + dvdd_1v2: af_28-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&cif_pwr>; + regulator-name = "dvdd_1v2"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + vin-supply = <&vcc_io>; + }; + + vbat_wl: wifi-regulator { + compatible = "regulator-fixed"; + regulator-name = "vbat_wl"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; vin-supply = <&vcc_io>; }; @@ -278,6 +326,10 @@ dvp_pwr: dvp-pwr { rockchip,pins = <0 11 RK_FUNC_GPIO &pcfg_pull_none>; }; + + cif_pwr: cif-pwr { + rockchip,pins = <7 12 RK_FUNC_GPIO &pcfg_pull_none>; + }; }; hym8563 { -- 2.7.4 ^ permalink raw reply related [flat|nested] 23+ messages in thread
end of thread, other threads:[~2016-08-19 4:22 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <1549971.ctkvOGm2xW@diego>
2016-07-18 15:32 ` [PATCH v2] ARM: dts: add rk3288-firefly-reload Randy Li
2016-07-18 15:32 ` [PATCH] " Randy Li
2016-07-18 19:46 ` Heiko Stübner
2016-08-07 3:40 ` Shawn Lin
2016-08-07 14:44 ` Heiko Stuebner
2016-08-08 2:29 ` Shawn Lin
2016-08-09 9:28 ` 陈豪
2016-08-09 10:02 ` 陈豪
2016-08-09 10:06 ` Randy Li
2016-08-09 10:58 ` Heiko Stübner
2016-08-10 1:12 ` Randy Li
2016-08-14 11:27 ` [PATCH 0/2] ARM: dts: rockchip: correct the regulators in firefly reload Randy Li
2016-08-14 11:27 ` [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for " Randy Li
2016-08-14 12:30 ` Heiko Stuebner
2016-08-14 12:38 ` ayaka
2016-08-17 14:10 ` Heiko Stübner
2016-08-17 17:03 ` [PATCH 0/2 v2] ARM: dts: rockchip: correct the regulators in " Randy Li
2016-08-17 17:03 ` [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for " Randy Li
2016-08-18 13:35 ` Heiko Stübner
2016-08-18 14:20 ` ayaka
2016-08-17 17:03 ` [PATCH 2/2] ARM: dts: rockchip: add missing regulators for firefly reload board Randy Li
2016-08-18 16:47 ` Heiko Stübner
2016-08-14 11:27 ` Randy Li
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).