diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-10-09 09:45:05 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-10-09 09:45:05 -0400 |
| commit | 5bc66d51ea8f9d49032188aa6b059b02004c613f (patch) | |
| tree | fa3ca8bf137a1f248d8c0c5a6ccbf107525a9c53 /arm-dts-am335x-bone-common-setup-default-pinmux-http.patch | |
| parent | c62084a59a73fcf3e354d651449d6c09eca0236b (diff) | |
| download | kernel-5bc66d51ea8f9d49032188aa6b059b02004c613f.tar.gz kernel-5bc66d51ea8f9d49032188aa6b059b02004c613f.tar.xz kernel-5bc66d51ea8f9d49032188aa6b059b02004c613f.zip | |
Linux v3.17-5503-g35a9ad8af0bb
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.patch | 12 |
1 files changed, 6 insertions, 6 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 180055d44..29fde1cfe 100644 --- a/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch +++ b/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch @@ -9,10 +9,10 @@ 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 c7357bcc7d5c..86cdb52dbf8a 100644 +index 754b96c5dbb1..4991a1664773 100644 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi -@@ -98,6 +98,13 @@ +@@ -95,6 +95,13 @@ >; }; @@ -26,7 +26,7 @@ index c7357bcc7d5c..86cdb52dbf8a 100644 clkout2_pin: pinmux_clkout2_pin { pinctrl-single,pins = < 0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */ -@@ -178,6 +185,33 @@ +@@ -175,6 +182,33 @@ 0x1c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad7.mmc1_dat7 */ >; }; @@ -60,7 +60,7 @@ index c7357bcc7d5c..86cdb52dbf8a 100644 }; &uart0 { -@@ -187,6 +221,13 @@ +@@ -184,6 +218,13 @@ status = "okay"; }; @@ -74,7 +74,7 @@ index c7357bcc7d5c..86cdb52dbf8a 100644 &usb { status = "okay"; }; -@@ -261,6 +302,56 @@ +@@ -258,6 +299,56 @@ }; }; @@ -131,7 +131,7 @@ index c7357bcc7d5c..86cdb52dbf8a 100644 /include/ "tps65217.dtsi" &tps { -@@ -337,3 +428,42 @@ +@@ -339,3 +430,42 @@ cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; cd-inverted; }; |