mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
Merge branch 'ux500/cleanup' into next/drivers
Patches from Lee Jones: This gets rid of mop500_snowball_ethernet_clock_enable() which is no longer in use. It also straightens out a bug which ensures the SMSC911x's regulator is turned on at start-up when using Device Tree. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
d925ef4386
5 changed files with 12 additions and 19 deletions
|
@ -326,6 +326,11 @@ ab8500 {
|
|||
interrupt-controller;
|
||||
#interrupt-cells = <2>;
|
||||
|
||||
ab8500_gpio: ab8500-gpio {
|
||||
gpio-controller;
|
||||
#gpio-cells = <2>;
|
||||
};
|
||||
|
||||
ab8500-rtc {
|
||||
compatible = "stericsson,ab8500-rtc";
|
||||
interrupts = <17 0x4
|
||||
|
|
|
@ -22,12 +22,13 @@ memory {
|
|||
|
||||
en_3v3_reg: en_3v3 {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "en-3v3-fixed-supply";
|
||||
regulator-min-microvolt = <3300000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
gpios = <&gpio0 26 0x4>; // 26
|
||||
startup-delay-us = <5000>;
|
||||
enable-active-high;
|
||||
regulator-name = "en-3v3-fixed-supply";
|
||||
regulator-min-microvolt = <3300000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
/* AB8500 GPIOs start from 1 - offset 25 is GPIO26. */
|
||||
gpio = <&ab8500_gpio 25 0x4>;
|
||||
startup-delay-us = <5000>;
|
||||
enable-active-high;
|
||||
};
|
||||
|
||||
gpio_keys {
|
||||
|
|
|
@ -413,15 +413,6 @@ static void mop500_prox_deactivate(struct device *dev)
|
|||
regulator_put(prox_regulator);
|
||||
}
|
||||
|
||||
void mop500_snowball_ethernet_clock_enable(void)
|
||||
{
|
||||
struct clk *clk;
|
||||
|
||||
clk = clk_get_sys("fsmc", NULL);
|
||||
if (!IS_ERR(clk))
|
||||
clk_prepare_enable(clk);
|
||||
}
|
||||
|
||||
static struct cryp_platform_data u8500_cryp1_platform_data = {
|
||||
.mem_to_engine = {
|
||||
.dir = DMA_MEM_TO_DEV,
|
||||
|
@ -635,8 +626,6 @@ static void __init snowball_init_machine(void)
|
|||
mop500_audio_init(parent);
|
||||
mop500_uart_init(parent);
|
||||
|
||||
mop500_snowball_ethernet_clock_enable();
|
||||
|
||||
u8500_cryp1_hash1_init(parent);
|
||||
|
||||
/* This board has full regulator constraints */
|
||||
|
|
|
@ -105,7 +105,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);
|
||||
void mop500_snowball_ethernet_clock_enable(void);
|
||||
|
||||
int __init mop500_uib_init(void);
|
||||
void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info,
|
||||
|
|
|
@ -279,7 +279,6 @@ static void __init u8500_init_machine(void)
|
|||
mop500_pinmaps_init();
|
||||
else if (of_machine_is_compatible("calaosystems,snowball-a9500")) {
|
||||
snowball_pinmaps_init();
|
||||
mop500_snowball_ethernet_clock_enable();
|
||||
} else if (of_machine_is_compatible("st-ericsson,hrefv60+"))
|
||||
hrefv60_pinmaps_init();
|
||||
else if (of_machine_is_compatible("st-ericsson,ccu9540")) {}
|
||||
|
|
Loading…
Reference in a new issue