diff mbox

[U-Boot,07/12] dt: socfpga: Rename snps, dw-spi-mmio to snps, dw-apb-ssi

Message ID 1420053301-10023-8-git-send-email-marex@denx.de
State Accepted
Delegated to: Jagannadha Sutradharudu Teki
Headers show

Commit Message

Marek Vasut Dec. 31, 2014, 7:14 p.m. UTC
Linux now also contains SPI driver, yet the name is 'snps,dw-apb-ssi'.
Fix the naming before we have to support both names.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Chin Liang See <clsee@opensource.altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Pavel Machek <pavel@denx.de>
Cc: Stefan Roese <sr@denx.de>
Cc: Vince Bridgers <vbridger@opensource.altera.com>
---
 arch/arm/dts/socfpga.dtsi    | 4 ++--
 drivers/spi/designware_spi.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Stefan Roese Jan. 3, 2015, 11:12 a.m. UTC | #1
On 31.12.2014 20:14, Marek Vasut wrote:
> Linux now also contains SPI driver, yet the name is 'snps,dw-apb-ssi'.
> Fix the naming before we have to support both names.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Chin Liang See <clsee@opensource.altera.com>
> Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
> Cc: Pavel Machek <pavel@denx.de>
> Cc: Stefan Roese <sr@denx.de>
> Cc: Vince Bridgers <vbridger@opensource.altera.com>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan
Pavel Machek Jan. 3, 2015, 3:45 p.m. UTC | #2
On Wed 2014-12-31 20:14:55, Marek Vasut wrote:
> Linux now also contains SPI driver, yet the name is 'snps,dw-apb-ssi'.
> Fix the naming before we have to support both names.
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Chin Liang See <clsee@opensource.altera.com>
> Cc: Dinh Nguyen <dinguyen@opensource.altera.com>

