Merge tag 'for-4.6' of git://git.osdn.jp/gitroot/uclinux-h8/linux

Pull h8300 updates from Yoshinori Sato:
 "Various h8300 fixes"

* tag 'for-4.6' of git://git.osdn.jp/gitroot/uclinux-h8/linux:
  h8300: switch EARLYCON
  h8300: dts: Rename the serial port clock to fck

diff --git a/arch/h8300/boot/dts/edosk2674.dts b/arch/h8300/boot/dts/edosk2674.dts
index 4ce9fa874a577e559d5e916a24ddfb71eef6fcdd..6ae884bf66a5268c9dba08db6111df7dc9f40d06 100644 (file)
--- a/arch/h8300/boot/dts/edosk2674.dts
+++ b/arch/h8300/boot/dts/edosk2674.dts
@@ -88,20 +88,20 @@
                reg = <0xffff78 8>;
                interrupts = <88 0>, <89 0>, <90 0>, <91 0>;
                clocks = <&fclk>;
-               clock-names = "sci_ick";
+               clock-names = "fck";
        };
        sci1: serial@ffff80 {
                compatible = "renesas,sci";
                reg = <0xffff80 8>;
                interrupts = <92 0>, <93 0>, <94 0>, <95 0>;
                clocks = <&fclk>;
-               clock-names = "sci_ick";
+               clock-names = "fck";
        };
        sci2: serial@ffff88 {
                compatible = "renesas,sci";
                reg = <0xffff88 8>;
                interrupts = <96 0>, <97 0>, <98 0>, <99 0>;
                clocks = <&fclk>;
-               clock-names = "sci_ick";
+               clock-names = "fck";
        };
 };

diff --git a/arch/h8300/boot/dts/h8300h_sim.dts b/arch/h8300/boot/dts/h8300h_sim.dts
index 545bfb57af9a9f2e8a81ff38aa46dcedf75c3757..9c733d920f1f0dc3eab70dd53e76d22a4860c3f3 100644 (file)
--- a/arch/h8300/boot/dts/h8300h_sim.dts
+++ b/arch/h8300/boot/dts/h8300h_sim.dts
@@ -83,7 +83,7 @@
                reg = <0xffffb0 8>;
                interrupts = <52 0>, <53 0>, <54 0>, <55 0>;
                clocks = <&fclk>;
-               clock-names = "sci_ick";
+               clock-names = "fck";
        };
 
        sci1: serial@ffffb8 {
@@ -91,6 +91,6 @@
                reg = <0xffffb8 8>;
                interrupts = <56 0>, <57 0>, <58 0>, <59 0>;
                clocks = <&fclk>;
-               clock-names = "sci_ick";
+               clock-names = "fck";
        };
 };

diff --git a/arch/h8300/boot/dts/h8s_sim.dts b/arch/h8300/boot/dts/h8s_sim.dts
index bcedba5a3ce7e8ae8fefaa195d86261b8ed8ba28..97e1f4b17ef067d5f10738e8aed5983359ce61c4 100644 (file)
--- a/arch/h8300/boot/dts/h8s_sim.dts
+++ b/arch/h8300/boot/dts/h8s_sim.dts
@@ -87,13 +87,13 @@
                reg = <0xffff78 8>;
                interrupts = <88 0>, <89 0>, <90 0>, <91 0>;
                clocks = <&fclk>;
-               clock-names = "sci_ick";
+               clock-names = "fck";
        };
        sci1: serial@ffff80 {
                compatible = "renesas,sci";
                reg = <0xffff80 8>;
                interrupts = <92 0>, <93 0>, <94 0>, <95 0>;
                clocks = <&fclk>;
-               clock-names = "sci_ick";
+               clock-names = "fck";
        };
 };

diff --git a/arch/h8300/configs/h8300h-sim_defconfig b/arch/h8300/configs/h8300h-sim_defconfig
index 067bfe9c49b3a6c96fea0713a0e27837f021b1fe..80624f46b0ed4797ca1faa1f45625ae849b68713 100644 (file)
--- a/arch/h8300/configs/h8300h-sim_defconfig
+++ b/arch/h8300/configs/h8300h-sim_defconfig
@@ -34,7 +34,7 @@ CONFIG_BINFMT_FLAT=y
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_DEVKMEM is not set
 CONFIG_SERIAL_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_CONSOLE=y
