On Wed, Oct 15, 2014 at 05:59:37PM +0900, Yoshihiro Kaneko wrote: > From: Koji Matsuoka <koji.matsuoka.xm@xxxxxxxxxxx> > > Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@xxxxxxxxxxx> > Signed-off-by: Yoshihiro Kaneko <ykaneko0929@xxxxxxxxx> Acked-by: Simon Horman <horms+renesas@xxxxxxxxxxxx> Tejun, could you consider picking up this change? > --- > > This patch is against for-next branch of Tejun's libata repo. > > v2 [Yoshihiro Kaneko] > * Update the binding documentation > > Documentation/devicetree/bindings/ata/sata_rcar.txt | 3 ++- > drivers/ata/sata_rcar.c | 5 +++++ > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/ata/sata_rcar.txt b/Documentation/devicetree/bindings/ata/sata_rcar.txt > index 1e61113..74b1130 100644 > --- a/Documentation/devicetree/bindings/ata/sata_rcar.txt > +++ b/Documentation/devicetree/bindings/ata/sata_rcar.txt > @@ -4,7 +4,8 @@ Required properties: > - compatible : should contain one of the following: > - "renesas,sata-r8a7779" for R-Car H1 > - "renesas,sata-r8a7790" for R-Car H2 > - - "renesas,sata-r8a7791" for R-Car M2 > + - "renesas,sata-r8a7791" for R-Car M2-W > + - "renesas,sata-r8a7793" for R-Car M2-N > - reg : address and length of the SATA registers; > - interrupts : must consist of one interrupt specifier. > > diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c > index 61eb6d7..6f8ed8e 100644 > --- a/drivers/ata/sata_rcar.c > +++ b/drivers/ata/sata_rcar.c > @@ -841,6 +841,10 @@ static struct of_device_id sata_rcar_match[] = { > .compatible = "renesas,sata-r8a7791", > .data = (void *)RCAR_GEN2_SATA > }, > + { > + .compatible = "renesas,sata-r8a7793", > + .data = (void *)RCAR_GEN2_SATA > + }, > { }, > }; > MODULE_DEVICE_TABLE(of, sata_rcar_match); > @@ -850,6 +854,7 @@ static const struct platform_device_id sata_rcar_id_table[] = { > { "sata-r8a7779", RCAR_GEN1_SATA }, > { "sata-r8a7790", RCAR_GEN2_SATA }, > { "sata-r8a7791", RCAR_GEN2_SATA }, > + { "sata-r8a7793", RCAR_GEN2_SATA }, > { }, > }; > MODULE_DEVICE_TABLE(platform, sata_rcar_id_table); > -- > 1.9.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html