Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 21:33:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for rk3288 ehci controllers.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABCAAGBQJT2crRAAoJEPOmecmc0R2B8cAIAIke/dswgq4Kmk/G6spgdict
 UXusTcy3mgnzz9X93fl+naGOopCJBSZFkTJFvNNo9nw7V+Knt1R7OW5uXMuOnwZ2
 MNMEp9bmZNNKrUNqtrvZeda+Y71TCY8OKLOAnnyfnCToVQ+OCYhW4qkq/G5B3KfI
 8YXK8jjhVERUG94+N6AIOxNq0qlmyoc+ZCErjUu6y3BlP/Z7OCLkEhfMmHiwMT7m
 CwowMIjE0WhTt4GlVaFhHx5FvBMWI4cQWC61kCJash+U84UY1uGZ/ejPbOcIW0XP
 76PCG4wt63sbpeUDjJR52e7HIzP/UGtVdVZACT82YJLpotqB3C5Mc7k/PQw46YM=
 =5B5W
 -----END PGP SIGNATURE-----

Merge tag 'v3.17-rockchip-rk3288-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

Merge "Basic rk3288 usb support" from Heiko Stübner:

Add support for rk3288 ehci controllers.

* tag 'v3.17-rockchip-rk3288-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: Enable USB host0 (EHCI) on rk3288-evb
  ARM: dts: add rk3288 ehci usb devices
  ARM: dts: Turn on USB host vbus on rk3288-evb

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2014-07-30 22:04:14 -07:00
commit 68a05338ce
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/arm/boot/dts/rk3288-evb.dtsi
View File

@ -35,6 +35,18 @@
debounce-interval = <100>; debounce-interval = <100>;
}; };
}; };
/* This turns on USB vbus for both host0 (ehci) and host1 (dwc2) */
vcc_host: vcc-host-regulator {
compatible = "regulator-fixed";
enable-active-high;
gpio = <&gpio0 14 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&host_vbus_drv>;
regulator-name = "vcc_host";
regulator-always-on;
regulator-boot-on;
};
}; };
&i2c0 { &i2c0 {
@ -71,4 +83,14 @@
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
usb {
host_vbus_drv: host-vbus-drv {
rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};
&usb_host0_ehci {
status = "okay";
}; };

20
arch/arm/boot/dts/rk3288.dtsi
View File

@ -251,6 +251,26 @@
status = "disabled"; status = "disabled";
}; };
usb_host0_ehci: usb@ff500000 {
compatible = "generic-ehci";
reg = <0xff500000 0x100>;
interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cru HCLK_USBHOST0>;
clock-names = "usbhost";
status = "disabled";
};
/* NOTE: ohci@ff520000 doesn't actually work on hardware */
usb_hsic: usb@ff5c0000 {
compatible = "generic-ehci";
reg = <0xff5c0000 0x100>;
interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cru HCLK_HSIC>;
clock-names = "usbhost";
status = "disabled";
};
gic: interrupt-controller@ffc01000 { gic: interrupt-controller@ffc01000 {
compatible = "arm,gic-400"; compatible = "arm,gic-400";
interrupt-controller; interrupt-controller;