Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1462078 > unrolled thread

[PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for firefly reload

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for firefly reload Randy Li <ayaka@soulik.info> - 2016-08-14 14:10 +0200
    Re: [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for firefly reload Heiko Stuebner <heiko@sntech.de> - 2016-08-14 14:40 +0200
      Re: [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for  firefly reload ayaka <ayaka@soulik.info> - 2016-08-14 14:40 +0200
        Re: [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for firefly reload Heiko Stübner <heiko@sntech.de> - 2016-08-17 16:20 +0200
          [PATCH 0/2 v2] ARM: dts: rockchip: correct the regulators in firefly reload Randy Li <ayaka@soulik.info> - 2016-08-17 19:10 +0200
            [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for firefly reload Randy Li <ayaka@soulik.info> - 2016-08-17 19:10 +0200
              Re: [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for firefly reload Heiko Stübner <heiko@sntech.de> - 2016-08-18 15:40 +0200
                Re: [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for  firefly reload ayaka <ayaka@soulik.info> - 2016-08-18 16:30 +0200
            [PATCH 2/2] ARM: dts: rockchip: add missing regulators for firefly reload board Randy Li <ayaka@soulik.info> - 2016-08-17 19:10 +0200
              Re: [PATCH 2/2] ARM: dts: rockchip: add missing regulators for firefly reload board Heiko Stübner <heiko@sntech.de> - 2016-08-19 06:30 +0200

#1462078 — [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.

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

diff --git a/arch/arm/boot/dts/rk3288-firefly-reload.dts b/arch/arm/boot/dts/rk3288-firefly-reload.dts
index 43145d1..a2b1f14 100644
--- a/arch/arm/boot/dts/rk3288-firefly-reload.dts
+++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts
@@ -202,18 +202,13 @@
 	bus-width = <4>;
 	cap-mmc-highspeed;
 	cap-sd-highspeed;
-	sd-uhs-sdr12;
-	sd-uhs-sdr25;
-	sd-uhs-sdr50;
-	sd-uhs-sdr104;
-	sd-uhs-ddr50;
 	card-detect-delay = <200>;
 	disable-wp;
 	num-slots = <1>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&sdmmc_clk>, <&sdmmc_cmd>, <&sdmmc_cd>, <&sdmmc_bus4>;
 	vmmc-supply = <&vcc_sd>;
-	vqmmc-supply = <&vccio_sd>;
+	vqmmc-supply = <&vcc_sd>;
 	status = "okay";
 };
 
-- 
2.7.4

[toc] | [next] | [standalone]

#1462114

Am Sonntag, 14. August 2016, 19:27:23 CEST schrieb Randy Li:
> Because of a bug in hardware design, the sdcard at firefly
> rk3288 reload board can't switch the io voltage level to 1.8v.
> 
> Signed-off-by: Randy Li <ayaka@soulik.info>
> ---
>  arch/arm/boot/dts/rk3288-firefly-reload.dts | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/rk3288-firefly-reload.dts
> b/arch/arm/boot/dts/rk3288-firefly-reload.dts index 43145d1..a2b1f14 100644
> --- a/arch/arm/boot/dts/rk3288-firefly-reload.dts
> +++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts
> @@ -202,18 +202,13 @@
>  	bus-width = <4>;
>  	cap-mmc-highspeed;
>  	cap-sd-highspeed;
> -	sd-uhs-sdr12;
> -	sd-uhs-sdr25;
> -	sd-uhs-sdr50;
> -	sd-uhs-sdr104;
> -	sd-uhs-ddr50;
>  	card-detect-delay = <200>;
>  	disable-wp;
>  	num-slots = <1>;
>  	pinctrl-names = "default";
>  	pinctrl-0 = <&sdmmc_clk>, <&sdmmc_cmd>, <&sdmmc_cd>, <&sdmmc_bus4>;
>  	vmmc-supply = <&vcc_sd>;
> -	vqmmc-supply = <&vccio_sd>;
> +	vqmmc-supply = <&vcc_sd>;

that looks wrong. vccio_sd is still the vqmmc supply in the schematics even 
though we don't want to switch to 1.8V . But that regulator should still be 
controllable without needing a regulator-always-on in the future.


Heiko

[toc] | [prev] | [next] | [standalone]

#1462115 — Re: [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for firefly reload

On 08/14/2016 08:30 PM, Heiko Stuebner wrote:
> Am Sonntag, 14. August 2016, 19:27:23 CEST schrieb Randy Li:
>> Because of a bug in hardware design, the sdcard at firefly
>> rk3288 reload board can't switch the io voltage level to 1.8v.
>>
>> Signed-off-by: Randy Li <ayaka@soulik.info>
>> ---
>>   arch/arm/boot/dts/rk3288-firefly-reload.dts | 7 +------
>>   1 file changed, 1 insertion(+), 6 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/rk3288-firefly-reload.dts
>> b/arch/arm/boot/dts/rk3288-firefly-reload.dts index 43145d1..a2b1f14 100644
>> --- a/arch/arm/boot/dts/rk3288-firefly-reload.dts
>> +++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts
>> @@ -202,18 +202,13 @@
>>   	bus-width = <4>;
>>   	cap-mmc-highspeed;
>>   	cap-sd-highspeed;
>> -	sd-uhs-sdr12;
>> -	sd-uhs-sdr25;
>> -	sd-uhs-sdr50;
>> -	sd-uhs-sdr104;
>> -	sd-uhs-ddr50;
>>   	card-detect-delay = <200>;
>>   	disable-wp;
>>   	num-slots = <1>;
>>   	pinctrl-names = "default";
>>   	pinctrl-0 = <&sdmmc_clk>, <&sdmmc_cmd>, <&sdmmc_cd>, <&sdmmc_bus4>;
>>   	vmmc-supply = <&vcc_sd>;
>> -	vqmmc-supply = <&vccio_sd>;
>> +	vqmmc-supply = <&vcc_sd>;
> that looks wrong. vccio_sd is still the vqmmc supply in the schematics even
> though we don't want to switch to 1.8V . But that regulator should still be
I think the vccio_sd is just the one connected to the io_domains, but 
the voltage source for the
pull up register is not vccio_sd but vcc_io.
> controllable without needing a regulator-always-on in the future.
>
>
> Heiko

[toc] | [prev] | [next] | [standalone]

#1464600

Am Sonntag, 14. August 2016, 20:38:59 schrieb ayaka:
> On 08/14/2016 08:30 PM, Heiko Stuebner wrote:
> > Am Sonntag, 14. August 2016, 19:27:23 CEST schrieb Randy Li:
> >> Because of a bug in hardware design, the sdcard at firefly
> >> rk3288 reload board can't switch the io voltage level to 1.8v.
> >> 
> >> Signed-off-by: Randy Li <ayaka@soulik.info>
> >> ---
> >> 
> >>   arch/arm/boot/dts/rk3288-firefly-reload.dts | 7 +------
> >>   1 file changed, 1 insertion(+), 6 deletions(-)
> >> 
> >> diff --git a/arch/arm/boot/dts/rk3288-firefly-reload.dts
> >> b/arch/arm/boot/dts/rk3288-firefly-reload.dts index 43145d1..a2b1f14
> >> 100644
> >> --- a/arch/arm/boot/dts/rk3288-firefly-reload.dts
> >> +++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts
> >> @@ -202,18 +202,13 @@
> >> 
> >>   	bus-width = <4>;
> >>   	cap-mmc-highspeed;
> >>   	cap-sd-highspeed;
> >> 
> >> -	sd-uhs-sdr12;
> >> -	sd-uhs-sdr25;
> >> -	sd-uhs-sdr50;
> >> -	sd-uhs-sdr104;
> >> -	sd-uhs-ddr50;
> >> 
> >>   	card-detect-delay = <200>;
> >>   	disable-wp;
> >>   	num-slots = <1>;
> >>   	pinctrl-names = "default";
> >>   	pinctrl-0 = <&sdmmc_clk>, <&sdmmc_cmd>, <&sdmmc_cd>, <&sdmmc_bus4>;
> >>   	vmmc-supply = <&vcc_sd>;
> >> 
> >> -	vqmmc-supply = <&vccio_sd>;
> >> +	vqmmc-supply = <&vcc_sd>;
> > 
> > that looks wrong. vccio_sd is still the vqmmc supply in the schematics
> > even
> > though we don't want to switch to 1.8V . But that regulator should still
> > be
> 
> I think the vccio_sd is just the one connected to the io_domains, but
> the voltage source for the
> pull up register is not vccio_sd but vcc_io.

vqmmc-supply is the so called io-voltage according to the code and also the 
jedec spec (VCCQ). And the sdmmc0_vdd that vccio_sd is connected to is exactly 
that ... according to the rk3288 datasheet the "SDMMC0 Digital IO Power 
Supply", so that connection is not only meaningful for the iodomains, but _is_ 
an actual supply and if you turn off vccio_sd, you probably won't get any 
sdmmc transfers at all ;-) .

So yes, due to the resistor misheap vccio_sd should stay limited to 3.3V, but 
its connection as vqmmc should stay.

[toc] | [prev] | [next] | [standalone]

#1464659 — [PATCH 0/2 v2] 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(-)

-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1464663

Because of a bug in hardware design, the sdcard at firefly
rk3288 reload board can't switch the io voltage level to 1.8v.

Signed-off-by: Randy Li <ayaka@soulik.info>
---
 arch/arm/boot/dts/rk3288-firefly-reload.dts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/arch/arm/boot/dts/rk3288-firefly-reload.dts b/arch/arm/boot/dts/rk3288-firefly-reload.dts
index 43145d1..b86419b 100644
--- a/arch/arm/boot/dts/rk3288-firefly-reload.dts
+++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts
@@ -202,11 +202,6 @@
 	bus-width = <4>;
 	cap-mmc-highspeed;
 	cap-sd-highspeed;
-	sd-uhs-sdr12;
-	sd-uhs-sdr25;
-	sd-uhs-sdr50;
-	sd-uhs-sdr104;
-	sd-uhs-ddr50;
 	card-detect-delay = <200>;
 	disable-wp;
 	num-slots = <1>;
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1465352

Am Donnerstag, 18. August 2016, 01:03:10 schrieb Randy Li:
> Because of a bug in hardware design, the sdcard at firefly
> rk3288 reload board can't switch the io voltage level to 1.8v.
> 
> Signed-off-by: Randy Li <ayaka@soulik.info>

applied to my dts32 branch for 4.9

In the future, please try to base your patches either on the correct dts 
branch in my repo [0] or simply on linux-next which does contain these too,
as I did reorder some things when applying your initial firefly-reload patch.


Thanks
Heiko


[0] https://git.kernel.org/cgit/linux/kernel/git/mmind/linux-rockchip.git/
[dts patches v4.x-armsoc/dts32 and v.x-armsoc/dts64 depending on what board 
you're working on]

[toc] | [prev] | [next] | [standalone]

#1465517 — Re: [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for firefly reload

On 08/18/2016 09:35 PM, Heiko Stübner wrote:
> Am Donnerstag, 18. August 2016, 01:03:10 schrieb Randy Li:
>> Because of a bug in hardware design, the sdcard at firefly
>> rk3288 reload board can't switch the io voltage level to 1.8v.
>>
>> Signed-off-by: Randy Li <ayaka@soulik.info>
> applied to my dts32 branch for 4.9
>
> In the future, please try to base your patches either on the correct dts
> branch in my repo [0] or simply on linux-next which does contain these too,
OK, I would based on linux-next time.
> as I did reorder some things when applying your initial firefly-reload patch.
Thank you for guide
>
> Thanks
> Heiko
>
>
> [0] https://git.kernel.org/cgit/linux/kernel/git/mmind/linux-rockchip.git/
> [dts patches v4.x-armsoc/dts32 and v.x-armsoc/dts64 depending on what board
> you're working on]

[toc] | [prev] | [next] | [standalone]

#1464664 — [PATCH 2/2] ARM: dts: rockchip: add missing regulators for firefly reload board

There are many regulators are missed in previous commit, this
commit complete most of them. It also fix some mistakes in the
regulator properties. The VDD_10(REG10) and VCC_18(REG11) had better
to keep in always-on state, as it is used as the USB PHY supply,
corretly we have no way to assign power supply to a USB PHY.
The VCCA_33(REG8) should be enabled or the GMAC won't work.

It also fix the wrong properties for audio in io-domains, the supply
connected to APIO4_VDD is different to firefly release version.

Signed-off-by: Randy Li <ayaka@soulik.info>
---
 arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 49 ++++-------------
 arch/arm/boot/dts/rk3288-firefly-reload.dts       | 64 ++++++++++++++++++++---
 2 files changed, 68 insertions(+), 45 deletions(-)

diff --git a/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi b/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi
index 5e5a348..de315e8 100644
--- a/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi
@@ -50,14 +50,6 @@
 		reg = <0 0x80000000>;
 	};
 
-	dovdd_1v8: dovdd-1v8-regulator {
-		compatible = "regulator-fixed";
-		regulator-name = "dovdd_1v8";
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <1800000>;
-		vin-supply = <&vcc28_dvp>;
-	};
-
 	ext_gmac: external-gmac-clock {
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
@@ -65,14 +57,6 @@
 		clock-output-names = "ext_gmac";
 	};
 
-	vbat_wl: vcc_sys: vsys-regulator {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc_sys";
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		regulator-always-on;
-		regulator-boot-on;
-	};
 
 	vcc_flash: flash-regulator {
 		compatible = "regulator-fixed";
@@ -81,17 +65,6 @@
 		regulator-max-microvolt = <1800000>;
 		vin-supply = <&vcc_io>;
 	};
-
-	vcc_5v: usb-regulator {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc_5v";
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		regulator-always-on;
-		regulator-boot-on;
-		vin-supply = <&vcc_sys>;
-	};
-
 };
 
 &cpu0 {
@@ -206,34 +179,34 @@
 				regulator-name = "vccio_sd";
 				regulator-min-microvolt = <3300000>;
 				regulator-max-microvolt = <3300000>;
-				regulator-always-on;
 			};
 
 			vdd10_lcd: REG6 {
 				regulator-name = "vdd10_lcd";
 				regulator-min-microvolt = <1000000>;
 				regulator-max-microvolt = <1000000>;
+			};
+
+			vcca_18: REG7  {
+				regulator-name = "vcca_18";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
 				regulator-always-on;
 			};
 
-			vcca_33: REG7  {
+			vcca_33: REG8 {
 				regulator-name = "vcca_33";
 				regulator-min-microvolt = <3300000>;
 				regulator-max-microvolt = <3300000>;
+				regulator-always-on;
 			};
 
-			vcc_lan: REG8 {
+			vcc_lan: REG9 {
 				regulator-name = "vcca_lan";
 				regulator-min-microvolt = <3300000>;
 				regulator-max-microvolt = <3300000>;
 			};
 
-			vccio_pmu: REG9 {
-				regulator-name = "vccio_pmu";
-				regulator-min-microvolt = <3300000>;
-				regulator-max-microvolt = <3300000>;
-			};
-
 			vdd_10: REG10 {
 				regulator-name = "vdd_10";
 				regulator-min-microvolt = <1000000>;
@@ -245,14 +218,12 @@
 				regulator-name = "vcc_18";
 				regulator-min-microvolt = <1800000>;
 				regulator-max-microvolt = <1800000>;
-				regulator-always-on;
 			};
 
 			vcc18_lcd: REG12 {
 				regulator-name = "vcc18_lcd";
 				regulator-min-microvolt = <1800000>;
 				regulator-max-microvolt = <1800000>;
-				regulator-always-on;
 			};
 		};
 	};
@@ -326,7 +297,7 @@
 &io_domains {
 	status = "okay";
 
-	audio-supply = <&vcca_33>;
+	audio-supply = <&vccio_wl>;
 	bb-supply = <&vcc_io>;
 	dvp-supply = <&dovdd_1v8>;
 	flash0-supply = <&vcc_flash>;
diff --git a/arch/arm/boot/dts/rk3288-firefly-reload.dts b/arch/arm/boot/dts/rk3288-firefly-reload.dts
index b86419b..7b710ea 100644
--- a/arch/arm/boot/dts/rk3288-firefly-reload.dts
+++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts
@@ -67,7 +67,16 @@
 			pinctrl-0 = <&work_led>;
 		};
 	};
-	
+
+	vcc_5v: vcc_sys: vsys-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc_5v";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		regulator-always-on;
+		regulator-boot-on;
+	};
+
 	vcc_sd: sdmmc-regulator {
 		compatible = "regulator-fixed";
 		gpio = <&gpio7 11 GPIO_ACTIVE_LOW>;
@@ -115,10 +124,18 @@
 		vin-supply = <&vcc_5v>;
 	};
 
-	/*
-	 * A TT8142 creates both dovdd_1v8 and vcc28_dvp, controlled
-	 * by the dvp_pwr pin.
-	 */
+	dovdd_1v8: dovdd-1v8-regulator {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&dvp_pwr>;
+		regulator-name = "dovdd_1v8";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		vin-supply = <&vcc_io>;
+	};
+
 	vcc28_dvp: vcc28-dvp-regulator {
 		compatible = "regulator-fixed";
 		enable-active-high;
@@ -128,7 +145,38 @@
 		regulator-name = "vcc28_dvp";
 		regulator-min-microvolt = <2800000>;
 		regulator-max-microvolt = <2800000>;
-		regulator-always-on;
+		vin-supply = <&vcc_io>;
+	};
+
+	af_28: af_28-regulator {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&dvp_pwr>;
+		regulator-name = "af_28";
+		regulator-min-microvolt = <2800000>;
+		regulator-max-microvolt = <2800000>;
+		vin-supply = <&vcc_io>;
+	};
+
+	dvdd_1v2: af_28-regulator {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&cif_pwr>;
+		regulator-name = "dvdd_1v2";
+		regulator-min-microvolt = <1200000>;
+		regulator-max-microvolt = <1200000>;
+		vin-supply = <&vcc_io>;
+	};
+
+	vbat_wl: wifi-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vbat_wl";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
 		vin-supply = <&vcc_io>;
 	};
 
@@ -278,6 +326,10 @@
 		dvp_pwr: dvp-pwr {
 			rockchip,pins = <0 11 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
+
+		cif_pwr: cif-pwr {
+			rockchip,pins = <7 12 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
 	};
 
 	hym8563 {
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1465984 — 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:
> There are many regulators are missed in previous commit, this
> commit complete most of them. It also fix some mistakes in the
> regulator properties. The VDD_10(REG10) and VCC_18(REG11) had better
> to keep in always-on state, as it is used as the USB PHY supply,
> corretly we have no way to assign power supply to a USB PHY.
> The VCCA_33(REG8) should be enabled or the GMAC won't work.
> 
> It also fix the wrong properties for audio in io-domains, the supply
> connected to APIO4_VDD is different to firefly release version.
> 
> Signed-off-by: Randy Li <ayaka@soulik.info>

applied to my dts32 branch for 4.9


Thanks
Heiko

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web