Commit c2bd78de authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-soc-5.12' of... 

Merge tag 'samsung-soc-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/soc

Samsung mach/soc changes for v5.12

Three fixes for S3C24xx: one for building with clang and two for
warnings.

* tag 'samsung-soc-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: s3c: irq-s3c24xx: staticize local functions
  ARM: s3c: irq-s3c24xx: include headers for missing declarations
  ARM: s3c: fix fiq for clang IAS

Link: https://lore.kernel.org/r/20210211082254.7934-1-krzk@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 36de760a f5038785

arch/arm/mach-s3c/irq-s3c24xx-fiq.S

+3 −6
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
	@ and an offset to the irq acknowledgment word



ENTRY(s3c24xx_spi_fiq_rx)

s3c24xx_spi_fix_rx:

	.word	fiq_rx_end - fiq_rx_start

	.word	fiq_rx_irq_ack - fiq_rx_start

fiq_rx_start:
@@ -49,7 +48,7 @@ fiq_rx_start: 
	strb	fiq_rtmp, [ fiq_rspi, # S3C2410_SPTDAT ]



	subs	fiq_rcount, fiq_rcount, #1

	subnes	pc, lr, #4		@@ return, still have work to do

	subsne	pc, lr, #4		@@ return, still have work to do



	@@ set IRQ controller so that next op will trigger IRQ

	mov	fiq_rtmp, #0
@@ -61,7 +60,6 @@ fiq_rx_irq_ack: 
fiq_rx_end:



ENTRY(s3c24xx_spi_fiq_txrx)

s3c24xx_spi_fiq_txrx:

	.word	fiq_txrx_end - fiq_txrx_start

	.word	fiq_txrx_irq_ack - fiq_txrx_start

fiq_txrx_start:
@@ -76,7 +74,7 @@ fiq_txrx_start: 
	strb	fiq_rtmp, [ fiq_rspi, # S3C2410_SPTDAT ]



	subs	fiq_rcount, fiq_rcount, #1

	subnes	pc, lr, #4		@@ return, still have work to do

	subsne	pc, lr, #4		@@ return, still have work to do



	mov	fiq_rtmp, #0

	str	fiq_rtmp, [ fiq_rirq, # S3C2410_INTMOD  - S3C24XX_VA_IRQ ]
@@ -88,7 +86,6 @@ fiq_txrx_irq_ack: 
fiq_txrx_end:



ENTRY(s3c24xx_spi_fiq_tx)

s3c24xx_spi_fix_tx:

	.word	fiq_tx_end - fiq_tx_start

	.word	fiq_tx_irq_ack - fiq_tx_start

fiq_tx_start:
@@ -101,7 +98,7 @@ fiq_tx_start: 
	strb	fiq_rtmp, [ fiq_rspi, # S3C2410_SPTDAT ]



	subs	fiq_rcount, fiq_rcount, #1

	subnes	pc, lr, #4		@@ return, still have work to do

	subsne	pc, lr, #4		@@ return, still have work to do



	mov	fiq_rtmp, #0

	str	fiq_rtmp, [ fiq_rirq, # S3C2410_INTMOD  - S3C24XX_VA_IRQ ]

arch/arm/mach-s3c/irq-s3c24xx.c

+5 −3
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/of.h>

#include <linux/of_irq.h>

#include <linux/of_address.h>

#include <linux/spi/s3c24xx.h>



#include <asm/exception.h>

#include <asm/mach/irq.h>
@@ -32,6 +33,7 @@ 
#include "cpu.h"

#include "regs-irqtype.h"

#include "pm.h"

#include "s3c24xx.h"



#define S3C_IRQTYPE_NONE	0

#define S3C_IRQTYPE_EINT	1
@@ -357,7 +359,7 @@ static inline int s3c24xx_handle_intc(struct s3c_irq_intc *intc, 
	return true;

}



asmlinkage void __exception_irq_entry s3c24xx_handle_irq(struct pt_regs *regs)

static asmlinkage void __exception_irq_entry s3c24xx_handle_irq(struct pt_regs *regs)

{

	do {

		if (likely(s3c_intc[0]))
@@ -1305,7 +1307,7 @@ static struct s3c24xx_irq_of_ctrl s3c2410_ctrl[] = { 
	}

};



int __init s3c2410_init_intc_of(struct device_node *np,

static int __init s3c2410_init_intc_of(struct device_node *np,

			struct device_node *interrupt_parent)

{

	return s3c_init_intc_of(np, interrupt_parent,
@@ -1327,7 +1329,7 @@ static struct s3c24xx_irq_of_ctrl s3c2416_ctrl[] = { 
	}

};



int __init s3c2416_init_intc_of(struct device_node *np,

static int __init s3c2416_init_intc_of(struct device_node *np,

			struct device_node *interrupt_parent)

{

	return s3c_init_intc_of(np, interrupt_parent,