Re: [PATCH v2 06/15] iio: adc: at91: remove unused include from include/mach
On 17/03/14 13:56, Alexandre Belloni wrote: That include file is now only used by the at91_adc driver, remove it from include/mach for better driver separation. Signed-off-by: Alexandre Belloni Acked-by: Jonathan Cameron --- arch/arm/mach-at91/include/mach/at91_adc.h | 120 - drivers/iio/adc/at91_adc.c | 103 - 2 files changed, 102 insertions(+), 121 deletions(-) delete mode 100644 arch/arm/mach-at91/include/mach/at91_adc.h diff --git a/arch/arm/mach-at91/include/mach/at91_adc.h b/arch/arm/mach-at91/include/mach/at91_adc.h deleted file mode 100644 index 7d80396346b2.. --- a/arch/arm/mach-at91/include/mach/at91_adc.h +++ /dev/null @@ -1,120 +0,0 @@ -/* - * arch/arm/mach-at91/include/mach/at91_adc.h - * - * Copyright (C) SAN People - * - * Analog-to-Digital Converter (ADC) registers. - * Based on AT91SAM9260 datasheet revision D. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ - -#ifndef AT91_ADC_H -#define AT91_ADC_H - -#define AT91_ADC_CR0x00/* Control Register */ -#defineAT91_ADC_SWRST (1 << 0) /* Software Reset */ -#defineAT91_ADC_START (1 << 1) /* Start Conversion */ - -#define AT91_ADC_MR0x04/* Mode Register */ -#defineAT91_ADC_TSAMOD (3 << 0) /* ADC mode */ -#defineAT91_ADC_TSAMOD_ADC_ONLY_MODE (0 << 0) /* ADC Mode */ -#defineAT91_ADC_TSAMOD_TS_ONLY_MODE(1 << 0) /* Touch Screen Only Mode */ -#defineAT91_ADC_TRGEN (1 << 0) /* Trigger Enable */ -#defineAT91_ADC_TRGSEL (7 << 1) /* Trigger Selection */ -#defineAT91_ADC_TRGSEL_TC0 (0 << 1) -#defineAT91_ADC_TRGSEL_TC1 (1 << 1) -#defineAT91_ADC_TRGSEL_TC2 (2 << 1) -#defineAT91_ADC_TRGSEL_EXTERNAL(6 << 1) -#defineAT91_ADC_LOWRES (1 << 4) /* Low Resolution */ -#defineAT91_ADC_SLEEP (1 << 5) /* Sleep Mode */ -#defineAT91_ADC_PENDET (1 << 6) /* Pen contact detection enable */ -#defineAT91_ADC_PRESCAL_9260 (0x3f << 8) /* Prescalar Rate Selection */ -#defineAT91_ADC_PRESCAL_9G45 (0xff << 8) -#defineAT91_ADC_PRESCAL_(x)((x) << 8) -#defineAT91_ADC_STARTUP_9260 (0x1f << 16) /* Startup Up Time */ -#defineAT91_ADC_STARTUP_9G45 (0x7f << 16) -#defineAT91_ADC_STARTUP_9X5(0xf << 16) -#defineAT91_ADC_STARTUP_(x)((x) << 16) -#defineAT91_ADC_SHTIM (0xf << 24) /* Sample & Hold Time */ -#defineAT91_ADC_SHTIM_(x) ((x) << 24) -#defineAT91_ADC_PENDBC (0x0f << 28) /* Pen Debounce time */ -#defineAT91_ADC_PENDBC_(x) ((x) << 28) - -#define AT91_ADC_TSR 0x0C -#defineAT91_ADC_TSR_SHTIM (0xf << 24) /* Sample & Hold Time */ -#defineAT91_ADC_TSR_SHTIM_(x) ((x) << 24) - -#define AT91_ADC_CHER 0x10/* Channel Enable Register */ -#define AT91_ADC_CHDR 0x14/* Channel Disable Register */ -#define AT91_ADC_CHSR 0x18/* Channel Status Register */ -#defineAT91_ADC_CH(n) (1 << (n))/* Channel Number */ - -#define AT91_ADC_SR0x1C/* Status Register */ -#defineAT91_ADC_EOC(n) (1 << (n))/* End of Conversion on Channel N */ -#defineAT91_ADC_OVRE(n)(1 << ((n) + 8))/* Overrun Error on Channel N */ -#defineAT91_ADC_DRDY (1 << 16) /* Data Ready */ -#defineAT91_ADC_GOVRE (1 << 17) /* General Overrun Error */ -#defineAT91_ADC_ENDRX (1 << 18) /* End of RX Buffer */ -#defineAT91_ADC_RXFUFF (1 << 19) /* RX Buffer Full */ - -#define AT91_ADC_SR_9X50x30/* Status Register for 9x5 */ -#defineAT91_ADC_SR_DRDY_9X5(1 << 24) /* Data Ready */ - -#define AT91_ADC_LCDR 0x20/* Last Converted Data Register */ -#defineAT91_ADC_LDATA (0x3ff) - -#define AT91_ADC_IER 0x24/* Interrupt Enable Register */ -#define AT91_ADC_IDR 0x28/* Interrupt Disable Register */ -#define AT91_ADC_IMR 0x2C/* Interrupt Mask
Re: [PATCH v2 06/15] iio: adc: at91: remove unused include from include/mach
On 17/03/14 13:56, Alexandre Belloni wrote: That include file is now only used by the at91_adc driver, remove it from include/mach for better driver separation. Signed-off-by: Alexandre Belloni alexandre.bell...@free-electrons.com Acked-by: Jonathan Cameron ji...@kernel.org --- arch/arm/mach-at91/include/mach/at91_adc.h | 120 - drivers/iio/adc/at91_adc.c | 103 - 2 files changed, 102 insertions(+), 121 deletions(-) delete mode 100644 arch/arm/mach-at91/include/mach/at91_adc.h diff --git a/arch/arm/mach-at91/include/mach/at91_adc.h b/arch/arm/mach-at91/include/mach/at91_adc.h deleted file mode 100644 index 7d80396346b2.. --- a/arch/arm/mach-at91/include/mach/at91_adc.h +++ /dev/null @@ -1,120 +0,0 @@ -/* - * arch/arm/mach-at91/include/mach/at91_adc.h - * - * Copyright (C) SAN People - * - * Analog-to-Digital Converter (ADC) registers. - * Based on AT91SAM9260 datasheet revision D. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ - -#ifndef AT91_ADC_H -#define AT91_ADC_H - -#define AT91_ADC_CR0x00/* Control Register */ -#defineAT91_ADC_SWRST (1 0) /* Software Reset */ -#defineAT91_ADC_START (1 1) /* Start Conversion */ - -#define AT91_ADC_MR0x04/* Mode Register */ -#defineAT91_ADC_TSAMOD (3 0) /* ADC mode */ -#defineAT91_ADC_TSAMOD_ADC_ONLY_MODE (0 0) /* ADC Mode */ -#defineAT91_ADC_TSAMOD_TS_ONLY_MODE(1 0) /* Touch Screen Only Mode */ -#defineAT91_ADC_TRGEN (1 0) /* Trigger Enable */ -#defineAT91_ADC_TRGSEL (7 1) /* Trigger Selection */ -#defineAT91_ADC_TRGSEL_TC0 (0 1) -#defineAT91_ADC_TRGSEL_TC1 (1 1) -#defineAT91_ADC_TRGSEL_TC2 (2 1) -#defineAT91_ADC_TRGSEL_EXTERNAL(6 1) -#defineAT91_ADC_LOWRES (1 4) /* Low Resolution */ -#defineAT91_ADC_SLEEP (1 5) /* Sleep Mode */ -#defineAT91_ADC_PENDET (1 6) /* Pen contact detection enable */ -#defineAT91_ADC_PRESCAL_9260 (0x3f 8) /* Prescalar Rate Selection */ -#defineAT91_ADC_PRESCAL_9G45 (0xff 8) -#defineAT91_ADC_PRESCAL_(x)((x) 8) -#defineAT91_ADC_STARTUP_9260 (0x1f 16) /* Startup Up Time */ -#defineAT91_ADC_STARTUP_9G45 (0x7f 16) -#defineAT91_ADC_STARTUP_9X5(0xf 16) -#defineAT91_ADC_STARTUP_(x)((x) 16) -#defineAT91_ADC_SHTIM (0xf 24) /* Sample Hold Time */ -#defineAT91_ADC_SHTIM_(x) ((x) 24) -#defineAT91_ADC_PENDBC (0x0f 28) /* Pen Debounce time */ -#defineAT91_ADC_PENDBC_(x) ((x) 28) - -#define AT91_ADC_TSR 0x0C -#defineAT91_ADC_TSR_SHTIM (0xf 24) /* Sample Hold Time */ -#defineAT91_ADC_TSR_SHTIM_(x) ((x) 24) - -#define AT91_ADC_CHER 0x10/* Channel Enable Register */ -#define AT91_ADC_CHDR 0x14/* Channel Disable Register */ -#define AT91_ADC_CHSR 0x18/* Channel Status Register */ -#defineAT91_ADC_CH(n) (1 (n))/* Channel Number */ - -#define AT91_ADC_SR0x1C/* Status Register */ -#defineAT91_ADC_EOC(n) (1 (n))/* End of Conversion on Channel N */ -#defineAT91_ADC_OVRE(n)(1 ((n) + 8))/* Overrun Error on Channel N */ -#defineAT91_ADC_DRDY (1 16) /* Data Ready */ -#defineAT91_ADC_GOVRE (1 17) /* General Overrun Error */ -#defineAT91_ADC_ENDRX (1 18) /* End of RX Buffer */ -#defineAT91_ADC_RXFUFF (1 19) /* RX Buffer Full */ - -#define AT91_ADC_SR_9X50x30/* Status Register for 9x5 */ -#defineAT91_ADC_SR_DRDY_9X5(1 24) /* Data Ready */ - -#define AT91_ADC_LCDR 0x20/* Last Converted Data Register */ -#defineAT91_ADC_LDATA (0x3ff) - -#define AT91_ADC_IER 0x24/* Interrupt Enable Register */ -#define AT91_ADC_IDR 0x28/* Interrupt Disable Register */ -#define AT91_ADC_IMR 0x2C/* Interrupt Mask Register */ -#define
[PATCH v2 06/15] iio: adc: at91: remove unused include from include/mach
That include file is now only used by the at91_adc driver, remove it from include/mach for better driver separation. Signed-off-by: Alexandre Belloni --- arch/arm/mach-at91/include/mach/at91_adc.h | 120 - drivers/iio/adc/at91_adc.c | 103 - 2 files changed, 102 insertions(+), 121 deletions(-) delete mode 100644 arch/arm/mach-at91/include/mach/at91_adc.h diff --git a/arch/arm/mach-at91/include/mach/at91_adc.h b/arch/arm/mach-at91/include/mach/at91_adc.h deleted file mode 100644 index 7d80396346b2.. --- a/arch/arm/mach-at91/include/mach/at91_adc.h +++ /dev/null @@ -1,120 +0,0 @@ -/* - * arch/arm/mach-at91/include/mach/at91_adc.h - * - * Copyright (C) SAN People - * - * Analog-to-Digital Converter (ADC) registers. - * Based on AT91SAM9260 datasheet revision D. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ - -#ifndef AT91_ADC_H -#define AT91_ADC_H - -#define AT91_ADC_CR0x00/* Control Register */ -#defineAT91_ADC_SWRST (1 << 0)/* Software Reset */ -#defineAT91_ADC_START (1 << 1)/* Start Conversion */ - -#define AT91_ADC_MR0x04/* Mode Register */ -#defineAT91_ADC_TSAMOD (3 << 0)/* ADC mode */ -#defineAT91_ADC_TSAMOD_ADC_ONLY_MODE (0 << 0) /* ADC Mode */ -#defineAT91_ADC_TSAMOD_TS_ONLY_MODE(1 << 0) /* Touch Screen Only Mode */ -#defineAT91_ADC_TRGEN (1 << 0)/* Trigger Enable */ -#defineAT91_ADC_TRGSEL (7 << 1)/* Trigger Selection */ -#defineAT91_ADC_TRGSEL_TC0 (0 << 1) -#defineAT91_ADC_TRGSEL_TC1 (1 << 1) -#defineAT91_ADC_TRGSEL_TC2 (2 << 1) -#defineAT91_ADC_TRGSEL_EXTERNAL(6 << 1) -#defineAT91_ADC_LOWRES (1 << 4)/* Low Resolution */ -#defineAT91_ADC_SLEEP (1 << 5)/* Sleep Mode */ -#defineAT91_ADC_PENDET (1 << 6)/* Pen contact detection enable */ -#defineAT91_ADC_PRESCAL_9260 (0x3f << 8) /* Prescalar Rate Selection */ -#defineAT91_ADC_PRESCAL_9G45 (0xff << 8) -#defineAT91_ADC_PRESCAL_(x)((x) << 8) -#defineAT91_ADC_STARTUP_9260 (0x1f << 16)/* Startup Up Time */ -#defineAT91_ADC_STARTUP_9G45 (0x7f << 16) -#defineAT91_ADC_STARTUP_9X5(0xf << 16) -#defineAT91_ADC_STARTUP_(x)((x) << 16) -#defineAT91_ADC_SHTIM (0xf << 24)/* Sample & Hold Time */ -#defineAT91_ADC_SHTIM_(x) ((x) << 24) -#defineAT91_ADC_PENDBC (0x0f << 28)/* Pen Debounce time */ -#defineAT91_ADC_PENDBC_(x) ((x) << 28) - -#define AT91_ADC_TSR 0x0C -#defineAT91_ADC_TSR_SHTIM (0xf << 24)/* Sample & Hold Time */ -#defineAT91_ADC_TSR_SHTIM_(x) ((x) << 24) - -#define AT91_ADC_CHER 0x10/* Channel Enable Register */ -#define AT91_ADC_CHDR 0x14/* Channel Disable Register */ -#define AT91_ADC_CHSR 0x18/* Channel Status Register */ -#defineAT91_ADC_CH(n) (1 << (n)) /* Channel Number */ - -#define AT91_ADC_SR0x1C/* Status Register */ -#defineAT91_ADC_EOC(n) (1 << (n)) /* End of Conversion on Channel N */ -#defineAT91_ADC_OVRE(n)(1 << ((n) + 8))/* Overrun Error on Channel N */ -#defineAT91_ADC_DRDY (1 << 16) /* Data Ready */ -#defineAT91_ADC_GOVRE (1 << 17) /* General Overrun Error */ -#defineAT91_ADC_ENDRX (1 << 18) /* End of RX Buffer */ -#defineAT91_ADC_RXFUFF (1 << 19) /* RX Buffer Full */ - -#define AT91_ADC_SR_9X50x30/* Status Register for 9x5 */ -#defineAT91_ADC_SR_DRDY_9X5(1 << 24) /* Data Ready */ - -#define AT91_ADC_LCDR 0x20/* Last Converted Data Register */ -#defineAT91_ADC_LDATA (0x3ff) - -#define AT91_ADC_IER 0x24/* Interrupt Enable Register */ -#define AT91_ADC_IDR 0x28/* Interrupt Disable Register */ -#define AT91_ADC_IMR 0x2C/* Interrupt Mask
[PATCH v2 06/15] iio: adc: at91: remove unused include from include/mach
That include file is now only used by the at91_adc driver, remove it from include/mach for better driver separation. Signed-off-by: Alexandre Belloni alexandre.bell...@free-electrons.com --- arch/arm/mach-at91/include/mach/at91_adc.h | 120 - drivers/iio/adc/at91_adc.c | 103 - 2 files changed, 102 insertions(+), 121 deletions(-) delete mode 100644 arch/arm/mach-at91/include/mach/at91_adc.h diff --git a/arch/arm/mach-at91/include/mach/at91_adc.h b/arch/arm/mach-at91/include/mach/at91_adc.h deleted file mode 100644 index 7d80396346b2.. --- a/arch/arm/mach-at91/include/mach/at91_adc.h +++ /dev/null @@ -1,120 +0,0 @@ -/* - * arch/arm/mach-at91/include/mach/at91_adc.h - * - * Copyright (C) SAN People - * - * Analog-to-Digital Converter (ADC) registers. - * Based on AT91SAM9260 datasheet revision D. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ - -#ifndef AT91_ADC_H -#define AT91_ADC_H - -#define AT91_ADC_CR0x00/* Control Register */ -#defineAT91_ADC_SWRST (1 0)/* Software Reset */ -#defineAT91_ADC_START (1 1)/* Start Conversion */ - -#define AT91_ADC_MR0x04/* Mode Register */ -#defineAT91_ADC_TSAMOD (3 0)/* ADC mode */ -#defineAT91_ADC_TSAMOD_ADC_ONLY_MODE (0 0) /* ADC Mode */ -#defineAT91_ADC_TSAMOD_TS_ONLY_MODE(1 0) /* Touch Screen Only Mode */ -#defineAT91_ADC_TRGEN (1 0)/* Trigger Enable */ -#defineAT91_ADC_TRGSEL (7 1)/* Trigger Selection */ -#defineAT91_ADC_TRGSEL_TC0 (0 1) -#defineAT91_ADC_TRGSEL_TC1 (1 1) -#defineAT91_ADC_TRGSEL_TC2 (2 1) -#defineAT91_ADC_TRGSEL_EXTERNAL(6 1) -#defineAT91_ADC_LOWRES (1 4)/* Low Resolution */ -#defineAT91_ADC_SLEEP (1 5)/* Sleep Mode */ -#defineAT91_ADC_PENDET (1 6)/* Pen contact detection enable */ -#defineAT91_ADC_PRESCAL_9260 (0x3f 8) /* Prescalar Rate Selection */ -#defineAT91_ADC_PRESCAL_9G45 (0xff 8) -#defineAT91_ADC_PRESCAL_(x)((x) 8) -#defineAT91_ADC_STARTUP_9260 (0x1f 16)/* Startup Up Time */ -#defineAT91_ADC_STARTUP_9G45 (0x7f 16) -#defineAT91_ADC_STARTUP_9X5(0xf 16) -#defineAT91_ADC_STARTUP_(x)((x) 16) -#defineAT91_ADC_SHTIM (0xf 24)/* Sample Hold Time */ -#defineAT91_ADC_SHTIM_(x) ((x) 24) -#defineAT91_ADC_PENDBC (0x0f 28)/* Pen Debounce time */ -#defineAT91_ADC_PENDBC_(x) ((x) 28) - -#define AT91_ADC_TSR 0x0C -#defineAT91_ADC_TSR_SHTIM (0xf 24)/* Sample Hold Time */ -#defineAT91_ADC_TSR_SHTIM_(x) ((x) 24) - -#define AT91_ADC_CHER 0x10/* Channel Enable Register */ -#define AT91_ADC_CHDR 0x14/* Channel Disable Register */ -#define AT91_ADC_CHSR 0x18/* Channel Status Register */ -#defineAT91_ADC_CH(n) (1 (n)) /* Channel Number */ - -#define AT91_ADC_SR0x1C/* Status Register */ -#defineAT91_ADC_EOC(n) (1 (n)) /* End of Conversion on Channel N */ -#defineAT91_ADC_OVRE(n)(1 ((n) + 8))/* Overrun Error on Channel N */ -#defineAT91_ADC_DRDY (1 16) /* Data Ready */ -#defineAT91_ADC_GOVRE (1 17) /* General Overrun Error */ -#defineAT91_ADC_ENDRX (1 18) /* End of RX Buffer */ -#defineAT91_ADC_RXFUFF (1 19) /* RX Buffer Full */ - -#define AT91_ADC_SR_9X50x30/* Status Register for 9x5 */ -#defineAT91_ADC_SR_DRDY_9X5(1 24) /* Data Ready */ - -#define AT91_ADC_LCDR 0x20/* Last Converted Data Register */ -#defineAT91_ADC_LDATA (0x3ff) - -#define AT91_ADC_IER 0x24/* Interrupt Enable Register */ -#define AT91_ADC_IDR 0x28/* Interrupt Disable Register */ -#define AT91_ADC_IMR 0x2C/* Interrupt Mask Register */ -#define
