Merge tag 'samsung-soc-4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc

Samsung mach/soc changes for v4.20, second round

1. Disable SAMSUNG_PM_CHECK Kconfig feature incompatible with Exynos.

* tag 'samsung-soc-4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: samsung: Limit SAMSUNG_PM_CHECK config option to non-Exynos platforms
  ARM: s3c24xx: Restore proper usage of pr_info/pr_cont
  ARM: s3c24xx: Correct SD card write protect detection on Mini2440
  ARM: s3c24xx: Consistently use tab for indenting member assignments
  ARM: s3c24xx: formatting cleanup in mach-mini2440.c
  ARM: s3c24xx: Remove empty gta02_pmu children probe
  ARM: exynos: Fix imprecise abort during Exynos5422 suspend to RAM
  ARM: exynos: Store Exynos5420 register state in one variable

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

7 files changed, 98 insertions, 109 deletions

diff --git a/Documentation/arm/Samsung/Bootloader-interface.txt b/Documentation/arm/Samsung/Bootloader-interface.txt
index ed494ac0beb2..d17ed518a7ea 100644
--- a/Documentation/arm/Samsung/Bootloader-interface.txt
+++ b/Documentation/arm/Samsung/Bootloader-interface.txt
@@ -26,6 +26,7 @@ Offset        Value                                        Purpose
 0x20          0xfcba0d10 (Magic cookie)                    AFTR
 0x24          exynos_cpu_resume_ns                         AFTR
 0x28 + 4*cpu  0x8 (Magic cookie, Exynos3250)               AFTR
+0x28          0x0 or last value during resume (Exynos542x) System suspend
 
 
 2. Secure mode
diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h
index dcd21bb95e3b..f96730cce6e8 100644
--- a/arch/arm/mach-exynos/common.h
+++ b/arch/arm/mach-exynos/common.h
@@ -110,6 +110,7 @@ void exynos_firmware_init(void);
 #define EXYNOS_SLEEP_MAGIC      0x00000bad
 #define EXYNOS_AFTR_MAGIC       0xfcba0d10
 
+bool __init exynos_secure_firmware_available(void);
 void exynos_set_boot_flag(unsigned int cpu, unsigned int mode);
 void exynos_clear_boot_flag(unsigned int cpu, unsigned int mode);
 
diff --git a/arch/arm/mach-exynos/firmware.c b/arch/arm/mach-exynos/firmware.c
index be1f20fe28f4..d602e3bf3f96 100644
--- a/arch/arm/mach-exynos/firmware.c
+++ b/arch/arm/mach-exynos/firmware.c
@@ -185,7 +185,7 @@ static void exynos_l2_configure(const struct l2x0_regs *regs)
         exynos_smc(SMC_CMD_L2X0SETUP2, regs->pwr_ctrl, regs->aux_ctrl, 0);
 }
 
