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

Commit 58a9e8f8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'davinci-for-v3.19/cleanup' of... 

Merge tag 'davinci-for-v3.19/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/cleanup

Pull "DaVinci updates for v3.19 - cleanups" from Sekhar Nori:

Fix some non-standard logging styles and remove
some unnecessary typecasting.

* tag 'davinci-for-v3.19/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci

:
  ARM: davinci: Remove redundant casts
  ARM: davinci: Use standard logging styles

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2c0b50fc 14f6aeb4

arch/arm/mach-davinci/board-da830-evm.c

+37 −52
Original line number Diff line number Diff line
@@ -80,8 +80,8 @@ static int da830_evm_usb_ocic_notify(da8xx_ocic_handler_t handler) 
				    IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,

				    "OHCI over-current indicator", NULL);

		if (error)

			printk(KERN_ERR "%s: could not request IRQ to watch "

			       "over-current indicator changes\n", __func__);

			pr_err("%s: could not request IRQ to watch over-current indicator changes\n",

			       __func__);

	} else

		free_irq(irq, NULL);
@@ -145,8 +145,7 @@ static __init void da830_evm_usb_init(void) 
	/* USB_REFCLKIN is not used. */

	ret = davinci_cfg_reg(DA830_USB0_DRVVBUS);

	if (ret)

		pr_warning("%s: USB 2.0 PinMux setup failed: %d\n",

			   __func__, ret);

		pr_warn("%s: USB 2.0 PinMux setup failed: %d\n", __func__, ret);

	else {

		/*

		 * TPS2065 switch @ 5V supplies 1 A (sustains 1.5 A),
@@ -154,37 +153,35 @@ static __init void da830_evm_usb_init(void) 
		 */

		ret = da8xx_register_usb20(1000, 3);

		if (ret)

			pr_warning("%s: USB 2.0 registration failed: %d\n",

			pr_warn("%s: USB 2.0 registration failed: %d\n",

				__func__, ret);

	}



	ret = davinci_cfg_reg_list(da830_evm_usb11_pins);

	if (ret) {

		pr_warning("%s: USB 1.1 PinMux setup failed: %d\n",

			   __func__, ret);

		pr_warn("%s: USB 1.1 PinMux setup failed: %d\n", __func__, ret);

		return;

	}



	ret = gpio_request(ON_BD_USB_DRV, "ON_BD_USB_DRV");

	if (ret) {

		printk(KERN_ERR "%s: failed to request GPIO for USB 1.1 port "

		       "power control: %d\n", __func__, ret);

		pr_err("%s: failed to request GPIO for USB 1.1 port power control: %d\n",

		       __func__, ret);

		return;

	}

	gpio_direction_output(ON_BD_USB_DRV, 0);



	ret = gpio_request(ON_BD_USB_OVC, "ON_BD_USB_OVC");

	if (ret) {

		printk(KERN_ERR "%s: failed to request GPIO for USB 1.1 port "

		       "over-current indicator: %d\n", __func__, ret);

		pr_err("%s: failed to request GPIO for USB 1.1 port over-current indicator: %d\n",

		       __func__, ret);

		return;

	}

	gpio_direction_input(ON_BD_USB_OVC);



	ret = da8xx_register_usb11(&da830_evm_usb11_pdata);

	if (ret)

		pr_warning("%s: USB 1.1 registration failed: %d\n",

			   __func__, ret);

		pr_warn("%s: USB 1.1 registration failed: %d\n", __func__, ret);

}



