diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-03-16 10:07:00 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-03-16 10:07:00 -0400 |
| commit | 9608f11d20f9c69ff4c624dcf421721221599255 (patch) | |
| tree | e4ee1f9536259e294f860ed0a371b82e823e6c0f /arm-dts-am335x-bone-common-setup-default-pinmux-http.patch | |
| parent | cd37906b18022c72b4599cb0af3cfbd1c001499c (diff) | |
| download | kernel-9608f11d20f9c69ff4c624dcf421721221599255.tar.gz kernel-9608f11d20f9c69ff4c624dcf421721221599255.tar.xz kernel-9608f11d20f9c69ff4c624dcf421721221599255.zip | |
Linux v4.0-rc4
- Drop arm64 RCU revert patch. Should be fixed properly upstream now.
- Disable 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 | 117 |
1 files changed, 105 insertions, 12 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 7f10489c6..9696f5386 100644 --- a/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch +++ b/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch @@ -5,14 +5,14 @@ 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 | 130 ++++++++++++++++++++++++++++++ - 1 file changed, 130 insertions(+) + arch/arm/boot/dts/am335x-bone-common.dtsi | 222 ++++++++++++++++++++++++++++++ + 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 ec755eeb78ee..db880bf46135 100644 +index 1fd496fe1a68..9688dda39e7a 100644 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi -@@ -95,6 +95,13 @@ +@@ -95,6 +95,20 @@ >; }; @@ -23,10 +23,17 @@ index ec755eeb78ee..db880bf46135 100644 + >; + }; + ++ uart1_pins: pinmux_uart1_pins { ++ pinctrl-single,pins = < ++ 0x180 (PIN_INPUT_PULLUP | MUX_MODE0) /* uart1_rxd.uart1_rxd */ ++ 0x184 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* uart1_txd.uart1_txd */ ++ >; ++ }; ++ clkout2_pin: pinmux_clkout2_pin { pinctrl-single,pins = < 0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */ -@@ -175,6 +182,33 @@ +@@ -175,6 +189,60 @@ 0x1c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad7.mmc1_dat7 */ >; }; @@ -57,10 +64,37 @@ index ec755eeb78ee..db880bf46135 100644 + 0x164 0x0 /* P9_42 (ZCZ ball C18) | MODE 0 */ + >; + }; ++ ++ spi0_pins: pinmux_spi0_pins { ++ pinctrl-single,pins = < ++ 0x150 (PIN_INPUT_PULLUP | MUX_MODE0) /* spi0_sclk.spi0_sclk */ ++ 0x154 (PIN_INPUT_PULLUP | MUX_MODE0) /* spi0_d0.spi0_d0 */ ++ 0x158 (PIN_OUTPUT_PULLUP | MUX_MODE0) /* spi0_d1.spi0_d1 */ ++ 0x15c (PIN_OUTPUT_PULLUP | MUX_MODE0) /* spi0_cs0.spi0_cs0 */ ++ >; ++ }; ++ ++ ehrpwm1_pin_p9_14: pinmux_ehrpwm1_pin_p9_14 { ++ pinctrl-single,pins = < ++ 0x048 0x6 /* P9_14 (ZCZ ball U14) | MODE 6 */ ++ >; ++ }; ++ ++ ehrpwm1_pin_p9_16: pinmux_ehrpwm1_pin_p9_16 { ++ pinctrl-single,pins = < ++ 0x04c 0x6 /* P9_16 (ZCZ ball T14) | MODE 6 */ ++ >; ++ }; ++ ++ ecap0_pin_p9_42: pinmux_ecap0_pin_p9_42 { ++ pinctrl-single,pins = < ++ 0x164 0x0 /* P9_42 (ZCZ ball C18) | MODE 0 */ ++ >; ++ }; }; &uart0 { -@@ -184,6 +218,13 @@ +@@ -184,6 +252,20 @@ status = "okay"; }; @@ -71,10 +105,17 @@ index ec755eeb78ee..db880bf46135 100644 + status = "okay"; +}; + ++&uart1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart1_pins>; ++ ++ status = "okay"; ++}; ++ &usb { status = "okay"; }; -@@ -259,6 +300,56 @@ +@@ -259,6 +341,106 @@ }; }; @@ -128,13 +169,65 @@ index ec755eeb78ee..db880bf46135 100644 + }; +}; + ++&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 { -@@ -340,3 +431,42 @@ - cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; - cd-inverted; - }; +@@ -347,4 +529,44 @@ + + &sham { + status = "okay"; ++ ++}; + +/ { + ocp { @@ -173,7 +266,7 @@ index ec755eeb78ee..db880bf46135 100644 + status = "okay"; + }; + }; -+}; + }; -- 2.1.0 |