-void __init exynos_firmware_init(void)
+bool __init exynos_secure_firmware_available(void)
 {
         struct device_node *nd;
         const __be32 *addr;
@@ -193,14 +193,22 @@ void __init exynos_firmware_init(void)
         nd = of_find_compatible_node(NULL, NULL,
                                         "samsung,secure-firmware");
         if (!nd)
-                return;
+                return false;
 
         addr = of_get_address(nd, 0, NULL, NULL);
         if (!addr) {
                 pr_err("%s: No address specified.\n", __func__);
-                return;
+                return false;
         }
 
+        return true;
+}
+
+void __init exynos_firmware_init(void)
+{
+        if (!exynos_secure_firmware_available())
+                return;
+
         pr_info("Running under secure firmware.\n");
 
         register_firmware_ops(&exynos_firmware_ops);
diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
index 7ead3acd6fa4..bb8e3985acdb 100644
--- a/arch/arm/mach-exynos/suspend.c
+++ b/arch/arm/mach-exynos/suspend.c
@@ -59,10 +59,15 @@ struct exynos_pm_data {
         int (*cpu_suspend)(unsigned long);
 };
 
-static const struct exynos_pm_data *pm_data __ro_after_init;
+/* Used only on Exynos542x/5800 */
+struct exynos_pm_state {
+        int cpu_state;
+        unsigned int pmu_spare3;
+        void __iomem *sysram_base;
+};
 
-static int exynos5420_cpu_state;
-static unsigned int exynos_pmu_spare3;
+static const struct exynos_pm_data *pm_data __ro_after_init;
+static struct exynos_pm_state pm_state;
 
 /*
  * GIC wake-up support
@@ -257,7 +262,7 @@ static int exynos5420_cpu_suspend(unsigned long arg)
         unsigned int cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
         unsigned int cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
 
-        writel_relaxed(0x0, sysram_base_addr + EXYNOS5420_CPU_STATE);
+        writel_relaxed(0x0, pm_state.sysram_base + EXYNOS5420_CPU_STATE);
 
         if (IS_ENABLED(CONFIG_EXYNOS5420_MCPM)) {
                 mcpm_set_entry_vector(cpu, cluster, exynos_cpu_resume);
@@ -321,7 +326,7 @@ static void exynos5420_pm_prepare(void)
         /* Set wake-up mask registers */
         exynos_pm_set_wakeup_mask();
 
-        exynos_pmu_spare3 = pmu_raw_readl(S5P_PMU_SPARE3);
+        pm_state.pmu_spare3 = pmu_raw_readl(S5P_PMU_SPARE3);
         /*
          * The cpu state needs to be saved and restored so that the
          * secondary CPUs will enter low power start. Though the U-Boot
@@ -329,8 +334,8 @@ static void exynos5420_pm_prepare(void)
          * needs to restore it back in case, the primary cpu fails to
          * suspend for any reason.
          */
-        exynos5420_cpu_state = readl_relaxed(sysram_base_addr +
-                                             EXYNOS5420_CPU_STATE);
+        pm_state.cpu_state = readl_relaxed(pm_state.sysram_base +
+                                           EXYNOS5420_CPU_STATE);
 
         exynos_pm_enter_sleep_mode();
 
@@ -448,8 +453,8 @@ static void exynos5420_pm_resume(void)
                        EXYNOS5_ARM_CORE0_SYS_PWR_REG);
 
         /* Restore the sysram cpu state register */
-        writel_relaxed(exynos5420_cpu_state,
-                       sysram_base_addr + EXYNOS5420_CPU_STATE);
+        writel_relaxed(pm_state.cpu_state,
+                       pm_state.sysram_base + EXYNOS5420_CPU_STATE);
 
         pmu_raw_writel(EXYNOS5420_USE_STANDBY_WFI_ALL,
                         S5P_CENTRAL_SEQ_OPTION);
@@ -457,7 +462,7 @@ static void exynos5420_pm_resume(void)
         if (exynos_pm_central_resume())
                 goto early_wakeup;
 
-        pmu_raw_writel(exynos_pmu_spare3, S5P_PMU_SPARE3);
+        pmu_raw_writel(pm_state.pmu_spare3, S5P_PMU_SPARE3);
 
 early_wakeup:
 
@@ -654,4 +659,13 @@ void __init exynos_pm_init(void)
 
         register_syscore_ops(&exynos_pm_syscore_ops);
         suspend_set_ops(&exynos_suspend_ops);
+
+        /*
+         * Applicable as of now only to Exynos542x. If booted under secure
+         * firmware, the non-secure region of sysram should be used.
+         */
+        if (exynos_secure_firmware_available())
+                pm_state.sysram_base = sysram_ns_base_addr;
+        else
+                pm_state.sysram_base = sysram_base_addr;
 }
