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

Commit 64507dd7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'ste-dt-for-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into next/dt 

From Lee Jones <lee.jones@linaro.org>:

* 'ste-dt-for-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500

:
  ARM: ux500: Rename dbx500 cpufreq code to be more generic
  ARM: dts: add missing ux500 device trees
  ARM: ux500: Stop registering the PCM driver from platform code
  ARM: ux500: Move board specific GPIO info out to subordinate DTS files
  ARM: ux500: Disable the MMCI gpio-regulator by default

This follows up on the previous ux500 DT changes. Most importantly, it
resolves a build error in the dts files that was the result of referring
to a board specific device node from the common dtsi file.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 61da823a e13316d6

arch/arm/boot/dts/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -94,7 +94,10 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
	am335x-bone.dtb

dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb

dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb

dtb-$(CONFIG_ARCH_U8500) += snowball.dtb

dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \

	hrefprev60.dtb \

	hrefv60plus.dtb \

	ccu9540.dtb

dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \

	r8a7740-armadillo800eva.dtb \

	sh73a0-kzm9g.dtb

arch/arm/boot/dts/dbx5x0.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -638,10 +638,10 @@ 
			regulator-name = "mmci-reg";

			regulator-type = "voltage";



			gpios = <&tc3589x_gpio 18 0x4>;

			gpio-enable = <&tc3589x_gpio 17 0x4>;

			states = <1800000 0x1

				  2900000 0x0>;



			status = "disabled";

		};

	};

};

arch/arm/boot/dts/hrefprev60.dts

+7 −0
Original line number Diff line number Diff line
@@ -37,5 +37,12 @@ 
				reset-gpio = <&tc3589x_gpio 13 0x4>;

			};

		};



		vmmci: regulator-gpio {

			gpios = <&tc3589x_gpio 18 0x4>;

			gpio-enable = <&tc3589x_gpio 17 0x4>;



			status = "okay";

		};

	};

};

arch/arm/mach-ux500/board-mop500-audio.c

+0 −16
Original line number Diff line number Diff line
@@ -150,15 +150,6 @@ static struct platform_device snd_soc_mop500 = { 
	},

};



/* Platform device for Ux500-PCM */

static struct platform_device ux500_pcm = {

		.name = "ux500-pcm",

		.id = 0,

		.dev = {

			.platform_data = NULL,

		},

};



struct msp_i2s_platform_data msp2_platform_data = {

	.id = MSP_I2S_2,

	.msp_i2s_dma_rx = &msp2_dma_rx,
@@ -186,10 +177,3 @@ void mop500_audio_init(struct device *parent) 
	db8500_add_msp_i2s(parent, 3, U8500_MSP3_BASE, IRQ_DB8500_MSP1,

			   &msp3_platform_data);

}
 


/* Due for removal once the MSP driver has been fully DT:ed. */

void mop500_of_audio_init(struct device *parent)

{

	pr_info("%s: Register platform-device 'ux500-pcm'\n", __func__);

	platform_device_register(&ux500_pcm);

}

arch/arm/mach-ux500/board-mop500.h

+0 −2
Original line number Diff line number Diff line
@@ -104,8 +104,6 @@ void __init mop500_pinmaps_init(void); 
void __init snowball_pinmaps_init(void);

void __init hrefv60_pinmaps_init(void);

void mop500_audio_init(struct device *parent);

/* Due for removal once the MSP driver has been fully DT:ed. */

void mop500_of_audio_init(struct device *parent);



int __init mop500_uib_init(void);

void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info,