tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'stericsson-fixes-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into fixes

Merge "Ux500 fixes" from Linus Walleij:

This fixes an MMC/SD configuration issue present for some time
in the Ux500 DT but triggered by proper error handling in v4.1-rc1.

* tag 'stericsson-fixes-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: ux500: Enable GPIO regulator for SD-card for snowball
ARM: ux500: Enable GPIO regulator for SD-card for HREF boards
ARM: ux500: Move GPIO regulator for SD-card into board DTSs

Arnd Bergmann bd1a6e7b 1e5f9ed0

+28 -17
-17
arch/arm/boot/dts/ste-dbx5x0.dtsi
··· 1017 1017 status = "disabled"; 1018 1018 }; 1019 1019 1020 - vmmci: regulator-gpio { 1021 - compatible = "regulator-gpio"; 1022 - 1023 - regulator-min-microvolt = <1800000>; 1024 - regulator-max-microvolt = <2900000>; 1025 - regulator-name = "mmci-reg"; 1026 - regulator-type = "voltage"; 1027 - 1028 - startup-delay-us = <100>; 1029 - enable-active-high; 1030 - 1031 - states = <1800000 0x1 1032 - 2900000 0x0>; 1033 - 1034 - status = "disabled"; 1035 - }; 1036 - 1037 1020 mcde@a0350000 { 1038 1021 compatible = "stericsson,mcde"; 1039 1022 reg = <0xa0350000 0x1000>, /* MCDE */
+15
arch/arm/boot/dts/ste-href.dtsi
··· 111 111 pinctrl-1 = <&i2c3_sleep_mode>; 112 112 }; 113 113 114 + vmmci: regulator-gpio { 115 + compatible = "regulator-gpio"; 116 + 117 + regulator-min-microvolt = <1800000>; 118 + regulator-max-microvolt = <2900000>; 119 + regulator-name = "mmci-reg"; 120 + regulator-type = "voltage"; 121 + 122 + startup-delay-us = <100>; 123 + enable-active-high; 124 + 125 + states = <1800000 0x1 126 + 2900000 0x0>; 127 + }; 128 + 114 129 // External Micro SD slot 115 130 sdi0_per1@80126000 { 116 131 arm,primecell-periphid = <0x10480180>;
+13
arch/arm/boot/dts/ste-snowball.dts
··· 146 146 }; 147 147 148 148 vmmci: regulator-gpio { 149 + compatible = "regulator-gpio"; 150 + 149 151 gpios = <&gpio7 4 0x4>; 150 152 enable-gpio = <&gpio6 25 0x4>; 153 + 154 + regulator-min-microvolt = <1800000>; 155 + regulator-max-microvolt = <2900000>; 156 + regulator-name = "mmci-reg"; 157 + regulator-type = "voltage"; 158 + 159 + startup-delay-us = <100>; 160 + enable-active-high; 161 + 162 + states = <1800000 0x1 163 + 2900000 0x0>; 151 164 }; 152 165 153 166 // External Micro SD slot