summaryrefslogtreecommitdiffstats
path: root/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-06-12 15:11:23 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-06-12 15:11:23 -0400
commitc68e8929a177ca34b09b06dcf41f20f9b955b358 (patch)
tree6adcf316291fc54c190e33129489a527ba12fccc /arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
parent6adde40b1c08a66fca3c5054edce1c230e4c1e45 (diff)
downloadkernel-c68e8929a177ca34b09b06dcf41f20f9b955b358.tar.gz
kernel-c68e8929a177ca34b09b06dcf41f20f9b955b358.tar.xz
kernel-c68e8929a177ca34b09b06dcf41f20f9b955b358.zip
Linux v4.1-rc7-72-gdf5f4158415b
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.patch4
1 files changed, 2 insertions, 2 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 2105fcb52..9bba4808a 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, 222 insertions(+)
diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index 1fd496fe1a68..9688dda39e7a 100644
+index b2e14381dd1c..853079eb0080 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -95,6 +95,20 @@
@@ -222,7 +222,7 @@ index 1fd496fe1a68..9688dda39e7a 100644
/include/ "tps65217.dtsi"
&tps {
-@@ -347,4 +529,44 @@
+@@ -366,4 +548,44 @@
&sham {
status = "okay";