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

Commit fc244e3a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v4.14-rockchip-dts32-1' of... 

Merge tag 'v4.14-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

Pull "Rockchip dts32 changes for 4.14" from Heiko Stübner:

Removal of the deprectated num-slots property from all Rockchip dw-mmc
nodes. The rv1108 gains support for sd-cards on the evaluation board and
the general nodes get a bit of cosmetic. On rk3288 the evb gains support
saradc and the adc-key connected to it while some more boards also get
their mali gpu enabled (fennec, evb, tinker).

The biggest set of changes can be found on the rk3228/rk3229 combo this
time. It gets core support for efuse, sdmmc, sdio, io-domans and spdif
as well as a separate rk3229.dtsi that will keep the slight differences
between the two brothers rk3228/rk3229. The evaluation board also gets
some attention and abled nodes (regulators, io-domains, emmc, tsadc keys)

But I think the most interesting change is the cpu enable-method for it.
Instead of using the older in-kernel method, we're now also moving to
handling this in firmware via the psci interface on 32bit Rockchip socs.
In a recently merged pull request [0] support for the rk3228/rk3229 was
added to OP-TEE including the psci support and it seems supporting other
32bit Rockchip socs that way is also planned for the future.

[0] https://github.com/OP-TEE/optee_os/pull/1666

* tag 'v4.14-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (23 commits)
  ARM: dts: rockchip: fix property-ordering in rv1108 mmc nodes
  ARM: dts: rockchip: enable sdmmc for rv1108 evb
  ARM: dts: rockchip: add efuse device node for rk3228
  ARM: dts: rockchip: add gpio power-key for rk3229-evb
  ARM: dts: rockchip: enable tsadc for rk3229-evb
  ARM: dts: rockchip: enable eMMC for rk3229-evb
  ARM: dts: rockchip: enable io-domain for rk3229-evb
  ARM: dts: rockchip: add cpu-supply property for cpu node of rk3229-evb
  ARM: dts: rockchip: add regulator nodes for rk3229-evb
  ARM: dts: rockchip: add sdmmc and sdio nodes for rk3228 SoC
  ARM: dts: rockchip: fix compatible string for eMMC node of rk3228 SoC
  ARM: dts: rockchip: add cpu enable method for rk3228 SoC
  ARM: dts: rockchip: remove num-slots from all platforms
  ARM: dts: rockchip: Add io-domain node for rk3228
  ARM: dts: rockchip: add basic dtsi file for RK3229 SoC
  ARM: dts: rockchip: enable adc key for rk3288-evb
  ARM: dts: rockchip: enable saradc for rk3288-evb
  ARM: dts: rockchip: enable ARM Mali GPU on rk3288-fennec
  ARM: dts: rockchip: enable ARM Mali GPU on rk3288-evb
  ARM: dts: rockchip: enable ARM Mali GPU on rk3288-tinker
  ...
parents f7ec9146 0f4dc7e1

arch/arm/boot/dts/rk3036-kylin.dts

+0 −2
Original line number Original line Diff line number Diff line
@@ -357,7 +357,6 @@ 
	keep-power-in-suspend;

	keep-power-in-suspend;

	mmc-pwrseq = <&sdio_pwrseq>;

	mmc-pwrseq = <&sdio_pwrseq>;

	non-removable;

	non-removable;

	num-slots = <1>;

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&sdio_clk &sdio_cmd &sdio_bus4>;

	pinctrl-0 = <&sdio_clk &sdio_cmd &sdio_bus4>;

	sd-uhs-sdr12;

	sd-uhs-sdr12;
@@ -372,7 +371,6 @@ 
	cap-sd-highspeed;

	cap-sd-highspeed;

	card-detect-delay = <200>;

	card-detect-delay = <200>;

	disable-wp;

	disable-wp;

	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>;

};

};

arch/arm/boot/dts/rk3036.dtsi

