Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+6
-5
+1
-1
MAINTAINERS
+1
-1
MAINTAINERS
···
8922
8922
M: Thierry Reding <thierry.reding@gmail.com>
8923
8923
L: linux-tegra@vger.kernel.org
8924
8924
Q: http://patchwork.ozlabs.org/project/linux-tegra/list/
8925
-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git
8925
+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git
8926
8926
S: Supported
8927
8927
N: [^a-z]tegra
8928
8928
+1
-1
arch/arm/boot/dts/ste-nomadik-s8815.dts
+1
-1
arch/arm/boot/dts/ste-nomadik-s8815.dts
+4
-3
arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
+4
-3
arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
···
1
1
/*
2
2
* Device Tree for the ST-Ericsson Nomadik 8815 STn8815 SoC
3
3
*/
4
-
/include/ "skeleton.dtsi"
4
+
5
+
#include <dt-bindings/gpio/gpio.h>
6
+
#include "skeleton.dtsi"
5
7
6
8
/ {
7
9
#address-cells = <1>;
···
844
842
bus-width = <4>;
845
843
cap-mmc-highspeed;
846
844
cap-sd-highspeed;
847
-
cd-gpios = <&gpio3 15 0x1>;
848
-
cd-inverted;
845
+
cd-gpios = <&gpio3 15 GPIO_ACTIVE_LOW>;
849
846
pinctrl-names = "default";
850
847
pinctrl-0 = <&mmcsd_default_mux>, <&mmcsd_default_mode>;
851
848
vmmc-supply = <&vmmc_regulator>;