ARM: dts: the dts support for rk3288 firefly reload
cover ARM: dts: the dts support for rk3288 firefly reload
The rk3288 firefly reload is a Rockchip RK3288 based board be found by core board and main board. The regulators are connected in a different way to the previous version of firefly boards, it is necessary to move some common code to uncommon place.
I only tested the ethernet and confirmed that works.
ayaka (3):
ARM: dts: add label leds for rk3288-firefly.dtsi
ARM: dts: move regulator settings from common to specifics
ARM: dts: add rk3288-firefly-reload
arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/rk3288-firefly-beta.dts | 30 ++++++++ arch/arm/boot/dts/rk3288-firefly-reload.dts | 109 ++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly.dts | 30 ++++++++ arch/arm/boot/dts/rk3288-firefly.dtsi | 16 ++-- 5 files changed, 178 insertions(+), 8 deletions(-) create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload.dts
Signature · 1 line
2.7.4
PATCH 1/3 ARM: dts: add label leds for rk3288-firefly.dtsi
The connected leds are different in firefly and firefly reload. Adding this label making it is possible to add more leds.
--- arch/arm/boot/dts/rk3288-firefly.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/rk3288-firefly.dtsi +1 -1
@@ -99,7 +99,7 @@ }; }; - leds { + leds: leds { compatible = "gpio-leds"; work {
Signature · 1 line
2.7.4
PATCH 2/3 ARM: dts: move regulator settings from common to specifics
In reply to ayakaThe regulator settings are the same in the firefly beta and firefly. But the firefly reload is different. I remove the difference part from the common header dtsi, but remained those common one to keep references.
--- arch/arm/boot/dts/rk3288-firefly-beta.dts | 30 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly.dts | 30 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly.dtsi | 14 +++++++------- 3 files changed, 67 insertions(+), 7 deletions(-)
arch/arm/boot/dts/rk3288-firefly-beta.dts +30 -0
@@ -69,3 +69,33 @@ &pwm0 { status = "okay"; }; + +&gmac { + phy-supply = <&vcc_lan>; +}; + +&io_domains { + audio-supply = <&vcca_33>; + flash1-supply = <&vcc_lan>; +}; + +®ulators { + vcca_18: REG7 { + regulator-name = "vcca_18"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + vcca_33: REG8 { + regulator-name = "vcca_33"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vcc_lan: REG9 { + regulator-name = "vcc_lan"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; +};
arch/arm/boot/dts/rk3288-firefly.dts +30 -0
@@ -69,3 +69,33 @@ &pwm1 { status = "okay"; }; + +&gmac { + phy-supply = <&vcc_lan>; +}; + +&io_domains { + audio-supply = <&vcca_33>; + flash1-supply = <&vcc_lan>; +}; + +®ulators { + vcca_18: REG7 { + regulator-name = "vcca_18"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + vcca_33: REG8 { + regulator-name = "vcca_33"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vcc_lan: REG9 { + regulator-name = "vcc_lan"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; +};
arch/arm/boot/dts/rk3288-firefly.dtsi +7 -7
@@ -68,11 +68,9 @@ compatible = "rockchip,rk3288-io-voltage-domain"; rockchip,grf = <&grf>; - 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>;
@@ -225,7 +223,6 @@ 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>;
@@ -296,7 +293,7 @@ inl2-supply = <&vcc_sys>; inl3-supply = <&vcc_20>; - regulators { + regulators: regulators { vcc_ddr: REG1 { regulator-name = "vcc_ddr"; regulator-min-microvolt = <1200000>;
@@ -339,24 +336,27 @@ regulator-always-on; }; - vcca_18: REG7 { + REG7 { regulator-name = "vcca_18"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; }; - vcca_33: REG8 { + + REG8 { regulator-name = "vcca_33"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; + regulator-always-on; }; - vcc_lan: REG9 { + REG9 { regulator-name = "vcc_lan"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; }; + vdd_10: REG10 { regulator-name = "vdd_10"; regulator-min-microvolt = <1000000>;
Signature · 1 line
2.7.4
Heiko Stuebner
maintainerRe: [PATCH 2/3] ARM: dts: move regulator settings from common to specifics
Hi,
Am Mittwoch, 6. Juli 2016, 23:25:23 schrieb ayaka:
Quoted 6 lines
The regulator settings are the same in the firefly beta and firefly. But the firefly reload is different. I remove the difference part from the common header dtsi, but remained those common one to keep references.
Signed-off-by ayaka <[email protected]>
applies to all 3 patches: we require real names both in the patch/mail from as well as the Signed-off-by line, see [0] at number 11. To my untrained eye the name given doesn't look like a real name, please correct me if I'm wrong.
[0] https://www.kernel.org/doc/Documentation/SubmittingPatches
Quoted 13 lines
--- arch/arm/boot/dts/rk3288-firefly-beta.dts | 30 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly.dts | 30 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly.dtsi | 14 +++++++------- 3 files changed, 67 insertions(+), 7 deletions(-)(quoted diff) +0
-0
b/arch/arm/boot/dts/rk3288-firefly-beta.dtsindex 75d77e3..6c08dae2 100644
arch/arm/boot/dts/rk3288-firefly-beta.dts line 75
Quoted 7 lines
arch/arm/boot/dts/rk3288-firefly-beta.dts +4
-0@@ -69,3 +69,33 @@ &pwm0 { status = "okay"; }; + +&gmac { + phy-supply = <&vcc_lan>; +};
Not 100% sure, but I guess this does not need to be duplicated. The supply is named vcc_lan in all board revisions only the supplying regulator seems different, so it should be enough to point the vcc_lan phandle to the correct regulator in the relevant file, but the gmac assignment could stay in the main file?
arch/arm/boot/dts/rk3288-firefly-beta.dts line 80
Quoted 5 lines
arch/arm/boot/dts/rk3288-firefly-beta.dts +5
-0+ +&io_domains { + audio-supply = <&vcca_33>; + flash1-supply = <&vcc_lan>; +};
same here
Quoted 84 lines
arch/arm/boot/dts/rk3288-firefly-beta.dts +21
-0+ +®ulators { + vcca_18: REG7 { + regulator-name = "vcca_18"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + vcca_33: REG8 { + regulator-name = "vcca_33"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vcc_lan: REG9 { + regulator-name = "vcc_lan"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; +};(quoted diff) +0
-0
b/arch/arm/boot/dts/rk3288-firefly.dtsindex c07fe92..1964b6f 100644arch/arm/boot/dts/rk3288-firefly.dts +30
-0@@ -69,3 +69,33 @@ &pwm1 { status = "okay"; }; + +&gmac { + phy-supply = <&vcc_lan>; +}; + +&io_domains { + audio-supply = <&vcca_33>; + flash1-supply = <&vcc_lan>; +}; + +®ulators { + vcca_18: REG7 { + regulator-name = "vcca_18"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + vcca_33: REG8 { + regulator-name = "vcca_33"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vcc_lan: REG9 { + regulator-name = "vcc_lan"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; +};(quoted diff) +0
-0
b/arch/arm/boot/dts/rk3288-firefly.dtsiindex 1d7f03c..205348f 100644arch/arm/boot/dts/rk3288-firefly.dtsi +0
-3@@ -68,11 +68,9 @@ compatible = "rockchip,rk3288-io-voltage-domain"; rockchip,grf = <&grf>; - 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>;@@ -225,7 +223,6 @@ 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>;
arch/arm/boot/dts/rk3288-firefly.dtsi line 296
Quoted 5 lines
arch/arm/boot/dts/rk3288-firefly.dtsi +1
-1@@ -296,7 +293,7 @@ inl2-supply = <&vcc_sys>; inl3-supply = <&vcc_20>; - regulators { + regulators: regulators {
the phandle name is to generic, as this is part of the act8846 and not something generic. So please name the phandle act8846_regulators / act8846_regs or so.
Quoted 6 lines
arch/arm/boot/dts/rk3288-firefly.dtsi +0
-0vcc_ddr: REG1 { regulator-name = "vcc_ddr"; regulator-min-microvolt = <1200000>;@@ -339,24 +336,27 @@ regulator-always-on; };
arch/arm/boot/dts/rk3288-firefly.dtsi line 345
Quoted 10 lines
arch/arm/boot/dts/rk3288-firefly.dtsi +2
-2- vcca_18: REG7 { + REG7 { regulator-name = "vcca_18"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; }; - vcca_33: REG8 { +
unecessary new empty line
Quoted 5 lines
arch/arm/boot/dts/rk3288-firefly.dtsi +2
-0+ REG8 { regulator-name = "vcca_33"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; + regulator-always-on;
arch/arm/boot/dts/rk3288-firefly.dtsi line 359
Quoted 10 lines
arch/arm/boot/dts/rk3288-firefly.dtsi +2
-1}; - vcc_lan: REG9 { + REG9 { regulator-name = "vcc_lan"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; }; +
unecessary new empty line
Quoted 5 lines
arch/arm/boot/dts/rk3288-firefly.dtsi +0
-1vdd_10: REG10 { regulator-name = "vdd_10"; regulator-min-microvolt = <1000000>; --2.7.4
Heiko
[PATCH 0/3] Re: [PATCH 2/3] ARM: dts: move regulator settings from common to specifics
I am sorry to make this mistake. I have re-sent my patches. Thank you for reminding me that.
I hope that I make it correct this time.
ayaka (3):
ARM: dts: add label leds for rk3288-firefly.dtsi
ARM: dts: move regulator settings from common to specifics
ARM: dts: add rk3288-firefly-reload
arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/rk3288-firefly-beta.dts | 30 ++++++++ arch/arm/boot/dts/rk3288-firefly-reload.dts | 109 ++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly.dts | 30 ++++++++ arch/arm/boot/dts/rk3288-firefly.dtsi | 16 ++-- 5 files changed, 178 insertions(+), 8 deletions(-) create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload.dts
Signature · 1 line
2.7.4
PATCH 1/3 ARM: dts: add label leds for rk3288-firefly.dtsi
From: ayaka <[email protected]>
The connected leds are different in firefly release version and firefly reload.
Adding this label making it is possible to add more leds.
--- arch/arm/boot/dts/rk3288-firefly.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/rk3288-firefly.dtsi +1 -1
@@ -99,7 +99,7 @@ }; }; - leds { + leds: leds { compatible = "gpio-leds"; work {
Signature · 1 line
2.7.4
PATCH 2/3 ARM: dts: move regulator settings from common to specifics
In reply to Randy LiFrom: ayaka <[email protected]>
The regulator settings are the same in the firefly beta and firefly release version. But the firefly reload is different. I remove the different part from the common header dtsi file, but remained those common one to keep references.
--- arch/arm/boot/dts/rk3288-firefly-beta.dts | 30 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly.dts | 30 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly.dtsi | 14 +++++++------- 3 files changed, 67 insertions(+), 7 deletions(-)
arch/arm/boot/dts/rk3288-firefly-beta.dts +30 -0
@@ -69,3 +69,33 @@ &pwm0 { status = "okay"; }; + +&gmac { + phy-supply = <&vcc_lan>; +}; + +&io_domains { + audio-supply = <&vcca_33>; + flash1-supply = <&vcc_lan>; +}; + +®ulators { + vcca_18: REG7 { + regulator-name = "vcca_18"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + vcca_33: REG8 { + regulator-name = "vcca_33"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vcc_lan: REG9 { + regulator-name = "vcc_lan"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; +};
arch/arm/boot/dts/rk3288-firefly.dts +30 -0
@@ -69,3 +69,33 @@ &pwm1 { status = "okay"; }; + +&gmac { + phy-supply = <&vcc_lan>; +}; + +&io_domains { + audio-supply = <&vcca_33>; + flash1-supply = <&vcc_lan>; +}; + +®ulators { + vcca_18: REG7 { + regulator-name = "vcca_18"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + vcca_33: REG8 { + regulator-name = "vcca_33"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vcc_lan: REG9 { + regulator-name = "vcc_lan"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; +};
arch/arm/boot/dts/rk3288-firefly.dtsi +7 -7
@@ -68,11 +68,9 @@ compatible = "rockchip,rk3288-io-voltage-domain"; rockchip,grf = <&grf>; - 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>;
@@ -225,7 +223,6 @@ 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>;
@@ -296,7 +293,7 @@ inl2-supply = <&vcc_sys>; inl3-supply = <&vcc_20>; - regulators { + regulators: regulators { vcc_ddr: REG1 { regulator-name = "vcc_ddr"; regulator-min-microvolt = <1200000>;
@@ -339,24 +336,27 @@ regulator-always-on; }; - vcca_18: REG7 { + REG7 { regulator-name = "vcca_18"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; }; - vcca_33: REG8 { + + REG8 { regulator-name = "vcca_33"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; + regulator-always-on; }; - vcc_lan: REG9 { + REG9 { regulator-name = "vcc_lan"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; }; + vdd_10: REG10 { regulator-name = "vdd_10"; regulator-min-microvolt = <1000000>;
Signature · 1 line
2.7.4
PATCH 3/3 ARM: dts: add rk3288-firefly-reload
In reply to Randy LiFrom: ayaka <[email protected]>
The firefly rk3288 reload is a Rockchip rk3288 based develop board.
--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/rk3288-firefly-reload.dts | 109 ++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload.dts
arch/arm/boot/dts/Makefile +1 -0
@@ -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 \
arch/arm/boot/dts/rk3288-firefly-reload.dts new file +109 -0
109 lines not on this page · raw message
Signature · 1 line
2.7.4
[PATCH 0/3] Re:[PATCH 2/3] ARM: dts: move regulator settings from common to specifics
In reply to Heiko StuebnerI am very sorry very sorry, the last time I sent are still wrong. I forget to reset the author. Please drop the below ones, and have a review on this time.
I am sorry to waste your time.
Randy Li (3):
ARM: dts: add label leds for rk3288-firefly.dtsi
ARM: dts: move regulator settings from common to specifics
ARM: dts: add rk3288-firefly-reload
arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/rk3288-firefly-beta.dts | 30 ++++++++ arch/arm/boot/dts/rk3288-firefly-reload.dts | 109 ++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly.dts | 30 ++++++++ arch/arm/boot/dts/rk3288-firefly.dtsi | 16 ++-- 5 files changed, 178 insertions(+), 8 deletions(-) create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload.dts
Signature · 1 line
2.7.4
PATCH 1/3 ARM: dts: add label leds for rk3288-firefly.dtsi
The connected leds are different in firefly release version and firefly reload.
Adding this label making it is possible to add more leds.
--- arch/arm/boot/dts/rk3288-firefly.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/rk3288-firefly.dtsi +1 -1
@@ -99,7 +99,7 @@ }; }; - leds { + leds: leds { compatible = "gpio-leds"; work {
Signature · 1 line
2.7.4
PATCH 2/3 ARM: dts: move regulator settings from common to specifics
In reply to Randy LiThe regulator settings are the same in the firefly beta and firefly release version. But the firefly reload is different. I remove the different part from the common header dtsi file, but remained those common one to keep references.
--- arch/arm/boot/dts/rk3288-firefly-beta.dts | 30 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly.dts | 30 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly.dtsi | 14 +++++++------- 3 files changed, 67 insertions(+), 7 deletions(-)
arch/arm/boot/dts/rk3288-firefly-beta.dts +30 -0
@@ -69,3 +69,33 @@ &pwm0 { status = "okay"; }; + +&gmac { + phy-supply = <&vcc_lan>; +}; + +&io_domains { + audio-supply = <&vcca_33>; + flash1-supply = <&vcc_lan>; +}; + +®ulators { + vcca_18: REG7 { + regulator-name = "vcca_18"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + vcca_33: REG8 { + regulator-name = "vcca_33"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vcc_lan: REG9 { + regulator-name = "vcc_lan"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; +};
arch/arm/boot/dts/rk3288-firefly.dts +30 -0
@@ -69,3 +69,33 @@ &pwm1 { status = "okay"; }; + +&gmac { + phy-supply = <&vcc_lan>; +}; + +&io_domains { + audio-supply = <&vcca_33>; + flash1-supply = <&vcc_lan>; +}; + +®ulators { + vcca_18: REG7 { + regulator-name = "vcca_18"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + vcca_33: REG8 { + regulator-name = "vcca_33"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vcc_lan: REG9 { + regulator-name = "vcc_lan"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; +};
arch/arm/boot/dts/rk3288-firefly.dtsi +7 -7
@@ -68,11 +68,9 @@ compatible = "rockchip,rk3288-io-voltage-domain"; rockchip,grf = <&grf>; - 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>;
@@ -225,7 +223,6 @@ 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>;
@@ -296,7 +293,7 @@ inl2-supply = <&vcc_sys>; inl3-supply = <&vcc_20>; - regulators { + regulators: regulators { vcc_ddr: REG1 { regulator-name = "vcc_ddr"; regulator-min-microvolt = <1200000>;
@@ -339,24 +336,27 @@ regulator-always-on; }; - vcca_18: REG7 { + REG7 { regulator-name = "vcca_18"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; }; - vcca_33: REG8 { + + REG8 { regulator-name = "vcca_33"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; + regulator-always-on; }; - vcc_lan: REG9 { + REG9 { regulator-name = "vcc_lan"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; }; + vdd_10: REG10 { regulator-name = "vdd_10"; regulator-min-microvolt = <1000000>;
Signature · 1 line
2.7.4
PATCH 3/3 ARM: dts: add rk3288-firefly-reload
In reply to Randy LiThe firefly rk3288 reload is a Rockchip rk3288 based develop board.
--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/rk3288-firefly-reload.dts | 109 ++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload.dts
arch/arm/boot/dts/Makefile +1 -0
@@ -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 \
arch/arm/boot/dts/rk3288-firefly-reload.dts new file +109 -0
109 lines not on this page · raw message
Signature · 1 line
2.7.4
Re: [PATCH 2/3] ARM: dts: move regulator settings from common to specifics
In reply to Heiko Stuebnerat July, 7th, Heiko Stuebner Wrote:
Quoted 35 lines
Hi,
Am Mittwoch, 6. Juli 2016, 23:25:23 schrieb ayaka:
Quoted 6 lines
The regulator settings are the same in the firefly beta and firefly. But the firefly reload is different. I remove the difference part from the common header dtsi, but remained those common one to keep references.
Signed-off-by ayaka <[email protected]>applies to all 3 patches: we require real names both in the patch/mail from as well as the Signed-off-by line, see [0] at number 11. To my untrained eye the name given doesn't look like a real name, please correct me if I'm wrong.
[0] https://www.kernel.org/doc/Documentation/SubmittingPatches
Quoted 17 lines
--- arch/arm/boot/dts/rk3288-firefly-beta.dts | 30 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly.dts | 30 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly.dtsi | 14 +++++++------- 3 files changed, 67 insertions(+), 7 deletions(-)(quoted diff) +0
-0
b/arch/arm/boot/dts/rk3288-firefly-beta.dtsindex 75d77e3..6c08dae2 100644arch/arm/boot/dts/rk3288-firefly-beta.dts +1
-0@@ -69,3 +69,33 @@ &pwm0 { status = "okay"; }; +
Quoted 9 lines
arch/arm/boot/dts/rk3288-firefly-beta.dts line 75
Quoted 3 lines
arch/arm/boot/dts/rk3288-firefly-beta.dts +3
-0+&gmac { + phy-supply = <&vcc_lan>; +};Not 100% sure, but I guess this does not need to be duplicated. The supply is named
vcc_lanin all board revisions only the supplying regulator seems different, so it should be enough to point thevcc_lanphandle to the correct regulator in the relevant file, but the gmac assignment could stay in the main file?
But I can't have two label in two different place.
So I have no choice but to do so. If the dts compiler in kernel support the overwrite now and unresolved symbols now, I would glad to know that.
Quoted 94 lines
arch/arm/boot/dts/rk3288-firefly-beta.dts line 80
Quoted 5 lines
arch/arm/boot/dts/rk3288-firefly-beta.dts +5
-0+ +&io_domains { + audio-supply = <&vcca_33>; + flash1-supply = <&vcc_lan>; +};same here
Quoted 87 lines
arch/arm/boot/dts/rk3288-firefly-beta.dts +21
-0+ +®ulators { + vcca_18: REG7 { + regulator-name = "vcca_18"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + vcca_33: REG8 { + regulator-name = "vcca_33"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vcc_lan: REG9 { + regulator-name = "vcc_lan"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; +};(quoted diff) +0
-0
b/arch/arm/boot/dts/rk3288-firefly.dtsindex c07fe92..1964b6f 100644arch/arm/boot/dts/rk3288-firefly.dts +30
-0@@ -69,3 +69,33 @@ &pwm1 { status = "okay"; }; + +&gmac { + phy-supply = <&vcc_lan>; +}; + +&io_domains { + audio-supply = <&vcca_33>; + flash1-supply = <&vcc_lan>; +}; + +®ulators { + vcca_18: REG7 { + regulator-name = "vcca_18"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + vcca_33: REG8 { + regulator-name = "vcca_33"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vcc_lan: REG9 { + regulator-name = "vcc_lan"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; +};(quoted diff) +0
-0
b/arch/arm/boot/dts/rk3288-firefly.dtsiindex 1d7f03c..205348f 100644arch/arm/boot/dts/rk3288-firefly.dtsi +0
-3@@ -68,11 +68,9 @@ compatible = "rockchip,rk3288-io-voltage-domain"; rockchip,grf = <&grf>; - 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>;@@ -225,7 +223,6 @@ 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>;@@ -296,7 +293,7 @@ inl2-supply = <&vcc_sys>; inl3-supply = <&vcc_20>;
Quoted 5 lines
arch/arm/boot/dts/rk3288-firefly.dtsi line 296
Quoted 2 lines
arch/arm/boot/dts/rk3288-firefly.dtsi +1
-1- regulators { + regulators: regulators {the phandle name is to generic, as this is part of the act8846 and not something generic. So please name the phandle
act8846_regulators/act8846_regsor so.
I forget that, I would re-send new patches. I am very sorry to re-send the same patches three times.
I should not be such hurry.
Quoted 15 lines
Quoted 15 lines
arch/arm/boot/dts/rk3288-firefly.dtsi +1
-1vcc_ddr: REG1 { regulator-name = "vcc_ddr"; regulator-min-microvolt = <1200000>;@@ -339,24 +336,27 @@ regulator-always-on; }; - vcca_18: REG7 { + REG7 { regulator-name = "vcca_18"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; };
Quoted 3 lines
arch/arm/boot/dts/rk3288-firefly.dtsi line 345
Quoted 2 lines
arch/arm/boot/dts/rk3288-firefly.dtsi +1
-1- vcca_33: REG8 { +unecessary new empty line
It would be removed
Quoted 14 lines
Quoted 14 lines
arch/arm/boot/dts/rk3288-firefly.dtsi +3
-1+ REG8 { regulator-name = "vcca_33"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; + regulator-always-on; }; - vcc_lan: REG9 { + REG9 { regulator-name = "vcc_lan"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; };
Quoted 2 lines
arch/arm/boot/dts/rk3288-firefly.dtsi line 359
Quoted 1 line
arch/arm/boot/dts/rk3288-firefly.dtsi +1
-0+unecessary new empty line
It would be removed
Quoted 8 lines
Quoted 6 lines
arch/arm/boot/dts/rk3288-firefly.dtsi +0
-1vdd_10: REG10 { regulator-name = "vdd_10"; regulator-min-microvolt = <1000000>; --2.7.4
Heiko
cover ARM: dts: the dts support for rk3288 firefly reload
In reply to Heiko StuebnerThe rk3288 firefly reload is a Rockchip RK3288 based board be found by core board and main board. The regulators are connected in a different way to the previous version of firefly boards, it is necessary to move some common code to uncommon place.
I only tested the ethernet and confirmed that works. The usb in this board won't caused by the bugs in the driver.
This version follow the suggests from Heiko Stuebner, except the duplicated supply name problem, I don't think it could be fixed in that way.
Randy Li (3):
ARM: dts: add label leds for rk3288-firefly.dtsi
ARM: dts: move regulator settings from common to specifics
ARM: dts: add rk3288-firefly-reload
arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/rk3288-firefly-beta.dts | 30 ++++++++ arch/arm/boot/dts/rk3288-firefly-reload.dts | 109 ++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly.dts | 30 ++++++++ arch/arm/boot/dts/rk3288-firefly.dtsi | 16 ++-- 5 files changed, 178 insertions(+), 8 deletions(-) create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload.dts
Signature · 1 line
2.7.4
PATCH 1/3 ARM: dts: add label leds for rk3288-firefly.dtsi
The connected leds are different in firefly release version and firefly reload.
Adding this label making it is possible to add more leds.
--- arch/arm/boot/dts/rk3288-firefly.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/rk3288-firefly.dtsi +1 -1
@@ -99,7 +99,7 @@ }; }; - leds { + leds: leds { compatible = "gpio-leds"; work {
Signature · 1 line
2.7.4
PATCH 2/3 ARM: dts: move regulator settings from common to specifics
In reply to Randy LiThe regulator settings are the same in the firefly beta and firefly release version. But the firefly reload is different. I remove the different part from the common header dtsi file, but remained those common one to keep references.
--- arch/arm/boot/dts/rk3288-firefly-beta.dts | 30 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly.dts | 30 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly.dtsi | 12 +++++------- 3 files changed, 65 insertions(+), 7 deletions(-)
arch/arm/boot/dts/rk3288-firefly-beta.dts +30 -0
@@ -69,3 +69,33 @@ &pwm0 { status = "okay"; }; + +&gmac { + phy-supply = <&vcc_lan>; +}; + +&io_domains { + audio-supply = <&vcca_33>; + flash1-supply = <&vcc_lan>; +}; + +&act8846_regs { + vcca_18: REG7 { + regulator-name = "vcca_18"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + vcca_33: REG8 { + regulator-name = "vcca_33"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vcc_lan: REG9 { + regulator-name = "vcc_lan"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; +};
arch/arm/boot/dts/rk3288-firefly.dts +30 -0
@@ -69,3 +69,33 @@ &pwm1 { status = "okay"; }; + +&gmac { + phy-supply = <&vcc_lan>; +}; + +&io_domains { + audio-supply = <&vcca_33>; + flash1-supply = <&vcc_lan>; +}; + +&act8846_regs { + vcca_18: REG7 { + regulator-name = "vcca_18"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + vcca_33: REG8 { + regulator-name = "vcca_33"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vcc_lan: REG9 { + regulator-name = "vcc_lan"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; +};
arch/arm/boot/dts/rk3288-firefly.dtsi +5 -7
@@ -68,11 +68,9 @@ compatible = "rockchip,rk3288-io-voltage-domain"; rockchip,grf = <&grf>; - 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>;
@@ -225,7 +223,6 @@ 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>;
@@ -296,7 +293,7 @@ inl2-supply = <&vcc_sys>; inl3-supply = <&vcc_20>; - regulators { + act8846_regs: regulators { vcc_ddr: REG1 { regulator-name = "vcc_ddr"; regulator-min-microvolt = <1200000>;
@@ -339,19 +336,20 @@ regulator-always-on; }; - vcca_18: REG7 { + REG7 { regulator-name = "vcca_18"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; }; - vcca_33: REG8 { + REG8 { regulator-name = "vcca_33"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; + regulator-always-on; }; - vcc_lan: REG9 { + REG9 { regulator-name = "vcc_lan"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
Signature · 1 line
2.7.4
PATCH 3/3 ARM: dts: add rk3288-firefly-reload
In reply to Randy LiThe firefly rk3288 reload is a Rockchip rk3288 based develop board.
--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/rk3288-firefly-reload.dts | 109 ++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload.dts
arch/arm/boot/dts/Makefile +1 -0
@@ -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 \
arch/arm/boot/dts/rk3288-firefly-reload.dts new file +109 -0
109 lines not on this page · raw message
Signature · 1 line
2.7.4
Heiko Stuebner
maintainerHi Randy,
Am Donnerstag, 7. Juli 2016, 02:22:57 schrieb Randy Li:
Quoted 11 lines
The rk3288 firefly reload is a Rockchip RK3288 based board be found by core board and main board. The regulators are connected in a different way to the previous version of firefly boards, it is necessary to move some common code to uncommon place.
I only tested the ethernet and confirmed that works. The usb in this board won't caused by the bugs in the driver.
This version follow the suggests from Heiko Stuebner, except the duplicated supply name problem, I don't think it could be fixed in that way.
I've now had a chance to look at that reload board on the firefly site. Firefly also is the company name, so a board named that way is not necessarily a "variant" :-) .
And looking at the "reload" board this definitly seems to be a very different product with it being a system-on-module+baseboard design with additional peripherals like that sata bridge, camera interfaces and probably more.
As you might've seen, most Rockchip boards are based on some reference- design, so are similar in a big part of their core layout.
So, looking at the vastly different product the reload is, I'd really like to have a separate dts for the reload, to not run into more confusing differences later on.
Also, when adding a new board, please also add an entry to Documentation/devicetree/bindingd/arm/rockchip.txt
Thanks
Heiko
Thank you for you review, HeiKo
Quoted 14 lines · Heiko Stuebner
Hi Randy,
Am Donnerstag, 7. Juli 2016, 02:22:57 schrieb Randy Li:
Quoted 11 lines
The rk3288 firefly reload is a Rockchip RK3288 based board be found by core board and main board. The regulators are connected in a different way to the previous version of firefly boards, it is necessary to move some common code to uncommon place.
I only tested the ethernet and confirmed that works. The usb in this board won't caused by the bugs in the driver.
This version follow the suggests from Heiko Stuebner, except the duplicated supply name problem, I don't think it could be fixed in that way.
Quoted 7 lines
I've now had a chance to look at that reload board on the firefly site. Firefly also is the company name, so a board named that way is not necessarily a "variant" :-) .
And looking at the "reload" board this definitly seems to be a very different product with it being a system-on-module+baseboard design with additional peripherals like that sata bridge, camera interfaces and probably
sata bridge is just a SATA to usb bridge and the "reload" bring back the DVP camera interface and
a HDMI rx chip connected to the other MIPI camera interface.
Quoted 4 lines
more.
As you might've seen, most Rockchip boards are based on some reference- design, so are similar in a big part of their core layout.
Yes, from the evb. But the even the main board of evb in rockchip company have at lease 3 versions
as I known.
Also the evb is found by power board, main board and core board.
Quoted 3 lines
So, looking at the vastly different product the reload is, I'd really like to have a separate dts for the reload, to not run into more confusing differences later on.
The main problem is that power connections are different. That is why I decide to make a
separate dts. If the kernel introduce the override dts, I could have a better way to implement
it.
Quoted 2 lines
Also, when adding a new board, please also add an entry to
Documentation/devicetree/bindingd/arm/rockchip.txt
I would send a patch set in a few days.
Quoted 2 lines
Thanks
Heiko
Thank you for you review and you patient again
Randy
Heiko Stuebner
maintainerHi Randy,
Am Samstag, 9. Juli 2016, 23:42:28 schrieb ayaka:
Quoted 18 lines · Heiko Stuebner
Quoted 17 lines
Am Donnerstag, 7. Juli 2016, 02:22:57 schrieb Randy Li:
Quoted 11 lines
The rk3288 firefly reload is a Rockchip RK3288 based board be found by core board and main board. The regulators are connected in a different way to the previous version of firefly boards, it is necessary to move some common code to uncommon place.
I only tested the ethernet and confirmed that works. The usb in this board won't caused by the bugs in the driver.
This version follow the suggests from Heiko Stuebner, except the duplicated supply name problem, I don't think it could be fixed in that way.
I've now had a chance to look at that reload board on the firefly site. Firefly also is the company name, so a board named that way is not necessarily a "variant" :-) .
Quoted 7 lines
Quoted 4 lines
And looking at the "reload" board this definitly seems to be a very different product with it being a system-on-module+baseboard design with additional peripherals like that sata bridge, camera interfaces and probably
sata bridge is just a SATA to usb bridge and the "reload" bring back the DVP camera interface and
a HDMI rx chip connected to the other MIPI camera interface.
there are always more things to control (reset pins, regulators) and the usb subsystem is currently in the process of getting support for such "embedded" uses.
Quoted 14 lines
Quoted 4 lines
more.
As you might've seen, most Rockchip boards are based on some reference- design, so are similar in a big part of their core layout.
Yes, from the evb. But the even the main board of evb in rockchip company have at lease 3 versions
as I known.
Also the evb is found by power board, main board and core board.Quoted 3 lines
So, looking at the vastly different product the reload is, I'd really like to have a separate dts for the reload, to not run into more confusing differences later on.
Quoted 5 lines
The main problem is that power connections are different. That is why I decide to make a
separate dts. If the kernel introduce the override dts, I could have a better way to implement
it.
Just to make sure we're not talking about different things. This was meant to illustrate that even though core layouts often look similar we should not try to connect different product board files unnecessarily, as the small differences will make everything more complicated.
The "reload" definitly is a completely different product that only shares the manufacturer (firefly) and the soc (rk3288) with the other product and as I wrote should get its own independent dts file.
If anything you could do a split into a reload-core dtsi for the system-on- module part and a baseboard dts that includes that (something like what is done for rk3288-rock2).
Quoted 9 lines
Quoted 2 lines
Also, when adding a new board, please also add an entry to
Documentation/devicetree/bindingd/arm/rockchip.txtI would send a patch set in a few days.
Quoted 2 lines
Thanks
HeikoThank you for you review and you patient again
no problem, always nice to have more people play with Rockchip stuff on a mainline kernel :-)
Heiko
PATCH 1/1 ARM: dts: the dts support for rk3288 firefly reload
This version is split into a reload core dtsi for the SoC module part and a baseboard dts for the reload baseboard. Thanks to the Heiko's advise.
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 | 304 ++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly-reload.dts | 320 +++++++++++++++++++++ 4 files changed, 629 insertions(+) create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload.dts
Signature · 1 line
2.7.4
PATCH 1/1 ARM: dts: add rk3288-firefly-reload
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.
--- Documentation/devicetree/bindings/arm/rockchip.txt | 4 + arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 304 ++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly-reload.dts | 320 +++++++++++++++++++++ 4 files changed, 629 insertions(+) create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload.dts
Documentation/devicetree/bindings/arm/rockchip.txt +4 -0
@@ -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";
arch/arm/boot/dts/Makefile +1 -0
@@ -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 \
arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi new file +304 -0
304 lines not on this page · raw message
arch/arm/boot/dts/rk3288-firefly-reload.dts new file +320 -0
320 lines not on this page · raw message
Signature · 1 line
2.7.4
Rob Herring
maintainerPATCH 1/1 ARM: dts: add rk3288-firefly-reload
Quoted 11 lines · 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 <[email protected]>
Quoted 8 lines
--- Documentation/devicetree/bindings/arm/rockchip.txt | 4 + arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 304 ++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly-reload.dts | 320 +++++++++++++++++++++ 4 files changed, 629 insertions(+) create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload.dts
Heiko Stübner
maintainerPATCH 1/1 ARM: dts: add rk3288-firefly-reload
In reply to Randy LiHi Randy,
Am Sonntag, 17. Juli 2016, 23:38:57 schrieb Randy Li:
Quoted 11 lines
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 <[email protected]>
looks mostly good, two small issues below. While I could replace the io-domain node with the newer variant myself, the licensing issue will require a resend anyway.
Please also carry over Rob's Ack in your resend as well.
Quoted 43 lines
--- Documentation/devicetree/bindings/arm/rockchip.txt | 4 + arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 304 ++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly-reload.dts | 320 +++++++++++++++++++++ 4 files changed, 629 insertions(+) create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload.dts(quoted diff) +0
-0
b/Documentation/devicetree/bindings/arm/rockchip.txtindex 715d960..3380212c 100644Documentation/devicetree/bindings/arm/rockchip.txt +4
-0@@ -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";arch/arm/boot/dts/Makefile +1
-0@@ -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 \(quoted diff) +0
-0
b/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsinew file mode 100644 index 0000000..039ae16
arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi line 6
Quoted 6 lines
arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi new file +6
-0@@ -0,0 +1,304 @@ +/* + * Device tree file for Firefly Rockchip RK3288 Core board + * Copyright (c) 2016 Randy Li <[email protected]> + * + * Licensed under GPLv2 or later. + */
please allow licensing under GPL and MIT licenses ... see license headers of the other Rockchip boards. Same for the dts file below.
Quoted 29 lines
arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi new file +29
-0+#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"; + }; + + io_domains: io-domains { + compatible = "rockchip,rk3288-io-voltage-domain"; + rockchip,grf = <&grf>; + + audio-supply = <&vcca_33>;
arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi line 46
Quoted 10 lines
arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi new file +10
-0+ 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>; + };
io-domains are now a sub-device of the GRF, see
https://git.kernel.org/cgit/linux/kernel/git/mmind/linux-rockchip.git/commit/?h=v4.8-armsoc/dts32&id=3445b2fae55f1a232e6e4843f4f74de074d8c07f
Heiko
Re: [PATCH v2] ARM: dts: add rk3288-firefly-reload
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
Signature · 1 line
2.7.4
PATCH 1/1 ARM: dts: add rk3288-firefly-reload
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.
--- 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
Documentation/devicetree/bindings/arm/rockchip.txt +4 -0
@@ -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";
arch/arm/boot/dts/Makefile +1 -0
@@ -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 \
arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi new file +339 -0
339 lines not on this page · raw message
arch/arm/boot/dts/rk3288-firefly-reload.dts new file +356 -0
356 lines not on this page · raw message
Signature · 1 line
2.7.4
Heiko Stübner
maintainerRe: [PATCH] ARM: dts: add rk3288-firefly-reload
Am Montag, 18. Juli 2016, 23:32:32 schrieb Randy Li:
Quoted 5 lines
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.
Quoted 7 lines
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 <[email protected]>Acked-by Rob Herring <[email protected]>
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
Re: [PATCH] ARM: dts: add rk3288-firefly-reload
Quoted 11 lines · Heiko St?bner
Am Montag, 18. Juli 2016, 23:32:32 schrieb Randy Li:
Quoted 10 lines
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.
Quoted 7 lines
Quoted 2 lines
Signed-off-by Randy Li <[email protected]>Acked-by Rob Herring <[email protected]>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? :)
Quoted 12 lines
Heiko
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Signature · 2 lines
Best Regards Shawn Lin
Heiko Stuebner
maintainerRe: [PATCH] ARM: dts: add rk3288-firefly-reload
Hi Shawn,
Am Sonntag, 7. August 2016, 11:40:21 schrieb Shawn Lin:
Quoted 20 lines · Heiko St?bner
Quoted 11 lines
Am Montag, 18. Juli 2016, 23:32:32 schrieb Randy Li:
Quoted 10 lines
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.
Quoted 7 lines
Quoted 2 lines
Signed-off-by Randy Li <[email protected]>Acked-by Rob Herring <[email protected]>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.
Quoted 7 lines
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_mmcto switch vqmmc from 3V3 to 1V8 after sending CMD11.But the vqmmc is
vccio_sdwhich 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
Re: [PATCH] ARM: dts: add rk3288-firefly-reload
? 2016/8/7 22:44, Heiko Stuebner ??:
Quoted 29 lines
Hi Shawn,
Am Sonntag, 7. August 2016, 11:40:21 schrieb Shawn Lin:
Quoted 26 lines · Heiko St?bner
Quoted 11 lines
Am Montag, 18. Juli 2016, 23:32:32 schrieb Randy Li:
Quoted 10 lines
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.
Quoted 7 lines
Quoted 2 lines
Signed-off-by Randy Li <[email protected]>Acked-by Rob Herring <[email protected]>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_mmcto switch vqmmc from 3V3 to 1V8 after sending CMD11.
Quoted 6 lines
Quoted 1 line
But the vqmmc is
vccio_sdwhich 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....
Quoted 12 lines
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 at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Signature · 2 lines
Best Regards Shawn Lin
Re: [PATCH] ARM: dts: add rk3288-firefly-reload
In reply to Heiko Stuebner2016-08-07 22:44 GMT+08:00 Heiko Stuebner <[email protected]>:
Quoted 36 lines
Hi Shawn,
Am Sonntag, 7. August 2016, 11:40:21 schrieb Shawn Lin:
Quoted 20 lines · Heiko St?bner
Quoted 11 lines
Am Montag, 18. Juli 2016, 23:32:32 schrieb Randy Li:
Quoted 10 lines
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.
Quoted 7 lines
Quoted 2 lines
Signed-off-by Randy Li <[email protected]>Acked-by Rob Herring <[email protected]>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.
Quoted 7 lines
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_mmcto switch vqmmc from 3V3 to 1V8 after sending CMD11.But the vqmmc is
vccio_sdwhich 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.
Quoted 5 lines
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>;
};
Re: [PATCH] ARM: dts: add rk3288-firefly-reload
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.
Re: [PATCH] ARM: dts: add rk3288-firefly-reload
??? iPad ??
Quoted 8 lines
?? <[email protected]> ? 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.
Yes, Jacob is right. Those high speed options need the voltage down to 1.8v. They should be removed.
Heiko Stübner
maintainerRe: [PATCH] ARM: dts: add rk3288-firefly-reload
Am Dienstag, 9. August 2016, 18:06:33 schrieb Randy Li:
Quoted 10 lines
??? iPad ??
Quoted 8 lines
?? <[email protected]> ? 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.
Thanks Jacob for pointing out this issue - I was always wondering why it wasn't working :-) .
Quoted 2 lines
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
Re: [PATCH] ARM: dts: add rk3288-firefly-reload
Quoted 11 lines · Heiko St?bner
Am Dienstag, 9. August 2016, 18:06:33 schrieb Randy Li:
Quoted 10 lines
??? iPad ??
Quoted 8 lines
?? <[email protected]> ? 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.
Quoted 8 lines
Thanks Jacob for pointing out this issue - I was always wondering why it wasn't working :-) .
Quoted 2 lines
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?
Quoted 5 lines
Thanks
Heiko
Signature · 2 lines
Randy Li The third produce department
cover ARM: dts: rockchip: correct the regulators in firefly reload
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(-)
Signature · 1 line
2.7.4
PATCH 1/2 ARM: dts: rockchip: remove excess sd properties for firefly reload
Because of a bug in hardware design, the sdcard at firefly rk3288 reload board can't switch the io voltage level to 1.8v.
--- arch/arm/boot/dts/rk3288-firefly-reload.dts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
arch/arm/boot/dts/rk3288-firefly-reload.dts +1 -6
@@ -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"; };
Signature · 1 line
2.7.4
Heiko Stuebner
maintainerRe: [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for firefly reload
Am Sonntag, 14. August 2016, 19:27:23 CEST schrieb Randy Li:
Quoted 19 lines
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 <[email protected]>--- arch/arm/boot/dts/rk3288-firefly-reload.dts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)(quoted diff) +0
-0
b/arch/arm/boot/dts/rk3288-firefly-reload.dtsindex 43145d1..a2b1f14 100644arch/arm/boot/dts/rk3288-firefly-reload.dts +0
-3@@ -202,18 +202,13 @@ bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; - sd-uhs-sdr12; - sd-uhs-sdr25; - sd-uhs-sdr50;
arch/arm/boot/dts/rk3288-firefly-reload.dts line 211
Quoted 10 lines
arch/arm/boot/dts/rk3288-firefly-reload.dts +1
-3- 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
Re: [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for firefly reload
Quoted 24 lines · Heiko Stuebner
Am Sonntag, 14. August 2016, 19:27:23 CEST schrieb Randy Li:
Quoted 23 lines
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 <[email protected]>--- arch/arm/boot/dts/rk3288-firefly-reload.dts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)(quoted diff) +0
-0
b/arch/arm/boot/dts/rk3288-firefly-reload.dtsindex 43145d1..a2b1f14 100644arch/arm/boot/dts/rk3288-firefly-reload.dts +0
-5@@ -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;
Quoted 8 lines
arch/arm/boot/dts/rk3288-firefly-reload.dts line 211
Quoted 6 lines
arch/arm/boot/dts/rk3288-firefly-reload.dts +1
-1num-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_sdis 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.
Quoted 4 lines
controllable without needing a regulator-always-on in the future.
Heiko
Heiko Stübner
maintainerRe: [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for firefly reload
Am Sonntag, 14. August 2016, 20:38:59 schrieb ayaka:
Quoted 43 lines · Heiko Stuebner
Quoted 34 lines
Am Sonntag, 14. August 2016, 19:27:23 CEST schrieb Randy Li:
Quoted 33 lines
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 <[email protected]>---
arch/arm/boot/dts/rk3288-firefly-reload.dts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)(quoted diff) +0
-0
b/arch/arm/boot/dts/rk3288-firefly-reload.dtsindex 43145d1..a2b1f14 100644arch/arm/boot/dts/rk3288-firefly-reload.dts +0
-5@@ -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>;Quoted 7 lines
arch/arm/boot/dts/rk3288-firefly-reload.dts line 211
Quoted 2 lines
arch/arm/boot/dts/rk3288-firefly-reload.dts +1
-1- vqmmc-supply = <&vccio_sd>; + vqmmc-supply = <&vcc_sd>;that looks wrong.
vccio_sdis still the vqmmc supply in the schematics even
though we don't want to switch to 1.8V . But that regulator should still be
Quoted 3 lines
I think the
vccio_sdis just the one connected to theio_domains, but the voltage source for the
pull up register is notvccio_sdbutvcc_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.
v2 cover ARM: dts: rockchip: correct the regulators in firefly reload
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(-)
Signature · 1 line
2.7.4
PATCH 1/2 ARM: dts: rockchip: remove excess sd properties for firefly reload
Because of a bug in hardware design, the sdcard at firefly rk3288 reload board can't switch the io voltage level to 1.8v.
--- arch/arm/boot/dts/rk3288-firefly-reload.dts | 5 ----- 1 file changed, 5 deletions(-)
arch/arm/boot/dts/rk3288-firefly-reload.dts +0 -5
@@ -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>;
Signature · 1 line
2.7.4
Re: [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for firefly reload
Am Donnerstag, 18. August 2016, 01:03:10 schrieb Randy Li:
Quoted 4 lines
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 <[email protected]>
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]
Re: [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for firefly reload
Quoted 9 lines · Heiko St?bner
Am Donnerstag, 18. August 2016, 01:03:10 schrieb Randy Li:
Quoted 4 lines
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 <[email protected]>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.
Quoted 1 line
as I did reorder some things when applying your initial firefly-reload patch.
Thank you for guide
Quoted 8 lines
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]
PATCH 2/2 ARM: dts: rockchip: add missing regulators for firefly reload board
In reply to Randy LiThere 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.
--- 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(-)
arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi +10 -39
@@ -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>;
arch/arm/boot/dts/rk3288-firefly-reload.dts +58 -6
88 lines not on this page · raw message
Signature · 1 line
2.7.4
Re: [PATCH 2/2] ARM: dts: rockchip: add missing regulators for firefly reload board
Am Donnerstag, 18. August 2016, 01:03:11 schrieb Randy Li:
Quoted 11 lines
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)andVCC_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. TheVCCA_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_VDDis different to firefly release version.Signed-off-by Randy Li <[email protected]>
applied to my dts32 branch for 4.9
Thanks
Heiko
PATCH 2/2 ARM: dts: rockchip: add missing regulators for firefly reload board
In reply to Randy LiThere 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.
--- 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(-)
arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi +1 -28
@@ -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>;
arch/arm/boot/dts/rk3288-firefly-reload.dts +58 -6
88 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH 3/3 ARM: dts: add rk3288-firefly-reload
In reply to ayakaThe firefly rk3288 reload is a Rockchip rk3288 based develop board.
--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/rk3288-firefly-reload.dts | 109 ++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload.dts
arch/arm/boot/dts/Makefile +1 -0
@@ -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 \
arch/arm/boot/dts/rk3288-firefly-reload.dts new file +109 -0
109 lines not on this page · raw message
Signature · 1 line
2.7.4