+1 −2
Original line number Original line Diff line number Diff line
@@ -287,7 +287,6 @@ 
		fifo-depth = <0x100>;

		fifo-depth = <0x100>;

		mmc-ddr-1_8v;

		mmc-ddr-1_8v;

		non-removable;

		non-removable;

		num-slots = <1>;

		pinctrl-names = "default";

		pinctrl-names = "default";

		pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;

		pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;

		resets = <&cru SRST_EMMC>;

		resets = <&cru SRST_EMMC>;
@@ -599,7 +598,7 @@ 
				rockchip,pins = <1 15 RK_FUNC_1 &pcfg_pull_default>;

				rockchip,pins = <1 15 RK_FUNC_1 &pcfg_pull_default>;

			};

			};





			sdmmc_cd: sdmcc-cd {

			sdmmc_cd: sdmmc-cd {

				rockchip,pins = <1 17 RK_FUNC_1 &pcfg_pull_default>;

				rockchip,pins = <1 17 RK_FUNC_1 &pcfg_pull_default>;

			};

			};

arch/arm/boot/dts/rk3066a-bqcurie2.dts

+0 −2
Original line number Original line Diff line number Diff line
@@ -190,7 +190,6 @@ 
#include "tps65910.dtsi"

#include "tps65910.dtsi"





&mmc0 { /* sdmmc */

&mmc0 { /* sdmmc */

	num-slots = <1>;

	status = "okay";

	status = "okay";

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;

	pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;
@@ -202,7 +201,6 @@ 
};

};





&mmc1 { /* wifi */

&mmc1 { /* wifi */

	num-slots = <1>;

	status = "okay";

	status = "okay";

	non-removable;

	non-removable;

arch/arm/boot/dts/rk3066a-mk808.dts

+0 −2
Original line number Original line Diff line number Diff line
@@ -132,7 +132,6 @@ 
	bus-width = <4>;

	bus-width = <4>;

	cap-mmc-highspeed;

	cap-mmc-highspeed;

	cap-sd-highspeed;

	cap-sd-highspeed;

	num-slots = <1>;

	vmmc-supply = <&vcc_sd>;

	vmmc-supply = <&vcc_sd>;

	status = "okay";

	status = "okay";

};

};
@@ -141,7 +140,6 @@ 
	bus-width = <4>;

	bus-width = <4>;

	disable-wp;

	disable-wp;

	non-removable;

	non-removable;

	num-slots = <1>;

	pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus4>;

	pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus4>;

	pinctrl-names = "default";

	pinctrl-names = "default";

	vmmc-supply = <&vcc_wifi>;

	vmmc-supply = <&vcc_wifi>;

arch/arm/boot/dts/rk3066a-rayeager.dts

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

	cap-mmc-highspeed;

	disable-wp;

	disable-wp;

	non-removable;

	non-removable;

	num-slots = <1>;

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&emmc_clk>, <&emmc_cmd>, <&emmc_rst>;

	pinctrl-0 = <&emmc_clk>, <&emmc_cmd>, <&emmc_rst>;

	vmmc-supply = <&vcc_emmc>;

	vmmc-supply = <&vcc_emmc>;
@@ -336,7 +335,6 @@ 
&mmc0 {

&mmc0 {

	bus-width = <4>;

	bus-width = <4>;

	disable-wp;

	disable-wp;

	num-slots = <1>;

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;

	pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;

	vmmc-supply = <&vcc_sd>;

	vmmc-supply = <&vcc_sd>;
@@ -349,7 +347,6 @@ 
	bus-width = <4>;

	bus-width = <4>;

	disable-wp;

	disable-wp;

	non-removable;

	non-removable;

	num-slots = <1>;

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&sd1_clk>, <&sd1_cmd>, <&sd1_bus4>;

	pinctrl-0 = <&sd1_clk>, <&sd1_cmd>, <&sd1_bus4>;

	vmmc-supply = <&vccio_wl>;

	vmmc-supply = <&vccio_wl>;