+CONFIG_SERIAL_SH_SCI_EARLYCON=y
 # CONFIG_HW_RANDOM is not set
 # CONFIG_HWMON is not set
 # CONFIG_USB_SUPPORT is not set

diff --git a/arch/h8300/kernel/setup.c b/arch/h8300/kernel/setup.c
index e4985dfa91dc853e1c227759808814b2e5e2ea97..c8c25a4e9e489eb8944d87551f55694dc6e50b8a 100644 (file)
--- a/arch/h8300/kernel/setup.c
+++ b/arch/h8300/kernel/setup.c
@@ -20,8 +20,6 @@
 #include <linux/bootmem.h>
 #include <linux/seq_file.h>
 #include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_fdt.h>
 #include <linux/of_platform.h>
@@ -137,11 +135,6 @@ void __init setup_arch(char **cmdline_p)
        parse_early_param();
 
        bootmem_init();
-#if defined(CONFIG_H8300H_SIM) || defined(CONFIG_H8S_SIM)
-       sim_console_register();
-#endif
-
-       early_platform_driver_probe("earlyprintk", 1, 0);
        /*
         * get kmalloc into gear
         */

diff --git a/arch/h8300/kernel/sim-console.c b/arch/h8300/kernel/sim-console.c
index a15edf0565d9e69c3ada3de938e2ac549be5e782..46138f55a9ea7eedb86eeb60e074655d863bcc69 100644 (file)
--- a/arch/h8300/kernel/sim-console.c
+++ b/arch/h8300/kernel/sim-console.c
@@ -1,79 +1,30 @@
 /*
- * arch/h8300/kernel/early_printk.c
+ * arch/h8300/kernel/sim-console.c
  *
- *  Copyright (C) 2009 Yoshinori Sato <ysato@users.sourceforge.jp>
+ *  Copyright (C) 2015 Yoshinori Sato <ysato@users.sourceforge.jp>
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  */
 #include <linux/console.h>
-#include <linux/tty.h>
 #include <linux/init.h>
-#include <linux/io.h>
-#include <linux/platform_device.h>
+#include <linux/serial_core.h>
 
-static void sim_write(struct console *co, const char *ptr,
-                                unsigned len)
+static void sim_write(struct console *con, const char *s, unsigned n)
 {
        register const int fd __asm__("er0") = 1; /* stdout */
-       register const char *_ptr __asm__("er1") = ptr;
-       register const unsigned _len __asm__("er2") = len;
+       register const char *_ptr __asm__("er1") = s;
+       register const unsigned _len __asm__("er2") = n;
 
        __asm__(".byte 0x5e,0x00,0x00,0xc7\n\t" /* jsr @0xc7 (sys_write) */
                : : "g"(fd), "g"(_ptr), "g"(_len));
 }
 
-static struct console sim_console = {
-       .name           = "sim_console",
-       .write          = sim_write,
-       .setup          = NULL,
-       .flags          = CON_PRINTBUFFER,
-       .index          = -1,
-};
-
-static char sim_console_buf[32];
-
-static int sim_probe(struct platform_device *pdev)
-{
-       if (sim_console.data)
-               return -EEXIST;
-
-       if (!strstr(sim_console_buf, "keep"))
-               sim_console.flags |= CON_BOOT;
-
-       register_console(&sim_console);
-       return 0;
-}
-
-static int sim_remove(struct platform_device *pdev)
+static int __init sim_setup(struct earlycon_device *device, const char *opt)
 {
+       device->con->write = sim_write;
        return 0;
 }
 
-static struct platform_driver sim_driver = {
-       .probe          = sim_probe,
-       .remove         = sim_remove,
-       .driver         = {
-               .name   = "h8300-sim",
-               .owner  = THIS_MODULE,
-       },
-};
-
-early_platform_init_buffer("earlyprintk", &sim_driver,
-                          sim_console_buf, ARRAY_SIZE(sim_console_buf));
-
-static struct platform_device sim_console_device = {
-       .name           = "h8300-sim",
-       .id             = 0,
-};
-
-static struct platform_device *devices[] __initdata = {
-       &sim_console_device,
-};
-
-void __init sim_console_register(void)
-{
-       early_platform_add_devices(devices,
-                                  ARRAY_SIZE(devices));
-}
+EARLYCON_DECLARE(h8sim, sim_setup);