static const short da830_evm_mcasp1_pins[] = {
@@ -252,31 +249,29 @@ static inline void da830_evm_init_mmc(void) 


	ret = davinci_cfg_reg_list(da830_evm_mmc_sd_pins);

	if (ret) {

		pr_warning("da830_evm_init: mmc/sd mux setup failed: %d\n",

				ret);

		pr_warn("%s: mmc/sd mux setup failed: %d\n", __func__, ret);

		return;

	}



	ret = gpio_request(DA830_MMCSD_WP_PIN, "MMC WP");

	if (ret) {

		pr_warning("da830_evm_init: can not open GPIO %d\n",

			   DA830_MMCSD_WP_PIN);

		pr_warn("%s: can not open GPIO %d\n",

			__func__, DA830_MMCSD_WP_PIN);

		return;

	}

	gpio_direction_input(DA830_MMCSD_WP_PIN);



	ret = gpio_request(DA830_MMCSD_CD_PIN, "MMC CD\n");

	if (ret) {

		pr_warning("da830_evm_init: can not open GPIO %d\n",

			   DA830_MMCSD_CD_PIN);

		pr_warn("%s: can not open GPIO %d\n",

			__func__, DA830_MMCSD_CD_PIN);

		return;

	}

	gpio_direction_input(DA830_MMCSD_CD_PIN);



	ret = da8xx_register_mmcsd0(&da830_evm_mmc_config);

	if (ret) {

		pr_warning("da830_evm_init: mmc/sd registration failed: %d\n",

				ret);

		pr_warn("%s: mmc/sd registration failed: %d\n", __func__, ret);

		gpio_free(DA830_MMCSD_WP_PIN);

	}

}
@@ -404,23 +399,21 @@ static inline void da830_evm_init_nand(int mux_mode) 
	int ret;



	if (HAS_MMC) {

		pr_warning("WARNING: both MMC/SD and NAND are "

				"enabled, but they share AEMIF pins.\n"

				"\tDisable MMC/SD for NAND support.\n");

		pr_warn("WARNING: both MMC/SD and NAND are enabled, but they share AEMIF pins\n"

			"\tDisable MMC/SD for NAND support\n");

		return;

	}



	ret = davinci_cfg_reg_list(da830_evm_emif25_pins);

	if (ret)

		pr_warning("da830_evm_init: emif25 mux setup failed: %d\n",

				ret);

		pr_warn("%s: emif25 mux setup failed: %d\n", __func__, ret);



	ret = platform_device_register(&da830_evm_nand_device);

	if (ret)

		pr_warning("da830_evm_init: NAND device not registered.\n");

		pr_warn("%s: NAND device not registered\n", __func__);



	if (davinci_aemif_setup(&da830_evm_nand_device))

		pr_warn("%s: Cannot configure AEMIF.\n", __func__);

		pr_warn("%s: Cannot configure AEMIF\n", __func__);



	gpio_direction_output(mux_mode, 1);

}
@@ -435,12 +428,11 @@ static inline void da830_evm_init_lcdc(int mux_mode) 


	ret = davinci_cfg_reg_list(da830_lcdcntl_pins);

	if (ret)

		pr_warning("da830_evm_init: lcdcntl mux setup failed: %d\n",

				ret);

		pr_warn("%s: lcdcntl mux setup failed: %d\n", __func__, ret);



	ret = da8xx_register_lcdc(&sharp_lcd035q3dg01_pdata);

	if (ret)

		pr_warning("da830_evm_init: lcd setup failed: %d\n", ret);

		pr_warn("%s: lcd setup failed: %d\n", __func__, ret);



	gpio_direction_output(mux_mode, 0);

}
@@ -598,22 +590,19 @@ static __init void da830_evm_init(void) 


	ret = da830_register_gpio();

	if (ret)

		pr_warn("da830_evm_init: GPIO init failed: %d\n", ret);

		pr_warn("%s: GPIO init failed: %d\n", __func__, ret);



	ret = da830_register_edma(da830_edma_rsv);

	if (ret)

		pr_warning("da830_evm_init: edma registration failed: %d\n",

				ret);

		pr_warn("%s: edma registration failed: %d\n", __func__, ret);



	ret = davinci_cfg_reg_list(da830_i2c0_pins);

	if (ret)

		pr_warning("da830_evm_init: i2c0 mux setup failed: %d\n",

				ret);

		pr_warn("%s: i2c0 mux setup failed: %d\n", __func__, ret);



	ret = da8xx_register_i2c(0, &da830_evm_i2c_0_pdata);

	if (ret)

		pr_warning("da830_evm_init: i2c0 registration failed: %d\n",

				ret);

		pr_warn("%s: i2c0 registration failed: %d\n", __func__, ret);



	da830_evm_usb_init();
