diff mbox

[16/25,v7,RFC] arm64: renesas: salvator-x: add pfc node and subnodes for usb 2.0

Message ID 55DE64D7.3070600@renesas.com (mailing list archive)
State Deferred
Delegated to: Simon Horman
Headers show

Commit Message

Yoshihiro Shimoda Aug. 27, 2015, 1:16 a.m. UTC 
Hi Geert-san,

(2015/08/26 23:26), Geert Uytterhoeven wrote:
> Hi Shimoda-san, Morimoto-san, Kihara-san,
> 
> On Mon, Aug 24, 2015 at 4:30 AM, Kuninori Morimoto
> <kuninori.morimoto.gx@renesas.com> wrote:
>> From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> 
>> --- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
>> +++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
>> @@ -38,6 +38,23 @@
>>         };
>>  };
>>
>> +&pfc {
>> +       usb0_pins: usb0 {
>> +               renesas,groups = "usb0";
>> +               renesas,function = "usb0";
>> +       };
>> +
>> +       usb1_pins: usb1 {
>> +               renesas,groups = "usb1";
>> +               renesas,function = "usb1";
>> +       };
>> +
>> +       usb2_pins: usb2 {
>> +               renesas,groups = "usb2";
>> +               renesas,function = "usb2";
>> +       };
>> +};
> 
> If CONFIG_PINCTRL=y:
> 
> | sh-pfc e6060000.pfc: cannot locate data/mark enum_id for mark 2253
> | phy_rcar_gen3_usb2 ee080200.usb-phy: Error applying setting, reverse
> things back
> 
> mark 2253 = USB0_PWEN_MARK
> 
> I believe this is due to the IPSR16 section in the pinmux_data[] array in
> drivers/pinctrl/sh-pfc/pfc-r8a7795.c lacking data for IP16_11_8.
> Data for usb1 (IP16_19_16) and usb2 (IP15_3_0) is present.
> 
> Unfortunately my pinctrl foo is not strong enough to fill in the missing
> pieces...

Thank you very much for the point.
I have ignored the error message because usb0 worked on my environment :)
However, we should fix it. And then, I found missing pieces for usb0 part as you mentioned.
If I applied the following patch, the error message disappeared and usb0 also worked.

So, Morimoto-san, if possible, would you merge this patch in v8?

Best regards,
Yoshihiro Shimoda

---
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Yoshihiro Shimoda Aug. 27, 2015, 3:13 a.m. UTC | #1 
Hi Morimoto-san,

> Sent: Thursday, August 27, 2015 10:16 AM
< snip >
> So, Morimoto-san, if possible, would you merge this patch in v8?
> 
> Best regards,
> Yoshihiro Shimoda
> 
> ---
> diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
> index 9437e87..1f60f4c 100644
> --- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
> +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
> @@ -1335,6 +1335,19 @@ static const u16 pinmux_data[] = {
>  	PINMUX_IPSR_DATA(IP15_31_28, SCK5),
> 
>  	/* IPSR16 */
> +	PINMUX_IPSR_DATA(IP16_11_8, USB0_PWEN),
> +	PINMUX_IPSR_MODSEL_DATA(IP16_11_8, SIM0_RST_C, SEL_SIMCARD_2),
> +	PINMUX_IPSR_MODSEL_DATA(IP16_11_8, TS_SCK1_D, SEL_TSIF1_3),
> +	PINMUX_IPSR_MODSEL_DATA(IP16_11_8, STP_ISCLK_1_D, SEL_SSP1_1_3),
> +	PINMUX_IPSR_MODSEL_DATA(IP16_11_8, BPFCLK_B, SEL_FM_1),
> +	PINMUX_IPSR_MODSEL_DATA(IP16_11_8, RIF3_CLK_B, SEL_DRIF3_1),
> +
> +	PINMUX_IPSR_DATA(IP16_15_12, USB0_OVC),
> +	PINMUX_IPSR_MODSEL_DATA(IP16_15_12, SIM0_D_C, SEL_SIMCARD_2),
> +	PINMUX_IPSR_MODSEL_DATA(IP16_15_12, TS_SDAT1_D, SEL_TSIF1_3),
> +	PINMUX_IPSR_MODSEL_DATA(IP16_15_12, STP_ISD_1_D, SEL_SSP1_1_3),
> +	PINMUX_IPSR_MODSEL_DATA(IP16_15_12, RIF3_SYNC_B, SEL_DRIF3_1),
> +
>  	PINMUX_IPSR_DATA(IP16_19_16, USB1_PWEN),
>  	PINMUX_IPSR_MODSEL_DATA(IP16_19_16, SIM0_CLK_C, SEL_SIMCARD_2),
>  	PINMUX_IPSR_MODSEL_DATA(IP16_19_16, SSI_SCK1_A, SEL_SSI_0),

Thank you for the point locally :)
Even if I don't add all the "PINMUX_IPSR_MODSEL_DATA" of usb0, it works correctly.
Since I didn't test the pins except USB0_{OVC,PWEN),
all the "PINMUX_IPSR_MODSEL_DATA" of usb0 should be removed.

