diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-04-27 21:49:14 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-04-27 21:49:14 +0200 |
| commit | b6942b68f85ed3161c91741791ec6f1779574919 (patch) | |
| tree | be4e8a20eec2c22692c2691d5a2520c789ad3cc5 | |
| parent | d12523f14ed615d093053cbfc46e3b257b1b9810 (diff) | |
| parent | 7574f67eb457bbd053e5addae665c187f309668b (diff) | |
Merge branch 'for_4.12/soc-pmdomain-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/drivers
Pull "Keystone mangled URLs fixed" from Santosh Shilimkar
* 'for_4.12/soc-pmdomain-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
soc: pm-domain: Fix the mangled urls
| -rw-r--r-- | drivers/soc/ti/ti_sci_pm_domains.c | 2 | ||||
| -rw-r--r-- | include/dt-bindings/genpd/k2g.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/soc/ti/ti_sci_pm_domains.c b/drivers/soc/ti/ti_sci_pm_domains.c index d9dccb0c3a2a..b0b283810e72 100644 --- a/drivers/soc/ti/ti_sci_pm_domains.c +++ b/drivers/soc/ti/ti_sci_pm_domains.c @@ -1,7 +1,7 @@ /* * TI SCI Generic Power Domain Driver * - * Copyright (C) 2015-2017 Texas Instruments Incorporated - https://urldefense.proofpoint.com/v2/url?u=http-3A__www.ti.com_&d=DwIBAg&c=RoP1YumCXCgaWHvlZYR8PQcxBKCX5YTpkKY057SbK10&r=XBn1JQGPwR8CsE7xpP3wPlG6DQU7qw8ym65xieNZ4hY&m=R6qGiR9DbG1C3EF_0mL-m-qkmSO64GklbFWpUzqt8fY&s=YTWcQCWi5lnIf4XHDLq1XDd4JbZv9xpqOwdPD8xEdZE&e= + * Copyright (C) 2015-2017 Texas Instruments Incorporated - http://www.ti.com/ * J Keerthy <j-keerthy@ti.com> * Dave Gerlach <d-gerlach@ti.com> * diff --git a/include/dt-bindings/genpd/k2g.h b/include/dt-bindings/genpd/k2g.h index fffdb604fc7d..1f31f17e19eb 100644 --- a/include/dt-bindings/genpd/k2g.h +++ b/include/dt-bindings/genpd/k2g.h @@ -1,7 +1,7 @@ /* * TI K2G SoC Device definitions * - * Copyright (C) 2015-2017 Texas Instruments Incorporated - https://urldefense.proofpoint.com/v2/url?u=http-3A__www.ti.com_&d=DwIBAg&c=RoP1YumCXCgaWHvlZYR8PQcxBKCX5YTpkKY057SbK10&r=XBn1JQGPwR8CsE7xpP3wPlG6DQU7qw8ym65xieNZ4hY&m=K-anSnBVCpVU_mSaI7FWz6dwIAPBePhk6w9rCref6SI&s=UvxGRJAJRKjDVjwUuXloC2gH4uWNkMelLuW2oG01DPM&e= + * 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 @@ -17,7 +17,7 @@ #ifndef _DT_BINDINGS_GENPD_K2G_H #define _DT_BINDINGS_GENPD_K2G_H -/* Documented in https://urldefense.proofpoint.com/v2/url?u=http-3A__processors.wiki.ti.com_index.php_TISCI&d=DwIBAg&c=RoP1YumCXCgaWHvlZYR8PQcxBKCX5YTpkKY057SbK10&r=XBn1JQGPwR8CsE7xpP3wPlG6DQU7qw8ym65xieNZ4hY&m=K-anSnBVCpVU_mSaI7FWz6dwIAPBePhk6w9rCref6SI&s=OUR-PBKiUWN0Bhs-J9hzlER8kpqh_V70s09xc8Zo1iA&e= */ +/* Documented in http://processors.wiki.ti.com/index.php/TISCI */ #define K2G_DEV_PMMC0 0x0000 #define K2G_DEV_MLB0 0x0001 |