Re: [PATCH 15/19] reset: sti: Remove STiH415/6 reset support

2016-10-20 Thread Philipp Zabel 
Am Dienstag, den 11.10.2016, 09:05 +0200 schrieb Patrice Chotard:
> Hi Philipp
> 
> On 09/27/2016 10:02 AM, Philipp Zabel wrote:
> > Hi Peter,
> > 
> > Am Mittwoch, den 14.09.2016, 14:27 +0100 schrieb Peter Griffin:
> >> Support for STiH415/6 SoCs is being removed from the
> >> kernel because the platforms are obsolete. This patch removes
> >> the reset drivers for these SoC's.
> >>
> >> Signed-off-by: Peter Griffin 
> >> Cc: 
> >> ---
> 
> [...]
> 
> >> -  .driver = {
> >> -  .name = "reset-stih416",
> >> -  .of_match_table = stih416_reset_match,
> >> -  },
> >> -};
> >> -
> >> -static int __init stih416_reset_init(void)
> >> -{
> >> -  return platform_driver_register(_reset_driver);
> >> -}
> >> -arch_initcall(stih416_reset_init);
> > 
> > Can I pick up patches 15 and 19, or are there dependencies in the
> > series?
> 
> Yes, you can pick up patches 15 and 19

Done.

regards
Philipp

Re: [PATCH 15/19] reset: sti: Remove STiH415/6 reset support

2016-10-20 Thread Philipp Zabel 
Am Dienstag, den 11.10.2016, 09:05 +0200 schrieb Patrice Chotard:
> Hi Philipp
> 
> On 09/27/2016 10:02 AM, Philipp Zabel wrote:
> > Hi Peter,
> > 
> > Am Mittwoch, den 14.09.2016, 14:27 +0100 schrieb Peter Griffin:
> >> Support for STiH415/6 SoCs is being removed from the
> >> kernel because the platforms are obsolete. This patch removes
> >> the reset drivers for these SoC's.
> >>
> >> Signed-off-by: Peter Griffin 
> >> Cc: 
> >> ---
> 
> [...]
> 
> >> -  .driver = {
> >> -  .name = "reset-stih416",
> >> -  .of_match_table = stih416_reset_match,
> >> -  },
> >> -};
> >> -
> >> -static int __init stih416_reset_init(void)
> >> -{
> >> -  return platform_driver_register(_reset_driver);
> >> -}
> >> -arch_initcall(stih416_reset_init);
> > 
> > Can I pick up patches 15 and 19, or are there dependencies in the
> > series?
> 
> Yes, you can pick up patches 15 and 19

Done.

regards
Philipp

Re: [PATCH 15/19] reset: sti: Remove STiH415/6 reset support

2016-10-11 Thread Patrice Chotard 
Hi Philipp

On 09/27/2016 10:02 AM, Philipp Zabel wrote:
> Hi Peter,
> 
> Am Mittwoch, den 14.09.2016, 14:27 +0100 schrieb Peter Griffin:
>> Support for STiH415/6 SoCs is being removed from the
>> kernel because the platforms are obsolete. This patch removes
>> the reset drivers for these SoC's.
>>
>> Signed-off-by: Peter Griffin 
>> Cc: 
>> ---

[...]

>> -.driver = {
>> -.name = "reset-stih416",
>> -.of_match_table = stih416_reset_match,
>> -},
>> -};
>> -
>> -static int __init stih416_reset_init(void)
>> -{
>> -return platform_driver_register(_reset_driver);
>> -}
>> -arch_initcall(stih416_reset_init);
> 
> Can I pick up patches 15 and 19, or are there dependencies in the
> series?

Yes, you can pick up patches 15 and 19

> In the latter case,
> Acked-by: Philipp Zabel 
> to merge both together with the other patches. Currently there is no
> conflict with changes queued from the reset tree.
> 
> regards
> Philipp
> 

Thanks

Patrice

Re: [PATCH 15/19] reset: sti: Remove STiH415/6 reset support

2016-10-11 Thread Patrice Chotard 
Hi Philipp

On 09/27/2016 10:02 AM, Philipp Zabel wrote:
> Hi Peter,
> 
> Am Mittwoch, den 14.09.2016, 14:27 +0100 schrieb Peter Griffin:
>> Support for STiH415/6 SoCs is being removed from the
>> kernel because the platforms are obsolete. This patch removes
>> the reset drivers for these SoC's.
>>
>> Signed-off-by: Peter Griffin 
>> Cc: 
>> ---

[...]

