Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'nios2-v5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2
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
+13
-11
+2
-3
Documentation/devicetree/bindings/fpga/fpga-region.txt
+2
-3
Documentation/devicetree/bindings/fpga/fpga-region.txt
···
263
263
gpio@10040 {
264
264
compatible = "altr,pio-1.0";
265
265
reg = <0x10040 0x20>;
266
-
altr,gpio-bank-width = <4>;
266
+
altr,ngpio = <4>;
267
267
#gpio-cells = <2>;
268
268
clocks = <2>;
269
269
gpio-controller;
···
468
468
compatible = "altr,pio-1.0";
469
469
reg = <0x10040 0x20>;
470
470
clocks = <0x2>;
471
-
altr,gpio-bank-width = <0x4>;
472
-
resetvalue = <0x0>;
471
+
altr,ngpio = <0x4>;
473
472
#gpio-cells = <0x2>;
474
473
gpio-controller;
475
474
};
-4
MAINTAINERS
-4
MAINTAINERS
···
738
738
739
739
ALTERA MAILBOX DRIVER
740
740
M: Ley Foon Tan <ley.foon.tan@intel.com>
741
-
L: nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
742
741
S: Maintained
743
742
F: drivers/mailbox/mailbox-altera.c
744
743
···
765
766
ALTERA TRIPLE SPEED ETHERNET DRIVER
766
767
M: Thor Thayer <thor.thayer@linux.intel.com>
767
768
L: netdev@vger.kernel.org
768
-
L: nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
769
769
S: Maintained
770
770
F: drivers/net/ethernet/altera/
771
771
772
772
ALTERA UART/JTAG UART SERIAL DRIVERS
773
773
M: Tobias Klauser <tklauser@distanz.ch>
774
774
L: linux-serial@vger.kernel.org
775
-
L: nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
776
775
S: Maintained
777
776
F: drivers/tty/serial/altera_uart.c
778
777
F: drivers/tty/serial/altera_jtaguart.c
···
11922
11925
11923
11926
NIOS2 ARCHITECTURE
11924
11927
M: Ley Foon Tan <ley.foon.tan@intel.com>
11925
-
L: nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
11926
11928
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git
11927
11929
S: Maintained
11928
11930
F: arch/nios2/
+1
arch/nios2/Kconfig
+1
arch/nios2/Kconfig
+2
-4
arch/nios2/boot/dts/10m50_devboard.dts
+2
-4
arch/nios2/boot/dts/10m50_devboard.dts
···
179
179
led_pio: gpio@180014d0 {
180
180
compatible = "altr,pio-1.0";
181
181
reg = <0x180014d0 0x00000010>;
182
-
altr,gpio-bank-width = <4>;
183
-
resetvalue = <15>;
182
+
altr,ngpio = <4>;
184
183
#gpio-cells = <2>;
185
184
gpio-controller;
186
185
};
···
189
190
reg = <0x180014c0 0x00000010>;
190
191
interrupt-parent = <&cpu>;
191
192
interrupts = <6>;
192
-
altr,gpio-bank-width = <3>;
193
+
altr,ngpio = <3>;
193
194
altr,interrupt-type = <2>;
194
195
edge_type = <1>;
195
196
level_trigger = <0>;
196
-
resetvalue = <0>;
197
197
#gpio-cells = <2>;
198
198
gpio-controller;
199
199
};
+8
arch/nios2/platform/platform.c
+8
arch/nios2/platform/platform.c
···
15
15
#include <linux/slab.h>
16
16
#include <linux/sys_soc.h>
17
17
#include <linux/io.h>
18
+
#include <linux/clk-provider.h>
19
+
20
+
static const struct of_device_id clk_match[] __initconst = {
21
+
{ .compatible = "fixed-clock", .data = of_fixed_clk_setup, },
22
+
{}
23
+
};
18
24
19
25
static int __init nios2_soc_device_init(void)
20
26
{
···
43
37
kfree(soc_dev_attr);
44
38
}
45
39
}
40
+
41
+
of_clk_init(clk_match);
46
42
47
43
return 0;
48
44
}