diff --git a/arch/arm/mach-s3c24xx/mach-gta02.c b/arch/arm/mach-s3c24xx/mach-gta02.c
index 9d5595c4ad99..594901f3b8e5 100644
--- a/arch/arm/mach-s3c24xx/mach-gta02.c
+++ b/arch/arm/mach-s3c24xx/mach-gta02.c
@@ -219,17 +219,6 @@ static void gta02_udc_vbus_draw(unsigned int ma)
 #define gta02_udc_vbus_draw             NULL
 #endif
 
-/*
- * This is called when pc50633 is probed, unfortunately quite late in the
- * day since it is an I2C bus device. Here we can belatedly define some
- * platform devices with the advantage that we can mark the pcf50633 as the
- * parent. This makes them get suspended and resumed with their parent
- * the pcf50633 still around.
- */
-
-static void gta02_pmu_attach_child_devices(struct pcf50633 *pcf);
-
-
 static char *gta02_batteries[] = {
         "battery",
 };
@@ -355,7 +344,6 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
                 },
 
         },
-        .probe_done = gta02_pmu_attach_child_devices,
         .mbc_event_callback = gta02_pmu_event_callback,
 };
 
@@ -512,36 +500,6 @@ static struct platform_device *gta02_devices[] __initdata = {
         &s3c_device_ts,
 };
 
-/* These guys DO need to be children of PMU. */
-
-static struct platform_device *gta02_devices_pmu_children[] = {
-};
-
-
-/*
- * This is called when pc50633 is probed, quite late in the day since it is an
- * I2C bus device.  Here we can define platform devices with the advantage that
- * we can mark the pcf50633 as the parent.  This makes them get suspended and
- * resumed with their parent the pcf50633 still around.  All devices whose
- * operation depends on something from pcf50633 must have this relationship
- * made explicit like this, or suspend and resume will become an unreliable
- * hellworld.
- */
-
-static void gta02_pmu_attach_child_devices(struct pcf50633 *pcf)
-{
-        int n;
-
-        /* Grab a copy of the now probed PMU pointer. */
-        gta02_pcf = pcf;
-
-        for (n = 0; n < ARRAY_SIZE(gta02_devices_pmu_children); n++)
-                gta02_devices_pmu_children[n]->dev.parent = pcf->dev;
-
-        platform_add_devices(gta02_devices_pmu_children,
-                             ARRAY_SIZE(gta02_devices_pmu_children));
-}
-
 static void gta02_poweroff(void)
 {
         pcf50633_reg_set_bit_mask(gta02_pcf, PCF50633_REG_OOCSHDWN, 1, 1);
diff --git a/arch/arm/mach-s3c24xx/mach-mini2440.c b/arch/arm/mach-s3c24xx/mach-mini2440.c
index f9fc1f8d2b28..50d67d760efd 100644
--- a/arch/arm/mach-s3c24xx/mach-mini2440.c
+++ b/arch/arm/mach-s3c24xx/mach-mini2440.c
@@ -64,31 +64,31 @@ static struct map_desc mini2440_iodesc[] __initdata = {
 };
 
 #define UCON S3C2410_UCON_DEFAULT
-#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
-#define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE
+#define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB)
+#define UFCON (S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE)
 
 
 static struct s3c2410_uartcfg mini2440_uartcfgs[] __initdata = {
         [0] = {
-                .hwport      = 0,
-                .flags       = 0,
-                .ucon        = UCON,
-                .ulcon       = ULCON,
-                .ufcon       = UFCON,
+                .hwport         = 0,
+                .flags          = 0,
+                .ucon           = UCON,
+                .ulcon          = ULCON,
+                .ufcon          = UFCON,
         },
         [1] = {
-                .hwport      = 1,
-                .flags       = 0,
-                .ucon        = UCON,
-                .ulcon       = ULCON,
-                .ufcon       = UFCON,
+                .hwport         = 1,
+                .flags          = 0,
+                .ucon           = UCON,
+                .ulcon          = ULCON,
+                .ufcon          = UFCON,
         },
         [2] = {
-                .hwport      = 2,
-                .flags       = 0,
-                .ucon        = UCON,
-                .ulcon       = ULCON,
-                .ufcon       = UFCON,
+                .hwport         = 2,
+                .flags          = 0,
+                .ucon           = UCON,
+                .ulcon          = ULCON,
+                .ufcon          = UFCON,
         },
 };
 
@@ -104,8 +104,8 @@ static struct s3c2410_udc_mach_info mini2440_udc_cfg __initdata = {
 /*
  * This macro simplifies the table bellow
  */
-#define _LCD_DECLARE(_clock,_xres,margin_left,margin_right,hsync, \
-                        _yres,margin_top,margin_bottom,vsync, refresh) \
+#define _LCD_DECLARE(_clock, _xres, margin_left, margin_right, hsync, \
+                        _yres, margin_top, margin_bottom, vsync, refresh) \
         .width = _xres, \
         .xres = _xres, \
         .height = _yres, \
