diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-02-04 19:09:14 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-02-04 19:09:14 +0100 |
| commit | 6844742ad9a94b888c14b773051dfe95a8695300 (patch) | |
| tree | 839bff734aa4fcf48f25fe8cd4072b932ad046f2 /arch | |
| parent | 3ee82c67793df6fcc6f97706befc7c0d878af8ce (diff) | |
| parent | 0ab72e0d78fc787c89789ba40da4ceb72a7269b0 (diff) | |
| download | barebox-6844742ad9a94b888c14b773051dfe95a8695300.tar.gz barebox-6844742ad9a94b888c14b773051dfe95a8695300.tar.xz | |
Merge branch 'for-next/am335x'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/am335x-phytec-phycore-som.dtsi | 30 | ||||
| -rw-r--r-- | arch/arm/dts/am335x-phytec-phyflex.dts | 31 |
2 files changed, 61 insertions, 0 deletions
diff --git a/arch/arm/dts/am335x-phytec-phycore-som.dtsi b/arch/arm/dts/am335x-phytec-phycore-som.dtsi index c34ae38271..7d0e3c5466 100644 --- a/arch/arm/dts/am335x-phytec-phycore-som.dtsi +++ b/arch/arm/dts/am335x-phytec-phycore-som.dtsi @@ -17,6 +17,13 @@ }; &am33xx_pinmux { + usb_pins: pinmux_usb_pins { + pinctrl-single,pins = < + 0x21c (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* usb0_drvvbus.usb0_drvvbus */ + 0x234 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* usb1_drvvbus.usb1_drvvbus */ + >; + }; + i2c0_pins: pinmux_i2c0_pins { pinctrl-single,pins = < 0x188 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_sda.i2c0_sda */ @@ -106,6 +113,29 @@ }; }; +&cppi41dma { + status = "okay"; +}; + +&usb_ctrl_mod { + status = "okay"; +}; + +&usb { + pinctrl-names = "default"; + pinctrl-0 = <&usb_pins>; + status = "okay"; +}; + +&usb1 { + status = "okay"; + dr_mode = "host"; +}; + +&usb1_phy { + status = "okay"; +}; + &i2c0 { pinctrl-names = "default"; pinctrl-0 = <&i2c0_pins>; diff --git a/arch/arm/dts/am335x-phytec-phyflex.dts b/arch/arm/dts/am335x-phytec-phyflex.dts index 6c49567107..5459cd24db 100644 --- a/arch/arm/dts/am335x-phytec-phyflex.dts +++ b/arch/arm/dts/am335x-phytec-phyflex.dts @@ -39,6 +39,13 @@ }; &am33xx_pinmux { + usb_pins: pinmux_usb { + pinctrl-single,pins = < + 0x21c (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* usb0_drvvbus.usb0_drvvbus */ + 0x234 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* usb1_drvvbus.usb1_drvvbus */ + >; + }; + i2c0_pins: pinmux_i2c0_pins { pinctrl-single,pins = < 0x188 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_sda */ @@ -129,6 +136,30 @@ }; }; +&cppi41dma { + status = "okay"; +}; + + +&usb_ctrl_mod { + status = "okay"; +}; + +&usb { + pinctrl-names = "default"; + pinctrl-0 = <&usb_pins>; + status = "okay"; +}; + +&usb1 { + dr_mode = "host"; + status = "okay"; +}; + +&usb1_phy { + status = "okay"; +}; + &i2c0 { pinctrl-names = "default"; pinctrl-0 = <&i2c0_pins>; |