power supply and reset fixes for the v4.3 series
* twl4030-charger fixes -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABCgAGBQJV+BZgAAoJENju1/PIO/qaWpMP/0s+579Lu1dJssDGiTYzbe0h IDeLvFbj6ikHehSCoKYeKiWJ765p/yYI0SySB6OLXuXxJsluDNqD/OSNh+ieZSZy thLmV5+pEW/a9zIl223JZGDWMBbFCtHJX3S61bRldtrv3CCeB1vQIw+3QDhG4YKb GAuWF/zs3FLMtMpycxx8cl08cm8KaDZ9tZEtASt2xAO2LfVOWc2I0JDfTraFrtn6 xpnqT6Y7noFHDT2DdKgg6hvymWzUUPhQj2uTEhdl4l3yjTCXXOYReyYEmYBQKYgi cpT6ydetphZAeu73I4UikQjRUeXbE+d/iWdPwR6ZzgYPn9V9yBWkN5v7F1aVm8+1 GWZUcT5tFXSeOIwocPlzTJP5h7f/wLhTfgPtN4REaQJTj1NGvptByZPbKckdCbQr V6eYryhQNdDYBRwKHFn48YD6X2CkuvitQ8CJokcnGqB0iw1L/tdACjcsFC0hIbrN N3tXenzvnA9mTeAQRMMXjAO7Y9GBY86ssZcMbtMQGbMv4hfVOgmK/RBauMMmLb2t HffceagdQr9Dxf2UVUGvH/hRwCqvmGjiK9vbO8iY8VgnWFmtIjDQiP9y8uns2RsD 5AR/HMl00dcptLc0/MWojvJzn3Q43MlkFb9Hod3GFKgI1IsVjrlmepO9ImFCnKmQ UMzowtWTwm4lBk0Bk1gh =5keI -----END PGP SIGNATURE----- Merge tag 'for-v4.3-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply Pull power supply fixes from Sebastian Reichel: "twl4030-charger fixes" * tag 'for-v4.3-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: twl4030_charger: fix another compile error Revert "twl4030_charger: correctly handle -EPROBE_DEFER from devm_usb_get_phy_by_node"
This commit is contained in:
commit
2e5735f4c3
|
@ -91,7 +91,7 @@
|
||||||
#define TWL4030_MSTATEC_COMPLETE1 0x0b
|
#define TWL4030_MSTATEC_COMPLETE1 0x0b
|
||||||
#define TWL4030_MSTATEC_COMPLETE4 0x0e
|
#define TWL4030_MSTATEC_COMPLETE4 0x0e
|
||||||
|
|
||||||
#if IS_ENABLED(CONFIG_TWL4030_MADC)
|
#if IS_REACHABLE(CONFIG_TWL4030_MADC)
|
||||||
/*
|
/*
|
||||||
* If AC (Accessory Charger) voltage exceeds 4.5V (MADC 11)
|
* If AC (Accessory Charger) voltage exceeds 4.5V (MADC 11)
|
||||||
* then AC is available.
|
* then AC is available.
|
||||||
|
@ -1057,13 +1057,9 @@ static int twl4030_bci_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
phynode = of_find_compatible_node(bci->dev->of_node->parent,
|
phynode = of_find_compatible_node(bci->dev->of_node->parent,
|
||||||
NULL, "ti,twl4030-usb");
|
NULL, "ti,twl4030-usb");
|
||||||
if (phynode) {
|
if (phynode)
|
||||||
bci->transceiver = devm_usb_get_phy_by_node(
|
bci->transceiver = devm_usb_get_phy_by_node(
|
||||||
bci->dev, phynode, &bci->usb_nb);
|
bci->dev, phynode, &bci->usb_nb);
|
||||||
if (IS_ERR(bci->transceiver) &&
|
|
||||||
PTR_ERR(bci->transceiver) == -EPROBE_DEFER)
|
|
||||||
return -EPROBE_DEFER;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Enable interrupts now. */
|
/* Enable interrupts now. */
|
||||||
|
|
Loading…
Reference in New Issue