Skip to content

Commit b032227

Browse files
committed
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 [email protected] 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 [email protected] arch: nios2: remove 'resetvalue' property arch: nios2: rename 'altr,gpio-bank-width' -> 'altr,ngpio' arch: nios2: Enable the common clk subsystem on Nios2
2 parents 75e7188 + 0ec8a50 commit b032227

File tree

5 files changed

+13
-11
lines changed

5 files changed

+13
-11
lines changed

Documentation/devicetree/bindings/fpga/fpga-region.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ Overlay contains:
263263
gpio@10040 {
264264
compatible = "altr,pio-1.0";
265265
reg = <0x10040 0x20>;
266-
altr,gpio-bank-width = <4>;
266+
altr,ngpio = <4>;
267267
#gpio-cells = <2>;
268268
clocks = <2>;
269269
gpio-controller;
@@ -468,8 +468,7 @@ programming is the FPGA based bridge of fpga_region1.
468468
compatible = "altr,pio-1.0";
469469
reg = <0x10040 0x20>;
470470
clocks = <0x2>;
471-
altr,gpio-bank-width = <0x4>;
472-
resetvalue = <0x0>;
471+
altr,ngpio = <0x4>;
473472
#gpio-cells = <0x2>;
474473
gpio-controller;
475474
};

MAINTAINERS

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,6 @@ F: drivers/i2c/busses/i2c-altera.c
738738

739739
ALTERA MAILBOX DRIVER
740740
M: Ley Foon Tan <[email protected]>
741-
L: [email protected] (moderated for non-subscribers)
742741
S: Maintained
743742
F: drivers/mailbox/mailbox-altera.c
744743

@@ -766,14 +765,12 @@ F: include/dt-bindings/reset/altr,rst-mgr-a10sr.h
766765
ALTERA TRIPLE SPEED ETHERNET DRIVER
767766
M: Thor Thayer <[email protected]>
768767
769-
L: [email protected] (moderated for non-subscribers)
770768
S: Maintained
771769
F: drivers/net/ethernet/altera/
772770

773771
ALTERA UART/JTAG UART SERIAL DRIVERS
774772
M: Tobias Klauser <[email protected]>
775773
776-
L: [email protected] (moderated for non-subscribers)
777774
S: Maintained
778775
F: drivers/tty/serial/altera_uart.c
779776
F: drivers/tty/serial/altera_jtaguart.c
@@ -11925,7 +11922,6 @@ F: drivers/scsi/nsp32*
1192511922

1192611923
NIOS2 ARCHITECTURE
1192711924
M: Ley Foon Tan <[email protected]>
11928-
L: [email protected] (moderated for non-subscribers)
1192911925
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git
1193011926
S: Maintained
1193111927
F: arch/nios2/

arch/nios2/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ config NIOS2
77
select ARCH_HAS_SYNC_DMA_FOR_DEVICE
88
select ARCH_HAS_DMA_SET_UNCACHED
99
select ARCH_NO_SWAP
10+
select COMMON_CLK
1011
select TIMER_OF
1112
select GENERIC_ATOMIC64
1213
select GENERIC_CLOCKEVENTS

arch/nios2/boot/dts/10m50_devboard.dts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,7 @@
179179
led_pio: gpio@180014d0 {
180180
compatible = "altr,pio-1.0";
181181
reg = <0x180014d0 0x00000010>;
182-
altr,gpio-bank-width = <4>;
183-
resetvalue = <15>;
182+
altr,ngpio = <4>;
184183
#gpio-cells = <2>;
185184
gpio-controller;
186185
};
@@ -190,11 +189,10 @@
190189
reg = <0x180014c0 0x00000010>;
191190
interrupt-parent = <&cpu>;
192191
interrupts = <6>;
193-
altr,gpio-bank-width = <3>;
192+
altr,ngpio = <3>;
194193
altr,interrupt-type = <2>;
195194
edge_type = <1>;
196195
level_trigger = <0>;
197-
resetvalue = <0>;
198196
#gpio-cells = <2>;
199197
gpio-controller;
200198
};

arch/nios2/platform/platform.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@
1515
#include <linux/slab.h>
1616
#include <linux/sys_soc.h>
1717
#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+
};
1824

1925
static int __init nios2_soc_device_init(void)
2026
{
@@ -38,6 +44,8 @@ static int __init nios2_soc_device_init(void)
3844
}
3945
}
4046

47+
of_clk_init(clk_match);
48+
4149
return 0;
4250
}
4351

0 commit comments

Comments
 (0)