Merge tag 'nios2-v5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan...

Pull nios2 updates from Ley Foon Tan:

 - Remove nios2-dev@lists.rocketboards.org from MAINTAINERS

 - remove 'resetvalue' property

 - rename 'altr,gpio-bank-width' -> 'altr,ngpio'

 - enable the common clk subsystem on Nios2

* tag 'nios2-v5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2:
  MAINTAINERS: Remove nios2-dev@lists.rocketboards.org
  arch: nios2: remove 'resetvalue' property
  arch: nios2: rename 'altr,gpio-bank-width' -> 'altr,ngpio'
  arch: nios2: Enable the common clk subsystem on Nios2

diff --git a/Documentation/devicetree/bindings/fpga/fpga-region.txt b/Documentation/devicetree/bindings/fpga/fpga-region.txt
index 90c44694a30b16b6cdb04126be2a9f328667e7f6..8ab19d1d3f9a8c9df78be5be02c173462f613b09 100644 (file)
--- a/Documentation/devicetree/bindings/fpga/fpga-region.txt
+++ b/Documentation/devicetree/bindings/fpga/fpga-region.txt
@@ -263,7 +263,7 @@ Overlay contains:
                        gpio@10040 {
                                compatible = "altr,pio-1.0";
                                reg = <0x10040 0x20>;
-                               altr,gpio-bank-width = <4>;
+                               altr,ngpio = <4>;
                                #gpio-cells = <2>;
                                clocks = <2>;
                                gpio-controller;
@@ -468,8 +468,7 @@ programming is the FPGA based bridge of fpga_region1.
                                compatible = "altr,pio-1.0";
                                reg = <0x10040 0x20>;
                                clocks = <0x2>;
-                               altr,gpio-bank-width = <0x4>;
-                               resetvalue = <0x0>;
+                               altr,ngpio = <0x4>;
                                #gpio-cells = <0x2>;
                                gpio-controller;
                        };

diff --git a/MAINTAINERS b/MAINTAINERS
index ff043097ea0e4dc8b8c36b2c5cd02da6d071fffa..0d186a01a37a6b61b0dc3c74b770e368854845fa 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -738,7 +738,6 @@ F:  drivers/i2c/busses/i2c-altera.c
 
 ALTERA MAILBOX DRIVER
 M:     Ley Foon Tan <ley.foon.tan@intel.com>
-L:     nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
 S:     Maintained
 F:     drivers/mailbox/mailbox-altera.c
 
@@ -766,14 +765,12 @@ F:        include/dt-bindings/reset/altr,rst-mgr-a10sr.h
 ALTERA TRIPLE SPEED ETHERNET DRIVER
 M:     Thor Thayer <thor.thayer@linux.intel.com>
 L:     netdev@vger.kernel.org
-L:     nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
 S:     Maintained
 F:     drivers/net/ethernet/altera/
 
 ALTERA UART/JTAG UART SERIAL DRIVERS
 M:     Tobias Klauser <tklauser@distanz.ch>
 L:     linux-serial@vger.kernel.org
-L:     nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
 S:     Maintained
 F:     drivers/tty/serial/altera_uart.c
 F:     drivers/tty/serial/altera_jtaguart.c
@@ -11925,7 +11922,6 @@ F:      drivers/scsi/nsp32*
 
 NIOS2 ARCHITECTURE
 M:     Ley Foon Tan <ley.foon.tan@intel.com>
-L:     nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git
 S:     Maintained
 F:     arch/nios2/

diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig
index 2fc4ed210b5f0446ce526f1c063d91d4f347b6b6..c6645141bb2a8885ba9ef0f5dd887570a4974968 100644 (file)
--- a/arch/nios2/Kconfig
+++ b/arch/nios2/Kconfig
@@ -7,6 +7,7 @@ config NIOS2
        select ARCH_HAS_SYNC_DMA_FOR_DEVICE
        select ARCH_HAS_DMA_SET_UNCACHED
        select ARCH_NO_SWAP
+       select COMMON_CLK
        select TIMER_OF
        select GENERIC_ATOMIC64
        select GENERIC_CLOCKEVENTS

diff --git a/arch/nios2/boot/dts/10m50_devboard.dts b/arch/nios2/boot/dts/10m50_devboard.dts
index 5e4ab032c1e80960831149cb8664a46d103957a7..56339bef3247d544fd34a101377b08d13d906959 100644 (file)
--- a/arch/nios2/boot/dts/10m50_devboard.dts
+++ b/arch/nios2/boot/dts/10m50_devboard.dts
@@ -179,8 +179,7 @@
                led_pio: gpio@180014d0 {
                        compatible = "altr,pio-1.0";
                        reg = <0x180014d0 0x00000010>;
-                       altr,gpio-bank-width = <4>;
-                       resetvalue = <15>;
+                       altr,ngpio = <4>;
                        #gpio-cells = <2>;
                        gpio-controller;
                };
@@ -190,11 +189,10 @@
                        reg = <0x180014c0 0x00000010>;
                        interrupt-parent = <&cpu>;
                        interrupts = <6>;
-                       altr,gpio-bank-width = <3>;
+                       altr,ngpio = <3>;
                        altr,interrupt-type = <2>;
                        edge_type = <1>;
                        level_trigger = <0>;
-                       resetvalue = <0>;
                        #gpio-cells = <2>;
                        gpio-controller;
                };

diff --git a/arch/nios2/platform/platform.c b/arch/nios2/platform/platform.c
index 2a35154ca1531f6c5e85aeb5c3aaefade71796a6..9737a87121fa7c5d6b41378ca55ba12f19bb44a4 100644 (file)
--- a/arch/nios2/platform/platform.c
+++ b/arch/nios2/platform/platform.c
@@ -15,6 +15,12 @@
 #include <linux/slab.h>
 #include <linux/sys_soc.h>
 #include <linux/io.h>
+#include <linux/clk-provider.h>
+
+static const struct of_device_id clk_match[] __initconst = {
+       { .compatible = "fixed-clock", .data = of_fixed_clk_setup, },
+       {}
+};
 
 static int __init nios2_soc_device_init(void)
 {
@@ -38,6 +44,8 @@ static int __init nios2_soc_device_init(void)
                }
        }
 
+       of_clk_init(clk_match);
+
        return 0;
 }