Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e301a08b authored by Jesper Nilsson's avatar Jesper Nilsson
Browse files

CRIS: Drop code related to obsolete or unused kconfigs 



Drop all code related to Kconfigs that don't exist.
Fix one Kconfig where it was actually typo:ed (ETRAX_KGB_PORT2)
Drop content related to CRIS v32 SoCs from etraxgpio.h headerfile,
all use of GPIO for both ETRAX FS and ARTPEC-3 should now be through
standard gpiolib instead.

Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
parent 9f4137fa

arch/cris/arch-v10/kernel/head.S

+0 −106
Original line number Diff line number Diff line
@@ -354,63 +354,6 @@ no_command_line: 
	blo	1b

	nop



#ifdef CONFIG_BLK_DEV_ETRAXIDE

	;; disable ATA before enabling it in genconfig below

	moveq	0,$r0

	move.d	$r0,[R_ATA_CTRL_DATA]

	move.d	$r0,[R_ATA_TRANSFER_CNT]

	move.d	$r0,[R_ATA_CONFIG]

#if 0

	move.d	R_PORT_G_DATA, $r1

	move.d	$r0, [$r1]; assert ATA bus-reset

	nop

	nop

	nop

	nop

	nop

	nop

	move.d	0x08000000,$r0

	move.d	$r0,[$r1]

#endif

#endif



#ifdef CONFIG_JULIETTE

	;; configure external DMA channel 0 before enabling it in genconfig



	moveq	0,$r0

	move.d	$r0,[R_EXT_DMA_0_ADDR]

	; cnt enable, word size, output, stop, size 0

	move.d	  IO_STATE (R_EXT_DMA_0_CMD, cnt, enable)	\

		| IO_STATE (R_EXT_DMA_0_CMD, rqpol, ahigh)	\

		| IO_STATE (R_EXT_DMA_0_CMD, apol, ahigh)	\

		| IO_STATE (R_EXT_DMA_0_CMD, rq_ack, burst)	\

		| IO_STATE (R_EXT_DMA_0_CMD, wid, word)		\

		| IO_STATE (R_EXT_DMA_0_CMD, dir, output)	\

		| IO_STATE (R_EXT_DMA_0_CMD, run, stop)		\

		| IO_FIELD (R_EXT_DMA_0_CMD, trf_count, 0),$r0

	move.d	$r0,[R_EXT_DMA_0_CMD]



	;; reset dma4 and wait for completion



	moveq	IO_STATE (R_DMA_CH4_CMD, cmd, reset),$r0

	move.b	$r0,[R_DMA_CH4_CMD]

1:	move.b	[R_DMA_CH4_CMD],$r0

	and.b	IO_MASK (R_DMA_CH4_CMD, cmd),$r0

	cmp.b	IO_STATE (R_DMA_CH4_CMD, cmd, reset),$r0

	beq	1b

	nop



	;; reset dma5 and wait for completion



	moveq	IO_STATE (R_DMA_CH5_CMD, cmd, reset),$r0

	move.b	$r0,[R_DMA_CH5_CMD]

1:	move.b	[R_DMA_CH5_CMD],$r0

	and.b	IO_MASK (R_DMA_CH5_CMD, cmd),$r0

	cmp.b	IO_STATE (R_DMA_CH5_CMD, cmd, reset),$r0

	beq	1b

	nop

#endif



	;; Etrax product HW genconfig setup



	moveq	0,$r0
@@ -447,21 +390,6 @@ no_command_line: 
		| IO_STATE (R_GEN_CONFIG, dma9, usb),$r0





#if defined(CONFIG_ETRAX_DEF_R_PORT_G0_DIR_OUT)

        or.d      IO_STATE (R_GEN_CONFIG, g0dir, out),$r0

#endif



#if defined(CONFIG_ETRAX_DEF_R_PORT_G8_15_DIR_OUT)

        or.d      IO_STATE (R_GEN_CONFIG, g8_15dir, out),$r0

#endif

#if defined(CONFIG_ETRAX_DEF_R_PORT_G16_23_DIR_OUT)

       or.d      IO_STATE (R_GEN_CONFIG, g16_23dir, out),$r0

#endif



#if defined(CONFIG_ETRAX_DEF_R_PORT_G24_DIR_OUT)

       or.d      IO_STATE (R_GEN_CONFIG, g24dir, out),$r0

#endif



	move.d	$r0,[genconfig_shadow] ; init a shadow register of R_GEN_CONFIG



	move.d	$r0,[R_GEN_CONFIG]
@@ -500,19 +428,9 @@ no_command_line: 
	;; including their shadow registers



	move.b	CONFIG_ETRAX_DEF_R_PORT_PA_DIR,$r0

#if defined(CONFIG_BLUETOOTH) && defined(CONFIG_BLUETOOTH_RESET_PA7)

	or.b	IO_STATE (R_PORT_PA_DIR, dir7, output),$r0

#endif

	move.b	$r0,[port_pa_dir_shadow]

	move.b	$r0,[R_PORT_PA_DIR]

	move.b	CONFIG_ETRAX_DEF_R_PORT_PA_DATA,$r0

#if defined(CONFIG_BLUETOOTH) && defined(CONFIG_BLUETOOTH_RESET_PA7)

#if defined(CONFIG_BLUETOOTH_RESET_ACTIVE_HIGH)

	and.b	~(1 << 7),$r0

#else

	or.b	(1 << 7),$r0

#endif

#endif

	move.b	$r0,[port_pa_data_shadow]

	move.b	$r0,[R_PORT_PA_DATA]
