Unverified Commit d4b07f7a authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10290 Backport 5.10.210 LTS patches from upstream 

Merge Pull Request from: @sanglipeng 
 
https://gitee.com/openeuler/kernel/issues/IAE52H

Conflicts:
Already merged(101):
9de69732dde4  dmaengine: fix NULL pointer in channel unregistration function
c6a8111aacbf  hwrng: core - Fix page fault dead lock on mmap-ed hwrng
cd51e26a3b89  crypto: s390/aes - Fix buffer overread in CTR mode
69ca89d80f2c  rpmsg: virtio: Free driver_override when rpmsg_remove()
20a6dea2d1c6  bus: mhi: host: Drop chan lock before queuing buffers
9ef68b58fd00  async: Split async_schedule_node_domain()
ac4dcccbe910  async: Introduce async_schedule_dev_nocall()
d132010e6d5c  ubifs: ubifs_symlink: Fix memleak of inode->i_link in error path
443b16ee3d9c  stddef: Introduce DECLARE_FLEX_ARRAY() helper
02f629bb460d  smb3: Replace smb2pdu 1-element arrays with flex-arrays
5fed92ca32ea  net/smc: fix illegal rmb_desc access in SMC-D connection dump
04f2a74b562f  llc: make llc_ui_sendmsg() more robust against bonding changes
9ccdef19cf94  llc: Drop support for ETH_P_TR_802_2.
05dd9facfb9a  wifi: iwlwifi: fix a memory corruption
9489e214ea8f  netfilter: nft_chain_filter: handle NETDEV_UNREGISTER for inet/ingress basechain
f55261469be8  drm: Don't unref the same fb many times by mistake due to deadlock handling
2245a8498569  PM: sleep: Use dev_printk() when possible
57df40f80089  PM: sleep: Avoid calling put_device() under dpm_list_mtx
8b604883d4cb  PM: core: Remove unnecessary (void *) conversions
f46eb832389f  PM: sleep: Fix possible deadlocks in core system-wide PM code
b6f27626f56e  fs/pipe: move check to pipe_has_watch_queue()
162ae0e78bda  pipe: wakeup wr_wait after setting max_usage
43872f44eee6  media: mtk-jpeg: Fix use after free bug due to error path handling in mtk_jpeg_dec_device_run
3399cc7013e7  PM / devfreq: Synchronize devfreq_monitor_[start/stop]
7aa33854477d  UBSAN: array-index-out-of-bounds in dtSplitRoot
1c40ca3d39d7  jfs: fix slab-out-of-bounds Read in dtSearch
2037cb9d95f1  jfs: fix array-index-out-of-bounds in dbAdjTree
bc6ef64dbe71  jfs: fix uaf in jfs_evict_inode
e2b77d107b33  jfs: fix array-index-out-of-bounds in diNewExt
150a3a387149  KVM: s390: fix setting of fpc register
c430e6bb4395  SUNRPC: Fix a suspicious RCU usage warning
b96019242269  ext4: unify the type of flexbg_size to unsigned int
e7b9fa6c298f  ext4: remove unnecessary check from alloc_flex_gd()
cfbbb3199e71  ext4: avoid online resizing failures due to oversized flex bg
69e905beca19  wifi: rt2x00: restart beacon queue when hardware reset
9bc7617a0d46  scsi: lpfc: Fix possible file string name overflow when updating firmware
84770a996ad8  wifi: ath9k: Fix potential array-index-out-of-bounds read in ath9k_htc_txstatus()
80c69f576ff3  f2fs: fix to check return value of f2fs_reserve_new_block()
3a1da8abd772  RDMA/IPoIB: Fix error code return in ipoib_mcast_join
ac2630fd3c90  IB/ipoib: Fix mcast list locking
a57b114a84f8  ip6_tunnel: use dev_sw_netstats_rx_add()
a9bc32879a08  ip6_tunnel: make sure to pull inner header in __ip6_tnl_rcv()
14690e419bb3  net-zerocopy: Refactor frag-is-remappable test.
f48bf9a83b16  tcp: add sanity checks to rx zerocopy
d0b5b1f12429  llc: call sock_orphan() at release time
f199018dc762  af_unix: fix lockdep positive in sk_diag_dump_icons()
6388d0e3200d  uapi: stddef.h: Fix __DECLARE_FLEX_ARRAY for C++
6db18971f73a  PM: sleep: Fix error handling in dpm_prepare()
ae6769ba5141  dmaengine: fsl-qdma: Fix a memory leak related to the queue command DMA
be3b82e4871b  phy: ti: phy-omap-usb2: Fix NULL pointer dereference for SRP
2fc45a4631ac  net: stmmac: xgmac: fix handling of DPP safety error for DMA channels
e77bf828f1ca  tunnels: fix out of bounds access when building IPv6 PMTU error
88081ba41522  inet: read sk->sk_family once in inet_recv_error()
b06e067e93fa  ppp_async: limit MRU to 64K
1771e8347ff1  netfilter: nft_set_pipapo: store index in scratch maps
d6fcad0da2bd  netfilter: nft_set_pipapo: add helper to release pcpu scratch area
1dd947c21d3f  netfilter: nft_set_pipapo: remove scratch_aligned pointer
9f56f3833117  blk-iocost: Fix an UBSAN shift-out-of-bounds warning
78115a3473b1  net: stmmac: xgmac: use #define for string constants
feace3c24044  net: stmmac: xgmac: fix a typo of register name in DPP safety handling
4cee42fcf54f  netfilter: nft_set_rbtree: skip end interval element from gc
55cfccb658fc  net: openvswitch: limit the number of recursions from action sets
56cfbe607107  tracing/trigger: Fix to return error if failed to alloc snapshot
81e7d2530d45  mm/writeback: fix possible divide-by-zero in wb_dirty_limits(), again
486a4176bc78  media: ir_toy: fix a memleak in irtoy_tx
7a14b8a477b8  i2c: i801: Fix block process call transactions
2f6d16f0520d  nfc: nci: free rx_data_reassembly skb on NCI device cleanup
0d8011a878fd  net: hsr: remove WARN_ONCE() in send_hsr_supervision_frame()
a423042052ec  binder: signal epoll threads of self-work
d033a555d9a1  ext4: fix double-free of blocks due to wrong extents moved_len
36a49290d7e6  iio: magnetometer: rm3100: add boundary check for the value read from RM3100_REG_TMRC
93d8109bf182  media: rc: bpf attach/detach requires write permission
9ec807e7b6f5  hv_netvsc: Fix race condition between netvsc_probe and netvsc_remove
364a66be2abd  nilfs2: fix data corruption in dsync block recovery for small block sizes
98a4026b22ff  nilfs2: fix hang in nilfs_lookup_dirty_data_buffers()
8180d0c27b93  ceph: prevent use-after-free in encode_cap_msg()
978e50ef8c38  can: j1939: Fix UAF in j1939_sk_match_filter during setsockopt(SO_J1939_FILTER)
0c3687822259  crypto: lib/mpi - Fix unexpected pointer access in mpi_ec_init
f3e4963566f5  nilfs2: fix potential bug in end_buffer_async_write
bc99dcedd2f4  tcp: make sure init the accept_queue's spinlocks once
5ae8d5004463  net/rds: Fix UBSAN: array-index-out-of-bounds in rds_cmsg_recv
ef70dfa0b1e5  tracing: Ensure visibility when inserting an element into tracing_map
be8d1f619ea3  netlink: fix potential sleeping issue in mqueue_flush_file
a3eba5989fc9  ipv6: init the accept_queue's spinlocks in inet6_create
cf116d9c3c2a  net/mlx5e: fix a double-free in arfs_create_groups
2bdf872bcfe6  btrfs: don't abort filesystem when attempting to snapshot deleted subvolume
55a60251fa50  netfilter: nf_tables: reject QUEUE/DROP verdict parameters
aa28eecb43ca  powerpc/mm: Fix null-pointer dereference in pgtable_cache_add
beee482cc4c9  powerpc/lib: Validate size for vector operations
a63e48cd835c  pstore/ram: Fix crash when setting number of cpus to an odd number
856caf2730ea  s390/ptrace: handle setting of fpc register correctly
95bc866c1197  block/rnbd-srv: Check for unlikely string overflow
4a5d0528cf19  PCI: switchtec: Fix stdev_release() crash after surprise hot remove
7610ba131925  blk-mq: fix IO hang from sbitmap wakeup race
e016e358461b  ceph: fix deadlock or deadcode of misusing dget()
9878c660d1f0  scsi: core: Move scsi_host_busy() out of host lock if it is for per-command
cda4ca038caf  vhost: use kzalloc() instead of kmalloc() followed by memset()
230e89b5ad0a  powerpc/kasan: Fix addr error caused by page alignment
58054faf3bd2  crypto: ccp - Fix null pointer dereference in __sev_platform_shutdown_locked
a891a0621e72  dm: limit the number of targets and parameter size area
9a865a11d689  netfilter: nf_tables: fix pointer math issue in nft_byteorder_eval()

