Re: [PATCH 1/8] ARM: at91: move peripheral id definitions to dt-bindings include dir
2013/8/19 Nicolas Ferre : > On 08/08/2013 06:09, boris brezillon : > >> Hello Arnd, >> >> On 07/08/2013 22:24, Arnd Bergmann wrote: >>> >>> On Thursday 01 August 2013, Boris BREZILLON wrote: This patch moves peripheral id definitions from machine specific include dir (arch/arm/mach-at91/include/mach/'soc-name'.h) to dt-bindinds include dir (include/dt-bindings/at91/'soc-name'/peripherals.h). These definitions will be used inside dt to define interrupt ids and peripheral clk ids. Signed-off-by: Boris BREZILLON >>> >>> This seems counterproductive, why would you do that? >> >> >> This was requested by Jean-Christophe Plagniol-Villard (and proposed by >> Richard Genoud) >> for the 3rd version of the "ARM: at91: move to common clk framework" >> patch series (see >> https://lkml.org/lkml/2013/7/29/361) and thought it was a good idea too >> (even if I didn't know >> where to put the macro files as there are no soc specific macro files in >> dt-bindings include >> dir). >> >> Indeed I found it much easier to detect bugs in dt definition using >> macros because >> the macro names and dt node names are the same (it does not protect >> against errors >> in the macro definitions). >> >> If you think these macro definitions should be dropped, I won't argue >> against this. >> But please, have a talk with Jean-Christophe first. > > > [..] > > >>> There is no sharing of identifiers across SoCs here, you just move the >>> data around, and changing the .dts files to use the abstract macros would >>> just end up making them harder to understand, not easier, since you then >>> have to look up the numbers in another file. > > > Boris, Jean-Christophe and Richard, > > Well, I must say that I do agree with Arnd on this point. > > I think that a simple numeric field in a cell has to be represented as a > number and even if this simple information is used twice (interrupt number > and clock bit position in PMC). The possibility of error is very low > compared to the big amount of unneeded definitions added by this solution. Well, maybe the use of macro there is a bit overkill... But after reviewing the patches (and found an error), I thought it was useful to use macros, because verifying each number according to the SoC manual is a pain ! It's way easier to check the header once for all, then there's no possible error in the dtsi (or at least, we can see it from far far away...) On the downside, I agree, it adds a lot of defines. (and once it has been validated, the dtsi should not change) my 2 cents... -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 1/8] ARM: at91: move peripheral id definitions to dt-bindings include dir
Hello Nicolas, On Mon, 19 Aug 2013 18:46:13 +0200, Nicolas Ferre wrote: > On 08/08/2013 06:09, boris brezillon : >> Hello Arnd, >> >> On 07/08/2013 22:24, Arnd Bergmann wrote: >>> On Thursday 01 August 2013, Boris BREZILLON wrote: This patch moves peripheral id definitions from machine specific include dir (arch/arm/mach-at91/include/mach/'soc-name'.h) to dt-bindinds include dir (include/dt-bindings/at91/'soc-name'/peripherals.h). These definitions will be used inside dt to define interrupt ids and peripheral clk ids. Signed-off-by: Boris BREZILLON >>> This seems counterproductive, why would you do that? >> >> This was requested by Jean-Christophe Plagniol-Villard (and proposed by >> Richard Genoud) >> for the 3rd version of the "ARM: at91: move to common clk framework" >> patch series (see >> https://lkml.org/lkml/2013/7/29/361) and thought it was a good idea too >> (even if I didn't know >> where to put the macro files as there are no soc specific macro files in >> dt-bindings include >> dir). >> >> Indeed I found it much easier to detect bugs in dt definition using >> macros because >> the macro names and dt node names are the same (it does not protect >> against errors >> in the macro definitions). >> >> If you think these macro definitions should be dropped, I won't argue >> against this. >> But please, have a talk with Jean-Christophe first. > > [..] > >>> There is no sharing of identifiers across SoCs here, you just move the >>> data around, and changing the .dts files to use the abstract macros would >>> just end up making them harder to understand, not easier, since you then >>> have to look up the numbers in another file. > > Boris, Jean-Christophe and Richard, > > Well, I must say that I do agree with Arnd on this point. > > I think that a simple numeric field in a cell has to be represented > as a number and even if this simple information is used twice > (interrupt number and clock bit position in PMC). The possibility of > error is very low compared to the big amount of unneeded definitions > added by this solution. > > Moreover, I had the hope to completely remove this long list of > peripheral definitions for all SoC when we have a full DT kernel (with > your patches about common clock framework). So I think it is not > interesting to move in this direction and continue to build such a > list for future full DT products... > > Believe me, I am sorry that I didn't entered the discussion earlier > and avoid unnecessary work... Anyway, give me your opinion, but I do > think that the simpler is the best. > As discussed with you (on IRC), I am not absolutely convinced we need these macro definitions, and given the direction you want to take (completely remove the peripheral id definitions), i would say we'd rather drop this patch. It won't bother me at all to rework the "sama5 dt clk" patch series (this is the only SoC I supported in the 3rd version of the at91 common clk transition) to remove references to these macros. Best Regards, Boris > Bye, -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 1/8] ARM: at91: move peripheral id definitions to dt-bindings include dir
Hello Nicolas, On Mon, 19 Aug 2013 18:46:13 +0200, Nicolas Ferre nicolas.fe...@atmel.com wrote: On 08/08/2013 06:09, boris brezillon : Hello Arnd, On 07/08/2013 22:24, Arnd Bergmann wrote: On Thursday 01 August 2013, Boris BREZILLON wrote: This patch moves peripheral id definitions from machine specific include dir (arch/arm/mach-at91/include/mach/'soc-name'.h) to dt-bindinds include dir (include/dt-bindings/at91/'soc-name'/peripherals.h). These definitions will be used inside dt to define interrupt ids and peripheral clk ids. Signed-off-by: Boris BREZILLON b.brezil...@overkiz.com This seems counterproductive, why would you do that? This was requested by Jean-Christophe Plagniol-Villard (and proposed by Richard Genoud) for the 3rd version of the ARM: at91: move to common clk framework patch series (see https://lkml.org/lkml/2013/7/29/361) and thought it was a good idea too (even if I didn't know where to put the macro files as there are no soc specific macro files in dt-bindings include dir). Indeed I found it much easier to detect bugs in dt definition using macros because the macro names and dt node names are the same (it does not protect against errors in the macro definitions). If you think these macro definitions should be dropped, I won't argue against this. But please, have a talk with Jean-Christophe first. [..] There is no sharing of identifiers across SoCs here, you just move the data around, and changing the .dts files to use the abstract macros would just end up making them harder to understand, not easier, since you then have to look up the numbers in another file. Boris, Jean-Christophe and Richard, Well, I must say that I do agree with Arnd on this point. I think that a simple numeric field in a cell has to be represented as a number and even if this simple information is used twice (interrupt number and clock bit position in PMC). The possibility of error is very low compared to the big amount of unneeded definitions added by this solution. Moreover, I had the hope to completely remove this long list of peripheral definitions for all SoC when we have a full DT kernel (with your patches about common clock framework). So I think it is not interesting to move in this direction and continue to build such a list for future full DT products... Believe me, I am sorry that I didn't entered the discussion earlier and avoid unnecessary work... Anyway, give me your opinion, but I do think that the simpler is the best. As discussed with you (on IRC), I am not absolutely convinced we need these macro definitions, and given the direction you want to take (completely remove the peripheral id definitions), i would say we'd rather drop this patch. It won't bother me at all to rework the sama5 dt clk patch series (this is the only SoC I supported in the 3rd version of the at91 common clk transition) to remove references to these macros. Best Regards, Boris Bye, -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 1/8] ARM: at91: move peripheral id definitions to dt-bindings include dir
2013/8/19 Nicolas Ferre nicolas.fe...@atmel.com: On 08/08/2013 06:09, boris brezillon : Hello Arnd, On 07/08/2013 22:24, Arnd Bergmann wrote: On Thursday 01 August 2013, Boris BREZILLON wrote: This patch moves peripheral id definitions from machine specific include dir (arch/arm/mach-at91/include/mach/'soc-name'.h) to dt-bindinds include dir (include/dt-bindings/at91/'soc-name'/peripherals.h). These definitions will be used inside dt to define interrupt ids and peripheral clk ids. Signed-off-by: Boris BREZILLON b.brezil...@overkiz.com This seems counterproductive, why would you do that? This was requested by Jean-Christophe Plagniol-Villard (and proposed by Richard Genoud) for the 3rd version of the ARM: at91: move to common clk framework patch series (see https://lkml.org/lkml/2013/7/29/361) and thought it was a good idea too (even if I didn't know where to put the macro files as there are no soc specific macro files in dt-bindings include dir). Indeed I found it much easier to detect bugs in dt definition using macros because the macro names and dt node names are the same (it does not protect against errors in the macro definitions). If you think these macro definitions should be dropped, I won't argue against this. But please, have a talk with Jean-Christophe first. [..] There is no sharing of identifiers across SoCs here, you just move the data around, and changing the .dts files to use the abstract macros would just end up making them harder to understand, not easier, since you then have to look up the numbers in another file. Boris, Jean-Christophe and Richard, Well, I must say that I do agree with Arnd on this point. I think that a simple numeric field in a cell has to be represented as a number and even if this simple information is used twice (interrupt number and clock bit position in PMC). The possibility of error is very low compared to the big amount of unneeded definitions added by this solution. Well, maybe the use of macro there is a bit overkill... But after reviewing the patches (and found an error), I thought it was useful to use macros, because verifying each number according to the SoC manual is a pain ! It's way easier to check the header once for all, then there's no possible error in the dtsi (or at least, we can see it from far far away...) On the downside, I agree, it adds a lot of defines. (and once it has been validated, the dtsi should not change) my 2 cents... -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 1/8] ARM: at91: move peripheral id definitions to dt-bindings include dir
On 08/08/2013 06:09, boris brezillon : Hello Arnd, On 07/08/2013 22:24, Arnd Bergmann wrote: On Thursday 01 August 2013, Boris BREZILLON wrote: This patch moves peripheral id definitions from machine specific include dir (arch/arm/mach-at91/include/mach/'soc-name'.h) to dt-bindinds include dir (include/dt-bindings/at91/'soc-name'/peripherals.h). These definitions will be used inside dt to define interrupt ids and peripheral clk ids. Signed-off-by: Boris BREZILLON This seems counterproductive, why would you do that? This was requested by Jean-Christophe Plagniol-Villard (and proposed by Richard Genoud) for the 3rd version of the "ARM: at91: move to common clk framework" patch series (see https://lkml.org/lkml/2013/7/29/361) and thought it was a good idea too (even if I didn't know where to put the macro files as there are no soc specific macro files in dt-bindings include dir). Indeed I found it much easier to detect bugs in dt definition using macros because the macro names and dt node names are the same (it does not protect against errors in the macro definitions). If you think these macro definitions should be dropped, I won't argue against this. But please, have a talk with Jean-Christophe first. [..] There is no sharing of identifiers across SoCs here, you just move the data around, and changing the .dts files to use the abstract macros would just end up making them harder to understand, not easier, since you then have to look up the numbers in another file. Boris, Jean-Christophe and Richard, Well, I must say that I do agree with Arnd on this point. I think that a simple numeric field in a cell has to be represented as a number and even if this simple information is used twice (interrupt number and clock bit position in PMC). The possibility of error is very low compared to the big amount of unneeded definitions added by this solution. Moreover, I had the hope to completely remove this long list of peripheral definitions for all SoC when we have a full DT kernel (with your patches about common clock framework). So I think it is not interesting to move in this direction and continue to build such a list for future full DT products... Believe me, I am sorry that I didn't entered the discussion earlier and avoid unnecessary work... Anyway, give me your opinion, but I do think that the simpler is the best. Bye, -- Nicolas Ferre -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 1/8] ARM: at91: move peripheral id definitions to dt-bindings include dir
On 08/08/2013 06:09, boris brezillon : Hello Arnd, On 07/08/2013 22:24, Arnd Bergmann wrote: On Thursday 01 August 2013, Boris BREZILLON wrote: This patch moves peripheral id definitions from machine specific include dir (arch/arm/mach-at91/include/mach/'soc-name'.h) to dt-bindinds include dir (include/dt-bindings/at91/'soc-name'/peripherals.h). These definitions will be used inside dt to define interrupt ids and peripheral clk ids. Signed-off-by: Boris BREZILLON b.brezil...@overkiz.com This seems counterproductive, why would you do that? This was requested by Jean-Christophe Plagniol-Villard (and proposed by Richard Genoud) for the 3rd version of the ARM: at91: move to common clk framework patch series (see https://lkml.org/lkml/2013/7/29/361) and thought it was a good idea too (even if I didn't know where to put the macro files as there are no soc specific macro files in dt-bindings include dir). Indeed I found it much easier to detect bugs in dt definition using macros because the macro names and dt node names are the same (it does not protect against errors in the macro definitions). If you think these macro definitions should be dropped, I won't argue against this. But please, have a talk with Jean-Christophe first. [..] There is no sharing of identifiers across SoCs here, you just move the data around, and changing the .dts files to use the abstract macros would just end up making them harder to understand, not easier, since you then have to look up the numbers in another file. Boris, Jean-Christophe and Richard, Well, I must say that I do agree with Arnd on this point. I think that a simple numeric field in a cell has to be represented as a number and even if this simple information is used twice (interrupt number and clock bit position in PMC). The possibility of error is very low compared to the big amount of unneeded definitions added by this solution. Moreover, I had the hope to completely remove this long list of peripheral definitions for all SoC when we have a full DT kernel (with your patches about common clock framework). So I think it is not interesting to move in this direction and continue to build such a list for future full DT products... Believe me, I am sorry that I didn't entered the discussion earlier and avoid unnecessary work... Anyway, give me your opinion, but I do think that the simpler is the best. Bye, -- Nicolas Ferre -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 1/8] ARM: at91: move peripheral id definitions to dt-bindings include dir
Hello Arnd, On 07/08/2013 22:24, Arnd Bergmann wrote: On Thursday 01 August 2013, Boris BREZILLON wrote: This patch moves peripheral id definitions from machine specific include dir (arch/arm/mach-at91/include/mach/'soc-name'.h) to dt-bindinds include dir (include/dt-bindings/at91/'soc-name'/peripherals.h). These definitions will be used inside dt to define interrupt ids and peripheral clk ids. Signed-off-by: Boris BREZILLON This seems counterproductive, why would you do that? This was requested by Jean-Christophe Plagniol-Villard (and proposed by Richard Genoud) for the 3rd version of the "ARM: at91: move to common clk framework" patch series (see https://lkml.org/lkml/2013/7/29/361) and thought it was a good idea too (even if I didn't know where to put the macro files as there are no soc specific macro files in dt-bindings include dir). Indeed I found it much easier to detect bugs in dt definition using macros because the macro names and dt node names are the same (it does not protect against errors in the macro definitions). If you think these macro definitions should be dropped, I won't argue against this. But please, have a talk with Jean-Christophe first. Best Regards, Boris There is no sharing of identifiers across SoCs here, you just move the data around, and changing the .dts files to use the abstract macros would just end up making them harder to understand, not easier, since you then have to look up the numbers in another file. Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 1/8] ARM: at91: move peripheral id definitions to dt-bindings include dir
On Thursday 01 August 2013, Boris BREZILLON wrote: > > This patch moves peripheral id definitions from machine specific include > dir (arch/arm/mach-at91/include/mach/'soc-name'.h) to dt-bindinds include > dir (include/dt-bindings/at91/'soc-name'/peripherals.h). > > These definitions will be used inside dt to define interrupt ids and > peripheral clk ids. > > Signed-off-by: Boris BREZILLON This seems counterproductive, why would you do that? There is no sharing of identifiers across SoCs here, you just move the data around, and changing the .dts files to use the abstract macros would just end up making them harder to understand, not easier, since you then have to look up the numbers in another file. Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 1/8] ARM: at91: move peripheral id definitions to dt-bindings include dir
On Thursday 01 August 2013, Boris BREZILLON wrote: This patch moves peripheral id definitions from machine specific include dir (arch/arm/mach-at91/include/mach/'soc-name'.h) to dt-bindinds include dir (include/dt-bindings/at91/'soc-name'/peripherals.h). These definitions will be used inside dt to define interrupt ids and peripheral clk ids. Signed-off-by: Boris BREZILLON b.brezil...@overkiz.com This seems counterproductive, why would you do that? There is no sharing of identifiers across SoCs here, you just move the data around, and changing the .dts files to use the abstract macros would just end up making them harder to understand, not easier, since you then have to look up the numbers in another file. Arnd -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 1/8] ARM: at91: move peripheral id definitions to dt-bindings include dir
Hello Arnd, On 07/08/2013 22:24, Arnd Bergmann wrote: On Thursday 01 August 2013, Boris BREZILLON wrote: This patch moves peripheral id definitions from machine specific include dir (arch/arm/mach-at91/include/mach/'soc-name'.h) to dt-bindinds include dir (include/dt-bindings/at91/'soc-name'/peripherals.h). These definitions will be used inside dt to define interrupt ids and peripheral clk ids. Signed-off-by: Boris BREZILLON b.brezil...@overkiz.com This seems counterproductive, why would you do that? This was requested by Jean-Christophe Plagniol-Villard (and proposed by Richard Genoud) for the 3rd version of the ARM: at91: move to common clk framework patch series (see https://lkml.org/lkml/2013/7/29/361) and thought it was a good idea too (even if I didn't know where to put the macro files as there are no soc specific macro files in dt-bindings include dir). Indeed I found it much easier to detect bugs in dt definition using macros because the macro names and dt node names are the same (it does not protect against errors in the macro definitions). If you think these macro definitions should be dropped, I won't argue against this. But please, have a talk with Jean-Christophe first. Best Regards, Boris There is no sharing of identifiers across SoCs here, you just move the data around, and changing the .dts files to use the abstract macros would just end up making them harder to understand, not easier, since you then have to look up the numbers in another file. Arnd -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 1/8] ARM: at91: move peripheral id definitions to dt-bindings include dir
This patch moves peripheral id definitions from machine specific include dir (arch/arm/mach-at91/include/mach/'soc-name'.h) to dt-bindinds include dir (include/dt-bindings/at91/'soc-name'/peripherals.h). These definitions will be used inside dt to define interrupt ids and peripheral clk ids. Signed-off-by: Boris BREZILLON --- arch/arm/mach-at91/include/mach/at91rm9200.h | 31 +- arch/arm/mach-at91/include/mach/at91sam9260.h | 29 + arch/arm/mach-at91/include/mach/at91sam9261.h | 23 +-- arch/arm/mach-at91/include/mach/at91sam9263.h | 27 + arch/arm/mach-at91/include/mach/at91sam9g45.h | 31 +- arch/arm/mach-at91/include/mach/at91sam9n12.h | 26 +--- arch/arm/mach-at91/include/mach/at91sam9rl.h | 25 +--- arch/arm/mach-at91/include/mach/at91sam9x5.h | 32 +- arch/arm/mach-at91/include/mach/hardware.h |3 +- arch/arm/mach-at91/include/mach/sama5d3.h | 48 +-- include/dt-bindings/at91/at91rm9200/peripherals.h | 44 ++ include/dt-bindings/at91/at91sam9260/peripherals.h | 42 + include/dt-bindings/at91/at91sam9261/peripherals.h | 36 +++ include/dt-bindings/at91/at91sam9263/peripherals.h | 40 + include/dt-bindings/at91/at91sam9g45/peripherals.h | 44 ++ include/dt-bindings/at91/at91sam9n12/peripherals.h | 41 + include/dt-bindings/at91/at91sam9rl/peripherals.h | 38 include/dt-bindings/at91/at91sam9x5/peripherals.h | 45 ++ include/dt-bindings/at91/common/peripherals.h | 14 + include/dt-bindings/at91/sama5d3/peripherals.h | 63 20 files changed, 417 insertions(+), 265 deletions(-) create mode 100644 include/dt-bindings/at91/at91rm9200/peripherals.h create mode 100644 include/dt-bindings/at91/at91sam9260/peripherals.h create mode 100644 include/dt-bindings/at91/at91sam9261/peripherals.h create mode 100644 include/dt-bindings/at91/at91sam9263/peripherals.h create mode 100644 include/dt-bindings/at91/at91sam9g45/peripherals.h create mode 100644 include/dt-bindings/at91/at91sam9n12/peripherals.h create mode 100644 include/dt-bindings/at91/at91sam9rl/peripherals.h create mode 100644 include/dt-bindings/at91/at91sam9x5/peripherals.h create mode 100644 include/dt-bindings/at91/common/peripherals.h create mode 100644 include/dt-bindings/at91/sama5d3/peripherals.h diff --git a/arch/arm/mach-at91/include/mach/at91rm9200.h b/arch/arm/mach-at91/include/mach/at91rm9200.h index e67317c..975b587 100644 --- a/arch/arm/mach-at91/include/mach/at91rm9200.h +++ b/arch/arm/mach-at91/include/mach/at91rm9200.h @@ -19,36 +19,7 @@ /* * Peripheral identifiers/interrupts. */ -#define AT91RM9200_ID_PIOA 2 /* Parallel IO Controller A */ -#define AT91RM9200_ID_PIOB 3 /* Parallel IO Controller B */ -#define AT91RM9200_ID_PIOC 4 /* Parallel IO Controller C */ -#define AT91RM9200_ID_PIOD 5 /* Parallel IO Controller D */ -#define AT91RM9200_ID_US0 6 /* USART 0 */ -#define AT91RM9200_ID_US1 7 /* USART 1 */ -#define AT91RM9200_ID_US2 8 /* USART 2 */ -#define AT91RM9200_ID_US3 9 /* USART 3 */ -#define AT91RM9200_ID_MCI 10 /* Multimedia Card Interface */ -#define AT91RM9200_ID_UDP 11 /* USB Device Port */ -#define AT91RM9200_ID_TWI 12 /* Two-Wire Interface */ -#define AT91RM9200_ID_SPI 13 /* Serial Peripheral Interface */ -#define AT91RM9200_ID_SSC0 14 /* Serial Synchronous Controller 0 */ -#define AT91RM9200_ID_SSC1 15 /* Serial Synchronous Controller 1 */ -#define AT91RM9200_ID_SSC2 16 /* Serial Synchronous Controller 2 */ -#define AT91RM9200_ID_TC0 17 /* Timer Counter 0 */ -#define AT91RM9200_ID_TC1 18 /* Timer Counter 1 */ -#define AT91RM9200_ID_TC2 19 /* Timer Counter 2 */ -#define AT91RM9200_ID_TC3 20 /* Timer Counter 3 */ -#define AT91RM9200_ID_TC4 21 /* Timer Counter 4 */ -#define AT91RM9200_ID_TC5 22 /* Timer Counter 5 */ -#define AT91RM9200_ID_UHP 23 /* USB Host port */ -#define AT91RM9200_ID_EMAC 24 /* Ethernet MAC */ -#define AT91RM9200_ID_IRQ0 25 /* Advanced Interrupt Controller (IRQ0) */ -#define AT91RM9200_ID_IRQ1 26 /* Advanced Interrupt Controller (IRQ1) */ -#define AT91RM9200_ID_IRQ2 27 /* Advanced Interrupt Controller (IRQ2) */ -#define AT91RM9200_ID_IRQ3 28 /* Advanced Interrupt Controller (IRQ3) */ -#define AT91RM9200_ID_IRQ4 29 /* Advanced Interrupt Controller (IRQ4) */ -#define AT91RM9200_ID_IRQ5 30 /* Advanced Interrupt Controller (IRQ5) */ -#define AT91RM9200_ID_IRQ6 31 /* Advanced Interrupt Controller (IRQ6) */ +#include /* diff --git a/arch/arm/mach-at91/include/mach/at91sam9260.h
[PATCH 1/8] ARM: at91: move peripheral id definitions to dt-bindings include dir
This patch moves peripheral id definitions from machine specific include dir (arch/arm/mach-at91/include/mach/'soc-name'.h) to dt-bindinds include dir (include/dt-bindings/at91/'soc-name'/peripherals.h). These definitions will be used inside dt to define interrupt ids and peripheral clk ids. Signed-off-by: Boris BREZILLON b.brezil...@overkiz.com --- arch/arm/mach-at91/include/mach/at91rm9200.h | 31 +- arch/arm/mach-at91/include/mach/at91sam9260.h | 29 + arch/arm/mach-at91/include/mach/at91sam9261.h | 23 +-- arch/arm/mach-at91/include/mach/at91sam9263.h | 27 + arch/arm/mach-at91/include/mach/at91sam9g45.h | 31 +- arch/arm/mach-at91/include/mach/at91sam9n12.h | 26 +--- arch/arm/mach-at91/include/mach/at91sam9rl.h | 25 +--- arch/arm/mach-at91/include/mach/at91sam9x5.h | 32 +- arch/arm/mach-at91/include/mach/hardware.h |3 +- arch/arm/mach-at91/include/mach/sama5d3.h | 48 +-- include/dt-bindings/at91/at91rm9200/peripherals.h | 44 ++ include/dt-bindings/at91/at91sam9260/peripherals.h | 42 + include/dt-bindings/at91/at91sam9261/peripherals.h | 36 +++ include/dt-bindings/at91/at91sam9263/peripherals.h | 40 + include/dt-bindings/at91/at91sam9g45/peripherals.h | 44 ++ include/dt-bindings/at91/at91sam9n12/peripherals.h | 41 + include/dt-bindings/at91/at91sam9rl/peripherals.h | 38 include/dt-bindings/at91/at91sam9x5/peripherals.h | 45 ++ include/dt-bindings/at91/common/peripherals.h | 14 + include/dt-bindings/at91/sama5d3/peripherals.h | 63 20 files changed, 417 insertions(+), 265 deletions(-) create mode 100644 include/dt-bindings/at91/at91rm9200/peripherals.h create mode 100644 include/dt-bindings/at91/at91sam9260/peripherals.h create mode 100644 include/dt-bindings/at91/at91sam9261/peripherals.h create mode 100644 include/dt-bindings/at91/at91sam9263/peripherals.h create mode 100644 include/dt-bindings/at91/at91sam9g45/peripherals.h create mode 100644 include/dt-bindings/at91/at91sam9n12/peripherals.h create mode 100644 include/dt-bindings/at91/at91sam9rl/peripherals.h create mode 100644 include/dt-bindings/at91/at91sam9x5/peripherals.h create mode 100644 include/dt-bindings/at91/common/peripherals.h create mode 100644 include/dt-bindings/at91/sama5d3/peripherals.h diff --git a/arch/arm/mach-at91/include/mach/at91rm9200.h b/arch/arm/mach-at91/include/mach/at91rm9200.h index e67317c..975b587 100644 --- a/arch/arm/mach-at91/include/mach/at91rm9200.h +++ b/arch/arm/mach-at91/include/mach/at91rm9200.h @@ -19,36 +19,7 @@ /* * Peripheral identifiers/interrupts. */ -#define AT91RM9200_ID_PIOA 2 /* Parallel IO Controller A */ -#define AT91RM9200_ID_PIOB 3 /* Parallel IO Controller B */ -#define AT91RM9200_ID_PIOC 4 /* Parallel IO Controller C */ -#define AT91RM9200_ID_PIOD 5 /* Parallel IO Controller D */ -#define AT91RM9200_ID_US0 6 /* USART 0 */ -#define AT91RM9200_ID_US1 7 /* USART 1 */ -#define AT91RM9200_ID_US2 8 /* USART 2 */ -#define AT91RM9200_ID_US3 9 /* USART 3 */ -#define AT91RM9200_ID_MCI 10 /* Multimedia Card Interface */ -#define AT91RM9200_ID_UDP 11 /* USB Device Port */ -#define AT91RM9200_ID_TWI 12 /* Two-Wire Interface */ -#define AT91RM9200_ID_SPI 13 /* Serial Peripheral Interface */ -#define AT91RM9200_ID_SSC0 14 /* Serial Synchronous Controller 0 */ -#define AT91RM9200_ID_SSC1 15 /* Serial Synchronous Controller 1 */ -#define AT91RM9200_ID_SSC2 16 /* Serial Synchronous Controller 2 */ -#define AT91RM9200_ID_TC0 17 /* Timer Counter 0 */ -#define AT91RM9200_ID_TC1 18 /* Timer Counter 1 */ -#define AT91RM9200_ID_TC2 19 /* Timer Counter 2 */ -#define AT91RM9200_ID_TC3 20 /* Timer Counter 3 */ -#define AT91RM9200_ID_TC4 21 /* Timer Counter 4 */ -#define AT91RM9200_ID_TC5 22 /* Timer Counter 5 */ -#define AT91RM9200_ID_UHP 23 /* USB Host port */ -#define AT91RM9200_ID_EMAC 24 /* Ethernet MAC */ -#define AT91RM9200_ID_IRQ0 25 /* Advanced Interrupt Controller (IRQ0) */ -#define AT91RM9200_ID_IRQ1 26 /* Advanced Interrupt Controller (IRQ1) */ -#define AT91RM9200_ID_IRQ2 27 /* Advanced Interrupt Controller (IRQ2) */ -#define AT91RM9200_ID_IRQ3 28 /* Advanced Interrupt Controller (IRQ3) */ -#define AT91RM9200_ID_IRQ4 29 /* Advanced Interrupt Controller (IRQ4) */ -#define AT91RM9200_ID_IRQ5 30 /* Advanced Interrupt Controller (IRQ5) */ -#define AT91RM9200_ID_IRQ6 31 /* Advanced Interrupt Controller (IRQ6) */ +#include dt-bindings/at91/at91rm9200/peripherals.h /* diff --git