@@ -520,19 +438,9 @@ no_command_line: 
	move.b	$r0,[port_pb_config_shadow]

	move.b	$r0,[R_PORT_PB_CONFIG]

	move.b	CONFIG_ETRAX_DEF_R_PORT_PB_DIR,$r0

#if defined(CONFIG_BLUETOOTH) && defined(CONFIG_BLUETOOTH_RESET_PB5)

	or.b	IO_STATE (R_PORT_PB_DIR, dir5, output),$r0

#endif

	move.b	$r0,[port_pb_dir_shadow]

	move.b	$r0,[R_PORT_PB_DIR]

	move.b	CONFIG_ETRAX_DEF_R_PORT_PB_DATA,$r0

#if defined(CONFIG_BLUETOOTH) && defined(CONFIG_BLUETOOTH_RESET_PB5)

#if defined(CONFIG_BLUETOOTH_RESET_ACTIVE_HIGH)

	and.b	~(1 << 5),$r0

#else

	or.b	(1 << 5),$r0

#endif

#endif

	move.b	$r0,[port_pb_data_shadow]

	move.b	$r0,[R_PORT_PB_DATA]
@@ -541,20 +449,6 @@ no_command_line: 
	move.d  $r0, [R_PORT_PB_I2C]



	moveq	0,$r0

#if defined(CONFIG_BLUETOOTH) && defined(CONFIG_BLUETOOTH_RESET_G10)

#if defined(CONFIG_BLUETOOTH_RESET_ACTIVE_HIGH)

	and.d	~(1 << 10),$r0

#else

	or.d	(1 << 10),$r0

#endif

#endif

#if defined(CONFIG_BLUETOOTH) && defined(CONFIG_BLUETOOTH_RESET_G11)

#if defined(CONFIG_BLUETOOTH_RESET_ACTIVE_HIGH)

	and.d	~(1 << 11),$r0

#else

	or.d	(1 << 11),$r0

#endif

#endif

	move.d	$r0,[port_g_data_shadow]

	move.d	$r0,[R_PORT_G_DATA]

arch/cris/arch-v10/mm/init.c

+3 −11
Original line number Diff line number Diff line
@@ -71,11 +71,7 @@ paging_init(void) 
			IO_STATE(R_MMU_KSEG, seg_d, page ) |

			IO_STATE(R_MMU_KSEG, seg_c, page ) |

			IO_STATE(R_MMU_KSEG, seg_b, seg  ) |  /* kernel reg area */

#ifdef CONFIG_JULIETTE

			IO_STATE(R_MMU_KSEG, seg_a, seg  ) |  /* ARTPEC etc. */

#else

			IO_STATE(R_MMU_KSEG, seg_a, page ) |

#endif

			IO_STATE(R_MMU_KSEG, seg_9, seg  ) |  /* LED's on some boards */

			IO_STATE(R_MMU_KSEG, seg_8, seg  ) |  /* CSE0/1, flash and I/O */

			IO_STATE(R_MMU_KSEG, seg_7, page ) |  /* kernel vmalloc area */
@@ -92,11 +88,7 @@ paging_init(void) 
			    IO_FIELD(R_MMU_KBASE_HI, base_d, 0x0 ) |

			    IO_FIELD(R_MMU_KBASE_HI, base_c, 0x0 ) |

			    IO_FIELD(R_MMU_KBASE_HI, base_b, 0xb ) |

#ifdef CONFIG_JULIETTE

			    IO_FIELD(R_MMU_KBASE_HI, base_a, 0xa ) |

#else

			    IO_FIELD(R_MMU_KBASE_HI, base_a, 0x0 ) |

#endif

			    IO_FIELD(R_MMU_KBASE_HI, base_9, 0x9 ) |

			    IO_FIELD(R_MMU_KBASE_HI, base_8, 0x8 ) );

arch/cris/arch-v32/kernel/debugport.c

+0 −2
Original line number Diff line number Diff line
@@ -77,8 +77,6 @@ static struct dbg_port *port = 
	&ports[2];

#elif defined(CONFIG_ETRAX_DEBUG_PORT3)

	&ports[3];

#elif defined(CONFIG_ETRAX_DEBUG_PORT4)

	&ports[4];

#else

	NULL;

#endif

arch/cris/arch-v32/kernel/head.S

+0 −4
Original line number Diff line number Diff line
@@ -292,11 +292,7 @@ _no_romfs_in_flash: 
	;; For cramfs, partition starts with magic and length.

	;; For jffs2, a jhead is prepended which contains with magic and length.

	;; The jhead is not part of the jffs2 partition however.

#ifndef CONFIG_ETRAXFS_SIM

	move.d	__bss_start, $r0

#else

	move.d	__end, $r0

#endif

	move.d	[$r0], $r1

	cmp.d	CRAMFS_MAGIC, $r1 ; cramfs magic?

	beq	2f		  ; yes, jump

arch/cris/arch-v32/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#define IGNOREMASK (1 << (SER0_INTR_VECT - FIRST_IRQ))

#elif defined(CONFIG_ETRAX_KGDB_PORT1)

#define IGNOREMASK (1 << (SER1_INTR_VECT - FIRST_IRQ))

#elif defined(CONFIG_ETRAX_KGB_PORT2)

#elif defined(CONFIG_ETRAX_KGDB_PORT2)

#define IGNOREMASK (1 << (SER2_INTR_VECT - FIRST_IRQ))

#elif defined(CONFIG_ETRAX_KGDB_PORT3)

#define IGNOREMASK (1 << (SER3_INTR_VECT - FIRST_IRQ))