Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 732b84ee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e46b4e2b 8cad4892

arch/h8300/boot/dts/edosk2674.dts

+3 −3
Original line number Diff line number Diff line
@@ -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";

	};

};

arch/h8300/boot/dts/h8300h_sim.dts

+2 −2
Original line number Diff line number Diff line
@@ -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";

	};

};

arch/h8300/boot/dts/h8s_sim.dts

+2 −2
Original line number Diff line number Diff line
@@ -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";

	};

};

arch/h8300/configs/h8300h-sim_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/h8300/kernel/setup.c

+0 −7
Original line number Diff line number Diff line
@@ -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

	 */