From c94a4ab7af3f07424e3db0c77f6b532d0a7202de Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Thu, 15 Nov 2012 13:02:16 +0000 Subject: ARM: ux500: Disable the MMCI gpio-regulator by default Not all supported boards will require a MMCI gpio-regulator, therefore it's a good idea to only enable the node when and if it is required. Let's disable it by default. Acked-by: Linus Walleij Signed-off-by: Lee Jones --- arch/arm/boot/dts/dbx5x0.dtsi | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/arm') diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi index 7ce45fc461f..d8ba489e32c 100644 --- a/arch/arm/boot/dts/dbx5x0.dtsi +++ b/arch/arm/boot/dts/dbx5x0.dtsi @@ -642,6 +642,8 @@ gpio-enable = <&tc3589x_gpio 17 0x4>; states = <1800000 0x1 2900000 0x0>; + + status = "disabled"; }; }; }; -- cgit v1.2.3-70-g09d2 From 8ad49c65f551c15af3f1049d10ccbdcd376a295d Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Thu, 15 Nov 2012 13:07:02 +0000 Subject: ARM: ux500: Move board specific GPIO info out to subordinate DTS files GPIO numbers for the newly created gpio-regulator will differ from board to board. Therefore it's not sensible to leave this information in the top level DTSI file. Let's move them out to the DTS files where they can correctly vary. Acked-by: Linus Walleij Signed-off-by: Lee Jones --- arch/arm/boot/dts/dbx5x0.dtsi | 2 -- arch/arm/boot/dts/hrefprev60.dts | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'arch/arm') diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi index d8ba489e32c..9f553630242 100644 --- a/arch/arm/boot/dts/dbx5x0.dtsi +++ b/arch/arm/boot/dts/dbx5x0.dtsi @@ -638,8 +638,6 @@ regulator-name = "mmci-reg"; regulator-type = "voltage"; - gpios = <&tc3589x_gpio 18 0x4>; - gpio-enable = <&tc3589x_gpio 17 0x4>; states = <1800000 0x1 2900000 0x0>; diff --git a/arch/arm/boot/dts/hrefprev60.dts b/arch/arm/boot/dts/hrefprev60.dts index b398946fd64..eec29c4a86d 100644 --- a/arch/arm/boot/dts/hrefprev60.dts +++ b/arch/arm/boot/dts/hrefprev60.dts @@ -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"; + }; }; }; -- cgit v1.2.3-70-g09d2 From 065871f152298b5fd385990b799cdbd7dc4121bd Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Fri, 14 Sep 2012 16:16:55 +0100 Subject: ARM: ux500: Stop registering the PCM driver from platform code We now initialise the PCM driver through the MSP DAI, so there is no need to register it though platform code anymore. This patch strips out all PCM platform registration. Acked-by: Linus Walleij Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500-audio.c | 16 ---------------- arch/arm/mach-ux500/board-mop500.h | 2 -- 2 files changed, 18 deletions(-) (limited to 'arch/arm') diff --git a/arch/arm/mach-ux500/board-mop500-audio.c b/arch/arm/mach-ux500/board-mop500-audio.c index 070629a9562..7adbed5df8a 100644 --- a/arch/arm/mach-ux500/board-mop500-audio.c +++ b/arch/arm/mach-ux500/board-mop500-audio.c @@ -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); -} diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h index d77208232cb..eaa605f5d90 100644 --- a/arch/arm/mach-ux500/board-mop500.h +++ b/arch/arm/mach-ux500/board-mop500.h @@ -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, -- cgit v1.2.3-70-g09d2 From d3fed7bd60eb4a45afe43c6e8dfc592a30e7e33f Mon Sep 17 00:00:00 2001 From: Fabio Baltieri Date: Mon, 26 Nov 2012 11:34:30 +0100 Subject: ARM: dts: add missing ux500 device trees This adds hrefprev60, hrefv60plus and ccu9540 to device trees compiled during build. Acked-by: Linus Walleij Acked-by: Lee Jones Signed-off-by: Fabio Baltieri --- arch/arm/boot/dts/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'arch/arm') diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index f37cf9fa5fa..01433b911a2 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -74,7 +74,10 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ am335x-evm.dtb \ am335x-bone.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 -- cgit v1.2.3-70-g09d2 From e13316d60658aee7987b51025f342649baa33487 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Thu, 22 Nov 2012 16:20:02 +0000 Subject: ARM: ux500: Rename dbx500 cpufreq code to be more generic The cpufreq driver doesn't only handle the db8500 anymore. There are new variants which rely on it too, so we've renamed the driver to be more generic. Acked-by: Linus Walleij Signed-off-by: Lee Jones --- arch/arm/mach-ux500/cpu-db8500.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/arm') diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index d2076ce22e9..4c6ce012dae 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -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; -- cgit v1.2.3-70-g09d2