Skip to content

Commit b814f58

Browse files
George HuangKae Woei Kang
authored andcommitted
SLSC Watchdog: Enable system watchdog for ni-slsc-12001
Using cadence watchdog to allow system to reboot when hangs for more than 10 sec. - Using phandle reference @watchdog0 to add reset-on-timeout property to cadence watchdog in ni-slsc-12001.dts - Regenerate nati-slsc-defconfig with savedefconfig to clear some previous manual edits. And add cadence watchdog driver support. Signed-off-by: George Huang <george.huang@ni.com> Acked-by: Brad Mouring <brad.mouring@ni.com> Acked-by: Brad Keryan <brad.keryan@emerson.com> Acked-by: Josh Cartwright <josh.cartwright@ni.com> Acked-by: Gratian Crisan <gratian.crisan@ni.com> Natinst-ReviewBoard-ID 149067 Signed-off-by: Kae Woei Kang <kae.woei.kang@emerson.com>
1 parent aa1ad74 commit b814f58

File tree

2 files changed

+12
-32
lines changed

2 files changed

+12
-32
lines changed

arch/arm/boot/dts/xilinx/ni-slsc-12001.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,10 @@
459459

460460
};
461461

462+
&watchdog0 {
463+
reset-on-timeout;
464+
};
465+
462466
&gem0 {
463467
status = "okay";
464468

arch/arm/configs/nati_slsc_defconfig

Lines changed: 8 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ CONFIG_IPV6=y
5454
# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
5555
# CONFIG_INET6_XFRM_MODE_BEET is not set
5656
# CONFIG_IPV6_SIT is not set
57-
5857
CONFIG_L2TP=m
5958
CONFIG_L2TP_DEBUGFS=m
6059
CONFIG_L2TP_V3=y
@@ -75,7 +74,6 @@ CONFIG_DEVTMPFS=y
7574
CONFIG_DEVTMPFS_MOUNT=y
7675
CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
7776
CONFIG_CONNECTOR=y
78-
7977
CONFIG_MTD=y
8078
CONFIG_MTD_CMDLINE_PARTS=y
8179
CONFIG_MTD_RESERVE_END=524288
@@ -84,13 +82,12 @@ CONFIG_MTD_CFI=y
8482
CONFIG_MTD_CFI_AMDSTD=y
8583
CONFIG_MTD_PHYSMAP=y
8684
CONFIG_MTD_PHYSMAP_OF=y
85+
CONFIG_MTD_M25P80=m
8786
CONFIG_MTD_NAND=y
8887
CONFIG_MTD_NAND_PL353=y
88+
CONFIG_MTD_SPI_NOR=y
8989
CONFIG_MTD_UBI=y
9090
CONFIG_MTD_UBI_GLUEBI=y
91-
CONFIG_MTD_SPI_NOR=y
92-
CONFIG_MTD_M25P80=m
93-
9491
CONFIG_BLK_DEV_LOOP=y
9592
CONFIG_BLK_DEV_RAM=y
9693
CONFIG_BLK_DEV_RAM_SIZE=16384
@@ -169,7 +166,6 @@ CONFIG_SERIAL_OF_PLATFORM=y
169166
CONFIG_SERIAL_XILINX_PS_UART=y
170167
CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
171168
# CONFIG_HW_RANDOM is not set
172-
CONFIG_I2C=y
173169
CONFIG_I2C_CHARDEV=y
174170
CONFIG_I2C_CADENCE=y
175171
CONFIG_I2C_XILINX=y
@@ -180,6 +176,8 @@ CONFIG_PTP_1588_CLOCK=y
180176
CONFIG_GPIOLIB=y
181177
CONFIG_GPIO_SYSFS=y
182178
CONFIG_GPIO_ZYNQ=y
179+
CONFIG_WATCHDOG=y
180+
CONFIG_CADENCE_WATCHDOG=y
183181
CONFIG_MEDIA_SUPPORT=y
184182
CONFIG_MEDIA_CAMERA_SUPPORT=y
185183
CONFIG_FB=y
@@ -219,8 +217,12 @@ CONFIG_RTC_DRV_DS3232=y
219217
CONFIG_RTC_DRV_PCF8563=y
220218
CONFIG_DMADEVICES=y
221219
CONFIG_PL330_DMA=y
220+
CONFIG_UIO=y
221+
CONFIG_UIO_PDRV_GENIRQ=y
222222
CONFIG_COMMON_CLK_SI570=y
223223
CONFIG_MEMORY=y
224+
CONFIG_IIO=y
225+
CONFIG_AD7291=y
224226
CONFIG_GIC_LEGACY_IRQDOMAIN=y
225227
CONFIG_EXT2_FS=y
226228
CONFIG_EXT2_FS_XATTR=y
@@ -238,9 +240,7 @@ CONFIG_SQUASHFS=y
238240
CONFIG_SQUASHFS_XATTR=y
239241
CONFIG_SQUASHFS_LZO=y
240242
CONFIG_SQUASHFS_XZ=y
241-
CONFIG_UNION_FS=y
242243
CONFIG_NFS_FS=y
243-
CONFIG_ROOT_NFS=y
244244
CONFIG_CIFS=y
245245
CONFIG_NLS_CODEPAGE_437=y
246246
CONFIG_NLS_ASCII=y
@@ -270,27 +270,3 @@ CONFIG_CRC7=y
270270
CONFIG_FONTS=y
271271
CONFIG_FONT_8x8=y
272272
CONFIG_FONT_8x16=y
273-
CONFIG_CRYPTO_ECB=y
274-
CONFIG_CRYPTO_HMAC=y
275-
CONFIG_CRYPTO_MD4=y
276-
CONFIG_CRYPTO_MD5=y
277-
CONFIG_CRYPTO_ARC4=y
278-
CONFIG_CRYPTO_DES=y
279-
# Generic UIO support
280-
CONFIG_UIO=y
281-
# CONFIG_UIO_CIF is not set
282-
CONFIG_UIO_PDRV_GENIRQ=y
283-
# CONFIG_UIO_DMEM_GENIRQ is not set
284-
# CONFIG_UIO_AEC is not set
285-
# CONFIG_UIO_SERCOS3 is not set
286-
# CONFIG_UIO_PCI_GENERIC is not set
287-
# CONFIG_UIO_NETX is not set
288-
# CONFIG_UIO_MF624 is not set
289-
#
290-
# SOC (System On Chip) specific Drivers
291-
#
292-
CONFIG_IIO=y
293-
#
294-
# Analog to digital converters
295-
#
296-
CONFIG_AD7291=y

0 commit comments

Comments
 (0)