Best regards,
Yoshihiro Shimoda

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Geert Uytterhoeven Aug. 27, 2015, 8:06 a.m. UTC | #2 
Hi Shimoda-san,

On Thu, Aug 27, 2015 at 5:13 AM, Yoshihiro Shimoda
<yoshihiro.shimoda.uh@renesas.com> wrote:
>> diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
>> index 9437e87..1f60f4c 100644
>> --- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
>> +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
>> @@ -1335,6 +1335,19 @@ static const u16 pinmux_data[] = {
>>       PINMUX_IPSR_DATA(IP15_31_28, SCK5),
>>
>>       /* IPSR16 */
>> +     PINMUX_IPSR_DATA(IP16_11_8, USB0_PWEN),
>> +     PINMUX_IPSR_MODSEL_DATA(IP16_11_8, SIM0_RST_C, SEL_SIMCARD_2),
>> +     PINMUX_IPSR_MODSEL_DATA(IP16_11_8, TS_SCK1_D, SEL_TSIF1_3),
>> +     PINMUX_IPSR_MODSEL_DATA(IP16_11_8, STP_ISCLK_1_D, SEL_SSP1_1_3),
>> +     PINMUX_IPSR_MODSEL_DATA(IP16_11_8, BPFCLK_B, SEL_FM_1),
>> +     PINMUX_IPSR_MODSEL_DATA(IP16_11_8, RIF3_CLK_B, SEL_DRIF3_1),
>> +
>> +     PINMUX_IPSR_DATA(IP16_15_12, USB0_OVC),
>> +     PINMUX_IPSR_MODSEL_DATA(IP16_15_12, SIM0_D_C, SEL_SIMCARD_2),
>> +     PINMUX_IPSR_MODSEL_DATA(IP16_15_12, TS_SDAT1_D, SEL_TSIF1_3),
>> +     PINMUX_IPSR_MODSEL_DATA(IP16_15_12, STP_ISD_1_D, SEL_SSP1_1_3),
>> +     PINMUX_IPSR_MODSEL_DATA(IP16_15_12, RIF3_SYNC_B, SEL_DRIF3_1),
>> +
>>       PINMUX_IPSR_DATA(IP16_19_16, USB1_PWEN),
>>       PINMUX_IPSR_MODSEL_DATA(IP16_19_16, SIM0_CLK_C, SEL_SIMCARD_2),
>>       PINMUX_IPSR_MODSEL_DATA(IP16_19_16, SSI_SCK1_A, SEL_SSI_0),
>
> Thank you for the point locally :)
> Even if I don't add all the "PINMUX_IPSR_MODSEL_DATA" of usb0, it works correctly.

Because usb0 is the default function after bootup?

> Since I didn't test the pins except USB0_{OVC,PWEN),
> all the "PINMUX_IPSR_MODSEL_DATA" of usb0 should be removed.

