xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Pull nios2 update from Ley Foon Tan:

 - clean up old Kconfig options from defconfig

 - remove leading 0x and 0s from bindings notation in dts files

* tag 'nios2-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2:
  nios2: defconfig: Cleanup from old Kconfig options
  nios2: dts: Remove leading 0x and 0s from bindings notation
This commit is contained in:
Linus Torvalds
2018-02-11 13:52:32 -08:00
parent d48fcbd864 e0691ebb33
commit 60d7a21aed
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arch/nios2/boot/dts/3c120_devboard.dts
View File

@@ -29,7 +29,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
cpu: cpu@0x0 { cpu: cpu@0 {
device_type = "cpu"; device_type = "cpu";
compatible = "altr,nios2-1.0"; compatible = "altr,nios2-1.0";
reg = <0x00000000>; reg = <0x00000000>;
@@ -69,7 +69,7 @@
compatible = "altr,avalon", "simple-bus"; compatible = "altr,avalon", "simple-bus";
bus-frequency = <125000000>; bus-frequency = <125000000>;
pb_cpu_to_io: bridge@0x8000000 { pb_cpu_to_io: bridge@8000000 {
compatible = "simple-bus"; compatible = "simple-bus";
reg = <0x08000000 0x00800000>; reg = <0x08000000 0x00800000>;
#address-cells = <1>; #address-cells = <1>;
@@ -83,7 +83,7 @@
<0x00008000 0x08008000 0x00000020>, <0x00008000 0x08008000 0x00000020>,
<0x00400000 0x08400000 0x00000020>; <0x00400000 0x08400000 0x00000020>;
timer_1ms: timer@0x400000 { timer_1ms: timer@400000 {
compatible = "altr,timer-1.0"; compatible = "altr,timer-1.0";
reg = <0x00400000 0x00000020>; reg = <0x00400000 0x00000020>;
interrupt-parent = <&cpu>; interrupt-parent = <&cpu>;
@@ -91,7 +91,7 @@
clock-frequency = <125000000>; clock-frequency = <125000000>;
}; };
timer_0: timer@0x8000 { timer_0: timer@8000 {
compatible = "altr,timer-1.0"; compatible = "altr,timer-1.0";
reg = < 0x00008000 0x00000020 >; reg = < 0x00008000 0x00000020 >;
interrupt-parent = < &cpu >; interrupt-parent = < &cpu >;
@@ -99,14 +99,14 @@
clock-frequency = < 125000000 >; clock-frequency = < 125000000 >;
}; };
jtag_uart: serial@0x4d50 { jtag_uart: serial@4d50 {
compatible = "altr,juart-1.0"; compatible = "altr,juart-1.0";
reg = <0x00004d50 0x00000008>; reg = <0x00004d50 0x00000008>;
interrupt-parent = <&cpu>; interrupt-parent = <&cpu>;
interrupts = <1>; interrupts = <1>;
}; };
tse_mac: ethernet@0x4000 { tse_mac: ethernet@4000 {
compatible = "altr,tse-1.0"; compatible = "altr,tse-1.0";
reg = <0x00004000 0x00000400>, reg = <0x00004000 0x00000400>,
<0x00004400 0x00000040>, <0x00004400 0x00000040>,
@@ -133,7 +133,7 @@
}; };
}; };
uart: serial@0x4c80 { uart: serial@4c80 {
compatible = "altr,uart-1.0"; compatible = "altr,uart-1.0";
reg = <0x00004c80 0x00000020>; reg = <0x00004c80 0x00000020>;
interrupt-parent = <&cpu>; interrupt-parent = <&cpu>;
@@ -143,7 +143,7 @@
}; };
}; };
cfi_flash_64m: flash@0x0 { cfi_flash_64m: flash@0 {
compatible = "cfi-flash"; compatible = "cfi-flash";
reg = <0x00000000 0x04000000>; reg = <0x00000000 0x04000000>;
bank-width = <2>; bank-width = <2>;

1
arch/nios2/configs/10m50_defconfig
View File

@@ -33,7 +33,6 @@ CONFIG_IP_PNP_RARP=y
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
# CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set
# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_XFRM_MODE_BEET is not set
# CONFIG_INET_LRO is not set
# CONFIG_IPV6 is not set # CONFIG_IPV6 is not set
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

1
arch/nios2/configs/3c120_defconfig
View File

@@ -35,7 +35,6 @@ CONFIG_IP_PNP_RARP=y
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
# CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set
# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_XFRM_MODE_BEET is not set
# CONFIG_INET_LRO is not set
# CONFIG_IPV6 is not set # CONFIG_IPV6 is not set
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"