@@ -622,18 +611,16 @@ static __init void da830_evm_init(void) 


	ret = davinci_cfg_reg_list(da830_cpgmac_pins);

	if (ret)

		pr_warning("da830_evm_init: cpgmac mux setup failed: %d\n",

				ret);

		pr_warn("%s: cpgmac mux setup failed: %d\n", __func__, ret);



	ret = da8xx_register_emac();

	if (ret)

		pr_warning("da830_evm_init: emac registration failed: %d\n",

				ret);

		pr_warn("%s: emac registration failed: %d\n", __func__, ret);



	ret = da8xx_register_watchdog();

	if (ret)

		pr_warning("da830_evm_init: watchdog registration failed: %d\n",

				ret);

		pr_warn("%s: watchdog registration failed: %d\n",

			__func__, ret);



	davinci_serial_init(da8xx_serial_device);

	i2c_register_board_info(1, da830_evm_i2c_devices,
@@ -641,8 +628,7 @@ static __init void da830_evm_init(void) 


	ret = davinci_cfg_reg_list(da830_evm_mcasp1_pins);

	if (ret)

		pr_warning("da830_evm_init: mcasp1 mux setup failed: %d\n",

				ret);

		pr_warn("%s: mcasp1 mux setup failed: %d\n", __func__, ret);



	da8xx_register_mcasp(1, &da830_evm_snd_data);
@@ -650,18 +636,17 @@ static __init void da830_evm_init(void) 


	ret = da8xx_register_rtc();

	if (ret)

		pr_warning("da830_evm_init: rtc setup failed: %d\n", ret);

		pr_warn("%s: rtc setup failed: %d\n", __func__, ret);



	ret = spi_register_board_info(da830evm_spi_info,

				      ARRAY_SIZE(da830evm_spi_info));

	if (ret)

		pr_warn("%s: spi info registration failed: %d\n", __func__,

			ret);

		pr_warn("%s: spi info registration failed: %d\n",

			__func__, ret);



	ret = da8xx_register_spi_bus(0, ARRAY_SIZE(da830evm_spi_info));

	if (ret)

		pr_warning("da830_evm_init: spi 0 registration failed: %d\n",

			   ret);

		pr_warn("%s: spi 0 registration failed: %d\n", __func__, ret);

}



#ifdef CONFIG_SERIAL_8250_CONSOLE

arch/arm/mach-davinci/board-da850-evm.c

+3 −6
Original line number Diff line number Diff line
@@ -452,8 +452,7 @@ static void da850_evm_ui_keys_init(unsigned gpio) 
	for (i = 0; i < DA850_N_UI_PB; i++) {

		button = &da850_evm_ui_keys[i];

		button->code = KEY_F8 - i;

		button->desc = (char *)

				da850_evm_ui_exp[DA850_EVM_UI_EXP_PB8 + i];

		button->desc = da850_evm_ui_exp[DA850_EVM_UI_EXP_PB8 + i];

		button->gpio = gpio + DA850_EVM_UI_EXP_PB8 + i;

	}

}
@@ -628,15 +627,13 @@ static void da850_evm_bb_keys_init(unsigned gpio) 
	struct gpio_keys_button *button;



	button = &da850_evm_bb_keys[0];

	button->desc = (char *)

		da850_evm_bb_exp[DA850_EVM_BB_EXP_USER_PB1];

	button->desc = da850_evm_bb_exp[DA850_EVM_BB_EXP_USER_PB1];

	button->gpio = gpio + DA850_EVM_BB_EXP_USER_PB1;



	for (i = 0; i < DA850_N_BB_USER_SW; i++) {

		button = &da850_evm_bb_keys[i + 1];

		button->code = SW_LID + i;

		button->desc = (char *)

				da850_evm_bb_exp[DA850_EVM_BB_EXP_USER_SW1 + i];

		button->desc = da850_evm_bb_exp[DA850_EVM_BB_EXP_USER_SW1 + i];

		button->gpio = gpio + DA850_EVM_BB_EXP_USER_SW1 + i;

	}

}