You still want to describe the full pinctrl. Else dynamic reconfiguration
(e.g. by loading a DT overlay) from another function to usb0 will not work.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Yoshihiro Shimoda Aug. 27, 2015, 10:42 a.m. UTC | #3 
SGkgR2VlcnQtc2FuLA0KDQo+IFNlbnQ6IFRodXJzZGF5LCBBdWd1c3QgMjcsIDIwMTUgNTowNyBQ
TQ0KPiANCj4gSGkgU2hpbW9kYS1zYW4sDQo+IA0KPiBPbiBUaHUsIEF1ZyAyNywgMjAxNSBhdCA1
OjEzIEFNLCBZb3NoaWhpcm8gU2hpbW9kYQ0KPiA8eW9zaGloaXJvLnNoaW1vZGEudWhAcmVuZXNh
cy5jb20+IHdyb3RlOg0KPiA+PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9waW5jdHJsL3NoLXBmYy9w
ZmMtcjhhNzc5NS5jIGIvZHJpdmVycy9waW5jdHJsL3NoLXBmYy9wZmMtcjhhNzc5NS5jDQo+ID4+
IGluZGV4IDk0MzdlODcuLjFmNjBmNGMgMTAwNjQ0DQo+ID4+IC0tLSBhL2RyaXZlcnMvcGluY3Ry
bC9zaC1wZmMvcGZjLXI4YTc3OTUuYw0KPiA+PiArKysgYi9kcml2ZXJzL3BpbmN0cmwvc2gtcGZj
L3BmYy1yOGE3Nzk1LmMNCj4gPj4gQEAgLTEzMzUsNiArMTMzNSwxOSBAQCBzdGF0aWMgY29uc3Qg
dTE2IHBpbm11eF9kYXRhW10gPSB7DQo+ID4+ICAgICAgIFBJTk1VWF9JUFNSX0RBVEEoSVAxNV8z
MV8yOCwgU0NLNSksDQo+ID4+DQo+ID4+ICAgICAgIC8qIElQU1IxNiAqLw0KPiA+PiArICAgICBQ
SU5NVVhfSVBTUl9EQVRBKElQMTZfMTFfOCwgVVNCMF9QV0VOKSwNCj4gPj4gKyAgICAgUElOTVVY
X0lQU1JfTU9EU0VMX0RBVEEoSVAxNl8xMV84LCBTSU0wX1JTVF9DLCBTRUxfU0lNQ0FSRF8yKSwN
Cj4gPj4gKyAgICAgUElOTVVYX0lQU1JfTU9EU0VMX0RBVEEoSVAxNl8xMV84LCBUU19TQ0sxX0Qs
IFNFTF9UU0lGMV8zKSwNCj4gPj4gKyAgICAgUElOTVVYX0lQU1JfTU9EU0VMX0RBVEEoSVAxNl8x
MV84LCBTVFBfSVNDTEtfMV9ELCBTRUxfU1NQMV8xXzMpLA0KPiA+PiArICAgICBQSU5NVVhfSVBT
Ul9NT0RTRUxfREFUQShJUDE2XzExXzgsIEJQRkNMS19CLCBTRUxfRk1fMSksDQo+ID4+ICsgICAg
IFBJTk1VWF9JUFNSX01PRFNFTF9EQVRBKElQMTZfMTFfOCwgUklGM19DTEtfQiwgU0VMX0RSSUYz
XzEpLA0KPiA+PiArDQo+ID4+ICsgICAgIFBJTk1VWF9JUFNSX0RBVEEoSVAxNl8xNV8xMiwgVVNC
MF9PVkMpLA0KPiA+PiArICAgICBQSU5NVVhfSVBTUl9NT0RTRUxfREFUQShJUDE2XzE1XzEyLCBT
SU0wX0RfQywgU0VMX1NJTUNBUkRfMiksDQo+ID4+ICsgICAgIFBJTk1VWF9JUFNSX01PRFNFTF9E
QVRBKElQMTZfMTVfMTIsIFRTX1NEQVQxX0QsIFNFTF9UU0lGMV8zKSwNCj4gPj4gKyAgICAgUElO
TVVYX0lQU1JfTU9EU0VMX0RBVEEoSVAxNl8xNV8xMiwgU1RQX0lTRF8xX0QsIFNFTF9TU1AxXzFf
MyksDQo+ID4+ICsgICAgIFBJTk1VWF9JUFNSX01PRFNFTF9EQVRBKElQMTZfMTVfMTIsIFJJRjNf
U1lOQ19CLCBTRUxfRFJJRjNfMSksDQo+ID4+ICsNCj4gPj4gICAgICAgUElOTVVYX0lQU1JfREFU
QShJUDE2XzE5XzE2LCBVU0IxX1BXRU4pLA0KPiA+PiAgICAgICBQSU5NVVhfSVBTUl9NT0RTRUxf
REFUQShJUDE2XzE5XzE2LCBTSU0wX0NMS19DLCBTRUxfU0lNQ0FSRF8yKSwNCj4gPj4gICAgICAg
UElOTVVYX0lQU1JfTU9EU0VMX0RBVEEoSVAxNl8xOV8xNiwgU1NJX1NDSzFfQSwgU0VMX1NTSV8w
KSwNCj4gPg0KPiA+IFRoYW5rIHlvdSBmb3IgdGhlIHBvaW50IGxvY2FsbHkgOikNCj4gPiBFdmVu
IGlmIEkgZG9uJ3QgYWRkIGFsbCB0aGUgIlBJTk1VWF9JUFNSX01PRFNFTF9EQVRBIiBvZiB1c2Iw
LCBpdCB3b3JrcyBjb3JyZWN0bHkuDQo+IA0KPiBCZWNhdXNlIHVzYjAgaXMgdGhlIGRlZmF1bHQg
ZnVuY3Rpb24gYWZ0ZXIgYm9vdHVwPw0KDQpZZXMsIHVzYiBpcyB0aGUgZGVmYXVsdCBmdW5jdGlv
bi4NCkFmdGVyIEkgZ290IHRoaXMgZW1haWwsIEkgdGVzdGVkIHRoZSBmb2xsb3dpbmcgY29uZGl0
aW9uLg0KDQogLSBJIGNoYW5nZWQgdGhlIFVTQjAgcGlucyBhcyBTSU0gb24gdS1ib290LiAoVGhp
cyBtZWFucyBJUFNSMTYgdmFsdWUgaXMgMHhYWFhYMzNYWC4pDQogIC0gY2FzZTE6IG9yaWdpbmFs
IFBGQyBkcml2ZXIgb2YgcjhhNzc5NQ0KICAtIGNhc2UyOiBmdWxsIFVTQjAgcGlucw0KICAtIGNh
c2UzOiBQSU5NVVhfSVBTUl9EQVRBIG9mIFVTQjAgcGlucyBvbmx5DQoNClJlc3VsdDoNCiAtIGNh
c2UxOiBUaGUgSVBTUjE2IHZhbHVlIGlzIDB4WFhYWDMzWFguDQogLSBjYXNlMjogVGhlIElQU1Ix
NiB2YWx1ZSBpcyAweFhYWFgwMFhYLg0KIC0gY2FzZTM6IFRoZSBJUFNSMTYgdmFsdWUgaXMgMHhY
WFhYMDBYWC4NCg0KVGhlIHJlc3VsdCBzZWVtcyB1c2IwIGNhbiB3b3JrIGV2ZW4gaWYgUElOTVVY
X0lQU1JfREFUQSBvZiBVU0IwIHBpbnMgb25seS4NCg0KPiA+IFNpbmNlIEkgZGlkbid0IHRlc3Qg
dGhlIHBpbnMgZXhjZXB0IFVTQjBfe09WQyxQV0VOKSwNCj4gPiBhbGwgdGhlICJQSU5NVVhfSVBT
Ul9NT0RTRUxfREFUQSIgb2YgdXNiMCBzaG91bGQgYmUgcmVtb3ZlZC4NCj4gDQo+IFlvdSBzdGls
bCB3YW50IHRvIGRlc2NyaWJlIHRoZSBmdWxsIHBpbmN0cmwuIEVsc2UgZHluYW1pYyByZWNvbmZp
Z3VyYXRpb24NCj4gKGUuZy4gYnkgbG9hZGluZyBhIERUIG92ZXJsYXkpIGZyb20gYW5vdGhlciBm
dW5jdGlvbiB0byB1c2IwIHdpbGwgbm90IHdvcmsuDQoNCkknbSBub3Qgc3VyZSBhYm91dCBsb2Fk
aW5nIGEgRFQgb3ZlcmxheS4NCkhvd2V2ZXIsIGFueXdheSwgd2Ugc2hvdWxkIGRlc2NyaWJlIHRo
ZSBmdWxsIHBpbmN0cmwgb2YgdXNiMD8NCg0KQmVzdCByZWdhcmRzLA0KWW9zaGloaXJvIFNoaW1v
ZGENCg0KPiBHcntvZXRqZSxlZXRpbmd9cywNCj4gDQo+ICAgICAgICAgICAgICAgICAgICAgICAg
IEdlZXJ0DQo+IA0KPiAtLQ0KPiBHZWVydCBVeXR0ZXJob2V2ZW4gLS0gVGhlcmUncyBsb3RzIG9m
IExpbnV4IGJleW9uZCBpYTMyIC0tIGdlZXJ0QGxpbnV4LW02OGsub3JnDQo+IA0KPiBJbiBwZXJz
b25hbCBjb252ZXJzYXRpb25zIHdpdGggdGVjaG5pY2FsIHBlb3BsZSwgSSBjYWxsIG15c2VsZiBh
IGhhY2tlci4gQnV0DQo+IHdoZW4gSSdtIHRhbGtpbmcgdG8gam91cm5hbGlzdHMgSSBqdXN0IHNh
eSAicHJvZ3JhbW1lciIgb3Igc29tZXRoaW5nIGxpa2UgdGhhdC4NCj4gICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAtLSBMaW51cyBUb3J2YWxkcw0K
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
index 9437e87..1f60f4c 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
@@ -1335,6 +1335,19 @@  static const u16 pinmux_data[] = {
 	PINMUX_IPSR_DATA(IP15_31_28, SCK5),

 	/* IPSR16 */
+	PINMUX_IPSR_DATA(IP16_11_8, USB0_PWEN),
+	PINMUX_IPSR_MODSEL_DATA(IP16_11_8, SIM0_RST_C, SEL_SIMCARD_2),
+	PINMUX_IPSR_MODSEL_DATA(IP16_11_8, TS_SCK1_D, SEL_TSIF1_3),
+	PINMUX_IPSR_MODSEL_DATA(IP16_11_8, STP_ISCLK_1_D, SEL_SSP1_1_3),
+	PINMUX_IPSR_MODSEL_DATA(IP16_11_8, BPFCLK_B, SEL_FM_1),
+	PINMUX_IPSR_MODSEL_DATA(IP16_11_8, RIF3_CLK_B, SEL_DRIF3_1),
+
+	PINMUX_IPSR_DATA(IP16_15_12, USB0_OVC),
+	PINMUX_IPSR_MODSEL_DATA(IP16_15_12, SIM0_D_C, SEL_SIMCARD_2),
+	PINMUX_IPSR_MODSEL_DATA(IP16_15_12, TS_SDAT1_D, SEL_TSIF1_3),
+	PINMUX_IPSR_MODSEL_DATA(IP16_15_12, STP_ISD_1_D, SEL_SSP1_1_3),
+	PINMUX_IPSR_MODSEL_DATA(IP16_15_12, RIF3_SYNC_B, SEL_DRIF3_1),
+
 	PINMUX_IPSR_DATA(IP16_19_16, USB1_PWEN),
 	PINMUX_IPSR_MODSEL_DATA(IP16_19_16, SIM0_CLK_C, SEL_SIMCARD_2),
 	PINMUX_IPSR_MODSEL_DATA(IP16_19_16, SSI_SCK1_A, SEL_SSI_0),