| Message ID | 20200502114752.1048500-7-martin.blumenstingl@googlemail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | phy: meson8b-usb2: small fixes and improvements | expand |
On Sat, May 2, 2020 at 1:48 PM Martin Blumenstingl <martin.blumenstingl@googlemail.com> wrote: > > The 3.10 vendor kernel sets the ACA_ENABLE bit on Meson8b, Meson8m2 and > GXBB, but not on Meson8. Add a compatible string for Meson8m2 which also > sets that bit. > While here, also update the Kconfig text and MODULE_DESCRIPTION. > > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Tested-by: hexdump <hexdump0815@googlemail.com> > --- > drivers/phy/amlogic/Kconfig | 2 +- > drivers/phy/amlogic/phy-meson8b-usb2.c | 6 +++++- > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/phy/amlogic/Kconfig b/drivers/phy/amlogic/Kconfig > index 3495b23af797..5ec53874d1ea 100644 > --- a/drivers/phy/amlogic/Kconfig > +++ b/drivers/phy/amlogic/Kconfig > @@ -3,7 +3,7 @@ > # Phy drivers for Amlogic platforms > # > config PHY_MESON8B_USB2 > - tristate "Meson8, Meson8b and GXBB USB2 PHY driver" > + tristate "Meson8, Meson8b, Meson8m2 and GXBB USB2 PHY driver" > default ARCH_MESON > depends on OF && (ARCH_MESON || COMPILE_TEST) > depends on USB_SUPPORT > diff --git a/drivers/phy/amlogic/phy-meson8b-usb2.c b/drivers/phy/amlogic/phy-meson8b-usb2.c > index 436dfa1a8a04..03c061dd5f0d 100644 > --- a/drivers/phy/amlogic/phy-meson8b-usb2.c > +++ b/drivers/phy/amlogic/phy-meson8b-usb2.c > @@ -302,6 +302,10 @@ static const struct of_device_id phy_meson8b_usb2_of_match[] = { > .compatible = "amlogic,meson8b-usb2-phy", > .data = &phy_meson8b_usb2_match_data > }, > + { > + .compatible = "amlogic,meson8m2-usb2-phy", > + .data = &phy_meson8b_usb2_match_data > + }, > { > .compatible = "amlogic,meson-gxbb-usb2-phy", > .data = &phy_meson8b_usb2_match_data > @@ -320,5 +324,5 @@ static struct platform_driver phy_meson8b_usb2_driver = { > module_platform_driver(phy_meson8b_usb2_driver); > > MODULE_AUTHOR("Martin Blumenstingl <martin.blumenstingl@googlemail.com>"); > -MODULE_DESCRIPTION("Meson8, Meson8b and GXBB USB2 PHY driver"); > +MODULE_DESCRIPTION("Meson8, Meson8b, Meson8m2 and GXBB USB2 PHY driver"); > MODULE_LICENSE("GPL"); > -- > 2.26.2 >
diff --git a/drivers/phy/amlogic/Kconfig b/drivers/phy/amlogic/Kconfig index 3495b23af797..5ec53874d1ea 100644 --- a/drivers/phy/amlogic/Kconfig +++ b/drivers/phy/amlogic/Kconfig @@ -3,7 +3,7 @@ # Phy drivers for Amlogic platforms # config PHY_MESON8B_USB2 - tristate "Meson8, Meson8b and GXBB USB2 PHY driver" + tristate "Meson8, Meson8b, Meson8m2 and GXBB USB2 PHY driver" default ARCH_MESON depends on OF && (ARCH_MESON || COMPILE_TEST) depends on USB_SUPPORT diff --git a/drivers/phy/amlogic/phy-meson8b-usb2.c b/drivers/phy/amlogic/phy-meson8b-usb2.c index 436dfa1a8a04..03c061dd5f0d 100644 --- a/drivers/phy/amlogic/phy-meson8b-usb2.c +++ b/drivers/phy/amlogic/phy-meson8b-usb2.c @@ -302,6 +302,10 @@ static const struct of_device_id phy_meson8b_usb2_of_match[] = { .compatible = "amlogic,meson8b-usb2-phy", .data = &phy_meson8b_usb2_match_data }, + { + .compatible = "amlogic,meson8m2-usb2-phy", + .data = &phy_meson8b_usb2_match_data + }, { .compatible = "amlogic,meson-gxbb-usb2-phy", .data = &phy_meson8b_usb2_match_data @@ -320,5 +324,5 @@ static struct platform_driver phy_meson8b_usb2_driver = { module_platform_driver(phy_meson8b_usb2_driver); MODULE_AUTHOR("Martin Blumenstingl <martin.blumenstingl@googlemail.com>"); -MODULE_DESCRIPTION("Meson8, Meson8b and GXBB USB2 PHY driver"); +MODULE_DESCRIPTION("Meson8, Meson8b, Meson8m2 and GXBB USB2 PHY driver"); MODULE_LICENSE("GPL");
The 3.10 vendor kernel sets the ACA_ENABLE bit on Meson8b, Meson8m2 and GXBB, but not on Meson8. Add a compatible string for Meson8m2 which also sets that bit. While here, also update the Kconfig text and MODULE_DESCRIPTION. Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> --- drivers/phy/amlogic/Kconfig | 2 +- drivers/phy/amlogic/phy-meson8b-usb2.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-)