| Message ID | 1456054103-19551-7-git-send-email-pali.rohar@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Pavel Machek <pavel@ucw.cz> [160221 06:05]: > On Sun 2016-02-21 12:28:23, Pali Rohár wrote: > > This change does not break existing userspace or Maemo software because > > isp1704_charger.c always export power supply device under isp1704 name. > > ..exports.. > > > Signed-off-by: Pali Rohár <pali.rohar@gmail.com> > > 4,5,6: Acked-by: Pavel Machek <pavel@ucw.cz> Ack for this one to get merged along with the driver changes: Acked-by: Tony Lindgren <tony@atomide.com> Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On Mon, Feb 22, 2016 at 11:06:50AM -0800, Tony Lindgren wrote: > * Pavel Machek <pavel@ucw.cz> [160221 06:05]: > > On Sun 2016-02-21 12:28:23, Pali Rohár wrote: > > > This change does not break existing userspace or Maemo software because > > > isp1704_charger.c always export power supply device under isp1704 name. > > > > ..exports.. > > > > > Signed-off-by: Pali Rohár <pali.rohar@gmail.com> > > > > 4,5,6: Acked-by: Pavel Machek <pavel@ucw.cz> > > Ack for this one to get merged along with the driver changes: > > Acked-by: Tony Lindgren <tony@atomide.com> Ok, done. -- Sebastian
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts index 82df643..e0443cd 100644 --- a/arch/arm/boot/dts/omap3-n900.dts +++ b/arch/arm/boot/dts/omap3-n900.dts @@ -107,8 +107,8 @@ }; }; - isp1704: isp1704 { - compatible = "nxp,isp1704"; + isp1707: isp1707 { + compatible = "nxp,isp1707"; nxp,enable-gpio = <&gpio3 3 GPIO_ACTIVE_HIGH>; usb-phy = <&usb2_phy>; }; @@ -735,7 +735,7 @@ ti,termination-current = <100>; ti,resistor-sense = <68>; - ti,usb-charger-detection = <&isp1704>; + ti,usb-charger-detection = <&isp1707>; }; };
This change does not break existing userspace or Maemo software because isp1704_charger.c always export power supply device under isp1704 name. Signed-off-by: Pali Rohár <pali.rohar@gmail.com> --- arch/arm/boot/dts/omap3-n900.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)