openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: dts: Ux500: move USB PHY pins to PHY device 

The physical pins from the SoC are in a sense belonging to the
PHY device (AB8500 USB) rather than the MUSB USB IP block.
The driver definately assumes so: before this change it
complains that it cannot control the pins it is using:

abx5x0-usb ab8500-usb.0: could not get/set default pinstate

After this patch the warning goes away.

Cc: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2017-01-12 15:22:42 +01:00
parent adef953bbc
commit 6097c2d0af
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/boot/dts/ste-href.dtsi
View File

@ -19,12 +19,6 @@ memory {
}; };
soc { soc {
usb_per5@a03e0000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&musb_default_mode>;
pinctrl-1 = <&musb_sleep_mode>;
};
uart@80120000 { uart@80120000 {
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&uart0_default_mode>; pinctrl-0 = <&uart0_default_mode>;
@ -225,6 +219,12 @@ ab8500 {
ab8500-gpio { ab8500-gpio {
}; };
ab8500_usb {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&musb_default_mode>;
pinctrl-1 = <&musb_sleep_mode>;
};
ab8500-regulators { ab8500-regulators {
ab8500_ldo_aux1_reg: ab8500_ldo_aux1 { ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
regulator-name = "V-DISPLAY"; regulator-name = "V-DISPLAY";

12
arch/arm/boot/dts/ste-snowball.dts
View File

@ -159,12 +159,6 @@ gpio@8011e080 {
"", "", "", "", "", "", "", ""; "", "", "", "", "", "", "", "";
}; };
usb_per5@a03e0000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&musb_default_mode>;
pinctrl-1 = <&musb_sleep_mode>;
};
sound { sound {
compatible = "stericsson,snd-soc-mop500"; compatible = "stericsson,snd-soc-mop500";
@ -451,6 +445,12 @@ ab8500-gpio {
"PM_GPIO42"; /* AB8500 GPIO42 */ "PM_GPIO42"; /* AB8500 GPIO42 */
}; };
ab8500_usb {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&musb_default_mode>;
pinctrl-1 = <&musb_sleep_mode>;
};
ext_regulators: ab8500-ext-regulators { ext_regulators: ab8500-ext-regulators {
ab8500_ext1_reg: ab8500_ext1 { ab8500_ext1_reg: ab8500_ext1 {
regulator-name = "ab8500-ext-supply1"; regulator-name = "ab8500-ext-supply1";