diff options
| author | Olof Johansson <olof@lixom.net> | 2014-09-23 22:27:38 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-09-23 22:27:51 -0700 |
| commit | fa0510fb215f600df663e31ab6bc027142dee92e (patch) | |
| tree | 799ba32a50e527921c2b27e32065c38439f789e9 /arch/arm/boot/dts/rk3188-radxarock.dts | |
| parent | 5f0798ce4a88e8f787c67f5265d77fc6428e2c88 (diff) | |
| parent | 6051ddd4f94894cce8fde3aa29f90ae6c567fc46 (diff) | |
Merge tag 'v3.18-rockchip-dts2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt
Merge "second bunch of dts changes for 3.18" from Heiko Stubner:
More peripheral support for Rockchip SoCs
- dwc2 usb controllers
- spi controllers
- emmc controller
* tag 'v3.18-rockchip-dts2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: dts: rockchip: Remove "regulator-always-on" in vcc_rmii for Radxa Rock
ARM: dts: rockchip: fix rk3188 emmc pull references
ARM: dts: rockchip: fix swapped Radxa Rock pinctrl references
ARM: dts: rockchip: clean up rk3xxx mmc nodes
ARM: dts: rockchip: add emmc nodes for rk3066 and rk3188
ARM: dts: rockchip: add Cortex-A9 SPI controller nodes
ARM: dts: rockchip: enable usb ports on Radxa Rock
ARM: dts: rockchip: add dwc2 controllers for rk3066 and rk3188
ARM: dts: rockchip: remove rockchip,bus-index from rk3xxx i2c0
ARM: dts: Switch i2c0 to 400kHz on rk3288-evb-rk808
ARM: dts: Add rk808 PMIC to rk3288-evb-rk808
ARM: dts: Add mshc aliases for rk3288
ARM: dts: Add SPI nodes to rk3288
ARM: dts: Enable USB host1(dwc) on rk3288-evb
ARM: dts: add rk3288 dwc2 controller support
ARM: dts: Add sdio0 and sdio1 to the rk3288
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/rk3188-radxarock.dts')
| -rw-r--r-- | arch/arm/boot/dts/rk3188-radxarock.dts | 44 |
1 files changed, 43 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts b/arch/arm/boot/dts/rk3188-radxarock.dts index 2c2313ff67c6..39f66e349445 100644 --- a/arch/arm/boot/dts/rk3188-radxarock.dts +++ b/arch/arm/boot/dts/rk3188-radxarock.dts @@ -65,6 +65,19 @@ pinctrl-0 = <&ir_recv_pin>; }; + vcc_otg: usb-otg-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&otg_vbus_drv>; + regulator-name = "otg-vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + regulator-boot-on; + }; + vcc_sd0: sdmmc-regulator { compatible = "regulator-fixed"; regulator-name = "sdmmc-supply"; @@ -74,6 +87,19 @@ startup-delay-us = <100000>; vin-supply = <&vcc_io>; }; + + vcc_host: usb-host-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio0 3 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&host_vbus_drv>; + regulator-name = "host-pwr"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + regulator-boot-on; + }; }; &i2c1 { @@ -160,7 +186,6 @@ regulator-name = "VCC_RMII"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - regulator-always-on; }; vccio_wl: REG10 { @@ -220,6 +245,15 @@ rockchip,pins = <RK_GPIO0 10 RK_FUNC_GPIO &pcfg_pull_none>; }; }; + + usb { + host_vbus_drv: host-vbus-drv { + rockchip,pins = <0 3 RK_FUNC_GPIO &pcfg_pull_none>; + }; + otg_vbus_drv: otg-vbus-drv { + rockchip,pins = <2 31 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; }; &uart0 { @@ -238,6 +272,14 @@ status = "okay"; }; +&usb_host { + status = "okay"; +}; + +&usb_otg { + status = "okay"; +}; + &wdt { status = "okay"; }; |