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

Commit b70e8beb authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v4.9-rockchip-dts64-fixes1' of... 

Merge tag 'v4.9-rockchip-dts64-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes

Correct regulator handling on Rockchip arm64 boards to make
bind/unbind calls work correctly and remove a sdio-only
property from non-sdio mmc hosts, that accidentially was
added there.

* tag 'v4.9-rockchip-dts64-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip

:
  arm64: dts: rockchip: remove the abuse of keep-power-in-suspend
  arm64: dts: rockchip: remove always-on and boot-on from vcc_sd

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents bb70e53e 7c627319

arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts

+0 −3
Original line number Original line Diff line number Diff line
@@ -116,7 +116,6 @@ 
	cap-mmc-highspeed;

	cap-mmc-highspeed;

	clock-frequency = <150000000>;

	clock-frequency = <150000000>;

	disable-wp;

	disable-wp;

	keep-power-in-suspend;

	non-removable;

	non-removable;

	num-slots = <1>;

	num-slots = <1>;

	vmmc-supply = <&vcc_io>;

	vmmc-supply = <&vcc_io>;
@@ -258,8 +257,6 @@ 
			};

			};





			vcc_sd: SWITCH_REG1 {

			vcc_sd: SWITCH_REG1 {

				regulator-always-on;

				regulator-boot-on;

				regulator-name = "vcc_sd";

				regulator-name = "vcc_sd";

			};

			};

arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts

+0 −4
Original line number Original line Diff line number Diff line
@@ -152,8 +152,6 @@ 
		gpio = <&gpio3 11 GPIO_ACTIVE_LOW>;

		gpio = <&gpio3 11 GPIO_ACTIVE_LOW>;

		regulator-min-microvolt = <1800000>;

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&vcc_io>;

		vin-supply = <&vcc_io>;

	};

	};
@@ -201,7 +199,6 @@ 
	bus-width = <8>;

	bus-width = <8>;

	cap-mmc-highspeed;

	cap-mmc-highspeed;

	disable-wp;

	disable-wp;

	keep-power-in-suspend;

	mmc-pwrseq = <&emmc_pwrseq>;

	mmc-pwrseq = <&emmc_pwrseq>;

	mmc-hs200-1_2v;

	mmc-hs200-1_2v;

	mmc-hs200-1_8v;

	mmc-hs200-1_8v;
@@ -350,7 +347,6 @@ 
	clock-freq-min-max = <400000 50000000>;

	clock-freq-min-max = <400000 50000000>;

	cap-sd-highspeed;

	cap-sd-highspeed;

	card-detect-delay = <200>;

	card-detect-delay = <200>;

	keep-power-in-suspend;

	num-slots = <1>;

	num-slots = <1>;

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;

	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;