[PATCH 0/3] ARM: dts: the dts support for rk3288 firefly reload

[PATCH 0/3] ARM: dts: the dts support for rk3288 firefly reload

[ayaka]

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

-- 
2.7.4

[PATCH 1/3] ARM: dts: add label leds for rk3288-firefly.dtsi

[ayaka]

The connected leds are different in firefly and firefly reload.
Adding this label making it is possible to add more leds.

Signed-off-by: ayaka <ayaka@soulik.info>
---
 arch/arm/boot/dts/rk3288-firefly.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi
index d6cf9ad..1d7f03c 100644
--- a/arch/arm/boot/dts/rk3288-firefly.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
@@ -99,7 +99,7 @@
 		};
 	};
 
-	leds {
+	leds: leds {
 		compatible = "gpio-leds";
 
 		work {
-- 
2.7.4

[PATCH 2/3] ARM: dts: move regulator settings from common to specifics

[ayaka]

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 <ayaka@soulik.info>
---
 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(-)

diff --git a/arch/arm/boot/dts/rk3288-firefly-beta.dts b/arch/arm/boot/dts/rk3288-firefly-beta.dts
index 75d77e3..6c08dae2 100644
--- a/arch/arm/boot/dts/rk3288-firefly-beta.dts
+++ b/arch/arm/boot/dts/rk3288-firefly-beta.dts
@@ -69,3 +69,33 @@
 &pwm0 {
 	status = "okay";
 };
+
+&gmac {
+	phy-supply = <&vcc_lan>;
+};
+
+&io_domains {
+		audio-supply = <&vcca_33>;
+		flash1-supply = <&vcc_lan>;
+};
+
+&regulators {
+	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>;
+	};
+};
diff --git a/arch/arm/boot/dts/rk3288-firefly.dts b/arch/arm/boot/dts/rk3288-firefly.dts
index c07fe92..1964b6f 100644
--- a/arch/arm/boot/dts/rk3288-firefly.dts
+++ b/arch/arm/boot/dts/rk3288-firefly.dts
@@ -69,3 +69,33 @@
 &pwm1 {
 	status = "okay";
 };
+
+&gmac {
+	phy-supply = <&vcc_lan>;
+};
+
+&io_domains {
+		audio-supply = <&vcca_33>;
+		flash1-supply = <&vcc_lan>;
+};
+
+&regulators {
+	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>;
+	};
+};
diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi
index 1d7f03c..205348f 100644
--- a/arch/arm/boot/dts/rk3288-firefly.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
@@ -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>;
-- 
2.7.4

Re: [PATCH 2/3] ARM: dts: move regulator settings from common to specifics

[Heiko Stuebner]

Hi,

Am Mittwoch, 6. Juli 2016, 23:25:23 schrieb ayaka:
> 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 <ayaka@soulik.info>

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


> ---
>  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(-)
> 
> diff --git a/arch/arm/boot/dts/rk3288-firefly-beta.dts
> b/arch/arm/boot/dts/rk3288-firefly-beta.dts index 75d77e3..6c08dae2
> 100644
> --- a/arch/arm/boot/dts/rk3288-firefly-beta.dts
> +++ b/arch/arm/boot/dts/rk3288-firefly-beta.dts
> @@ -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?

> +
> +&io_domains {
> +		audio-supply = <&vcca_33>;
> +		flash1-supply = <&vcc_lan>;
> +};

same here

> +
> +&regulators {
> +	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>;
> +	};
> +};
> diff --git a/arch/arm/boot/dts/rk3288-firefly.dts
> b/arch/arm/boot/dts/rk3288-firefly.dts index c07fe92..1964b6f 100644
> --- a/arch/arm/boot/dts/rk3288-firefly.dts
> +++ b/arch/arm/boot/dts/rk3288-firefly.dts
> @@ -69,3 +69,33 @@
>  &pwm1 {
>  	status = "okay";
>  };
> +
> +&gmac {
> +	phy-supply = <&vcc_lan>;
> +};
> +
> +&io_domains {
> +		audio-supply = <&vcca_33>;
> +		flash1-supply = <&vcc_lan>;
> +};
> +
> +&regulators {
> +	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>;
> +	};
> +};
> diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi
> b/arch/arm/boot/dts/rk3288-firefly.dtsi index 1d7f03c..205348f 100644
> --- a/arch/arm/boot/dts/rk3288-firefly.dtsi
> +++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
> @@ -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 {

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.

>  			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 {
> +

unecessary new empty line

> +			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>;
>  			};
> 
> +

unecessary new empty line

>  			vdd_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

[Randy Li]

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

-- 
2.7.4

[PATCH 1/3] ARM: dts: add label leds for rk3288-firefly.dtsi

[Randy Li]

From: ayaka <ayaka@soulik.info>

The connected leds are different in firefly release version
and firefly reload.
Adding this label making it is possible to add more leds.

Signed-off-by: Randy Li <ayaka@soulik.info>
---
 arch/arm/boot/dts/rk3288-firefly.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi
index d6cf9ad..1d7f03c 100644
--- a/arch/arm/boot/dts/rk3288-firefly.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
@@ -99,7 +99,7 @@
 		};
 	};
 