arch/arm/mach-davinci/board-dm644x-evm.c

+4 −6
Original line number Diff line number Diff line
@@ -767,9 +767,8 @@ static __init void davinci_evm_init(void) 


	if (HAS_ATA) {

		if (HAS_NAND || HAS_NOR)

			pr_warning("WARNING: both IDE and Flash are "

				"enabled, but they share AEMIF pins.\n"

				"\tDisable IDE for NAND/NOR support.\n");

			pr_warn("WARNING: both IDE and Flash are enabled, but they share AEMIF pins\n"

				"\tDisable IDE for NAND/NOR support\n");

		davinci_init_ide();

	} else if (HAS_NAND || HAS_NOR) {

		davinci_cfg_reg(DM644X_HPIEN_DISABLE);
@@ -780,13 +779,12 @@ static __init void davinci_evm_init(void) 
			platform_device_register(&davinci_evm_nandflash_device);



			if (davinci_aemif_setup(&davinci_evm_nandflash_device))

				pr_warn("%s: Cannot configure AEMIF.\n",

				pr_warn("%s: Cannot configure AEMIF\n",

					__func__);



			evm_leds[7].default_trigger = "nand-disk";

			if (HAS_NOR)

				pr_warning("WARNING: both NAND and NOR flash "

					"are enabled; disable one of them.\n");

				pr_warn("WARNING: both NAND and NOR flash are enabled; disable one of them.\n");

		} else if (HAS_NOR)

			platform_device_register(&davinci_evm_norflash_device);

	}

arch/arm/mach-davinci/board-mityomapl138.c

+22 −23
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 
 * any kind, whether express or implied.

 */



#define pr_fmt(fmt) "MityOMAPL138: " fmt



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/console.h>
@@ -107,7 +109,7 @@ static void mityomapl138_cpufreq_init(const char *partnum) 


	ret = da850_register_cpufreq("pll0_sysclk3");

	if (ret)

		pr_warning("cpufreq registration failed: %d\n", ret);

		pr_warn("cpufreq registration failed: %d\n", ret);

}

#else

static void mityomapl138_cpufreq_init(const char *partnum) { }
@@ -121,33 +123,31 @@ static void read_factory_config(struct memory_accessor *a, void *context) 


	ret = a->read(a, (char *)&factory_config, 0, sizeof(factory_config));

	if (ret != sizeof(struct factory_config)) {

		pr_warning("MityOMAPL138: Read Factory Config Failed: %d\n",

				ret);

		pr_warn("Read Factory Config Failed: %d\n", ret);

		goto bad_config;

	}



	if (factory_config.magic != FACTORY_CONFIG_MAGIC) {

		pr_warning("MityOMAPL138: Factory Config Magic Wrong (%X)\n",

		pr_warn("Factory Config Magic Wrong (%X)\n",

			factory_config.magic);

		goto bad_config;

	}



	if (factory_config.version != FACTORY_CONFIG_VERSION) {

		pr_warning("MityOMAPL138: Factory Config Version Wrong (%X)\n",

		pr_warn("Factory Config Version Wrong (%X)\n",

			factory_config.version);

		goto bad_config;

	}



	pr_info("MityOMAPL138: Found MAC = %pM\n", factory_config.mac);

	pr_info("Found MAC = %pM\n", factory_config.mac);

	if (is_valid_ether_addr(factory_config.mac))

		memcpy(soc_info->emac_pdata->mac_addr,

			factory_config.mac, ETH_ALEN);

	else

		pr_warning("MityOMAPL138: Invalid MAC found "

				"in factory config block\n");

		pr_warn("Invalid MAC found in factory config block\n");



	partnum = factory_config.partnum;

	pr_info("MityOMAPL138: Part Number = %s\n", partnum);

	pr_info("Part Number = %s\n", partnum);



bad_config:

	/* default maximum speed is valid for all platforms */
@@ -435,7 +435,7 @@ static void __init mityomapl138_setup_nand(void) 
				 ARRAY_SIZE(mityomapl138_devices));



	if (davinci_aemif_setup(&mityomapl138_nandflash_device))

		pr_warn("%s: Cannot configure AEMIF.\n", __func__);

		pr_warn("%s: Cannot configure AEMIF\n", __func__);

}



