ARM: ux500: Fixup signal voltage regulator for SD card
Subsystems (4)
cover ARM: ux500: Fixup signal voltage regulator for SD card
The SD card signal voltage regulator are configured from DT as a gpio regulator. Some configurations were missing and some were wrong, so let's fix it.
Ulf Hansson (3):
ARM: ux500: Refactor common DT configs for sdi[n] devices
ARM: ux500: Configure regulator for I/O voltage for SD-card slot
ARM: ux500: regulators: Remove dead code for SD-card regulator
arch/arm/boot/dts/ste-href.dtsi | 2 -- arch/arm/boot/dts/ste-hrefprev60.dtsi | 7 +++-- arch/arm/boot/dts/ste-hrefv60plus.dtsi | 40 ++----------------------- arch/arm/boot/dts/ste-snowball.dts | 6 ++-- arch/arm/mach-ux500/board-mop500-regulators.c | 14 --------- 5 files changed, 10 insertions(+), 59 deletions(-)
Signature · 1 line
1.7.9.5
PATCH 1/3 ARM: ux500: Refactor common DT configs for sdi[n] devices
Remove duplicated configurations and move specific details into each corresponding dtsi file for the href versions.
--- arch/arm/boot/dts/ste-href.dtsi | 2 -- arch/arm/boot/dts/ste-hrefprev60.dtsi | 5 ++++ arch/arm/boot/dts/ste-hrefv60plus.dtsi | 39 -------------------------------- 3 files changed, 5 insertions(+), 41 deletions(-)
arch/arm/boot/dts/ste-href.dtsi +0 -2
@@ -124,8 +124,6 @@ pinctrl-0 = <&sdi0_default_mode>; pinctrl-1 = <&sdi0_sleep_mode>; - cd-gpios = <&tc3589x_gpio 3 0x4>; - status = "okay"; };
arch/arm/boot/dts/ste-hrefprev60.dtsi +5 -0
@@ -60,6 +60,11 @@ pinctrl-0 = <&ssp0_hrefprev60_mode>; }; + // External Micro SD slot + sdi0_per1 at 80126000 { + cd-gpios = <&tc3589x_gpio 3 0x4>; + }; + vmmci: regulator-gpio { gpios = <&tc3589x_gpio 18 0x4>; enable-gpio = <&tc3589x_gpio 17 0x4>;
arch/arm/boot/dts/ste-hrefv60plus.dtsi +0 -39
@@ -19,46 +19,7 @@ soc { // External Micro SD slot sdi0_per1 at 80126000 { - arm,primecell-periphid = <0x10480180>; - max-frequency = <100000000>; - bus-width = <4>; - mmc-cap-sd-highspeed; - mmc-cap-mmc-highspeed; - vmmc-supply = <&ab8500_ldo_aux3_reg>; - cd-gpios = <&gpio2 31 0x4>; // 95 - - status = "okay"; - }; - - // WLAN SDIO channel - sdi1_per2 at 80118000 { - arm,primecell-periphid = <0x10480180>; - max-frequency = <100000000>; - bus-width = <4>; - - status = "okay"; - }; - - // PoP:ed eMMC - sdi2_per3 at 80005000 { - arm,primecell-periphid = <0x10480180>; - max-frequency = <100000000>; - bus-width = <8>; - mmc-cap-mmc-highspeed; - - status = "okay"; - }; - - // On-board eMMC - sdi4_per2 at 80114000 { - arm,primecell-periphid = <0x10480180>; - max-frequency = <100000000>; - bus-width = <8>; - mmc-cap-mmc-highspeed; - vmmc-supply = <&ab8500_ldo_aux2_reg>; - - status = "okay"; }; pinctrl {
Signature · 1 line
1.7.9.5
Linus Walleij
AppliedPATCH 1/3 ARM: ux500: Refactor common DT configs for sdi[n] devices
Quoted 6 lines · Ulf Hansson
Remove duplicated configurations and move specific details into each corresponding dtsi file for the href versions.
Cc Lee Jones <[email protected]>Cc devicetree at vger.kernel.orgSigned-off-by Ulf Hansson <[email protected]>
Applied to my ux500-devicetree branch, thanks!
Yours,
Linus Walleij
PATCH 2/3 ARM: ux500: Configure regulator for I/O voltage for SD-card slot
In reply to Ulf HanssonTo be able to enable SDR12|25 for SD-cards, we needed to fixup the configuration in DT of the gpio regulator, which handles the signal voltage level. Some configuration were missing and some were wrong.
--- arch/arm/boot/dts/ste-hrefprev60.dtsi | 2 -- arch/arm/boot/dts/ste-hrefv60plus.dtsi | 5 +++++ arch/arm/boot/dts/ste-snowball.dts | 6 ++---- 3 files changed, 7 insertions(+), 6 deletions(-)
arch/arm/boot/dts/ste-hrefprev60.dtsi +0 -2
@@ -68,8 +68,6 @@ vmmci: regulator-gpio { gpios = <&tc3589x_gpio 18 0x4>; enable-gpio = <&tc3589x_gpio 17 0x4>; - - status = "okay"; }; pinctrl {
arch/arm/boot/dts/ste-hrefv60plus.dtsi +5 -0
@@ -22,6 +22,11 @@ cd-gpios = <&gpio2 31 0x4>; // 95 }; + vmmci: regulator-gpio { + gpios = <&gpio0 5 0x4>; + enable-gpio = <&gpio5 9 0x4>; + }; + pinctrl { /* * Set this up using hogs, as time goes by and as seems fit, these
arch/arm/boot/dts/ste-snowball.dts +2 -4
@@ -146,10 +146,8 @@ }; vmmci: regulator-gpio { - gpios = <&gpio6 25 0x4>; - enable-gpio = <&gpio7 4 0x4>; - - status = "okay"; + gpios = <&gpio7 4 0x4>; + enable-gpio = <&gpio6 25 0x4>; }; // External Micro SD slot
Signature · 1 line
1.7.9.5
PATCH 2/3 ARM: ux500: Configure regulator for I/O voltage for SD-card slot
Quoted 7 lines · Ulf Hansson
To be able to enable SDR12|25 for SD-cards, we needed to fixup the configuration in DT of the gpio regulator, which handles the signal voltage level. Some configuration were missing and some were wrong.
Cc Lee Jones <[email protected]>Cc devicetree at vger.kernel.orgSigned-off-by Ulf Hansson <[email protected]>
Patch applied to the ux500-devicetree branch, thanks!
Yours,
Linus Walleij
PATCH 3/3 ARM: ux500: regulators: Remove dead code for SD-card regulator
In reply to Ulf HanssonThe signal-voltage regulator is handled through a gpio regulator configured in DT. Remove the old dead code.
--- arch/arm/mach-ux500/board-mop500-regulators.c | 14 -------------- 1 file changed, 14 deletions(-)
arch/arm/mach-ux500/board-mop500-regulators.c +0 -14
@@ -30,20 +30,6 @@ struct regulator_init_data gpio_en_3v3_regulator = { .consumer_supplies = gpio_en_3v3_consumers, }; -static struct regulator_consumer_supply sdi0_reg_consumers[] = { -REGULATOR_SUPPLY ("vqmmc" ,"sdi0" ), -}; - -struct regulator_init_data sdi0_reg_init_data = { - .constraints = { - .min_uV =1800000 , - .max_uV =2900000 , - .valid_ops_mask =REGULATOR_CHANGE_VOLTAGE |REGULATOR_CHANGE_STATUS , - }, - .num_consumer_supplies =ARRAY_SIZE (sdi0_reg_consumers), - .consumer_supplies = sdi0_reg_consumers, -}; -/* * TPS61052 regulator */
Signature · 1 line
1.7.9.5
PATCH 3/3 ARM: ux500: regulators: Remove dead code for SD-card regulator
Quoted 14 lines · Ulf Hansson
The signal-voltage regulator is handled through a gpio regulator configured in DT. Remove the old dead code.
Cc Lee Jones <[email protected]>Signed-off-by Ulf Hansson <[email protected]>--- arch/arm/mach-ux500/board-mop500-regulators.c | 14 -------------- 1 file changed, 14 deletions(-)arch/arm/mach-ux500/board-mop500-regulators.c +0
-0
arch/arm/mach-ux500/board-mop500-regulators.c struct regulator_init_data gpio_en_3v3_regulator = { · line 37
Quoted 8 lines
arch/arm/mach-ux500/board-mop500-regulators.c +0
-5@@ -30,20 +30,6 @@ struct regulator_init_data gpio_en_3v3_regulator = { .consumer_supplies = gpio_en_3v3_consumers, }; -static struct regulator_consumer_supply sdi0_reg_consumers[] = { -REGULATOR_SUPPLY ("vqmmc" ,"sdi0" ), -}; - -struct regulator_init_data sdi0_reg_init_data = {
You also need to remove it from the header file:
arch/arm/mach-ux500/board-mop500-regulators.h
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog