From f1c8547f56f1da9db51fe3281479c823e949a9fd Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Tue, 9 Sep 2014 15:40:52 +0200 Subject: ARM: dts: rockchip: enable usb ports on Radxa Rock This enables both the otg and host port and adds the vbus regulators on the Radxa Rock board. As we don't have phy support yet, the vbus regulators are added in always-on mode. Signed-off-by: Heiko Stuebner --- arch/arm/boot/dts/rk3188-radxarock.dts | 43 ++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'arch/arm/boot/dts/rk3188-radxarock.dts') diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts b/arch/arm/boot/dts/rk3188-radxarock.dts index ff35acfa..1be0c34 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 = <&host_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 = <&otg_vbus_drv>; + regulator-name = "host-pwr"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + regulator-boot-on; + }; }; &i2c1 { @@ -218,6 +244,15 @@ rockchip,pins = ; }; }; + + 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 { @@ -236,6 +271,14 @@ status = "okay"; }; +&usb_host { + status = "okay"; +}; + +&usb_otg { + status = "okay"; +}; + &wdt { status = "okay"; }; -- cgit v1.1 From 66fa6cf29fc67ecbc42efd632c2310688530e441 Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Tue, 16 Sep 2014 18:53:10 +0200 Subject: ARM: dts: rockchip: fix swapped Radxa Rock pinctrl references The host and otg regulator pinctrl settings got swapped, making the host reference the otg pinctrl and the other way round. The actual pins are correct (gpio0-3 for host and gpio2-31 for otg). Reported-by: Naoki FUKAUMI Signed-off-by: Heiko Stuebner --- arch/arm/boot/dts/rk3188-radxarock.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/arm/boot/dts/rk3188-radxarock.dts') diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts b/arch/arm/boot/dts/rk3188-radxarock.dts index 1be0c34..c08744d 100644 --- a/arch/arm/boot/dts/rk3188-radxarock.dts +++ b/arch/arm/boot/dts/rk3188-radxarock.dts @@ -70,7 +70,7 @@ enable-active-high; gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; - pinctrl-0 = <&host_vbus_drv>; + pinctrl-0 = <&otg_vbus_drv>; regulator-name = "otg-vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; @@ -93,7 +93,7 @@ enable-active-high; gpio = <&gpio0 3 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; - pinctrl-0 = <&otg_vbus_drv>; + pinctrl-0 = <&host_vbus_drv>; regulator-name = "host-pwr"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; -- cgit v1.1 From 6051ddd4f94894cce8fde3aa29f90ae6c567fc46 Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Fri, 19 Sep 2014 12:36:27 +0000 Subject: ARM: dts: rockchip: Remove "regulator-always-on" in vcc_rmii for Radxa Rock On Rockchip RK3188 SoCs the platform driver emac_rockchip is used. This variant driver enables this regulator when the device driver is loaded. The phy no longer needs to be always on. Signed-off-by: Romain Perier Signed-off-by: Heiko Stuebner --- arch/arm/boot/dts/rk3188-radxarock.dts | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/boot/dts/rk3188-radxarock.dts') diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts b/arch/arm/boot/dts/rk3188-radxarock.dts index c08744d..61d364e 100644 --- a/arch/arm/boot/dts/rk3188-radxarock.dts +++ b/arch/arm/boot/dts/rk3188-radxarock.dts @@ -186,7 +186,6 @@ regulator-name = "VCC_RMII"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - regulator-always-on; }; vccio_wl: REG10 { -- cgit v1.1