Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1591dc44 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v3.19-rockchip-dtsfixes1' of... 

Merge tag 'v3.19-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/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: default avatarOlof Johansson <olof@lixom.net>
parents eaa27f34 6618e478

arch/arm/boot/dts/rk3288-evb.dtsi

+30 −0
Original line number Diff line number Diff line
@@ -155,6 +155,15 @@ 
};



&pinctrl {

	pcfg_pull_none_drv_8ma: pcfg-pull-none-drv-8ma {

		drive-strength = <8>;

	};



	pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma {

		bias-pull-up;

		drive-strength = <8>;

	};



	backlight {

		bl_en: bl-en {

			rockchip,pins = <7 2 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -173,6 +182,27 @@ 
		};

	};



	sdmmc {

		/*

		 * Default drive strength isn't enough to achieve even

		 * high-speed mode on EVB board so bump up to 8ma.

		 */

		sdmmc_bus4: sdmmc-bus4 {

			rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,

					<6 17 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,

					<6 18 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,

					<6 19 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;

		};



		sdmmc_clk: sdmmc-clk {

			rockchip,pins = <6 20 RK_FUNC_1 &pcfg_pull_none_drv_8ma>;

		};



		sdmmc_cmd: sdmmc-cmd {

			rockchip,pins = <6 21 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;

		};

	};



	usb {

		host_vbus_drv: host-vbus-drv {

			rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>;