Acked-by: Pavel Machek <pavel@denx.de>
Jagan Teki Jan. 6, 2015, 10:37 a.m. UTC | #3
On 3 January 2015 at 21:15, Pavel Machek <pavel@denx.de> wrote:
> On Wed 2014-12-31 20:14:55, Marek Vasut wrote:
>> Linux now also contains SPI driver, yet the name is 'snps,dw-apb-ssi'.
>> Fix the naming before we have to support both names.
>>
>> Signed-off-by: Marek Vasut <marex@denx.de>
>> Cc: Chin Liang See <clsee@opensource.altera.com>
>> Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
>
> Acked-by: Pavel Machek <pavel@denx.de>
>
> --
> (english) http://www.livejournal.com/~pavelmachek
> (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot

Applied to u-boot-spi/master

thanks!
Marek Vasut Jan. 6, 2015, 3:41 p.m. UTC | #4
On Tuesday, January 06, 2015 at 11:37:22 AM, Jagan Teki wrote:
> On 3 January 2015 at 21:15, Pavel Machek <pavel@denx.de> wrote:
> > On Wed 2014-12-31 20:14:55, Marek Vasut wrote:
> >> Linux now also contains SPI driver, yet the name is 'snps,dw-apb-ssi'.
> >> Fix the naming before we have to support both names.
> >> 
> >> Signed-off-by: Marek Vasut <marex@denx.de>
> >> Cc: Chin Liang See <clsee@opensource.altera.com>
> >> Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
> > 
> > Acked-by: Pavel Machek <pavel@denx.de>
> > 
> > --
> > (english) http://www.livejournal.com/~pavelmachek
> > (cesky, pictures)
> > http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
> > _______________________________________________
> > U-Boot mailing list
> > U-Boot@lists.denx.de
> > http://lists.denx.de/mailman/listinfo/u-boot
> 
> Applied to u-boot-spi/master

Do you plan to submit this for current release ? If that's the case, please also 
pick 08/12 .

Thanks!

Best regards,
Marek Vasut
Jagan Teki Jan. 6, 2015, 4:43 p.m. UTC | #5
On 6 January 2015 at 21:11, Marek Vasut <marex@denx.de> wrote:
> On Tuesday, January 06, 2015 at 11:37:22 AM, Jagan Teki wrote:
>> On 3 January 2015 at 21:15, Pavel Machek <pavel@denx.de> wrote:
>> > On Wed 2014-12-31 20:14:55, Marek Vasut wrote:
>> >> Linux now also contains SPI driver, yet the name is 'snps,dw-apb-ssi'.
>> >> Fix the naming before we have to support both names.
>> >>
>> >> Signed-off-by: Marek Vasut <marex@denx.de>
>> >> Cc: Chin Liang See <clsee@opensource.altera.com>
>> >> Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
>> >
>> > Acked-by: Pavel Machek <pavel@denx.de>
>> >
>> > --
>> > (english) http://www.livejournal.com/~pavelmachek
>> > (cesky, pictures)
>> > http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
>> > _______________________________________________
>> > U-Boot mailing list
>> > U-Boot@lists.denx.de
>> > http://lists.denx.de/mailman/listinfo/u-boot
>>
>> Applied to u-boot-spi/master
>
> Do you plan to submit this for current release ? If that's the case, please also
> pick 08/12 .

Yes - pls confirm this is 08/12
"[PATCH 08/12] dt: socfpga: Replace num-chipselect with num-cs"

thanks!
Marek Vasut Jan. 6, 2015, 4:49 p.m. UTC | #6
On Tuesday, January 06, 2015 at 05:43:28 PM, Jagan Teki wrote:
> On 6 January 2015 at 21:11, Marek Vasut <marex@denx.de> wrote:
> > On Tuesday, January 06, 2015 at 11:37:22 AM, Jagan Teki wrote:
> >> On 3 January 2015 at 21:15, Pavel Machek <pavel@denx.de> wrote:
> >> > On Wed 2014-12-31 20:14:55, Marek Vasut wrote:
> >> >> Linux now also contains SPI driver, yet the name is
> >> >> 'snps,dw-apb-ssi'. Fix the naming before we have to support both
> >> >> names.
> >> >> 
> >> >> Signed-off-by: Marek Vasut <marex@denx.de>
> >> >> Cc: Chin Liang See <clsee@opensource.altera.com>
> >> >> Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
> >> > 
> >> > Acked-by: Pavel Machek <pavel@denx.de>
> >> > 
> >> > --
> >> > (english) http://www.livejournal.com/~pavelmachek
> >> > (cesky, pictures)
> >> > http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
> >> > _______________________________________________
> >> > U-Boot mailing list
> >> > U-Boot@lists.denx.de
> >> > http://lists.denx.de/mailman/listinfo/u-boot
> >> 
> >> Applied to u-boot-spi/master
> > 
> > Do you plan to submit this for current release ? If that's the case,
> > please also pick 08/12 .
> 
> Yes - pls confirm this is 08/12
> "[PATCH 08/12] dt: socfpga: Replace num-chipselect with num-cs"

Yes it is ^^^^^ ;-)

Please make sure these two land in current release then, since we don't want to 
introduce incompatible DT props. Thanks!

Best regards,
Marek Vasut
diff mbox

Patch

diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi
index 969e5ad..93d3776 100644
--- a/arch/arm/dts/socfpga.dtsi
+++ b/arch/arm/dts/socfpga.dtsi
@@ -644,7 +644,7 @@ 
 		};
 
 		spi0: spi@fff00000 {
-			compatible = "snps,dw-spi-mmio";
+			compatible = "snps,dw-apb-ssi";
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0xfff00000 0x1000>;
@@ -658,7 +658,7 @@ 
 		};
 
 		spi1: spi@fff01000 {
-			compatible = "snps,dw-spi-mmio";
+			compatible = "snps,dw-apb-ssi";
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0xfff01000 0x1000>;
diff --git a/drivers/spi/designware_spi.c b/drivers/spi/designware_spi.c
index 98c9f03..a42c0af 100644
--- a/drivers/spi/designware_spi.c
+++ b/drivers/spi/designware_spi.c
@@ -409,7 +409,7 @@  static const struct dm_spi_ops dw_spi_ops = {
 };
 
 static const struct udevice_id dw_spi_ids[] = {
-	{ .compatible = "snps,dw-spi-mmio" },
+	{ .compatible = "snps,dw-apb-ssi" },
 	{ }
 };