@@ -128,7 +128,7 @@ static struct s3c2410fb_display mini2440_lcd_cfg[] __initdata = {
         [0] = { /* mini2440 + 3.5" TFT + touchscreen */
                 _LCD_DECLARE(
                         7,                      /* The 3.5 is quite fast */
-                        240, 21, 38, 6,         /* x timing */
+                        240, 21, 38, 6,         /* x timing */
                         320, 4, 4, 2,           /* y timing */
                         60),                    /* refresh rate */
                 .lcdcon5        = (S3C2410_LCDCON5_FRM565 |
@@ -140,7 +140,7 @@ static struct s3c2410fb_display mini2440_lcd_cfg[] __initdata = {
         [1] = { /* mini2440 + 7" TFT + touchscreen */
                 _LCD_DECLARE(
                         10,                     /* the 7" runs slower */
-                        800, 40, 40, 48,        /* x timing */
+                        800, 40, 40, 48,        /* x timing */
                         480, 29, 3, 3,          /* y timing */
                         50),                    /* refresh rate */
                 .lcdcon5        = (S3C2410_LCDCON5_FRM565 |
@@ -148,7 +148,7 @@ static struct s3c2410fb_display mini2440_lcd_cfg[] __initdata = {
                                    S3C2410_LCDCON5_INVVFRAME |
                                    S3C2410_LCDCON5_PWREN),
         },
-        /* The VGA shield can outout at several resolutions. All share 
+        /* The VGA shield can outout at several resolutions. All share
          * the same timings, however, anything smaller than 1024x768
          * will only be displayed in the top left corner of a 1024x768
          * XGA output unless you add optional dip switches to the shield.
@@ -158,9 +158,10 @@ static struct s3c2410fb_display mini2440_lcd_cfg[] __initdata = {
                 _LCD_DECLARE(
                         10,
                         1024, 1, 2, 2,          /* y timing */
-                        768, 200, 16, 16,       /* x timing */
+                        768, 200, 16, 16,       /* x timing */
                         24),    /* refresh rate, maximum stable,
-                                 tested with the FPGA shield */
+                                 * tested with the FPGA shield
+                                 */
                 .lcdcon5        = (S3C2410_LCDCON5_FRM565 |
                                    S3C2410_LCDCON5_HWSWP),
         },
@@ -196,7 +197,8 @@ static struct s3c2410fb_mach_info mini2440_fb_info __initdata = {
 
         /* Enable VD[2..7], VD[10..15], VD[18..23] and VCLK, syncs, VDEN
          * and disable the pull down resistors on pins we are using for LCD
-         * data. */
+         * data.
+         */
 
         .gpcup          = (0xf << 1) | (0x3f << 10),
 
@@ -232,10 +234,11 @@ static struct s3c2410fb_mach_info mini2440_fb_info __initdata = {
 /* MMC/SD  */
 
 static struct s3c24xx_mci_pdata mini2440_mmc_cfg __initdata = {
-   .gpio_detect   = S3C2410_GPG(8),
-   .gpio_wprotect = S3C2410_GPH(8),
-   .set_power     = NULL,
-   .ocr_avail     = MMC_VDD_32_33|MMC_VDD_33_34,
+        .gpio_detect            = S3C2410_GPG(8),
+        .gpio_wprotect          = S3C2410_GPH(8),
+        .wprotect_invert        = 1,
+        .set_power              = NULL,
+        .ocr_avail              = MMC_VDD_32_33|MMC_VDD_33_34,
 };
 
 /* NAND Flash on MINI2440 board */
@@ -254,7 +257,8 @@ static struct mtd_partition mini2440_default_nand_part[] __initdata = {
         [2] = {
                 .name   = "kernel",
                 /* 5 megabytes, for a kernel with no modules
-                 * or a uImage with a ramdisk attached */
+                 * or a uImage with a ramdisk attached
+                 */
                 .size   = 0x00500000,
                 .offset = SZ_256K + SZ_128K,
         },
@@ -271,7 +275,7 @@ static struct s3c2410_nand_set mini2440_nand_sets[] __initdata = {
                 .nr_chips       = 1,
                 .nr_partitions  = ARRAY_SIZE(mini2440_default_nand_part),
                 .partitions     = mini2440_default_nand_part,
-                .flash_bbt      = 1, /* we use u-boot to create a BBT */
+                .flash_bbt      = 1, /* we use u-boot to create a BBT */
         },
 };
 
@@ -282,7 +286,7 @@ static struct s3c2410_platform_nand mini2440_nand_info __initdata = {
         .nr_sets        = ARRAY_SIZE(mini2440_nand_sets),
         .sets           = mini2440_nand_sets,
         .ignore_unset_ecc = 1,
-        .ecc_mode       = NAND_ECC_HW,
+        .ecc_mode       = NAND_ECC_HW,
 };
 
 /* DM9000AEP 10/100 ethernet controller */
@@ -290,7 +294,7 @@ static struct s3c2410_platform_nand mini2440_nand_info __initdata = {
 static struct resource mini2440_dm9k_resource[] = {
         [0] = DEFINE_RES_MEM(MACH_MINI2440_DM9K_BASE, 4),
         [1] = DEFINE_RES_MEM(MACH_MINI2440_DM9K_BASE + 4, 4),
-        [2] = DEFINE_RES_NAMED(IRQ_EINT7, 1, NULL, IORESOURCE_IRQ \
+        [2] = DEFINE_RES_NAMED(IRQ_EINT7, 1, NULL, IORESOURCE_IRQ
                                                 | IORESOURCE_IRQ_HIGHEDGE),
 };
 
@@ -362,7 +366,8 @@ static struct gpio_keys_button mini2440_buttons[] = {
         },
 #if 0
         /* this pin is also known as TCLK1 and seems to already
-         * marked as "in use" somehow in the kernel -- possibly wrongly */
+         * marked as "in use" somehow in the kernel -- possibly wrongly
+         */
         {
                 .gpio           = S3C2410_GPG(11),      /* K6 */
                 .code           = KEY_F6,
@@ -564,7 +569,8 @@ static char mini2440_features_str[12] __initdata = "0tb";
 static int __init mini2440_features_setup(char *str)
 {
         if (str)
-                strlcpy(mini2440_features_str, str, sizeof(mini2440_features_str));
+                strlcpy(mini2440_features_str, str,
+                        sizeof(mini2440_features_str));
         return 1;
 }
 
@@ -583,10 +589,10 @@ struct mini2440_features_t {
 };
 
 static void __init mini2440_parse_features(
-                struct mini2440_features_t * features,
-                const char * features_str )
+                struct mini2440_features_t *features,
+                const char *features_str)
 {
-        const char * fp = features_str;
+        const char *fp = features_str;
 
         features->count = 0;
         features->done = 0;
@@ -598,13 +604,14 @@ static void __init mini2440_parse_features(
                 switch (f) {
                 case '0'...'9': /* tft screen */
                         if (features->done & FEATURE_SCREEN) {
-                                printk(KERN_INFO "MINI2440: '%c' ignored, "
-                                        "screen type already set\n", f);
+                                pr_info("MINI2440: '%c' ignored, screen type already set\n",
+                                        f);
                         } else {
                                 int li = f - '0';
+
                                 if (li >= ARRAY_SIZE(mini2440_lcd_cfg))
-                                        printk(KERN_INFO "MINI2440: "
-                                                "'%c' out of range LCD mode\n", f);
+                                        pr_info("MINI2440: '%c' out of range LCD mode\n",
+                                                f);
                                 else {
                                         features->optional[features->count++] =
                                                         &s3c_device_lcd;
@@ -615,8 +622,8 @@ static void __init mini2440_parse_features(
                         break;
                 case 'b':
                         if (features->done & FEATURE_BACKLIGHT)
-                                printk(KERN_INFO "MINI2440: '%c' ignored, "
-                                        "backlight already set\n", f);
+                                pr_info("MINI2440: '%c' ignored, backlight already set\n",
+                                        f);
                         else {
                                 features->optional[features->count++] =
                                                 &mini2440_led_backlight;
@@ -624,13 +631,13 @@ static void __init mini2440_parse_features(
                         features->done |= FEATURE_BACKLIGHT;
                         break;
                 case 't':
-                        printk(KERN_INFO "MINI2440: '%c' ignored, "
-                                "touchscreen not compiled in\n", f);
+                        pr_info("MINI2440: '%c' ignored, touchscreen not compiled in\n",
+                                f);
                         break;
                 case 'c':
                         if (features->done & FEATURE_CAMERA)
-                                printk(KERN_INFO "MINI2440: '%c' ignored, "
-                                        "camera already registered\n", f);
+                                pr_info("MINI2440: '%c' ignored, camera already registered\n",
+                                        f);
                         else
                                 features->optional[features->count++] =
                                         &s3c_device_camif;
@@ -645,7 +652,7 @@ static void __init mini2440_init(void)
         struct mini2440_features_t features = { 0 };
         int i;
 
-        printk(KERN_INFO "MINI2440: Option string mini2440=%s\n",
+        pr_info("MINI2440: Option string mini2440=%s\n",
                         mini2440_features_str);
 
         /* Parse the feature string */
@@ -674,17 +681,17 @@ static void __init mini2440_init(void)
                 mini2440_fb_info.displays =
                         &mini2440_lcd_cfg[features.lcd_index];
 
-                printk(KERN_INFO "MINI2440: LCD");
+                pr_info("MINI2440: LCD");
                 for (li = 0; li < ARRAY_SIZE(mini2440_lcd_cfg); li++)
                         if (li == features.lcd_index)
-                                printk(" [%d:%dx%d]", li,
+                                pr_cont(" [%d:%dx%d]", li,
                                         mini2440_lcd_cfg[li].width,
                                         mini2440_lcd_cfg[li].height);
                         else
-                                printk(" %d:%dx%d", li,
+                                pr_cont(" %d:%dx%d", li,
                                         mini2440_lcd_cfg[li].width,
                                         mini2440_lcd_cfg[li].height);
-                printk("\n");
+                pr_cont("\n");
                 s3c24xx_fb_set_platdata(&mini2440_fb_info);
         }
 
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index b600e38364eb..377ff9cda667 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -256,7 +256,7 @@ config S3C_PM_DEBUG_LED_SMDK
 
 config SAMSUNG_PM_CHECK
         bool "S3C2410 PM Suspend Memory CRC"
-        depends on PM
+        depends on PM && (PLAT_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210)
         select CRC32
         help
           Enable the PM code's memory area checksum over sleep. This option