Commit d925ef43 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 86727c62 b6f5f4a5

arch/arm/boot/dts/dbx5x0.dtsi

+5 −0
Original line number Original line Diff line number Diff line
@@ -326,6 +326,11 @@ 
				interrupt-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

				#interrupt-cells = <2>;





				ab8500_gpio: ab8500-gpio {

					gpio-controller;

					#gpio-cells = <2>;

				};



				ab8500-rtc {

				ab8500-rtc {

					compatible = "stericsson,ab8500-rtc";

					compatible = "stericsson,ab8500-rtc";

					interrupts = <17 0x4

					interrupts = <17 0x4

arch/arm/boot/dts/snowball.dts

+7 −6
Original line number Original line Diff line number Diff line
@@ -25,7 +25,8 @@ 
		regulator-name = "en-3v3-fixed-supply";

		regulator-name = "en-3v3-fixed-supply";

		regulator-min-microvolt = <3300000>;

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

                gpios = <&gpio0 26  0x4>; // 26

		/* AB8500 GPIOs start from 1 - offset 25 is GPIO26. */

		gpio = <&ab8500_gpio 25 0x4>;

		startup-delay-us = <5000>;

		startup-delay-us = <5000>;

		enable-active-high;

		enable-active-high;

	};

	};

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

+0 −11
Original line number Original line Diff line number Diff line
@@ -413,15 +413,6 @@ static void mop500_prox_deactivate(struct device *dev) 
	regulator_put(prox_regulator);

	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 = {

static struct cryp_platform_data u8500_cryp1_platform_data = {

		.mem_to_engine = {

		.mem_to_engine = {

				.dir = DMA_MEM_TO_DEV,

				.dir = DMA_MEM_TO_DEV,
@@ -635,8 +626,6 @@ static void __init snowball_init_machine(void) 
	mop500_audio_init(parent);

	mop500_audio_init(parent);

	mop500_uart_init(parent);

	mop500_uart_init(parent);





	mop500_snowball_ethernet_clock_enable();



	u8500_cryp1_hash1_init(parent);

	u8500_cryp1_hash1_init(parent);





	/* This board has full regulator constraints */

	/* This board has full regulator constraints */

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -105,7 +105,6 @@ void __init mop500_pinmaps_init(void); 
void __init snowball_pinmaps_init(void);

void __init snowball_pinmaps_init(void);

void __init hrefv60_pinmaps_init(void);

void __init hrefv60_pinmaps_init(void);

void mop500_audio_init(struct device *parent);

void mop500_audio_init(struct device *parent);

void mop500_snowball_ethernet_clock_enable(void);





int __init mop500_uib_init(void);

int __init mop500_uib_init(void);

void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info,

void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info,

arch/arm/mach-ux500/cpu-db8500.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -279,7 +279,6 @@ static void __init u8500_init_machine(void) 
		mop500_pinmaps_init();

		mop500_pinmaps_init();

	else if (of_machine_is_compatible("calaosystems,snowball-a9500")) {

	else if (of_machine_is_compatible("calaosystems,snowball-a9500")) {

		snowball_pinmaps_init();

		snowball_pinmaps_init();

		mop500_snowball_ethernet_clock_enable();

	} else if (of_machine_is_compatible("st-ericsson,hrefv60+"))

	} else if (of_machine_is_compatible("st-ericsson,hrefv60+"))

		hrefv60_pinmaps_init();

		hrefv60_pinmaps_init();

	else if (of_machine_is_compatible("st-ericsson,ccu9540")) {}

	else if (of_machine_is_compatible("st-ericsson,ccu9540")) {}

CRA Git | Maintained and supported by SUSTech CRA and CCSE