-	leds {
+	leds: leds {
 		compatible = "gpio-leds";
 
 		work {
-- 
2.7.4

[PATCH 2/3] ARM: dts: move regulator settings from common to specifics

[Randy Li]

From: ayaka <ayaka@soulik.info>

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.

Signed-off-by: Randy Li <ayaka@soulik.info>
---
 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(-)

diff --git a/arch/arm/boot/dts/rk3288-firefly-beta.dts b/arch/arm/boot/dts/rk3288-firefly-beta.dts
index 75d77e3..6c08dae2 100644
--- a/arch/arm/boot/dts/rk3288-firefly-beta.dts
+++ b/arch/arm/boot/dts/rk3288-firefly-beta.dts
@@ -69,3 +69,33 @@
 &pwm0 {
 	status = "okay";
 };
+
+&gmac {
+	phy-supply = <&vcc_lan>;
+};
+
+&io_domains {
+		audio-supply = <&vcca_33>;
+		flash1-supply = <&vcc_lan>;
+};
+
+&regulators {
+	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>;
+	};
+};
diff --git a/arch/arm/boot/dts/rk3288-firefly.dts b/arch/arm/boot/dts/rk3288-firefly.dts
index c07fe92..1964b6f 100644
--- a/arch/arm/boot/dts/rk3288-firefly.dts
+++ b/arch/arm/boot/dts/rk3288-firefly.dts
@@ -69,3 +69,33 @@
 &pwm1 {
 	status = "okay";
 };
+
+&gmac {
+	phy-supply = <&vcc_lan>;
+};
+
+&io_domains {
+		audio-supply = <&vcca_33>;
+		flash1-supply = <&vcc_lan>;
+};
+
+&regulators {
+	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>;
+	};
+};
diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi
index 1d7f03c..205348f 100644
--- a/arch/arm/boot/dts/rk3288-firefly.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
@@ -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>;
-- 
2.7.4

[PATCH 3/3] ARM: dts: add rk3288-firefly-reload

[Randy Li]

From: ayaka <ayaka@soulik.info>

The firefly rk3288 reload is a Rockchip rk3288 based develop board.

Signed-off-by: Randy Li <ayaka@soulik.info>
---
 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

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 06b6c2d..19a6049 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.dts b/arch/arm/boot/dts/rk3288-firefly-reload.dts
new file mode 100644
index 0000000..9805cf2
--- /dev/null
+++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts
@@ -0,0 +1,109 @@
+/*
+ * 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.dtsi"
+
+/ {
+	model = "Firefly-RK3288-reload";
+	compatible = "firefly,firefly-rk3288-reload", "rockchip,rk3288";
+
+};
+
+&leds {
+	power {
+		gpios = <&gpio8 2 GPIO_ACTIVE_LOW>;
+		label = "firefly:blue:power";
+		linux,default-trigger = "default-on";
+		pinctrl-names = "default";
+		pinctrl-0 = <&power_led>;
+	};
+};
+
+&gmac {
+	phy-supply = <&vcc_lan>;
+};
+
+&pinctrl {
+	act8846 {
+		pmic_vsel: pmic-vsel {
+			rockchip,pins = <7 14 RK_FUNC_GPIO &pcfg_output_low>;
+		};
+	};
+
+	ir {
+		ir_int: ir-int {
+			rockchip,pins = <7 0 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+
+};
+
+&pwm1 {
+	status = "disabled";
+};
+
+&io_domains {
+		audio-supply = <&vcca_33>;
+		flash1-supply = <&vcc_lan>;
+};
+
+&regulators {
+	vcca_33: REG7 {
+		regulator-name = "vcca_33";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+	};
+
+	vcc_lan: REG8 {
+		regulator-name = "vcc_lan";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+	};
+
+	vccio_pmu: REG9 {
+		regulator-name = "vccio_pmu";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-always-on;
+	};
+};
-- 
2.7.4

[PATCH 0/3] Re:[PATCH 2/3] ARM: dts: move regulator settings from common to specifics

[Randy Li]

I 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

-- 
2.7.4

[PATCH 1/3] ARM: dts: add label leds for rk3288-firefly.dtsi

[Randy Li]

The connected leds are different in firefly release version
and firefly reload.
Adding this label making it is possible to add more leds.

Signed-off-by: Randy Li <ayaka@soulik.info>
---
 arch/arm/boot/dts/rk3288-firefly.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi
index d6cf9ad..1d7f03c 100644
--- a/arch/arm/boot/dts/rk3288-firefly.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
@@ -99,7 +99,7 @@
 		};
 	};
 
-	leds {
+	leds: leds {
 		compatible = "gpio-leds";
 
 		work {
-- 
2.7.4

[PATCH 2/3] ARM: dts: move regulator settings from common to specifics

[Randy Li]

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.

Signed-off-by: Randy Li <ayaka@soulik.info>
---
 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(-)

diff --git a/arch/arm/boot/dts/rk3288-firefly-beta.dts b/arch/arm/boot/dts/rk3288-firefly-beta.dts
index 75d77e3..6c08dae2 100644
--- a/arch/arm/boot/dts/rk3288-firefly-beta.dts
+++ b/arch/arm/boot/dts/rk3288-firefly-beta.dts
@@ -69,3 +69,33 @@
 &pwm0 {
 	status = "okay";
 };
+
+&gmac {
+	phy-supply = <&vcc_lan>;
+};
+
+&io_domains {
+		audio-supply = <&vcca_33>;
+		flash1-supply = <&vcc_lan>;
+};
+
+&regulators {
+	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>;
+	};
+};
diff --git a/arch/arm/boot/dts/rk3288-firefly.dts b/arch/arm/boot/dts/rk3288-firefly.dts
index c07fe92..1964b6f 100644
--- a/arch/arm/boot/dts/rk3288-firefly.dts
+++ b/arch/arm/boot/dts/rk3288-firefly.dts
@@ -69,3 +69,33 @@
 &pwm1 {
 	status = "okay";
 };
+
+&gmac {
+	phy-supply = <&vcc_lan>;
+};
+
+&io_domains {
+		audio-supply = <&vcca_33>;
+		flash1-supply = <&vcc_lan>;
+};
+
+&regulators {
+	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>;
+	};
+};
diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi
index 1d7f03c..205348f 100644
--- a/arch/arm/boot/dts/rk3288-firefly.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
@@ -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>;
-- 
2.7.4

[PATCH 3/3] ARM: dts: add rk3288-firefly-reload

[Randy Li]

The firefly rk3288 reload is a Rockchip rk3288 based develop board.

Signed-off-by: Randy Li <ayaka@soulik.info>
---
 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

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 06b6c2d..19a6049 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.dts b/arch/arm/boot/dts/rk3288-firefly-reload.dts
new file mode 100644
index 0000000..9805cf2
--- /dev/null
+++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts
@@ -0,0 +1,109 @@
+/*
+ * 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.dtsi"
+
+/ {
+	model = "Firefly-RK3288-reload";
+	compatible = "firefly,firefly-rk3288-reload", "rockchip,rk3288";
+
+};
+
+&leds {
+	power {
+		gpios = <&gpio8 2 GPIO_ACTIVE_LOW>;
+		label = "firefly:blue:power";
+		linux,default-trigger = "default-on";
+		pinctrl-names = "default";
+		pinctrl-0 = <&power_led>;
+	};
+};
+
+&gmac {
+	phy-supply = <&vcc_lan>;
+};
+
+&pinctrl {
+	act8846 {
+		pmic_vsel: pmic-vsel {
+			rockchip,pins = <7 14 RK_FUNC_GPIO &pcfg_output_low>;
+		};
+	};
+
+	ir {
+		ir_int: ir-int {
+			rockchip,pins = <7 0 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+
+};
+
+&pwm1 {
+	status = "disabled";
+};
+
+&io_domains {
+		audio-supply = <&vcca_33>;
+		flash1-supply = <&vcc_lan>;
+};
+
+&regulators {
+	vcca_33: REG7 {
+		regulator-name = "vcca_33";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+	};
+
+	vcc_lan: REG8 {
+		regulator-name = "vcc_lan";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+	};
+
+	vccio_pmu: REG9 {
+		regulator-name = "vccio_pmu";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-always-on;
+	};
+};
-- 
2.7.4

Re: [PATCH 2/3] ARM: dts: move regulator settings from common to specifics

[Randy Li]

at July, 7th,  Heiko Stuebner Wrote:
> Hi,
>
> Am Mittwoch, 6. Juli 2016, 23:25:23 schrieb ayaka:
>> 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 <ayaka@soulik.info>
> 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
>
>
>> ---
>>   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(-)
>>
>> diff --git a/arch/arm/boot/dts/rk3288-firefly-beta.dts
>> b/arch/arm/boot/dts/rk3288-firefly-beta.dts index 75d77e3..6c08dae2
>> 100644
>> --- a/arch/arm/boot/dts/rk3288-firefly-beta.dts
>> +++ b/arch/arm/boot/dts/rk3288-firefly-beta.dts
>> @@ -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?
>
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.
>> +
>> +&io_domains {
>> +		audio-supply = <&vcca_33>;
>> +		flash1-supply = <&vcc_lan>;
>> +};
> same here
>
>> +
>> +&regulators {
>> +	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>;
>> +	};
>> +};
>> diff --git a/arch/arm/boot/dts/rk3288-firefly.dts
>> b/arch/arm/boot/dts/rk3288-firefly.dts index c07fe92..1964b6f 100644
>> --- a/arch/arm/boot/dts/rk3288-firefly.dts
>> +++ b/arch/arm/boot/dts/rk3288-firefly.dts
>> @@ -69,3 +69,33 @@
>>   &pwm1 {
>>   	status = "okay";
>>   };
>> +
>> +&gmac {
>> +	phy-supply = <&vcc_lan>;
>> +};
>> +
>> +&io_domains {
>> +		audio-supply = <&vcca_33>;
>> +		flash1-supply = <&vcc_lan>;
>> +};
>> +
>> +&regulators {
>> +	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>;
>> +	};
>> +};
>> diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi
>> b/arch/arm/boot/dts/rk3288-firefly.dtsi index 1d7f03c..205348f 100644
>> --- a/arch/arm/boot/dts/rk3288-firefly.dtsi
>> +++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
>> @@ -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 {
> 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.
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.
>
>>   			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 {
>> +
> unecessary new empty line
It would be removed
>> +			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>;
>>   			};
>>
>> +
> unecessary new empty line
It would be removed
>
>>   			vdd_10: REG10 {
>>   				regulator-name = "vdd_10";
>>   				regulator-min-microvolt = <1000000>;
>> --
>> 2.7.4
>
> Heiko

[PATCH 0/3] ARM: dts: the dts support for rk3288 firefly reload

[Randy Li]

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.

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

-- 
2.7.4

[PATCH 1/3] ARM: dts: add label leds for rk3288-firefly.dtsi

[Randy Li]

The connected leds are different in firefly release version
and firefly reload.
Adding this label making it is possible to add more leds.

Signed-off-by: Randy Li <ayaka@soulik.info>
---
 arch/arm/boot/dts/rk3288-firefly.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi
index d6cf9ad..1d7f03c 100644
--- a/arch/arm/boot/dts/rk3288-firefly.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
@@ -99,7 +99,7 @@
 		};
 	};
 
-	leds {
+	leds: leds {
 		compatible = "gpio-leds";
 
 		work {
-- 
2.7.4

[PATCH 2/3] ARM: dts: move regulator settings from common to specifics

[Randy Li]

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.

Signed-off-by: Randy Li <ayaka@soulik.info>
---
 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(-)

diff --git a/arch/arm/boot/dts/rk3288-firefly-beta.dts b/arch/arm/boot/dts/rk3288-firefly-beta.dts
index 75d77e3..375c5d8 100644
--- a/arch/arm/boot/dts/rk3288-firefly-beta.dts
+++ b/arch/arm/boot/dts/rk3288-firefly-beta.dts
@@ -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>;
+	};
+};
diff --git a/arch/arm/boot/dts/rk3288-firefly.dts b/arch/arm/boot/dts/rk3288-firefly.dts
index c07fe92..e89e575 100644
--- a/arch/arm/boot/dts/rk3288-firefly.dts
+++ b/arch/arm/boot/dts/rk3288-firefly.dts
@@ -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>;
+	};
+};
diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi
index 1d7f03c..194e05a 100644
--- a/arch/arm/boot/dts/rk3288-firefly.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
@@ -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>;
-- 
2.7.4

[PATCH 3/3] ARM: dts: add rk3288-firefly-reload

[Randy Li]

The firefly rk3288 reload is a Rockchip rk3288 based develop board.

Signed-off-by: Randy Li <ayaka@soulik.info>
---
 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

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 06b6c2d..19a6049 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.dts b/arch/arm/boot/dts/rk3288-firefly-reload.dts
new file mode 100644
index 0000000..9d02509
--- /dev/null
+++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts
@@ -0,0 +1,109 @@
+/*
+ * 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.dtsi"
+
+/ {
+	model = "Firefly-RK3288-reload";
+	compatible = "firefly,firefly-rk3288-reload", "rockchip,rk3288";
+
+};
+
+&leds {
+	power {
+		gpios = <&gpio8 2 GPIO_ACTIVE_LOW>;
+		label = "firefly:blue:power";
+		linux,default-trigger = "default-on";
+		pinctrl-names = "default";
+		pinctrl-0 = <&power_led>;
+	};
+};
+
+&gmac {
+	phy-supply = <&vcc_lan>;
+};
+
+&pinctrl {
+	act8846 {
+		pmic_vsel: pmic-vsel {
+			rockchip,pins = <7 14 RK_FUNC_GPIO &pcfg_output_low>;
+		};
+	};
+
+	ir {
+		ir_int: ir-int {
+			rockchip,pins = <7 0 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+
+};
+
+&pwm1 {
+	status = "disabled";
+};
+
+&io_domains {
+		audio-supply = <&vcca_33>;
+		flash1-supply = <&vcc_lan>;
+};
+
+&act8846_regs {
+	vcca_33: REG7 {
+		regulator-name = "vcca_33";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+	};
+
+	vcc_lan: REG8 {
+		regulator-name = "vcc_lan";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+	};
+
+	vccio_pmu: REG9 {
+		regulator-name = "vccio_pmu";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-always-on;
+	};
+};
-- 
2.7.4

Re: [PATCH 0/3] ARM: dts: the dts support for rk3288 firefly reload

[Heiko Stuebner]

Hi Randy,

Am Donnerstag, 7. Juli 2016, 02:22:57 schrieb Randy Li:
> 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

Re: [PATCH 0/3] ARM: dts: the dts support for rk3288 firefly reload

[ayaka]

Thank you for you review, HeiKo


On 07/08/2016 05:35 AM, Heiko Stuebner wrote:
> Hi Randy,
>
> Am Donnerstag, 7. Juli 2016, 02:22:57 schrieb Randy Li:
>> 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
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.
> 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.
> 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.
> 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.
> Thanks
> Heiko
Thank you for you review and you patient again
Randy

Re: [PATCH 0/3] ARM: dts: the dts support for rk3288 firefly reload

[Heiko Stuebner]

Hi Randy,

Am Samstag, 9. Juli 2016, 23:42:28 schrieb ayaka:
> On 07/08/2016 05:35 AM, Heiko Stuebner wrote:
> > Am Donnerstag, 7. Juli 2016, 02:22:57 schrieb Randy Li:
> >> 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
> 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.


> > 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.
> 
> > 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.

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).



> > 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.
> 
> > Thanks
> > Heiko
> 
> Thank 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 3/3] ARM: dts: add rk3288-firefly-reload

[ayaka]

The firefly rk3288 reload is a Rockchip rk3288 based develop board.

Signed-off-by: ayaka <ayaka@soulik.info>
---
 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

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 06b6c2d..19a6049 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.dts b/arch/arm/boot/dts/rk3288-firefly-reload.dts
new file mode 100644
index 0000000..9805cf2
--- /dev/null
+++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts
@@ -0,0 +1,109 @@
+/*
+ * 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.dtsi"
+
+/ {
+	model = "Firefly-RK3288-reload";
+	compatible = "firefly,firefly-rk3288-reload", "rockchip,rk3288";
+
+};
+
+&leds {
+	power {
+		gpios = <&gpio8 2 GPIO_ACTIVE_LOW>;
+		label = "firefly:blue:power";
+		linux,default-trigger = "default-on";
+		pinctrl-names = "default";
+		pinctrl-0 = <&power_led>;
+	};
+};
+
+&gmac {
+	phy-supply = <&vcc_lan>;
+};
+
+&pinctrl {
+	act8846 {
+		pmic_vsel: pmic-vsel {
+			rockchip,pins = <7 14 RK_FUNC_GPIO &pcfg_output_low>;
+		};
+	};
+
+	ir {
+		ir_int: ir-int {
+			rockchip,pins = <7 0 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+
+};
+
+&pwm1 {
+	status = "disabled";
+};
+
+&io_domains {
+		audio-supply = <&vcca_33>;
+		flash1-supply = <&vcc_lan>;
+};
+
+&regulators {
+	vcca_33: REG7 {
+		regulator-name = "vcca_33";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+	};
+
+	vcc_lan: REG8 {
+		regulator-name = "vcc_lan";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+	};
+
+	vccio_pmu: REG9 {
+		regulator-name = "vccio_pmu";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-always-on;
+	};
+};
-- 
2.7.4