Rejected(15):
ff4332f1ec75  rename(): fix the locking of subdirectories
c71e1c1a08c2  KVM: use __vcalloc for very large allocations
74a80f8dda6a  mm: use __pfn_to_section() instead of open coding it
90ad17575d26  mm/sparsemem: fix race in accessing memory_section->usage
d073f4608b47  btrfs: remove err variable from btrfs_delete_subvolume
e1c50b0c6242  btrfs: avoid copying BTRFS_ROOT_SUBVOL_DEAD flag to snapshot of subvolume being deleted
02e5b2ff4753  x86/boot: Ignore NMIs during very early boot
95c864c81148  ACPI: APEI: set memory failure flags as MF_ACTION_REQUIRED on synchronous events
80700978cb34  bpf: Add map and need_defer parameters to .map_fd_put_ptr()
7efadce40a6b  scsi: core: Introduce enum scsi_disposition
f5944853f7a9  scsi: core: Move scsi_host_busy() out of host lock for waking up EH handler
8868106251cd  clocksource: Skip watchdog check for large watchdog intervals
3f5d47eb163b  btrfs: do not ASSERT() if the newly created subvolume already got read
5e8a6140d42f  i2c: i801: Remove i801_set_block_buffer_mode
8f8f18564374  net: prevent mss overflow in skb_segment()

