Commit 7d1206bc authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'kirkwood/dt' into next/dt2 



This was part of the for-next branch earlier but for some reasons
a rebuild of the tree missed it, so I'm putting it back in now.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f4eb2834 c899445f

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -1579,6 +1579,7 @@ config ARCH_NR_GPIO 
	int

	default 1024 if ARCH_SHMOBILE || ARCH_TEGRA

	default 350 if ARCH_U8500

	default 264 if MACH_H4700

	default 0

	help

	  Maximum number of GPIOs in the system.

arch/arm/boot/dts/kirkwood-dreamplug.dts

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/dts-v1/;



/include/ "kirkwood.dtsi"



/ {

	model = "Globalscale Technologies Dreamplug";

	compatible = "globalscale,dreamplug-003-ds2001", "globalscale,dreamplug", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";



	memory {

		device_type = "memory";

		reg = <0x00000000 0x20000000>;

	};



	chosen {

		bootargs = "console=ttyS0,115200n8 earlyprintk";

	};



	ocp@f1000000 {

		serial@12000 {

			clock-frequency = <200000000>;

			status = "ok";

		};

	};

};

arch/arm/boot/dts/kirkwood.dtsi

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/include/ "skeleton.dtsi"



/ {

	compatible = "mrvl,kirkwood";



	ocp@f1000000 {

		compatible = "simple-bus";

		ranges = <0 0xf1000000 0x1000000>;

		#address-cells = <1>;

		#size-cells = <1>;



		serial@12000 {

			compatible = "ns16550a";

			reg = <0x12000 0x100>;

			reg-shift = <2>;

			interrupts = <33>;

			/* set clock-frequency in board dts */

			status = "disabled";

		};



		serial@12100 {

			compatible = "ns16550a";

			reg = <0x12100 0x100>;

			reg-shift = <2>;

			interrupts = <34>;

			/* set clock-frequency in board dts */

			status = "disabled";

		};



		rtc@10300 {

			compatible = "mrvl,kirkwood-rtc", "mrvl,orion-rtc";

			reg = <0x10300 0x20>;

			interrupts = <53>;

		};

	};

};

arch/arm/boot/dts/tegra-paz00.dts

+26 −0
Original line number Diff line number Diff line
@@ -42,6 +42,11 @@ 


	i2c@7000d000 {

		clock-frequency = <400000>;



		adt7461@4c {

			compatible = "adi,adt7461";

			reg = <0x4c>;

		};

	};



	i2s@70002a00 {
@@ -105,4 +110,25 @@ 
	sdhci@c8000600 {

		support-8bit;

	};



	gpio-keys {

		compatible = "gpio-keys";



		power {

			label = "Power";

			gpios = <&gpio 79 1>; /* gpio PJ7, active low */

			linux,code = <116>; /* KEY_POWER */

			gpio-key,wakeup;

		};

	};



	gpio-leds {

		compatible = "gpio-leds";



		wifi {

			label = "wifi-led";

			gpios = <&gpio 24 0>;

			linux,default-trigger = "rfkill0";

		};

	};

};

arch/arm/mach-exynos/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -183,7 +183,9 @@ config MACH_SMDKV310 
	select S5P_DEV_FIMC1

	select S5P_DEV_FIMC2

	select S5P_DEV_FIMC3

	select S5P_DEV_G2D

	select S5P_DEV_I2C_HDMIPHY

	select S5P_DEV_JPEG

	select S5P_DEV_MFC

	select S5P_DEV_TV

	select S5P_DEV_USB_EHCI
@@ -230,7 +232,9 @@ config MACH_UNIVERSAL_C210 
	select S5P_DEV_FIMC1

	select S5P_DEV_FIMC2

	select S5P_DEV_FIMC3

	select S5P_DEV_G2D

	select S5P_DEV_CSIS0

	select S5P_DEV_JPEG

	select S5P_DEV_FIMD0

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC2
@@ -268,11 +272,14 @@ config MACH_NURI 
	select S3C_DEV_I2C1

	select S3C_DEV_I2C3

	select S3C_DEV_I2C5

	select S3C_DEV_I2C6

	select S5P_DEV_CSIS0

	select S5P_DEV_JPEG

	select S5P_DEV_FIMC0

	select S5P_DEV_FIMC1

	select S5P_DEV_FIMC2

	select S5P_DEV_FIMC3

	select S5P_DEV_G2D

	select S5P_DEV_MFC

	select S5P_DEV_USB_EHCI

	select S5P_SETUP_MIPIPHY
@@ -283,6 +290,7 @@ config MACH_NURI 
	select EXYNOS4_SETUP_I2C1

	select EXYNOS4_SETUP_I2C3

	select EXYNOS4_SETUP_I2C5

	select EXYNOS4_SETUP_I2C6

	select EXYNOS4_SETUP_SDHCI

	select EXYNOS4_SETUP_USB_PHY

	select S5P_SETUP_MIPIPHY
@@ -303,7 +311,9 @@ config MACH_ORIGEN 
	select S5P_DEV_FIMC2

	select S5P_DEV_FIMC3

	select S5P_DEV_FIMD0

	select S5P_DEV_G2D

	select S5P_DEV_I2C_HDMIPHY

	select S5P_DEV_JPEG

	select S5P_DEV_MFC

	select S5P_DEV_TV

	select S5P_DEV_USB_EHCI

CRA Git | Maintained and supported by SUSTech CRA and CCSE