openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2012-11-27 13:24:45 +01:00
parent 61da823ab9 e13316d606
commit 64507dd702
6 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/boot/dts/Makefile
View File

@ -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

4
arch/arm/boot/dts/dbx5x0.dtsi
View File

@ -638,10 +638,10 @@ vmmci: regulator-gpio {
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";
};
};
};

7
arch/arm/boot/dts/hrefprev60.dts
View File

@ -37,5 +37,12 @@ bu21013_tp@0x5c {
reset-gpio = <&tc3589x_gpio 13 0x4>;
};
};
vmmci: regulator-gpio {
gpios = <&tc3589x_gpio 18 0x4>;
gpio-enable = <&tc3589x_gpio 17 0x4>;
status = "okay";
};
};
};

16
arch/arm/mach-ux500/board-mop500-audio.c
View File

@ -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);
}

2
arch/arm/mach-ux500/board-mop500.h
View File

@ -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,

4
arch/arm/mach-ux500/cpu-db8500.c
View File

@ -222,7 +222,7 @@ struct device * __init u8500_init_devices(struct ab8500_platform_data *ab8500)
db8500_add_usb(parent, usb_db8500_rx_dma_cfg, usb_db8500_tx_dma_cfg);
platform_device_register_data(parent,
"cpufreq-u8500", -1, NULL, 0);
"cpufreq-ux500", -1, NULL, 0);
for (i = 0; i < ARRAY_SIZE(platform_devs); i++)
platform_devs[i]->dev.parent = parent;
@ -244,7 +244,7 @@ static struct device * __init u8500_of_init_devices(void)
db8500_add_usb(parent, usb_db8500_rx_dma_cfg, usb_db8500_tx_dma_cfg);
platform_device_register_data(parent,
"cpufreq-u8500", -1, NULL, 0);
"cpufreq-ux500", -1, NULL, 0);
u8500_dma40_device.dev.parent = parent;