Kabi broken(3):
b1f576be92d0  hrtimer: Report offline hrtimer enqueue
a24d5f2ac8ef  netfilter: ipset: fix performance regression in swap
c80ddc10927f  netfilter: ipset: Missing gc cancellations fixed

Total patches: 371 - 101 - 15 - 3 = 252 
 
Link:https://gitee.com/openeuler/kernel/pulls/10290

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents bf4cdbe5 cc36114d

Documentation/ABI/testing/sysfs-class-net-queues

+11 −11
Original line number Diff line number Diff line 
What:		/sys/class/<iface>/queues/rx-<queue>/rps_cpus

What:		/sys/class/net/<iface>/queues/rx-<queue>/rps_cpus

Date:		March 2010

KernelVersion:	2.6.35

Contact:	netdev@vger.kernel.org
@@ -8,7 +8,7 @@ Description: 
		network device queue. Possible values depend on the number

		of available CPU(s) in the system.



What:		/sys/class/<iface>/queues/rx-<queue>/rps_flow_cnt

What:		/sys/class/net/<iface>/queues/rx-<queue>/rps_flow_cnt

Date:		April 2010

KernelVersion:	2.6.35

Contact:	netdev@vger.kernel.org
@@ -16,7 +16,7 @@ Description: 
		Number of Receive Packet Steering flows being currently

		processed by this particular network device receive queue.



What:		/sys/class/<iface>/queues/tx-<queue>/tx_timeout

What:		/sys/class/net/<iface>/queues/tx-<queue>/tx_timeout

Date:		November 2011

KernelVersion:	3.3

Contact:	netdev@vger.kernel.org
@@ -24,7 +24,7 @@ Description: 
		Indicates the number of transmit timeout events seen by this

		network interface transmit queue.



What:		/sys/class/<iface>/queues/tx-<queue>/tx_maxrate

What:		/sys/class/net/<iface>/queues/tx-<queue>/tx_maxrate

Date:		March 2015

KernelVersion:	4.1

Contact:	netdev@vger.kernel.org
@@ -32,7 +32,7 @@ Description: 
		A Mbps max-rate set for the queue, a value of zero means disabled,

		default is disabled.



What:		/sys/class/<iface>/queues/tx-<queue>/xps_cpus

What:		/sys/class/net/<iface>/queues/tx-<queue>/xps_cpus

Date:		November 2010

KernelVersion:	2.6.38

Contact:	netdev@vger.kernel.org
@@ -42,7 +42,7 @@ Description: 
		network device transmit queue. Possible vaules depend on the

		number of available CPU(s) in the system.



What:		/sys/class/<iface>/queues/tx-<queue>/xps_rxqs

What:		/sys/class/net/<iface>/queues/tx-<queue>/xps_rxqs

Date:		June 2018

KernelVersion:	4.18.0

