Merge branch 'for-rmk' of... (bbba7560) · Commits · e / devices / android_kernel_oneplus_sm7250

arch/arm/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -766,6 +766,7 @@ config ARCH_S5PV310
		select ARCH_SPARSEMEM_ENABLE
		select GENERIC_GPIO
		select HAVE_CLK
		select ARCH_HAS_CPUFREQ
		select GENERIC_CLOCKEVENTS
		select HAVE_S3C_RTC if RTC_CLASS
		select HAVE_S3C2410_I2C if I2C

+11 −11

Original line number	Diff line number	Diff line
		@@ -75,38 +75,38 @@ static unsigned char bast_pc104_irqmasks[] = {
		static unsigned char bast_pc104_irqs[] = { 3, 5, 7, 10 };

		static void
		bast_pc104_mask(unsigned int irqno)
		bast_pc104_mask(struct irq_data *data)
		{
		unsigned long temp;

		temp = __raw_readb(BAST_VA_PC104_IRQMASK);
		temp &= ~bast_pc104_irqmasks[irqno];
		temp &= ~bast_pc104_irqmasks[data->irq];
		__raw_writeb(temp, BAST_VA_PC104_IRQMASK);
		}

		static void
		bast_pc104_maskack(unsigned int irqno)
		bast_pc104_maskack(struct irq_data *data)
		{
		struct irq_desc *desc = irq_desc + IRQ_ISA;

		bast_pc104_mask(irqno);
		desc->chip->ack(IRQ_ISA);
		bast_pc104_mask(data);
		desc->irq_data.chip->irq_ack(&desc->irq_data);
		}

		static void
		bast_pc104_unmask(unsigned int irqno)
		bast_pc104_unmask(struct irq_data *data)
		{
		unsigned long temp;

		temp = __raw_readb(BAST_VA_PC104_IRQMASK);
		temp \|= bast_pc104_irqmasks[irqno];
		temp \|= bast_pc104_irqmasks[data->irq];
		__raw_writeb(temp, BAST_VA_PC104_IRQMASK);
		}

		static struct irq_chip bast_pc104_chip = {
		.mask = bast_pc104_mask,
		.unmask = bast_pc104_unmask,
		.ack = bast_pc104_maskack
		.irq_mask = bast_pc104_mask,
		.irq_unmask = bast_pc104_unmask,
		.irq_ack = bast_pc104_maskack
		};

		static void
		@@ -123,7 +123,7 @@ bast_irq_pc104_demux(unsigned int irq,
		/* ack if we get an irq with nothing (ie, startup) */

		desc = irq_desc + IRQ_ISA;
		desc->chip->ack(IRQ_ISA);
		desc->irq_data.chip->irq_ack(&desc->irq_data);
		} else {
		/* handle the IRQ */

+2 −2

Original line number	Diff line number	Diff line
		@@ -152,8 +152,8 @@

		#define IRQ_S3C2416_HSMMC0 S3C2410_IRQ(21) /* S3C2416/S3C2450 */

		#define IRQ_HSMMC0 IRQ_S3C2443_HSMMC
		#define IRQ_HSMMC1 IRQ_S3C2416_HSMMC0
		#define IRQ_HSMMC0 IRQ_S3C2416_HSMMC0
		#define IRQ_HSMMC1 IRQ_S3C2443_HSMMC

		#define IRQ_S3C2443_LCD1 S3C2410_IRQSUB(14)
		#define IRQ_S3C2443_LCD2 S3C2410_IRQSUB(15)

+2 −2

Original line number	Diff line number	Diff line
		@@ -112,8 +112,8 @@
		#define S3C_PA_IIC S3C2410_PA_IIC
		#define S3C_PA_UART S3C24XX_PA_UART
		#define S3C_PA_USBHOST S3C2410_PA_USBHOST
		#define S3C_PA_HSMMC0 S3C2443_PA_HSMMC
		#define S3C_PA_HSMMC1 S3C2416_PA_HSMMC0
		#define S3C_PA_HSMMC0 S3C2416_PA_HSMMC0
		#define S3C_PA_HSMMC1 S3C2443_PA_HSMMC
		#define S3C_PA_WDT S3C2410_PA_WATCHDOG
		#define S3C_PA_NAND S3C24XX_PA_NAND

+1 −0