Merge tag 'renesas-r7s72100-ccf2-for-v3.16' of... (05e46817) · Commits · e / devices / android_kernel_oneplus_sm7250

arch/arm/boot/dts/Makefile

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -299,7 +299,6 @@ dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \
	s3c6410-smdk6410.dtb		s3c6410-smdk6410.dtb
	dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \		dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \
	r7s72100-genmai.dtb \		r7s72100-genmai.dtb \
	r7s72100-genmai-reference.dtb \
	r8a7740-armadillo800eva.dtb \		r8a7740-armadillo800eva.dtb \
	r8a7778-bockw.dtb \		r8a7778-bockw.dtb \
	r8a7778-bockw-reference.dtb \		r8a7778-bockw-reference.dtb \
	@@ -314,7 +313,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \
	r8a73a4-ape6evm-reference.dtb \		r8a73a4-ape6evm-reference.dtb \
	sh7372-mackerel.dtb		sh7372-mackerel.dtb
	dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \		dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
	r7s72100-genmai-reference.dtb \		r7s72100-genmai.dtb \
	r8a7791-koelsch.dtb \		r8a7791-koelsch.dtb \
	r8a7790-lager.dtb		r8a7790-lager.dtb
	dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \		dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \

deleted100644 → 0

+0 −59

Original line number	Original line	Diff line number	Diff line
	/*
	* Device Tree Source for the Genmai board
	*
	* Copyright (C) 2013-14 Renesas Solutions Corp.
	* Copyright (C) 2014 Wolfram Sang, Sang Engineering <wsa@sang-engineering.com>
	*
	* This file is licensed under the terms of the GNU General Public License
	* version 2. This program is licensed "as is" without any warranty of any
	* kind, whether express or implied.
	*/

	/dts-v1/;
	#include "r7s72100.dtsi"

	/ {
	model = "Genmai";
	compatible = "renesas,genmai-reference", "renesas,r7s72100";

	aliases {
	serial2 = &scif2;
	};

	chosen {
	bootargs = "console=ttySC2,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";
	};

	memory {
	device_type = "memory";
	reg = <0x08000000 0x08000000>;
	};

	lbsc {
	#address-cells = <1>;
	#size-cells = <1>;
	};
	};

	&extal_clk {
	clock-frequency = <13330000>;
	};

	&usb_x1_clk {
	clock-frequency = <48000000>;
	};

	&i2c2 {
	status = "okay";
	clock-frequency = <400000>;

	eeprom@50 {
	compatible = "renesas,24c128";
	reg = <0x50>;
	pagesize = <64>;
	};
	};

	&scif2 {
	status = "okay";
	};

+29 −1

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* Device Tree Source for the Genmai board		* Device Tree Source for the Genmai board
	*		*
	* Copyright (C) 2013 Renesas Solutions Corp.		* Copyright (C) 2013-14 Renesas Solutions Corp.
			* Copyright (C) 2014 Wolfram Sang, Sang Engineering <wsa@sang-engineering.com>
	*		*
	* This file is licensed under the terms of the GNU General Public License		* This file is licensed under the terms of the GNU General Public License
	* version 2. This program is licensed "as is" without any warranty of any		* version 2. This program is licensed "as is" without any warranty of any
	@@ -15,6 +16,10 @@
	model = "Genmai";		model = "Genmai";
	compatible = "renesas,genmai", "renesas,r7s72100";		compatible = "renesas,genmai", "renesas,r7s72100";

			aliases {
			serial2 = &scif2;
			};

	chosen {		chosen {
	bootargs = "console=ttySC2,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";		bootargs = "console=ttySC2,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";
	};		};
	@@ -29,3 +34,26 @@
	#size-cells = <1>;		#size-cells = <1>;
	};		};
	};		};

			&extal_clk {
			clock-frequency = <13330000>;
			};

			&usb_x1_clk {
			clock-frequency = <48000000>;
			};

			&i2c2 {
			status = "okay";
			clock-frequency = <400000>;

			eeprom@50 {
			compatible = "renesas,24c128";
			reg = <0x50>;
			pagesize = <64>;
			};
			};

			&scif2 {
			status = "okay";
			};

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -240,17 +240,6 @@ config MACH_GENMAI
	depends on ARCH_R7S72100		depends on ARCH_R7S72100
	select USE_OF		select USE_OF

	config MACH_GENMAI_REFERENCE
	bool "Genmai board - Reference Device Tree Implementation"
	depends on ARCH_R7S72100
	select USE_OF
	---help---
	Use reference implementation of Genmai board support
	which makes use of device tree at the expense
	of not supporting a number of devices.

	This is intended to aid developers

	config MACH_MARZEN		config MACH_MARZEN
	bool "MARZEN board"		bool "MARZEN board"
	depends on ARCH_R8A7779		depends on ARCH_R8A7779

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -67,7 +67,6 @@ obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o
	obj-$(CONFIG_MACH_BOCKW) += board-bockw.o		obj-$(CONFIG_MACH_BOCKW) += board-bockw.o
	obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o		obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o
	obj-$(CONFIG_MACH_GENMAI) += board-genmai.o		obj-$(CONFIG_MACH_GENMAI) += board-genmai.o
	obj-$(CONFIG_MACH_GENMAI_REFERENCE) += board-genmai-reference.o
	obj-$(CONFIG_MACH_MARZEN) += board-marzen.o		obj-$(CONFIG_MACH_MARZEN) += board-marzen.o
	obj-$(CONFIG_MACH_MARZEN_REFERENCE) += board-marzen-reference.o		obj-$(CONFIG_MACH_MARZEN_REFERENCE) += board-marzen-reference.o
	obj-$(CONFIG_MACH_LAGER) += board-lager.o		obj-$(CONFIG_MACH_LAGER) += board-lager.o