| Message ID | 20170522183737.24946-1-d-gerlach@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, May 22, 2017 at 01:37:37PM -0500, Dave Gerlach wrote: > Commit 7cc119f29b19 ("dt-bindings: Add TI SCI PM Domains") introduced a > number of K2G_DEV_x macros to represent each device ID available on the > K2G platform for use by the genpd, clock, and reset drivers. Rather than > use these macros, which are only used in the device tree for property > values and not actually used by the drivers, let's just use the device > ID number directly in the device tree to avoid macro bloat. > > Signed-off-by: Dave Gerlach <d-gerlach@ti.com> > --- > Based on discussion here [1] it was agreed that these macros are not needed > and it is better to just use the device IDs directly in dt. > > [1] https://www.spinics.net/lists/arm-kernel/msg577079.html > > .../devicetree/bindings/soc/ti/sci-pm-domain.txt | 5 +- > include/dt-bindings/genpd/k2g.h | 90 ---------------------- > 2 files changed, 3 insertions(+), 92 deletions(-) > delete mode 100644 include/dt-bindings/genpd/k2g.h Acked-by: Rob Herring <robh@kernel.org>
Santosh, On 05/31/2017 11:28 AM, Rob Herring wrote: > On Mon, May 22, 2017 at 01:37:37PM -0500, Dave Gerlach wrote: >> Commit 7cc119f29b19 ("dt-bindings: Add TI SCI PM Domains") introduced a >> number of K2G_DEV_x macros to represent each device ID available on the >> K2G platform for use by the genpd, clock, and reset drivers. Rather than >> use these macros, which are only used in the device tree for property >> values and not actually used by the drivers, let's just use the device >> ID number directly in the device tree to avoid macro bloat. >> >> Signed-off-by: Dave Gerlach <d-gerlach@ti.com> >> --- >> Based on discussion here [1] it was agreed that these macros are not needed >> and it is better to just use the device IDs directly in dt. >> >> [1] https://www.spinics.net/lists/arm-kernel/msg577079.html >> >> .../devicetree/bindings/soc/ti/sci-pm-domain.txt | 5 +- >> include/dt-bindings/genpd/k2g.h | 90 ---------------------- >> 2 files changed, 3 insertions(+), 92 deletions(-) >> delete mode 100644 include/dt-bindings/genpd/k2g.h > > Acked-by: Rob Herring <robh@kernel.org> > Gentle ping on this. If you're OK with the patch any chance you can pick it up? Regards, Dave
On 6/13/2017 1:16 PM, Dave Gerlach wrote: > Santosh, > On 05/31/2017 11:28 AM, Rob Herring wrote: >> On Mon, May 22, 2017 at 01:37:37PM -0500, Dave Gerlach wrote: [...] >>> [1] https://www.spinics.net/lists/arm-kernel/msg577079.html >>> >>> .../devicetree/bindings/soc/ti/sci-pm-domain.txt | 5 +- >>> include/dt-bindings/genpd/k2g.h | 90 ---------------------- >>> 2 files changed, 3 insertions(+), 92 deletions(-) >>> delete mode 100644 include/dt-bindings/genpd/k2g.h >> >> Acked-by: Rob Herring <robh@kernel.org> >> > > Gentle ping on this. If you're OK with the patch any chance you can pick it up? > Sorry Dave I missed to pick this one in pull request for 4.13. Will pick this one along with what Suman and Tero have been working for following merge window. Thanks for reminding about this one. Regards, Santosh
On 13/06/17 23:32, Santosh Shilimkar wrote: > On 6/13/2017 1:16 PM, Dave Gerlach wrote: >> Santosh, >> On 05/31/2017 11:28 AM, Rob Herring wrote: >>> On Mon, May 22, 2017 at 01:37:37PM -0500, Dave Gerlach wrote: > [...] > >>>> [1] https://www.spinics.net/lists/arm-kernel/msg577079.html >>>> >>>> .../devicetree/bindings/soc/ti/sci-pm-domain.txt | 5 +- >>>> include/dt-bindings/genpd/k2g.h | 90 >>>> ---------------------- >>>> 2 files changed, 3 insertions(+), 92 deletions(-) >>>> delete mode 100644 include/dt-bindings/genpd/k2g.h >>> >>> Acked-by: Rob Herring <robh@kernel.org> >>> >> >> Gentle ping on this. If you're OK with the patch any chance you can >> pick it up? >> > Sorry Dave I missed to pick this one in pull request for 4.13. Will pick > this > one along with what Suman and Tero have been working for following merge > window. Thanks for reminding about this one. I think Stephen will probably be picking up the clock part directly by himself. -Tero
On 6/14/17 12:07 AM, Tero Kristo wrote: > On 13/06/17 23:32, Santosh Shilimkar wrote: [...] >> Sorry Dave I missed to pick this one in pull request for 4.13. Will >> pick this >> one along with what Suman and Tero have been working for following merge >> window. Thanks for reminding about this one. > > I think Stephen will probably be picking up the clock part directly by > himself. > Works for me :-) Regards, Santosh
diff --git a/Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt b/Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt index c705db07d820..66e6265fb0aa 100644 --- a/Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt +++ b/Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt @@ -46,12 +46,13 @@ Required Properties: - power-domains: phandle pointing to the corresponding PM domain node and an ID representing the device. -See dt-bindings/genpd/k2g.h for the list of valid identifiers for k2g. +See http://processors.wiki.ti.com/index.php/TISCI#66AK2G02_Data for the list +of valid identifiers for k2g. Example (K2G): -------------------- uart0: serial@02530c00 { compatible = "ns16550a"; ... - power-domains = <&k2g_pds K2G_DEV_UART0>; + power-domains = <&k2g_pds 0x002c>; }; diff --git a/include/dt-bindings/genpd/k2g.h b/include/dt-bindings/genpd/k2g.h deleted file mode 100644 index 1f31f17e19eb..000000000000 --- a/include/dt-bindings/genpd/k2g.h +++ /dev/null @@ -1,90 +0,0 @@ -/* - * TI K2G SoC Device definitions - * - * Copyright (C) 2015-2017 Texas Instruments Incorporated - http://www.ti.com/ - * - * 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#ifndef _DT_BINDINGS_GENPD_K2G_H -#define _DT_BINDINGS_GENPD_K2G_H - -/* Documented in http://processors.wiki.ti.com/index.php/TISCI */ - -#define K2G_DEV_PMMC0 0x0000 -#define K2G_DEV_MLB0 0x0001 -#define K2G_DEV_DSS0 0x0002 -#define K2G_DEV_MCBSP0 0x0003 -#define K2G_DEV_MCASP0 0x0004 -#define K2G_DEV_MCASP1 0x0005 -#define K2G_DEV_MCASP2 0x0006 -#define K2G_DEV_DCAN0 0x0008 -#define K2G_DEV_DCAN1 0x0009 -#define K2G_DEV_EMIF0 0x000a -#define K2G_DEV_MMCHS0 0x000b -#define K2G_DEV_MMCHS1 0x000c -#define K2G_DEV_GPMC0 0x000d -#define K2G_DEV_ELM0 0x000e -#define K2G_DEV_SPI0 0x0010 -#define K2G_DEV_SPI1 0x0011 -#define K2G_DEV_SPI2 0x0012 -#define K2G_DEV_SPI3 0x0013 -#define K2G_DEV_ICSS0 0x0014 -#define K2G_DEV_ICSS1 0x0015 -#define K2G_DEV_USB0 0x0016 -#define K2G_DEV_USB1 0x0017 -#define K2G_DEV_NSS0 0x0018 -#define K2G_DEV_PCIE0 0x0019 -#define K2G_DEV_GPIO0 0x001b -#define K2G_DEV_GPIO1 0x001c -#define K2G_DEV_TIMER64_0 0x001d -#define K2G_DEV_TIMER64_1 0x001e -#define K2G_DEV_TIMER64_2 0x001f -#define K2G_DEV_TIMER64_3 0x0020 -#define K2G_DEV_TIMER64_4 0x0021 -#define K2G_DEV_TIMER64_5 0x0022 -#define K2G_DEV_TIMER64_6 0x0023 -#define K2G_DEV_MSGMGR0 0x0025 -#define K2G_DEV_BOOTCFG0 0x0026 -#define K2G_DEV_ARM_BOOTROM0 0x0027 -#define K2G_DEV_DSP_BOOTROM0 0x0029 -#define K2G_DEV_DEBUGSS0 0x002b -#define K2G_DEV_UART0 0x002c -#define K2G_DEV_UART1 0x002d -#define K2G_DEV_UART2 0x002e -#define K2G_DEV_EHRPWM0 0x002f -#define K2G_DEV_EHRPWM1 0x0030 -#define K2G_DEV_EHRPWM2 0x0031 -#define K2G_DEV_EHRPWM3 0x0032 -#define K2G_DEV_EHRPWM4 0x0033 -#define K2G_DEV_EHRPWM5 0x0034 -#define K2G_DEV_EQEP0 0x0035 -#define K2G_DEV_EQEP1 0x0036 -#define K2G_DEV_EQEP2 0x0037 -#define K2G_DEV_ECAP0 0x0038 -#define K2G_DEV_ECAP1 0x0039 -#define K2G_DEV_I2C0 0x003a -#define K2G_DEV_I2C1 0x003b -#define K2G_DEV_I2C2 0x003c -#define K2G_DEV_EDMA0 0x003f -#define K2G_DEV_SEMAPHORE0 0x0040 -#define K2G_DEV_INTC0 0x0041 -#define K2G_DEV_GIC0 0x0042 -#define K2G_DEV_QSPI0 0x0043 -#define K2G_DEV_ARM_64B_COUNTER0 0x0044 -#define K2G_DEV_TETRIS0 0x0045 -#define K2G_DEV_CGEM0 0x0046 -#define K2G_DEV_MSMC0 0x0047 -#define K2G_DEV_CBASS0 0x0049 -#define K2G_DEV_BOARD0 0x004c -#define K2G_DEV_EDMA1 0x004f - -#endif
Commit 7cc119f29b19 ("dt-bindings: Add TI SCI PM Domains") introduced a number of K2G_DEV_x macros to represent each device ID available on the K2G platform for use by the genpd, clock, and reset drivers. Rather than use these macros, which are only used in the device tree for property values and not actually used by the drivers, let's just use the device ID number directly in the device tree to avoid macro bloat. Signed-off-by: Dave Gerlach <d-gerlach@ti.com> --- Based on discussion here [1] it was agreed that these macros are not needed and it is better to just use the device IDs directly in dt. [1] https://www.spinics.net/lists/arm-kernel/msg577079.html .../devicetree/bindings/soc/ti/sci-pm-domain.txt | 5 +- include/dt-bindings/genpd/k2g.h | 90 ---------------------- 2 files changed, 3 insertions(+), 92 deletions(-) delete mode 100644 include/dt-bindings/genpd/k2g.h