Contact:	netdev@vger.kernel.org
@@ -53,7 +53,7 @@ Description: 
		number of available receive queue(s) in the network device.

		Default is disabled.



What:		/sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/hold_time

What:		/sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/hold_time

Date:		November 2011

KernelVersion:	3.3

Contact:	netdev@vger.kernel.org
@@ -62,7 +62,7 @@ Description: 
		of this particular network device transmit queue.

		Default value is 1000.



What:		/sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/inflight

What:		/sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/inflight

Date:		November 2011

KernelVersion:	3.3

Contact:	netdev@vger.kernel.org
@@ -70,7 +70,7 @@ Description: 
		Indicates the number of bytes (objects) in flight on this

		network device transmit queue.



What:		/sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit

What:		/sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/limit

Date:		November 2011

KernelVersion:	3.3

Contact:	netdev@vger.kernel.org
@@ -79,7 +79,7 @@ Description: 
		on this network device transmit queue. This value is clamped

		to be within the bounds defined by limit_max and limit_min.



What:		/sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit_max

What:		/sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/limit_max

Date:		November 2011

KernelVersion:	3.3

Contact:	netdev@vger.kernel.org
@@ -88,7 +88,7 @@ Description: 
		queued on this network device transmit queue. See

		include/linux/dynamic_queue_limits.h for the default value.



What:		/sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit_min

What:		/sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/limit_min

Date:		November 2011

KernelVersion:	3.3

Contact:	netdev@vger.kernel.org

Documentation/ABI/testing/sysfs-class-net-statistics

+24 −24
Original line number Diff line number Diff line 
What:		/sys/class/<iface>/statistics/collisions

What:		/sys/class/net/<iface>/statistics/collisions

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -6,7 +6,7 @@ Description: 
		Indicates the number of collisions seen by this network device.

		This value might not be relevant with all MAC layers.



What:		/sys/class/<iface>/statistics/multicast

What:		/sys/class/net/<iface>/statistics/multicast

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -14,7 +14,7 @@ Description: 
		Indicates the number of multicast packets received by this

		network device.



What:		/sys/class/<iface>/statistics/rx_bytes

What:		/sys/class/net/<iface>/statistics/rx_bytes

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -23,7 +23,7 @@ Description: 
		See the network driver for the exact meaning of when this

		value is incremented.



What:		/sys/class/<iface>/statistics/rx_compressed

What:		/sys/class/net/<iface>/statistics/rx_compressed

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -32,7 +32,7 @@ Description: 
		network device. This value might only be relevant for interfaces

		that support packet compression (e.g: PPP).



What:		/sys/class/<iface>/statistics/rx_crc_errors

What:		/sys/class/net/<iface>/statistics/rx_crc_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -41,7 +41,7 @@ Description: 
		by this network device. Note that the specific meaning might

		depend on the MAC layer used by the interface.



What:		/sys/class/<iface>/statistics/rx_dropped

What:		/sys/class/net/<iface>/statistics/rx_dropped

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -51,7 +51,7 @@ Description: 
		packet processing. See the network driver for the exact

		meaning of this value.



What:		/sys/class/<iface>/statistics/rx_errors

What:		/sys/class/net/<iface>/statistics/rx_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -59,7 +59,7 @@ Description: 
		Indicates the number of receive errors on this network device.

		See the network driver for the exact meaning of this value.



What:		/sys/class/<iface>/statistics/rx_fifo_errors

What:		/sys/class/net/<iface>/statistics/rx_fifo_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -68,7 +68,7 @@ Description: 
		network device. See the network driver for the exact

		meaning of this value.



What:		/sys/class/<iface>/statistics/rx_frame_errors

What:		/sys/class/net/<iface>/statistics/rx_frame_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -78,7 +78,7 @@ Description: 
		on the MAC layer protocol used. See the network driver for

		the exact meaning of this value.



What:		/sys/class/<iface>/statistics/rx_length_errors

What:		/sys/class/net/<iface>/statistics/rx_length_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -87,7 +87,7 @@ Description: 
		error, oversized or undersized. See the network driver for the

		exact meaning of this value.



What:		/sys/class/<iface>/statistics/rx_missed_errors

What:		/sys/class/net/<iface>/statistics/rx_missed_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -96,7 +96,7 @@ Description: 
		due to lack of capacity in the receive side. See the network

		driver for the exact meaning of this value.



What:		/sys/class/<iface>/statistics/rx_nohandler

What:		/sys/class/net/<iface>/statistics/rx_nohandler