static const short mityomap_mii_pins[] = {
@@ -478,7 +478,7 @@ static void __init mityomapl138_config_emac(void) 
	}



	if (ret) {

		pr_warning("mii/rmii mux setup failed: %d\n", ret);

		pr_warn("mii/rmii mux setup failed: %d\n", ret);

		return;

	}
@@ -489,7 +489,7 @@ static void __init mityomapl138_config_emac(void) 


	ret = da8xx_register_emac();

	if (ret)

		pr_warning("emac registration failed: %d\n", ret);

		pr_warn("emac registration failed: %d\n", ret);

}



static struct davinci_pm_config da850_pm_pdata = {
@@ -511,21 +511,21 @@ static void __init mityomapl138_init(void) 
	/* for now, no special EDMA channels are reserved */

	ret = da850_register_edma(NULL);

	if (ret)

		pr_warning("edma registration failed: %d\n", ret);

		pr_warn("edma registration failed: %d\n", ret);



	ret = da8xx_register_watchdog();

	if (ret)

		pr_warning("watchdog registration failed: %d\n", ret);

		pr_warn("watchdog registration failed: %d\n", ret);



	davinci_serial_init(da8xx_serial_device);



	ret = da8xx_register_i2c(0, &mityomap_i2c_0_pdata);

	if (ret)

		pr_warning("i2c0 registration failed: %d\n", ret);

		pr_warn("i2c0 registration failed: %d\n", ret);



	ret = pmic_tps65023_init();

	if (ret)

		pr_warning("TPS65023 PMIC init failed: %d\n", ret);

		pr_warn("TPS65023 PMIC init failed: %d\n", ret);



	mityomapl138_setup_nand();
@@ -537,22 +537,21 @@ static void __init mityomapl138_init(void) 
	ret = da8xx_register_spi_bus(1,

				     ARRAY_SIZE(mityomapl138_spi_flash_info));

	if (ret)

		pr_warning("spi 1 registration failed: %d\n", ret);

		pr_warn("spi 1 registration failed: %d\n", ret);



	mityomapl138_config_emac();



	ret = da8xx_register_rtc();

	if (ret)

		pr_warning("rtc setup failed: %d\n", ret);

		pr_warn("rtc setup failed: %d\n", ret);



	ret = da8xx_register_cpuidle();

	if (ret)

		pr_warning("cpuidle registration failed: %d\n", ret);

		pr_warn("cpuidle registration failed: %d\n", ret);



	ret = da850_register_pm(&da850_pm_device);

	if (ret)

		pr_warning("da850_evm_init: suspend registration failed: %d\n",

				ret);

		pr_warn("suspend registration failed: %d\n", ret);

}



#ifdef CONFIG_SERIAL_8250_CONSOLE

arch/arm/mach-davinci/board-neuros-osd2.c

+2 −3
Original line number Diff line number Diff line
@@ -183,9 +183,8 @@ static __init void davinci_ntosd2_init(void) 


	if (HAS_ATA) {

		if (HAS_NAND)

			pr_warning("WARNING: both IDE and Flash are "

				"enabled, but they share AEMIF pins.\n"

				"\tDisable IDE for NAND/NOR support.\n");

			pr_warn("WARNING: both IDE and Flash are enabled, but they share AEMIF pins\n"

				"\tDisable IDE for NAND/NOR support\n");

		davinci_init_ide();

	} else if (HAS_NAND) {

		davinci_cfg_reg(DM644X_HPIEN_DISABLE);