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

Commit 9d0b1f34 authored Aug 24, 2014 by Olof Johansson

Merge tag 'v3.17-rockchip-fixes1' of...

Merge tag 'v3.17-rockchip-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes

Merge "ARM: rockchip: fix for 3.17" from Heiko Stubner:

Pinctrl that got accidentially dropped when reorganizing the
dts files and addition of the new Rockchip list to MAINTAINERS.

* tag 'v3.17-rockchip-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip

:
  MAINTAINERS: add new Rockchip SoC list
  ARM: dts: rockchip: readd missing mmc0 pinctrl settings

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

parents 2136edf3 00250b52

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -1277,6 +1277,7 @@ F: drivers/scsi/arm/
		ARM/Rockchip SoC support
		M: Heiko Stuebner <heiko@sntech.de>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		L: linux-rockchip@lists.infradead.org
		S: Maintained
		F: arch/arm/mach-rockchip/
		F: drivers//rockchip*

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -149,6 +149,8 @@
		&mmc0 { /* sdmmc */
		num-slots = <1>;
		status = "okay";
		pinctrl-names = "default";
		pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;
		vmmc-supply = <&vcc_sd0>;

		slot@0 {

arch/arm/boot/dts/rk3188-radxarock.dts

+2 −0

Original line number	Diff line number	Diff line
		@@ -179,6 +179,8 @@
		&mmc0 {
		num-slots = <1>;
		status = "okay";
		pinctrl-names = "default";
		pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;
		vmmc-supply = <&vcc_sd0>;

		slot@0 {