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

Commit 9642a104 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM straggler SoC fix from Olof Johansson:
 "A DT bugfix for Nomadik that had an ambigouos double-inversion of a
  gpio line, and one MAINTAINER URL update that might as well go in now.

  We could hold off until the merge window, but then we'll just have to
  mark the DT fix for stable and it just seems like in total causing
  more work"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  MAINTAINERS: Update Tegra Git URL
  ARM: nomadik: fix up double inversion in DT
parents 6f092803 b779b88d

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -8922,7 +8922,7 @@ M: Stephen Warren <swarren@wwwdotorg.org> 
M:	Thierry Reding <thierry.reding@gmail.com>

L:	linux-tegra@vger.kernel.org

Q:	http://patchwork.ozlabs.org/project/linux-tegra/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git

S:	Supported

N:	[^a-z]tegra

arch/arm/boot/dts/ste-nomadik-s8815.dts

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 */



/dts-v1/;

/include/ "ste-nomadik-stn8815.dtsi"

#include "ste-nomadik-stn8815.dtsi"



/ {

	model = "Calao Systems USB-S8815";

arch/arm/boot/dts/ste-nomadik-stn8815.dtsi

+4 −3
Original line number Diff line number Diff line 
/*

 * Device Tree for the ST-Ericsson Nomadik 8815 STn8815 SoC

 */

/include/ "skeleton.dtsi"



#include <dt-bindings/gpio/gpio.h>

#include "skeleton.dtsi"



/ {

	#address-cells = <1>;
@@ -842,8 +844,7 @@ 
			bus-width = <4>;

			cap-mmc-highspeed;

			cap-sd-highspeed;

			cd-gpios = <&gpio3 15 0x1>;

			cd-inverted;

			cd-gpios = <&gpio3 15 GPIO_ACTIVE_LOW>;

			pinctrl-names = "default";

			pinctrl-0 = <&mmcsd_default_mux>, <&mmcsd_default_mode>;

			vmmc-supply = <&vmmc_regulator>;