Commit 1591dc44a067a6579544c33d05fefa9d8665e1c0

Authored by Olof Johansson

Merge tag 'v3.19-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kerne…

…l/git/mmind/linux-rockchip into fixes

Merge "ARM: rockchip: dts fix for 3.19" from Heiko Stübner:

Increase drive-strength to sdmmc pins on rk3288-evb to fix
an issue with the fixed highspeed card detection.

* tag 'v3.19-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: bump sd card pin drive strength up on rk3288-evb

Signed-off-by: Olof Johansson <olof@lixom.net>

Showing 1 changed file Side-by-side Diff

arch/arm/boot/dts/rk3288-evb.dtsi
... ... @@ -155,6 +155,15 @@
155 155 };
156 156  
157 157 &pinctrl {
  158 + pcfg_pull_none_drv_8ma: pcfg-pull-none-drv-8ma {
  159 + drive-strength = <8>;
  160 + };
  161 +
  162 + pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma {
  163 + bias-pull-up;
  164 + drive-strength = <8>;
  165 + };
  166 +
158 167 backlight {
159 168 bl_en: bl-en {
160 169 rockchip,pins = <7 2 RK_FUNC_GPIO &pcfg_pull_none>;
... ... @@ -170,6 +179,27 @@
170 179 pmic {
171 180 pmic_int: pmic-int {
172 181 rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;
  182 + };
  183 + };
  184 +
  185 + sdmmc {
  186 + /*
  187 + * Default drive strength isn't enough to achieve even
  188 + * high-speed mode on EVB board so bump up to 8ma.
  189 + */
  190 + sdmmc_bus4: sdmmc-bus4 {
  191 + rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
  192 + <6 17 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
  193 + <6 18 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
  194 + <6 19 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;
  195 + };
  196 +
  197 + sdmmc_clk: sdmmc-clk {
  198 + rockchip,pins = <6 20 RK_FUNC_1 &pcfg_pull_none_drv_8ma>;
  199 + };
  200 +
  201 + sdmmc_cmd: sdmmc-cmd {
  202 + rockchip,pins = <6 21 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;
173 203 };
174 204 };
175 205