Date:		February 2016

KernelVersion:	4.6

Contact:	netdev@vger.kernel.org
@@ -104,7 +104,7 @@ Description: 
		Indicates the number of received packets that were dropped on

		an inactive device by the network core.



What:		/sys/class/<iface>/statistics/rx_over_errors

What:		/sys/class/net/<iface>/statistics/rx_over_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -114,7 +114,7 @@ Description: 
		(e.g: larger than MTU). See the network driver for the exact

		meaning of this value.



What:		/sys/class/<iface>/statistics/rx_packets

What:		/sys/class/net/<iface>/statistics/rx_packets

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -122,7 +122,7 @@ Description: 
		Indicates the total number of good packets received by this

		network device.



What:		/sys/class/<iface>/statistics/tx_aborted_errors

What:		/sys/class/net/<iface>/statistics/tx_aborted_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -132,7 +132,7 @@ Description: 
		a medium collision). See the network driver for the exact

		meaning of this value.



What:		/sys/class/<iface>/statistics/tx_bytes

What:		/sys/class/net/<iface>/statistics/tx_bytes

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -143,7 +143,7 @@ Description: 
		transmitted packets or all packets that have been queued for

		transmission.



What:		/sys/class/<iface>/statistics/tx_carrier_errors

What:		/sys/class/net/<iface>/statistics/tx_carrier_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -152,7 +152,7 @@ Description: 
		because of carrier errors (e.g: physical link down). See the

		network driver for the exact meaning of this value.



What:		/sys/class/<iface>/statistics/tx_compressed

What:		/sys/class/net/<iface>/statistics/tx_compressed

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -161,7 +161,7 @@ Description: 
		this might only be relevant for devices that support

		compression (e.g: PPP).



What:		/sys/class/<iface>/statistics/tx_dropped

What:		/sys/class/net/<iface>/statistics/tx_dropped

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -170,7 +170,7 @@ Description: 
		See the driver for the exact reasons as to why the packets were

		dropped.



What:		/sys/class/<iface>/statistics/tx_errors

What:		/sys/class/net/<iface>/statistics/tx_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -179,7 +179,7 @@ Description: 
		a network device. See the driver for the exact reasons as to

		why the packets were dropped.



What:		/sys/class/<iface>/statistics/tx_fifo_errors

What:		/sys/class/net/<iface>/statistics/tx_fifo_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -188,7 +188,7 @@ Description: 
		FIFO error. See the driver for the exact reasons as to why the

		packets were dropped.



What:		/sys/class/<iface>/statistics/tx_heartbeat_errors

What:		/sys/class/net/<iface>/statistics/tx_heartbeat_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -197,7 +197,7 @@ Description: 
		reported as heartbeat errors. See the driver for the exact

		reasons as to why the packets were dropped.



What:		/sys/class/<iface>/statistics/tx_packets

What:		/sys/class/net/<iface>/statistics/tx_packets

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -206,7 +206,7 @@ Description: 
		device. See the driver for whether this reports the number of all

		attempted or successful transmissions.



What:		/sys/class/<iface>/statistics/tx_window_errors

What:		/sys/class/net/<iface>/statistics/tx_window_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org

Documentation/sound/soc/dapm.rst

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ corresponding soft power control. In this case it is necessary to create 
a virtual widget - a widget with no control bits e.g.

::



  SND_SOC_DAPM_MIXER("AC97 Mixer", SND_SOC_DAPM_NOPM, 0, 0, NULL, 0),

  SND_SOC_DAPM_MIXER("AC97 Mixer", SND_SOC_NOPM, 0, 0, NULL, 0),



This can be used to merge to signal paths together in software.

arch/arm/boot/dts/exynos4210-i9100.dts

+8 −0
Original line number Diff line number Diff line
@@ -464,6 +464,14 @@ 
				regulator-name = "VT_CAM_1.8V";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;



				/*

				 * Force-enable this regulator; otherwise the

				 * kernel hangs very early in the boot process

				 * for about 12 seconds, without apparent

				 * reason.

				 */

				regulator-always-on;

			};



			vcclcd_reg: LDO13 {

arch/arm/boot/dts/imx1-ads.dts

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ 
	pinctrl-0 = <&pinctrl_weim>;

	status = "okay";



	nor: nor@0,0 {

	nor: flash@0,0 {

		compatible = "cfi-flash";

		reg = <0 0x00000000 0x02000000>;

		bank-width = <4>;