summaryrefslogtreecommitdiffstats
path: root/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-03-03 09:00:03 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2015-03-03 09:00:03 -0500
commit3b35d75b8c3f7046e93c9bb9d0bfce145fbd9033 (patch)
tree327879b3e53e14b264bcc31af9308875f88be76b /arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
parent2939fc47bcf1f4f0757c12dc94d0c2dfe0aba4ae (diff)
downloadkernel-3b35d75b8c3f7046e93c9bb9d0bfce145fbd9033.tar.gz
kernel-3b35d75b8c3f7046e93c9bb9d0bfce145fbd9033.tar.xz
kernel-3b35d75b8c3f7046e93c9bb9d0bfce145fbd9033.zip
Linux v4.0-rc1-178-g023a6007a08d
Diffstat (limited to 'arm-dts-am335x-bone-common-setup-default-pinmux-http.patch')
-rw-r--r--arm-dts-am335x-bone-common-setup-default-pinmux-http.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch b/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
index d676839aa..7f10489c6 100644
--- a/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
+++ b/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
@@ -9,7 +9,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
1 file changed, 130 insertions(+)
diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index 754b96c5dbb1..4991a1664773 100644
+index ec755eeb78ee..db880bf46135 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -95,6 +95,13 @@
@@ -74,7 +74,7 @@ index 754b96c5dbb1..4991a1664773 100644
&usb {
status = "okay";
};
-@@ -258,6 +299,56 @@
+@@ -259,6 +300,56 @@
};
};
@@ -131,7 +131,7 @@ index 754b96c5dbb1..4991a1664773 100644
/include/ "tps65217.dtsi"
&tps {
-@@ -339,3 +430,42 @@
+@@ -340,3 +431,42 @@
cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
cd-inverted;
};