diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-06-29 11:24:25 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-06-29 11:24:25 -0400 |
| commit | 76c11d9b55366c6da11ee821716d56b68110a2c6 (patch) | |
| tree | b7eae841919f78db12d303d20863564b05bf3f33 /arm-dts-am335x-bone-common-setup-default-pinmux-http.patch | |
| parent | c9229e16082bdc9b2f74a08bfdc77bcfed51df18 (diff) | |
| download | kernel-76c11d9b55366c6da11ee821716d56b68110a2c6.tar.gz kernel-76c11d9b55366c6da11ee821716d56b68110a2c6.tar.xz kernel-76c11d9b55366c6da11ee821716d56b68110a2c6.zip | |
Linux v4.1-11235-gc63f887bdae8
- Reenable debugging options.
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 | 63 |
1 files changed, 6 insertions, 57 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 9bba4808a..829bd16ef 100644 --- a/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch +++ b/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch @@ -5,11 +5,11 @@ Subject: [PATCH] arm: dts: am335x-bone-common: setup default pinmux Signed-off-by: Robert Nelson <robertcnelson@gmail.com> --- - arch/arm/boot/dts/am335x-bone-common.dtsi | 222 ++++++++++++++++++++++++++++++ - 1 file changed, 222 insertions(+) + arch/arm/boot/dts/am335x-bone-common.dtsi | 171 ++++++++++++++++++++++++++++++ + 1 file changed, 171 insertions(+) diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi -index b2e14381dd1c..853079eb0080 100644 +index fec78349c1f3..ab90dc7f00f3 100644 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi @@ -95,6 +95,20 @@ @@ -115,7 +115,7 @@ index b2e14381dd1c..853079eb0080 100644 &usb { status = "okay"; }; -@@ -259,6 +341,106 @@ +@@ -285,6 +367,55 @@ }; }; @@ -168,61 +168,10 @@ index b2e14381dd1c..853079eb0080 100644 + ti,adc-channels = <4 5 6>; + }; +}; -+ -+&epwmss0 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&ecap0_pin_p9_42>; -+ status = "okay"; -+ -+ ecap@48300100 { -+ status = "okay"; -+ }; -+}; -+ -+&epwmss1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = < -+ &ehrpwm1_pin_p9_14 -+ &ehrpwm1_pin_p9_16 -+ >; -+ -+ status = "okay"; -+ -+ ehrpwm@48302200 { -+ status = "okay"; -+ }; -+}; -+ -+&spi0 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&spi0_pins>; -+ status = "okay"; -+ -+ spidev0: spi@0 { -+ compatible = "spidev"; -+ reg = <0>; -+ spi-max-frequency = <16000000>; -+ spi-cpha; -+ }; -+ -+ spidev1: spi@1 { -+ compatible = "spidev"; -+ reg = <1>; -+ spi-max-frequency = <16000000>; -+ }; -+}; -+ -+&tscadc { -+ status = "okay"; -+ adc { -+ ti,adc-channels = <4 5 6>; -+ }; -+}; -+ + /include/ "tps65217.dtsi" - &tps { -@@ -366,4 +548,44 @@ +@@ -393,4 +524,44 @@ &sham { status = "okay"; |