>> -.driver = {
>> -.name = "reset-stih416",
>> -.of_match_table = stih416_reset_match,
>> -},
>> -};
>> -
>> -static int __init stih416_reset_init(void)
>> -{
>> -return platform_driver_register(_reset_driver);
>> -}
>> -arch_initcall(stih416_reset_init);
> 
> Can I pick up patches 15 and 19, or are there dependencies in the
> series?

Yes, you can pick up patches 15 and 19

> In the latter case,
> Acked-by: Philipp Zabel 
> to merge both together with the other patches. Currently there is no
> conflict with changes queued from the reset tree.
> 
> regards
> Philipp
> 

Thanks

Patrice

Re: [PATCH 15/19] reset: sti: Remove STiH415/6 reset support

2016-09-27 Thread Philipp Zabel 
Hi Peter,

Am Mittwoch, den 14.09.2016, 14:27 +0100 schrieb Peter Griffin:
> Support for STiH415/6 SoCs is being removed from the
> kernel because the platforms are obsolete. This patch removes
> the reset drivers for these SoC's.
> 
> Signed-off-by: Peter Griffin 
> Cc: 
> ---
>  arch/arm/mach-sti/Kconfig |   2 -
>  drivers/reset/sti/Kconfig |   8 ---
>  drivers/reset/sti/Makefile|   2 -
>  drivers/reset/sti/reset-stih415.c | 112 -
>  drivers/reset/sti/reset-stih416.c | 143 
> --
>  5 files changed, 267 deletions(-)
>  delete mode 100644 drivers/reset/sti/reset-stih415.c
>  delete mode 100644 drivers/reset/sti/reset-stih416.c
> 
> diff --git a/arch/arm/mach-sti/Kconfig b/arch/arm/mach-sti/Kconfig
> index 119e110..f8eeeff 100644
> --- a/arch/arm/mach-sti/Kconfig
> +++ b/arch/arm/mach-sti/Kconfig
> @@ -28,7 +28,6 @@ if ARCH_STI
>  config SOC_STIH415
>   bool "STiH415 STMicroelectronics Consumer Electronics family"
>   default y
> - select STIH415_RESET
>   help
> This enables support for STMicroelectronics Digital Consumer
> Electronics family StiH415 parts, primarily targeted at set-top-box
> @@ -38,7 +37,6 @@ config SOC_STIH415
>  config SOC_STIH416
>   bool "STiH416 STMicroelectronics Consumer Electronics family"
>   default y
> - select STIH416_RESET
>   help
> This enables support for STMicroelectronics Digital Consumer
> Electronics family StiH416 parts, primarily targeted at set-top-box
> diff --git a/drivers/reset/sti/Kconfig b/drivers/reset/sti/Kconfig
> index 6131785..71592b5 100644
> --- a/drivers/reset/sti/Kconfig
> +++ b/drivers/reset/sti/Kconfig
> @@ -3,14 +3,6 @@ if ARCH_STI
>  config STI_RESET_SYSCFG
>   bool
>  
> -config STIH415_RESET
> - bool
> - select STI_RESET_SYSCFG
> -
> -config STIH416_RESET
> - bool
> - select STI_RESET_SYSCFG
> -
>  config STIH407_RESET
>   bool
>   select STI_RESET_SYSCFG
> diff --git a/drivers/reset/sti/Makefile b/drivers/reset/sti/Makefile
> index dc85dfb..f9d8241 100644
> --- a/drivers/reset/sti/Makefile
> +++ b/drivers/reset/sti/Makefile
> @@ -1,5 +1,3 @@
>  obj-$(CONFIG_STI_RESET_SYSCFG) += reset-syscfg.o
>  
> -obj-$(CONFIG_STIH415_RESET) += reset-stih415.o
> -obj-$(CONFIG_STIH416_RESET) += reset-stih416.o
>  obj-$(CONFIG_STIH407_RESET) += reset-stih407.o
> diff --git a/drivers/reset/sti/reset-stih415.c 
> b/drivers/reset/sti/reset-stih415.c
> deleted file mode 100644
> index 6f220cd..000
> --- a/drivers/reset/sti/reset-stih415.c
> +++ /dev/null
> @@ -1,112 +0,0 @@
> -/*
> - * Copyright (C) 2013 STMicroelectronics (R) Limited
> - * Author: Stephen Gallimore 
> - * Author: Srinivas Kandagatla 
> - *
> - * 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.
> - */
> -#include 
> -#include 
> -#include 
> -#include 
> -
> -#include 
> -
> -#include "reset-syscfg.h"
> -
> -/*
> - * STiH415 Peripheral powerdown definitions.
> - */
> -static const char stih415_front[] = "st,stih415-front-syscfg";
> -static const char stih415_rear[] = "st,stih415-rear-syscfg";
> -static const char stih415_sbc[] = "st,stih415-sbc-syscfg";
> -static const char stih415_lpm[] = "st,stih415-lpm-syscfg";
> -
> -#define STIH415_PDN_FRONT(_bit) \
> - _SYSCFG_RST_CH(stih415_front, SYSCFG_114, _bit, SYSSTAT_187, _bit)
> -
> -#define STIH415_PDN_REAR(_cntl, _stat) \
> - _SYSCFG_RST_CH(stih415_rear, SYSCFG_336, _cntl, SYSSTAT_384, _stat)
> -
> -#define STIH415_SRST_REAR(_reg, _bit) \
> - _SYSCFG_RST_CH_NO_ACK(stih415_rear, _reg, _bit)
> -
> -#define STIH415_SRST_SBC(_reg, _bit) \
> - _SYSCFG_RST_CH_NO_ACK(stih415_sbc, _reg, _bit)
> -
> -#define STIH415_SRST_FRONT(_reg, _bit) \
> - _SYSCFG_RST_CH_NO_ACK(stih415_front, _reg, _bit)
> -
> -#define STIH415_SRST_LPM(_reg, _bit) \
> - _SYSCFG_RST_CH_NO_ACK(stih415_lpm, _reg, _bit)
> -
> -#define SYSCFG_114   0x38 /* Powerdown request EMI/NAND/Keyscan */
> -#define SYSSTAT_187  0x15c /* Powerdown status EMI/NAND/Keyscan */
> -
> -#define SYSCFG_336   0x90 /* Powerdown request USB/SATA/PCIe */
> -#define SYSSTAT_384  0x150 /* Powerdown status USB/SATA/PCIe */
> -
> -#define SYSCFG_376   0x130 /* Reset generator 0 control 0 */
> -#define SYSCFG_166   0x108 /* Softreset Ethernet 0 */
> -#define SYSCFG_310x7c /* Softreset Ethernet 1 */
> -#define LPM_SYSCFG_1 0x4 /* Softreset IRB */
> -
> -static const struct syscfg_reset_channel_data stih415_powerdowns[] = {
> - [STIH415_EMISS_POWERDOWN]   = STIH415_PDN_FRONT(0),
> - [STIH415_NAND_POWERDOWN]= STIH415_PDN_FRONT(1),
> - [STIH415_KEYSCAN_POWERDOWN] =

Re: [PATCH 15/19] reset: sti: Remove STiH415/6 reset support

2016-09-27 Thread Philipp Zabel 
Hi Peter,

Am Mittwoch, den 14.09.2016, 14:27 +0100 schrieb Peter Griffin:
> Support for STiH415/6 SoCs is being removed from the
> kernel because the platforms are obsolete. This patch removes
> the reset drivers for these SoC's.
> 
> Signed-off-by: Peter Griffin 
> Cc: 
> ---
>  arch/arm/mach-sti/Kconfig |   2 -
>  drivers/reset/sti/Kconfig |   8 ---
>  drivers/reset/sti/Makefile|   2 -
>  drivers/reset/sti/reset-stih415.c | 112 -
>  drivers/reset/sti/reset-stih416.c | 143 
> --
>  5 files changed, 267 deletions(-)
>  delete mode 100644 drivers/reset/sti/reset-stih415.c
>  delete mode 100644 drivers/reset/sti/reset-stih416.c
> 
> diff --git a/arch/arm/mach-sti/Kconfig b/arch/arm/mach-sti/Kconfig
> index 119e110..f8eeeff 100644
> --- a/arch/arm/mach-sti/Kconfig
> +++ b/arch/arm/mach-sti/Kconfig
> @@ -28,7 +28,6 @@ if ARCH_STI
>  config SOC_STIH415
>   bool "STiH415 STMicroelectronics Consumer Electronics family"
>   default y
> - select STIH415_RESET
>   help
> This enables support for STMicroelectronics Digital Consumer
> Electronics family StiH415 parts, primarily targeted at set-top-box
> @@ -38,7 +37,6 @@ config SOC_STIH415
>  config SOC_STIH416
>   bool "STiH416 STMicroelectronics Consumer Electronics family"
>   default y
> - select STIH416_RESET
>   help
> This enables support for STMicroelectronics Digital Consumer
> Electronics family StiH416 parts, primarily targeted at set-top-box
> diff --git a/drivers/reset/sti/Kconfig b/drivers/reset/sti/Kconfig
> index 6131785..71592b5 100644
> --- a/drivers/reset/sti/Kconfig
> +++ b/drivers/reset/sti/Kconfig
> @@ -3,14 +3,6 @@ if ARCH_STI
>  config STI_RESET_SYSCFG
>   bool
>  
> -config STIH415_RESET
> - bool
> - select STI_RESET_SYSCFG
> -
> -config STIH416_RESET
> - bool
> - select STI_RESET_SYSCFG
> -
>  config STIH407_RESET
>   bool
>   select STI_RESET_SYSCFG
> diff --git a/drivers/reset/sti/Makefile b/drivers/reset/sti/Makefile
> index dc85dfb..f9d8241 100644
> --- a/drivers/reset/sti/Makefile
> +++ b/drivers/reset/sti/Makefile
> @@ -1,5 +1,3 @@
>  obj-$(CONFIG_STI_RESET_SYSCFG) += reset-syscfg.o
>  
> -obj-$(CONFIG_STIH415_RESET) += reset-stih415.o
> -obj-$(CONFIG_STIH416_RESET) += reset-stih416.o
>  obj-$(CONFIG_STIH407_RESET) += reset-stih407.o
> diff --git a/drivers/reset/sti/reset-stih415.c 
> b/drivers/reset/sti/reset-stih415.c
> deleted file mode 100644
> index 6f220cd..000
> --- a/drivers/reset/sti/reset-stih415.c
> +++ /dev/null
> @@ -1,112 +0,0 @@
> -/*
> - * Copyright (C) 2013 STMicroelectronics (R) Limited
> - * Author: Stephen Gallimore 
> - * Author: Srinivas Kandagatla 
> - *
> - * 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.
> - */
> -#include 
> -#include 
> -#include 
> -#include 
> -
> -#include 
> -
> -#include "reset-syscfg.h"
> -
> -/*
> - * STiH415 Peripheral powerdown definitions.
> - */
> -static const char stih415_front[] = "st,stih415-front-syscfg";
> -static const char stih415_rear[] = "st,stih415-rear-syscfg";
> -static const char stih415_sbc[] = "st,stih415-sbc-syscfg";
> -static const char stih415_lpm[] = "st,stih415-lpm-syscfg";
> -
> -#define STIH415_PDN_FRONT(_bit) \
> - _SYSCFG_RST_CH(stih415_front, SYSCFG_114, _bit, SYSSTAT_187, _bit)
> -
> -#define STIH415_PDN_REAR(_cntl, _stat) \
> - _SYSCFG_RST_CH(stih415_rear, SYSCFG_336, _cntl, SYSSTAT_384, _stat)
> -
> -#define STIH415_SRST_REAR(_reg, _bit) \
> - _SYSCFG_RST_CH_NO_ACK(stih415_rear, _reg, _bit)
> -
> -#define STIH415_SRST_SBC(_reg, _bit) \
> - _SYSCFG_RST_CH_NO_ACK(stih415_sbc, _reg, _bit)
> -
> -#define STIH415_SRST_FRONT(_reg, _bit) \
> - _SYSCFG_RST_CH_NO_ACK(stih415_front, _reg, _bit)
> -
> -#define STIH415_SRST_LPM(_reg, _bit) \
> - _SYSCFG_RST_CH_NO_ACK(stih415_lpm, _reg, _bit)
> -
> -#define SYSCFG_114   0x38 /* Powerdown request EMI/NAND/Keyscan */
> -#define SYSSTAT_187  0x15c /* Powerdown status EMI/NAND/Keyscan */
> -
> -#define SYSCFG_336   0x90 /* Powerdown request USB/SATA/PCIe */
> -#define SYSSTAT_384  0x150 /* Powerdown status USB/SATA/PCIe */
> -
> -#define SYSCFG_376   0x130 /* Reset generator 0 control 0 */
> -#define SYSCFG_166   0x108 /* Softreset Ethernet 0 */
> -#define SYSCFG_310x7c /* Softreset Ethernet 1 */
> -#define LPM_SYSCFG_1 0x4 /* Softreset IRB */
> -
> -static const struct syscfg_reset_channel_data stih415_powerdowns[] = {
> - [STIH415_EMISS_POWERDOWN]   = STIH415_PDN_FRONT(0),
> - [STIH415_NAND_POWERDOWN]= STIH415_PDN_FRONT(1),
> - [STIH415_KEYSCAN_POWERDOWN] = STIH415_PDN_FRONT(2),
> - [STIH415_USB0_POWERDOWN]= STIH415_PDN_REAR(0, 0),
> -