Re: [PATCH AUTOSEL 4.14 27/67] ARM: exynos: Define EINT_WAKEUP_MASK registers for S5Pv210 and Exynos5433
On Fri, Sep 07, 2018 at 08:33:22AM +0200, Krzysztof Kozlowski wrote:
>On Fri, 7 Sep 2018 at 02:54, Sasha Levin wrote:
>>
>> From: Krzysztof Kozlowski
>>
>> [ Upstream commit e5cda42c16d89720c29678f51d95a119490ef7d8 ]
>>
>> S5Pv210 and Exynos5433/Exynos7 have different address of
>> EINT_WAKEUP_MASK register. Rename existing S5P_EINT_WAKEUP_MASK to
>> avoid confusion and add new ones.
>
>This should not be backported to stable. It does not fix anything but
>prepares the code for a8be2af0218c ("pinctrl: samsung: Write external
>wakeup interrupt mask").
Now dropped, thanks!
Re: [PATCH AUTOSEL 4.14 27/67] ARM: exynos: Define EINT_WAKEUP_MASK registers for S5Pv210 and Exynos5433
On Fri, Sep 07, 2018 at 08:33:22AM +0200, Krzysztof Kozlowski wrote:
>On Fri, 7 Sep 2018 at 02:54, Sasha Levin wrote:
>>
>> From: Krzysztof Kozlowski
>>
>> [ Upstream commit e5cda42c16d89720c29678f51d95a119490ef7d8 ]
>>
>> S5Pv210 and Exynos5433/Exynos7 have different address of
>> EINT_WAKEUP_MASK register. Rename existing S5P_EINT_WAKEUP_MASK to
>> avoid confusion and add new ones.
>
>This should not be backported to stable. It does not fix anything but
>prepares the code for a8be2af0218c ("pinctrl: samsung: Write external
>wakeup interrupt mask").
Now dropped, thanks!
Re: [PATCH AUTOSEL 4.14 27/67] ARM: exynos: Define EINT_WAKEUP_MASK registers for S5Pv210 and Exynos5433
On Fri, 7 Sep 2018 at 02:54, Sasha Levin wrote:
>
> From: Krzysztof Kozlowski
>
> [ Upstream commit e5cda42c16d89720c29678f51d95a119490ef7d8 ]
>
> S5Pv210 and Exynos5433/Exynos7 have different address of
> EINT_WAKEUP_MASK register. Rename existing S5P_EINT_WAKEUP_MASK to
> avoid confusion and add new ones.
This should not be backported to stable. It does not fix anything but
prepares the code for a8be2af0218c ("pinctrl: samsung: Write external
wakeup interrupt mask").
Best regards,
Krzysztof
>
> Signed-off-by: Krzysztof Kozlowski
> Cc: Tomasz Figa
> Cc: Sylwester Nawrocki
> Acked-by: Tomasz Figa
> Tested-by: Marek Szyprowski
> Signed-off-by: Sasha Levin
> ---
> arch/arm/mach-exynos/suspend.c | 2 +-
> include/linux/soc/samsung/exynos-regs-pmu.h | 6 +-
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
> index b529ba04ed16..a6a4ba334147 100644
> --- a/arch/arm/mach-exynos/suspend.c
> +++ b/arch/arm/mach-exynos/suspend.c
> @@ -279,7 +279,7 @@ static int exynos5420_cpu_suspend(unsigned long arg)
> static void exynos_pm_set_wakeup_mask(void)
> {
> /* Set wake-up mask registers */
> - pmu_raw_writel(exynos_get_eint_wake_mask(), S5P_EINT_WAKEUP_MASK);
> + pmu_raw_writel(exynos_get_eint_wake_mask(), EXYNOS_EINT_WAKEUP_MASK);
> pmu_raw_writel(exynos_irqwake_intmask & ~(1 << 31), S5P_WAKEUP_MASK);
> }
>
> diff --git a/include/linux/soc/samsung/exynos-regs-pmu.h
> b/include/linux/soc/samsung/exynos-regs-pmu.h
> index bebdde5dccd6..f248e7e079b7 100644
> --- a/include/linux/soc/samsung/exynos-regs-pmu.h
> +++ b/include/linux/soc/samsung/exynos-regs-pmu.h
> @@ -46,7 +46,7 @@
> #define EXYNOS_SWRESET 0x0400
>
> #define S5P_WAKEUP_STAT0x0600
> -#define S5P_EINT_WAKEUP_MASK 0x0604
> +#define EXYNOS_EINT_WAKEUP_MASK0x0604
> #define S5P_WAKEUP_MASK0x0608
> #define S5P_WAKEUP_MASK2 0x0614
>
> @@ -184,6 +184,9 @@
> #define S5P_CORE_WAKEUP_FROM_LOCAL_CFG (0x3 << 8)
> #define S5P_CORE_AUTOWAKEUP_EN (1 << 31)
>
> +/* Only for S5Pv210 */
> +#define S5PV210_EINT_WAKEUP_MASK 0xC004
> +
> /* Only for EXYNOS4210 */
> #define S5P_CMU_CLKSTOP_LCD1_LOWPWR0x1154
> #define S5P_CMU_RESET_LCD1_LOWPWR 0x1174
> @@ -645,6 +648,7 @@
> | EXYNOS5420_KFC_USE_STANDBY_WFI3)
>
> /* For EXYNOS5433 */
> +#define EXYNOS5433_EINT_WAKEUP_MASK(0x060C)
> #define EXYNOS5433_USBHOST30_PHY_CONTROL (0x0728)
> #define EXYNOS5433_PAD_RETENTION_AUD_OPTION(0x3028)
> #define EXYNOS5433_PAD_RETENTION_MMC2_OPTION (0x30C8)
> --
> 2.17.1
Re: [PATCH AUTOSEL 4.14 27/67] ARM: exynos: Define EINT_WAKEUP_MASK registers for S5Pv210 and Exynos5433
On Fri, 7 Sep 2018 at 02:54, Sasha Levin wrote:
>
> From: Krzysztof Kozlowski
>
> [ Upstream commit e5cda42c16d89720c29678f51d95a119490ef7d8 ]
>
> S5Pv210 and Exynos5433/Exynos7 have different address of
> EINT_WAKEUP_MASK register. Rename existing S5P_EINT_WAKEUP_MASK to
> avoid confusion and add new ones.
This should not be backported to stable. It does not fix anything but
prepares the code for a8be2af0218c ("pinctrl: samsung: Write external
wakeup interrupt mask").
Best regards,
Krzysztof
>
> Signed-off-by: Krzysztof Kozlowski
> Cc: Tomasz Figa
> Cc: Sylwester Nawrocki
> Acked-by: Tomasz Figa
> Tested-by: Marek Szyprowski
> Signed-off-by: Sasha Levin
> ---
> arch/arm/mach-exynos/suspend.c | 2 +-
> include/linux/soc/samsung/exynos-regs-pmu.h | 6 +-
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
> index b529ba04ed16..a6a4ba334147 100644
> --- a/arch/arm/mach-exynos/suspend.c
> +++ b/arch/arm/mach-exynos/suspend.c
> @@ -279,7 +279,7 @@ static int exynos5420_cpu_suspend(unsigned long arg)
> static void exynos_pm_set_wakeup_mask(void)
> {
> /* Set wake-up mask registers */
> - pmu_raw_writel(exynos_get_eint_wake_mask(), S5P_EINT_WAKEUP_MASK);
> + pmu_raw_writel(exynos_get_eint_wake_mask(), EXYNOS_EINT_WAKEUP_MASK);
> pmu_raw_writel(exynos_irqwake_intmask & ~(1 << 31), S5P_WAKEUP_MASK);
> }
>
> diff --git a/include/linux/soc/samsung/exynos-regs-pmu.h
> b/include/linux/soc/samsung/exynos-regs-pmu.h
> index bebdde5dccd6..f248e7e079b7 100644
> --- a/include/linux/soc/samsung/exynos-regs-pmu.h
> +++ b/include/linux/soc/samsung/exynos-regs-pmu.h
> @@ -46,7 +46,7 @@
> #define EXYNOS_SWRESET 0x0400
>
> #define S5P_WAKEUP_STAT0x0600
> -#define S5P_EINT_WAKEUP_MASK 0x0604
> +#define EXYNOS_EINT_WAKEUP_MASK0x0604
> #define S5P_WAKEUP_MASK0x0608
> #define S5P_WAKEUP_MASK2 0x0614
>
> @@ -184,6 +184,9 @@
> #define S5P_CORE_WAKEUP_FROM_LOCAL_CFG (0x3 << 8)
> #define S5P_CORE_AUTOWAKEUP_EN (1 << 31)
>
> +/* Only for S5Pv210 */
> +#define S5PV210_EINT_WAKEUP_MASK 0xC004
> +
> /* Only for EXYNOS4210 */
> #define S5P_CMU_CLKSTOP_LCD1_LOWPWR0x1154
> #define S5P_CMU_RESET_LCD1_LOWPWR 0x1174
> @@ -645,6 +648,7 @@
> | EXYNOS5420_KFC_USE_STANDBY_WFI3)
>
> /* For EXYNOS5433 */
> +#define EXYNOS5433_EINT_WAKEUP_MASK(0x060C)
> #define EXYNOS5433_USBHOST30_PHY_CONTROL (0x0728)
> #define EXYNOS5433_PAD_RETENTION_AUD_OPTION(0x3028)
> #define EXYNOS5433_PAD_RETENTION_MMC2_OPTION (0x30C8)
> --
> 2.17.1
[PATCH AUTOSEL 4.14 27/67] ARM: exynos: Define EINT_WAKEUP_MASK registers for S5Pv210 and Exynos5433
From: Krzysztof Kozlowski
[ Upstream commit e5cda42c16d89720c29678f51d95a119490ef7d8 ]
S5Pv210 and Exynos5433/Exynos7 have different address of
EINT_WAKEUP_MASK register. Rename existing S5P_EINT_WAKEUP_MASK to
avoid confusion and add new ones.
Signed-off-by: Krzysztof Kozlowski
Cc: Tomasz Figa
Cc: Sylwester Nawrocki
Acked-by: Tomasz Figa
Tested-by: Marek Szyprowski
Signed-off-by: Sasha Levin
---
arch/arm/mach-exynos/suspend.c | 2 +-
include/linux/soc/samsung/exynos-regs-pmu.h | 6 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
index b529ba04ed16..a6a4ba334147 100644
--- a/arch/arm/mach-exynos/suspend.c
+++ b/arch/arm/mach-exynos/suspend.c
@@ -279,7 +279,7 @@ static int exynos5420_cpu_suspend(unsigned long arg)
static void exynos_pm_set_wakeup_mask(void)
{
/* Set wake-up mask registers */
- pmu_raw_writel(exynos_get_eint_wake_mask(), S5P_EINT_WAKEUP_MASK);
+ pmu_raw_writel(exynos_get_eint_wake_mask(), EXYNOS_EINT_WAKEUP_MASK);
pmu_raw_writel(exynos_irqwake_intmask & ~(1 << 31), S5P_WAKEUP_MASK);
}
diff --git a/include/linux/soc/samsung/exynos-regs-pmu.h
b/include/linux/soc/samsung/exynos-regs-pmu.h
index bebdde5dccd6..f248e7e079b7 100644
--- a/include/linux/soc/samsung/exynos-regs-pmu.h
+++ b/include/linux/soc/samsung/exynos-regs-pmu.h
@@ -46,7 +46,7 @@
#define EXYNOS_SWRESET 0x0400
#define S5P_WAKEUP_STAT0x0600
-#define S5P_EINT_WAKEUP_MASK 0x0604
+#define EXYNOS_EINT_WAKEUP_MASK0x0604
#define S5P_WAKEUP_MASK0x0608
#define S5P_WAKEUP_MASK2 0x0614
@@ -184,6 +184,9 @@
#define S5P_CORE_WAKEUP_FROM_LOCAL_CFG (0x3 << 8)
#define S5P_CORE_AUTOWAKEUP_EN (1 << 31)
+/* Only for S5Pv210 */
+#define S5PV210_EINT_WAKEUP_MASK 0xC004
+
/* Only for EXYNOS4210 */
#define S5P_CMU_CLKSTOP_LCD1_LOWPWR0x1154
#define S5P_CMU_RESET_LCD1_LOWPWR 0x1174
@@ -645,6 +648,7 @@
| EXYNOS5420_KFC_USE_STANDBY_WFI3)
/* For EXYNOS5433 */
+#define EXYNOS5433_EINT_WAKEUP_MASK(0x060C)
#define EXYNOS5433_USBHOST30_PHY_CONTROL (0x0728)
#define EXYNOS5433_PAD_RETENTION_AUD_OPTION(0x3028)
#define EXYNOS5433_PAD_RETENTION_MMC2_OPTION (0x30C8)
--
2.17.1
[PATCH AUTOSEL 4.14 27/67] ARM: exynos: Define EINT_WAKEUP_MASK registers for S5Pv210 and Exynos5433
From: Krzysztof Kozlowski
[ Upstream commit e5cda42c16d89720c29678f51d95a119490ef7d8 ]
S5Pv210 and Exynos5433/Exynos7 have different address of
EINT_WAKEUP_MASK register. Rename existing S5P_EINT_WAKEUP_MASK to
avoid confusion and add new ones.
Signed-off-by: Krzysztof Kozlowski
Cc: Tomasz Figa
Cc: Sylwester Nawrocki
Acked-by: Tomasz Figa
Tested-by: Marek Szyprowski
Signed-off-by: Sasha Levin
---
arch/arm/mach-exynos/suspend.c | 2 +-
include/linux/soc/samsung/exynos-regs-pmu.h | 6 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
index b529ba04ed16..a6a4ba334147 100644
--- a/arch/arm/mach-exynos/suspend.c
+++ b/arch/arm/mach-exynos/suspend.c
@@ -279,7 +279,7 @@ static int exynos5420_cpu_suspend(unsigned long arg)
static void exynos_pm_set_wakeup_mask(void)
{
/* Set wake-up mask registers */
- pmu_raw_writel(exynos_get_eint_wake_mask(), S5P_EINT_WAKEUP_MASK);
+ pmu_raw_writel(exynos_get_eint_wake_mask(), EXYNOS_EINT_WAKEUP_MASK);
pmu_raw_writel(exynos_irqwake_intmask & ~(1 << 31), S5P_WAKEUP_MASK);
}
diff --git a/include/linux/soc/samsung/exynos-regs-pmu.h
b/include/linux/soc/samsung/exynos-regs-pmu.h
index bebdde5dccd6..f248e7e079b7 100644
--- a/include/linux/soc/samsung/exynos-regs-pmu.h
+++ b/include/linux/soc/samsung/exynos-regs-pmu.h
@@ -46,7 +46,7 @@
#define EXYNOS_SWRESET 0x0400
#define S5P_WAKEUP_STAT0x0600
-#define S5P_EINT_WAKEUP_MASK 0x0604
+#define EXYNOS_EINT_WAKEUP_MASK0x0604
#define S5P_WAKEUP_MASK0x0608
#define S5P_WAKEUP_MASK2 0x0614
@@ -184,6 +184,9 @@
#define S5P_CORE_WAKEUP_FROM_LOCAL_CFG (0x3 << 8)
#define S5P_CORE_AUTOWAKEUP_EN (1 << 31)
+/* Only for S5Pv210 */
+#define S5PV210_EINT_WAKEUP_MASK 0xC004
+
/* Only for EXYNOS4210 */
#define S5P_CMU_CLKSTOP_LCD1_LOWPWR0x1154
#define S5P_CMU_RESET_LCD1_LOWPWR 0x1174
@@ -645,6 +648,7 @@
| EXYNOS5420_KFC_USE_STANDBY_WFI3)
/* For EXYNOS5433 */
+#define EXYNOS5433_EINT_WAKEUP_MASK(0x060C)
#define EXYNOS5433_USBHOST30_PHY_CONTROL (0x0728)
#define EXYNOS5433_PAD_RETENTION_AUD_OPTION(0x3028)
#define EXYNOS5433_PAD_RETENTION_MMC2_OPTION (0x30C8)
--
2.17.1
