ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2020-04-11 11:38:44 -07:00
parent 75e7188397 0ec8a5054d
commit b032227c62
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/devicetree/bindings/fpga/fpga-region.txt
View File

@@ -263,7 +263,7 @@ Overlay contains:
gpio@10040 { gpio@10040 {
compatible = "altr,pio-1.0"; compatible = "altr,pio-1.0";
reg = <0x10040 0x20>; reg = <0x10040 0x20>;
altr,gpio-bank-width = <4>; altr,ngpio = <4>;
#gpio-cells = <2>; #gpio-cells = <2>;
clocks = <2>; clocks = <2>;
gpio-controller; gpio-controller;
@@ -468,8 +468,7 @@ programming is the FPGA based bridge of fpga_region1.
compatible = "altr,pio-1.0"; compatible = "altr,pio-1.0";
reg = <0x10040 0x20>; reg = <0x10040 0x20>;
clocks = <0x2>; clocks = <0x2>;
altr,gpio-bank-width = <0x4>; altr,ngpio = <0x4>;
resetvalue = <0x0>;
#gpio-cells = <0x2>; #gpio-cells = <0x2>;
gpio-controller; gpio-controller;
}; };

4
MAINTAINERS
View File

@@ -738,7 +738,6 @@ F: drivers/i2c/busses/i2c-altera.c
ALTERA MAILBOX DRIVER ALTERA MAILBOX DRIVER
M: Ley Foon Tan <ley.foon.tan@intel.com> M: Ley Foon Tan <ley.foon.tan@intel.com>
L: nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
S: Maintained S: Maintained
F: drivers/mailbox/mailbox-altera.c 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 ALTERA TRIPLE SPEED ETHERNET DRIVER
M: Thor Thayer <thor.thayer@linux.intel.com> M: Thor Thayer <thor.thayer@linux.intel.com>
L: netdev@vger.kernel.org L: netdev@vger.kernel.org
L: nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
S: Maintained S: Maintained
F: drivers/net/ethernet/altera/ F: drivers/net/ethernet/altera/
ALTERA UART/JTAG UART SERIAL DRIVERS ALTERA UART/JTAG UART SERIAL DRIVERS
M: Tobias Klauser <tklauser@distanz.ch> M: Tobias Klauser <tklauser@distanz.ch>
L: linux-serial@vger.kernel.org L: linux-serial@vger.kernel.org
L: nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
S: Maintained S: Maintained
F: drivers/tty/serial/altera_uart.c F: drivers/tty/serial/altera_uart.c
F: drivers/tty/serial/altera_jtaguart.c F: drivers/tty/serial/altera_jtaguart.c
@@ -11925,7 +11922,6 @@ F: drivers/scsi/nsp32*
NIOS2 ARCHITECTURE NIOS2 ARCHITECTURE
M: Ley Foon Tan <ley.foon.tan@intel.com> 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 T: git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git
S: Maintained S: Maintained
F: arch/nios2/ F: arch/nios2/

1
arch/nios2/Kconfig
View File

@@ -7,6 +7,7 @@ config NIOS2
select ARCH_HAS_SYNC_DMA_FOR_DEVICE select ARCH_HAS_SYNC_DMA_FOR_DEVICE
select ARCH_HAS_DMA_SET_UNCACHED select ARCH_HAS_DMA_SET_UNCACHED
select ARCH_NO_SWAP select ARCH_NO_SWAP
select COMMON_CLK
select TIMER_OF select TIMER_OF
select GENERIC_ATOMIC64 select GENERIC_ATOMIC64
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS

6
arch/nios2/boot/dts/10m50_devboard.dts
View File

@@ -179,8 +179,7 @@
led_pio: gpio@180014d0 { led_pio: gpio@180014d0 {
compatible = "altr,pio-1.0"; compatible = "altr,pio-1.0";
reg = <0x180014d0 0x00000010>; reg = <0x180014d0 0x00000010>;
altr,gpio-bank-width = <4>; altr,ngpio = <4>;
resetvalue = <15>;
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
}; };
@@ -190,11 +189,10 @@
reg = <0x180014c0 0x00000010>; reg = <0x180014c0 0x00000010>;
interrupt-parent = <&cpu>; interrupt-parent = <&cpu>;
interrupts = <6>; interrupts = <6>;
altr,gpio-bank-width = <3>; altr,ngpio = <3>;
altr,interrupt-type = <2>; altr,interrupt-type = <2>;
edge_type = <1>; edge_type = <1>;
level_trigger = <0>; level_trigger = <0>;
resetvalue = <0>;
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
}; };

8
arch/nios2/platform/platform.c
View File

@@ -15,6 +15,12 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/sys_soc.h> #include <linux/sys_soc.h>
#include <linux/io.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) 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; return 0;
} }