* linux-next: manual merge of the moduleh tree
From: Stephen Rothwell @ 2011-10-04 6:57 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 289 bytes --]
Hi Paul,
I also dropped the following already applied patches:
wireless-ath6kl-use-of-module_param-requires-the-inc.patch
staging-add-module.h-to-various-iio-drivers.patch
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the moduleh tree with the wireless tree
From: Stephen Rothwell @ 2011-10-04 6:46 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Kalle Valo, John W. Linville
[-- Attachment #1: Type: text/plain, Size: 455 bytes --]
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
drivers/net/wireless/ath/ath6kl/init.c between commit c6efe578fc5d
("wireless/ath6kl: use of module_param requires the inclusion of
moduleparam.h") from the wireless tree and the same patch as a merge fix
for the moduleh tree.
I dropped the moduleh tree merge fix.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the staging tree with the net and wireless trees
From: Stephen Rothwell @ 2011-10-04 6:14 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Eliad Peller, John W. Linville,
David Miller, netdev
[-- Attachment #1: Type: text/plain, Size: 608 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/brcm80211/brcmsmac/mac80211_if.c between commit
37a41b4affa3 ("mac80211: add ieee80211_vif param to tsf functions") from
the net tree, commit 8a3a3c85e44d ("mac80211: pass vif param to conf_tx()
callback") from the wireless tree and several commits from the staging
tree.
I fixed it up (just removed the forward declarions that were changed by
the former commits) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the staging tree with the block tree
From: Stephen Rothwell @ 2011-10-04 6:14 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Christoph Hellwig, Jens Axboe,
Jerome Marchand
[-- Attachment #1: Type: text/plain, Size: 1034 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/zram/zram_drv.c between commit 5a7bbad27a41 ("block:
remove support for bio remapping from ->make_request") from the block
tree and commit 0900beae178a ("staging: zram: fix zram locking") from the
staging tree.
I fixed it up (I think - see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/staging/zram/zram_drv.c
index 02589ca,b9926ee..0000000
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@@ -572,9 -573,18 +573,17 @@@ static void zram_make_request(struct re
}
__zram_make_request(zram, bio, bio_data_dir(bio));
+ up_read(&zram->init_lock);
+
- return 0;
++ return;
+
+ error_unlock:
+ up_read(&zram->init_lock);
+ error:
+ bio_io_error(bio);
- return 0;
}
- void zram_reset_device(struct zram *zram)
+ void __zram_reset_device(struct zram *zram)
{
size_t index;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the usb tree with the arm-soc tree
From: Stephen Rothwell @ 2011-10-04 5:50 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Felipe Balbi, Tony Lindgren
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
arch/arm/mach-omap2/Makefile between commit f41caddbe73f ("omap2+: Use
Kconfig symbol in Makefile instead of obj-y") from the arm-soc tree and
commitb 3c3dc22366b ("usb: musb: fix build breakage") from the usb tree.
I fixed it up (I think, see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-omap2/Makefile
index 8bd389d,7317a2b..0000000
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@@ -218,21 -229,24 +218,17 @@@ obj-$(CONFIG_MACH_OMAP_ZOOM3) += board
board-zoom-debugboard.o
obj-$(CONFIG_MACH_OMAP_3630SDP) += board-3630sdp.o \
board-zoom-peripherals.o \
- board-zoom-display.o \
- board-flash.o \
- hsmmc.o
-obj-$(CONFIG_MACH_CM_T35) += board-cm-t35.o \
- hsmmc.o
+ board-zoom-display.o
+obj-$(CONFIG_MACH_CM_T35) += board-cm-t35.o
obj-$(CONFIG_MACH_CM_T3517) += board-cm-t3517.o
-obj-$(CONFIG_MACH_IGEP0020) += board-igep0020.o \
- hsmmc.o
-obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK) += board-omap3touchbook.o \
- hsmmc.o
-obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o \
- hsmmc.o
-obj-$(CONFIG_MACH_OMAP4_PANDA) += board-omap4panda.o \
- hsmmc.o
+obj-$(CONFIG_MACH_IGEP0020) += board-igep0020.o
+obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK) += board-omap3touchbook.o
- obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o \
- omap_phy_internal.o
- obj-$(CONFIG_MACH_OMAP4_PANDA) += board-omap4panda.o \
- omap_phy_internal.o
++obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o
++obj-$(CONFIG_MACH_OMAP4_PANDA) += board-omap4panda.o
+
- obj-$(CONFIG_MACH_PCM049) += board-omap4pcm049.o \
- omap_phy_internal.o
++obj-$(CONFIG_MACH_PCM049) += board-omap4pcm049.o
- obj-$(CONFIG_MACH_OMAP3517EVM) += board-am3517evm.o \
- omap_phy_internal.o
+ obj-$(CONFIG_MACH_OMAP3517EVM) += board-am3517evm.o
obj-$(CONFIG_MACH_CRANEBOARD) += board-am3517crane.o
^ permalink raw reply
* linux-next: manual merge of the omap_dss2 tree with the arm-soc tree
From: Stephen Rothwell @ 2011-10-04 4:06 UTC (permalink / raw)
To: Tomi Valkeinen; +Cc: linux-next, linux-kernel, Tony Lindgren
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-2430sdp.c between commit 8f5b5a41ebc7 ("ARM:
OMAP: Introduce SoC specific early_init") from the arm-soc tree and
commit 6e896ff9ff1c ("OMAP: 2420SDP: Port the display driver to new
DSS2") from the omap_dss2 tree.
Just context changes. I fixed it up (I think - see below) and can carry
the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-omap2/board-2430sdp.c
index 4191743,6ab6350..0000000
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@@ -137,10 -192,12 +192,6 @@@ static inline void board_smc91x_init(vo
#endif
- static struct omap_board_config_kernel sdp2430_config[] __initdata = {
- {OMAP_TAG_LCD, &sdp2430_lcd_config},
- };
-
-static void __init omap_2430sdp_init_early(void)
-{
- omap2_init_common_infrastructure();
- omap2_init_common_devices(NULL, NULL);
-}
-
static struct regulator_consumer_supply sdp2430_vmmc1_supplies[] = {
REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),
};
^ permalink raw reply
* linux-next: manual merge of the omap_dss2 tree with the arm-soc tree
From: Stephen Rothwell @ 2011-10-04 4:06 UTC (permalink / raw)
To: Tomi Valkeinen; +Cc: linux-next, linux-kernel, Tony Lindgren
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-apollon.c between commit a4ca9dbe44a1 ("ARM:
OMAP: Move omap2_init_common_devices out of init_early") from the arm-soc
tree and commit da91e89fb2f5 ("OMAP: Apollon: Port the display driver to
new DSS2") from the omap_dss2 tree.
Just context changes. I fixed it up (I think - see below) and can carry
the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-omap2/board-apollon.c
index 868d5f0,d8eb81e..0000000
--- a/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@@ -265,14 -262,34 +262,28 @@@ static struct omap_usb_config apollon_u
.pins[0] = 6,
};
- static struct omap_lcd_config apollon_lcd_config __initdata = {
- .ctrl_name = "internal",
+ static struct panel_generic_dpi_data apollon_panel_data = {
+ .name = "apollon",
};
- static struct omap_board_config_kernel apollon_config[] __initdata = {
- { OMAP_TAG_LCD, &apollon_lcd_config },
+ static struct omap_dss_device apollon_lcd_device = {
+ .name = "lcd",
+ .driver_name = "generic_dpi_panel",
+ .type = OMAP_DISPLAY_TYPE_DPI,
+ .phy.dpi.data_lines = 18,
+ .data = &apollon_panel_data,
+ };
+
+ static struct omap_dss_device *apollon_dss_devices[] = {
+ &apollon_lcd_device,
+ };
+
+ static struct omap_dss_board_info apollon_dss_data = {
+ .num_devices = ARRAY_SIZE(apollon_dss_devices),
+ .devices = apollon_dss_devices,
+ .default_device = &apollon_lcd_device,
};
-static void __init omap_apollon_init_early(void)
-{
- omap2_init_common_infrastructure();
- omap2_init_common_devices(NULL, NULL);
-}
-
static struct gpio apollon_gpio_leds[] __initdata = {
{ LED0_GPIO13, GPIOF_OUT_INIT_LOW, "LED0" }, /* LED0 - AA10 */
{ LED1_GPIO14, GPIOF_OUT_INIT_LOW, "LED1" }, /* LED1 - AA6 */
@@@ -334,7 -349,8 +343,9 @@@ static void __init omap_apollon_init(vo
*/
platform_add_devices(apollon_devices, ARRAY_SIZE(apollon_devices));
omap_serial_init();
+ omap_sdrc_init(NULL, NULL);
+
+ omap_display_init(&apollon_dss_data);
}
static void __init omap_apollon_map_io(void)
^ permalink raw reply
* linux-next: manual merge of the omap_dss2 tree with the arm-soc tree
From: Stephen Rothwell @ 2011-10-04 4:06 UTC (permalink / raw)
To: Tomi Valkeinen; +Cc: linux-next, linux-kernel, Tony Lindgren
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-h4.c between commit 8f5b5a41ebc7 ("ARM: OMAP:
Introduce SoC specific early_init") from the arm-soc tree and commit
cbf1455bfc9f ("OMAP: H4: Port the display driver to new DSS2") from the
omap_dss2 tree.
Just context changes. I fixed it up (I think - see below) and can carry
the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc arch/arm/mach-omap2/board-h4.c
index f0ddc27,f7c09de..0000000
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@@ -285,10 -301,12 +300,6 @@@ static struct omap_usb_config h4_usb_co
.hmc_mode = 0x00, /* 0:dev|otg 1:disable 2:disable */
};
- static struct omap_board_config_kernel h4_config[] __initdata = {
- { OMAP_TAG_LCD, &h4_lcd_config },
- };
-
-static void __init omap_h4_init_early(void)
-{
- omap2_init_common_infrastructure();
- omap2_init_common_devices(NULL, NULL);
-}
-
static void __init omap_h4_init_irq(void)
{
omap2_init_irq();
@@@ -364,8 -379,9 +372,10 @@@ static void __init omap_h4_init(void
platform_add_devices(h4_devices, ARRAY_SIZE(h4_devices));
omap2_usbfs_init(&h4_usb_config);
omap_serial_init();
+ omap_sdrc_init(NULL, NULL);
h4_init_flash();
+
+ omap_display_init(&h4_dss_data);
}
static void __init omap_h4_map_io(void)
^ permalink raw reply
* linux-next: manual merge of the omap_dss2 tree with the arm-soc tree
From: Stephen Rothwell @ 2011-10-04 4:06 UTC (permalink / raw)
To: Tomi Valkeinen; +Cc: linux-next, linux-kernel, Tony Lindgren
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-ldp.c between commit 8f5b5a41ebc7 ("ARM: OMAP:
Introduce SoC specific early_init") from the arm-soc tree and commit
14dd72d8542f ("OMAP: LDP: Port the display driver to new DSS2") from the
omap_dss2 tree.
Just context changes. I fixed it up (I think - see below) and can carry
the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-omap2/board-ldp.c
index 5797917,689ed49..0000000
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@@ -179,19 -183,103 +183,97 @@@ static inline void __init ldp_init_smsc
gpmc_smsc911x_init(&smsc911x_cfg);
}
- static struct platform_device ldp_lcd_device = {
- .name = "ldp_lcd",
- .id = -1,
+ /* LCD */
+
+ static int ldp_backlight_gpio;
+ static int ldp_lcd_enable_gpio;
+
+ #define LCD_PANEL_RESET_GPIO 55
+ #define LCD_PANEL_QVGA_GPIO 56
+
+ static int ldp_panel_enable_lcd(struct omap_dss_device *dssdev)
+ {
+ if (gpio_is_valid(ldp_lcd_enable_gpio))
+ gpio_direction_output(ldp_lcd_enable_gpio, 1);
+ if (gpio_is_valid(ldp_backlight_gpio))
+ gpio_direction_output(ldp_backlight_gpio, 1);
+
+ return 0;
+ }
+
+ static void ldp_panel_disable_lcd(struct omap_dss_device *dssdev)
+ {
+ if (gpio_is_valid(ldp_lcd_enable_gpio))
+ gpio_direction_output(ldp_lcd_enable_gpio, 0);
+ if (gpio_is_valid(ldp_backlight_gpio))
+ gpio_direction_output(ldp_backlight_gpio, 0);
+ }
+
+ static struct panel_generic_dpi_data ldp_panel_data = {
+ .name = "nec_nl2432dr22-11b",
+ .platform_enable = ldp_panel_enable_lcd,
+ .platform_disable = ldp_panel_disable_lcd,
};
- static struct omap_lcd_config ldp_lcd_config __initdata = {
- .ctrl_name = "internal",
+ static struct omap_dss_device ldp_lcd_device = {
+ .name = "lcd",
+ .driver_name = "generic_dpi_panel",
+ .type = OMAP_DISPLAY_TYPE_DPI,
+ .phy.dpi.data_lines = 18,
+ .data = &ldp_panel_data,
+ };
+
+ static struct omap_dss_device *ldp_dss_devices[] = {
+ &ldp_lcd_device,
};
- static struct omap_board_config_kernel ldp_config[] __initdata = {
- { OMAP_TAG_LCD, &ldp_lcd_config },
+ static struct omap_dss_board_info ldp_dss_data = {
+ .num_devices = ARRAY_SIZE(ldp_dss_devices),
+ .devices = ldp_dss_devices,
+ .default_device = &ldp_lcd_device,
};
+ static void __init ldp_display_init(void)
+ {
+ int r;
+
+ static struct gpio gpios[] __initdata = {
+ {LCD_PANEL_RESET_GPIO, GPIOF_OUT_INIT_HIGH, "LCD RESET"},
+ {LCD_PANEL_QVGA_GPIO, GPIOF_OUT_INIT_HIGH, "LCD QVGA"},
+ };
+
+ r = gpio_request_array(gpios, ARRAY_SIZE(gpios));
+ if (r) {
+ pr_err("Cannot request LCD GPIOs, error %d\n", r);
+ return;
+ }
+
+ omap_display_init(&ldp_dss_data);
+ }
+
-static void __init omap_ldp_init_early(void)
-{
- omap2_init_common_infrastructure();
- omap2_init_common_devices(NULL, NULL);
-}
-
+ static int ldp_twl_gpio_setup(struct device *dev, unsigned gpio, unsigned ngpio)
+ {
+ int r;
+
+ struct gpio gpios[] = {
+ {gpio + 7 , GPIOF_OUT_INIT_LOW, "LCD ENABLE"},
+ {gpio + 15, GPIOF_OUT_INIT_LOW, "LCD BACKLIGHT"},
+ };
+
+ r = gpio_request_array(gpios, ARRAY_SIZE(gpios));
+ if (r) {
+ pr_err("Cannot request LCD GPIOs, error %d\n", r);
+ ldp_backlight_gpio = -EINVAL;
+ ldp_lcd_enable_gpio = -EINVAL;
+ return r;
+ }
+
+ ldp_backlight_gpio = gpio + 15;
+ ldp_lcd_enable_gpio = gpio + 7;
+
+ return 0;
+ }
+
static struct twl4030_gpio_platform_data ldp_gpio_data = {
.gpio_base = OMAP_MAX_GPIO_LINES,
.irq_base = TWL4030_GPIO_IRQ_BASE,
^ permalink raw reply
* linux-next: manual merge of the omap_dss2 tree with the arm-soc tree
From: Stephen Rothwell @ 2011-10-04 4:06 UTC (permalink / raw)
To: Tomi Valkeinen; +Cc: linux-next, linux-kernel, Tony Lindgren
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-rx51.c between commit 8f5b5a41ebc7 ("ARM: OMAP:
Introduce SoC specific early_init") from the arm-soc tree and commit
cc9347352509 ("OMAP: RX51: Remove unused old omapfb stuff") from the
omap_dss2 tree.
Just context changes. I fixed it up (I think - see below) and can carry
the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-omap2/board-rx51.c
index e2e958a,9e7dde6..0000000
--- a/arch/arm/mach-omap2/board-rx51.c
+++ b/arch/arm/mach-omap2/board-rx51.c
@@@ -79,29 -79,15 +79,6 @@@ static struct cpuidle_params rx51_cpuid
{7505 + 15274, 484329, 1},
};
- static struct omap_lcd_config rx51_lcd_config = {
- .ctrl_name = "internal",
- };
-
- static struct omap_fbmem_config rx51_fbmem0_config = {
- .size = 752 * 1024,
- };
-
- static struct omap_fbmem_config rx51_fbmem1_config = {
- .size = 752 * 1024,
- };
-
- static struct omap_fbmem_config rx51_fbmem2_config = {
- .size = 752 * 1024,
- };
-
- static struct omap_board_config_kernel rx51_config[] = {
- { OMAP_TAG_FBMEM, &rx51_fbmem0_config },
- { OMAP_TAG_FBMEM, &rx51_fbmem1_config },
- { OMAP_TAG_FBMEM, &rx51_fbmem2_config },
- { OMAP_TAG_LCD, &rx51_lcd_config },
- };
-
-static void __init rx51_init_early(void)
-{
- struct omap_sdrc_params *sdrc_params;
-
- omap2_init_common_infrastructure();
- sdrc_params = nokia_get_sdram_timings();
- omap2_init_common_devices(sdrc_params, sdrc_params);
-}
-
extern void __init rx51_peripherals_init(void);
#ifdef CONFIG_OMAP_MUX
@@@ -118,17 -104,9 +95,15 @@@ static struct omap_musb_board_data musb
static void __init rx51_init(void)
{
+ struct omap_sdrc_params *sdrc_params;
+
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
- omap_board_config = rx51_config;
- omap_board_config_size = ARRAY_SIZE(rx51_config);
omap3_pm_init_cpuidle(rx51_cpuidle_params);
omap_serial_init();
+
+ sdrc_params = nokia_get_sdram_timings();
+ omap_sdrc_init(sdrc_params, sdrc_params);
+
usb_musb_init(&musb_board_data);
rx51_peripherals_init();
^ permalink raw reply
* linux-next: build failure after merge of the arm-soc tree
From: Stephen Rothwell @ 2011-10-04 0:26 UTC (permalink / raw)
Cc: linux-next, linux-kernel, Nicolas Ferre, stable, Arnd Bergmann
[-- Attachment #1: Type: text/plain, Size: 688 bytes --]
Hi Arnd,
After merging the arm-soc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
ERROR: "clk_enable" [drivers/misc/atmel_pwm.ko] undefined!
ERROR: "clk_disable" [drivers/misc/atmel_pwm.ko] undefined!
ERROR: "clk_put" [drivers/misc/atmel_pwm.ko] undefined!
ERROR: "clk_get_rate" [drivers/misc/atmel_pwm.ko] undefined!
ERROR: "clk_get" [drivers/misc/atmel_pwm.ko] undefined!
Caused by commit 9dccc010c816 ("ARM: at91: remove dependency for Atmel
PWM driver selector in Kconfig").
I have used the arm-soc tree from next-20110930 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: manual merge of the arm-soc tree with the arm tree
From: Stephen Rothwell @ 2011-10-04 0:08 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-next, linux-kernel, Stephen Warren, Russell King,
Olof Johansson
Hi Arnd,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-tegra/board-seaboard.h between commit ea5abbd215b7 ("ARM:
7101/1: arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h>") from
the arm tree and commit a697e694aeb8 ("ARM: Tegra: Seaboard board updates
for audio") from the arm-soc tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-tegra/board-seaboard.h
index 15b6c57,d06c334..0000000
--- a/arch/arm/mach-tegra/board-seaboard.h
+++ b/arch/arm/mach-tegra/board-seaboard.h
@@@ -17,8 -17,9 +17,11 @@@
#ifndef _MACH_TEGRA_BOARD_SEABOARD_H
#define _MACH_TEGRA_BOARD_SEABOARD_H
+#include <mach/gpio-tegra.h>
+
+ #define SEABOARD_GPIO_TPS6586X(_x_) (TEGRA_NR_GPIOS + (_x_))
+ #define SEABOARD_GPIO_WM8903(_x_) (SEABOARD_GPIO_TPS6586X(4) + (_x_))
+
#define TEGRA_GPIO_SD2_CD TEGRA_GPIO_PI5
#define TEGRA_GPIO_SD2_WP TEGRA_GPIO_PH1
#define TEGRA_GPIO_SD2_POWER TEGRA_GPIO_PI6
^ permalink raw reply
* linux-next: manual merge of the arm-soc tree with the arm tree
From: Stephen Rothwell @ 2011-10-04 0:05 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-next, linux-kernel, Russell King, Stephen Warren,
Marc Dietrich, Olof Johansson
Hi Arnd,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-tegra/board-paz00.h between commit ea5abbd215b7 ("ARM:
7101/1: arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h>") from
the arm tree and commit 9aaa15a739a0 ("ARM: tegra: paz00: enable rfkill
for internal wifi card") from the arm-soc tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-tegra/board-paz00.h
index 42ce863,86057c3..0000000
--- a/arch/arm/mach-tegra/board-paz00.h
+++ b/arch/arm/mach-tegra/board-paz00.h
@@@ -17,12 -17,18 +17,20 @@@
#ifndef _MACH_TEGRA_BOARD_PAZ00_H
#define _MACH_TEGRA_BOARD_PAZ00_H
+#include <mach/gpio-tegra.h>
+
- #define TEGRA_GPIO_SD1_CD TEGRA_GPIO_PV5
- #define TEGRA_GPIO_SD1_WP TEGRA_GPIO_PH1
- #define TEGRA_GPIO_SD1_POWER TEGRA_GPIO_PT3
- #define TEGRA_ULPI_RST TEGRA_GPIO_PV0
+ /* SDCARD */
+ #define TEGRA_GPIO_SD1_CD TEGRA_GPIO_PV5
+ #define TEGRA_GPIO_SD1_WP TEGRA_GPIO_PH1
+ #define TEGRA_GPIO_SD1_POWER TEGRA_GPIO_PT3
+
+ /* ULPI */
+ #define TEGRA_ULPI_RST TEGRA_GPIO_PV0
+
+ /* WIFI */
+ #define TEGRA_WIFI_PWRN TEGRA_GPIO_PK5
+ #define TEGRA_WIFI_RST TEGRA_GPIO_PD1
+ #define TEGRA_WIFI_LED TEGRA_GPIO_PD0
void paz00_pinmux_init(void);
^ permalink raw reply
* Re: movement of my usb / staging / tty / driver-core trees
From: Stephen Rothwell @ 2011-10-03 23:10 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, linux-usb
In-Reply-To: <20111003220219.GA9913@kroah.com>
[-- Attachment #1: Type: text/plain, Size: 870 bytes --]
Hi Greg,
On Mon, 3 Oct 2011 15:02:19 -0700 Greg KH <greg@kroah.com> wrote:
>
> Now that git.kernel.org is back up, I've moved my linux-next git trees
> to a different name, dropping the "2.6" suffix on them.
>
> So, they are now at:
>
> USB: git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
> staging: git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
> driver-core: git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
> TTY: git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
>
> All of the branch names are the same as before, and they are now all up
> to date with the local copy of my trees that I kept while kernel.org was
> down.
OK, I have switched to these from today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* movement of my usb / staging / tty / driver-core trees
From: Greg KH @ 2011-10-03 22:02 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, linux-usb
[-- Attachment #1: Type: text/plain, Size: 784 bytes --]
Hi Stephen,
Now that git.kernel.org is back up, I've moved my linux-next git trees
to a different name, dropping the "2.6" suffix on them.
So, they are now at:
USB: git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
staging: git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
driver-core: git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
TTY: git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
All of the branch names are the same as before, and they are now all up
to date with the local copy of my trees that I kept while kernel.org was
down.
If you have any problems with them, please let me know. I'll be
updating the MAINTAINERS file for 3.2 to update the locations to keep
everything in sync.
thanks,
greg k-h
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* linux-next: no tree for 2011-10-03
From: Stephen Rothwell @ 2011-10-03 7:13 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 173 bytes --]
Hi all,
There will be no tree today due to a public holiday
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the moduleh tree
From: Linus Walleij @ 2011-10-03 6:55 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Paul Gortmaker, linux-next, linux-kernel
In-Reply-To: <20110930231906.7859fd1df20e5609301b3646@canb.auug.org.au>
On Fri, Sep 30, 2011 at 3:19 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> On Fri, 30 Sep 2011 14:52:28 +0200 Linus Walleij <linus.walleij@linaro.org> wrote:
>>
>> On Fri, Sep 30, 2011 at 6:50 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> > I have applied the following patch for today (Linus, the
>> > drivers/pinctrl/pinmux.c part of this can be applied to your tree).
>>
>> Thanks a lot Stephen, applied and pushed this to the pinctrl tree!
>
> You can't apply the whole patch since export.h doe not exist outside the
> moduleh tree in linux-next (did you try to build it?). As I said above
> only the drivers/pinctrl/pinmux.c part is applicable to your tree.
OK right, I fixed it up, sorry...
Thanks,
Linus Walleij
^ permalink raw reply
* Re: [PATCH] KVM: x86: Use do_div for tsc deadline calculation
From: Avi Kivity @ 2011-10-02 9:05 UTC (permalink / raw)
To: Jan Kiszka
Cc: Marcelo Tosatti, Stephen Rothwell, Randy Dunlap, linux-next, LKML,
kvm@vger.kernel.org, Liu >> "Liu, Jinsong",
Tian, Kevin
In-Reply-To: <4E85ACFC.1090509@siemens.com>
On 09/30/2011 02:50 PM, Jan Kiszka wrote:
> Required on i386 hosts.
>
>
Thanks, applied.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply
* Re: [PATCH] drivers/media: fix dependencies in video mt9t001/mt9p031
From: Randy Dunlap @ 2011-09-30 22:38 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: mchehab, sfr, linux-next, linux-media
In-Reply-To: <1317418491-26513-1-git-send-email-paul.gortmaker@windriver.com>
On 09/30/11 14:34, Paul Gortmaker wrote:
> Both mt9t001.c and mt9p031.c have two identical issues, those
> being that they will need module.h inclusion for the upcoming
> cleanup going on there, and that their dependencies don't limit
> selection of configs that will fail to compile as follows:
>
> drivers/media/video/mt9p031.c:457: error: implicit declaration of function ‘v4l2_subdev_get_try_crop’
> drivers/media/video/mt9t001.c:787: error: ‘struct v4l2_subdev’ has no member named ‘entity’
>
> The related config options are CONFIG_MEDIA_CONTROLLER and
> CONFIG_VIDEO_V4L2_SUBDEV_API. Looking at the code, it appears
> that the driver was never intended to work without these enabled,
> so add a dependency on CONFIG_VIDEO_V4L2_SUBDEV_API, which in
> turn already has a dependency on CONFIG_MEDIA_CONTROLLER.
>
> Reported-by: Randy Dunlap <rdunlap@xenotime.net>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Thanks, Paul.
>
> diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
> index 75e43c0..d285c8c 100644
> --- a/drivers/media/video/Kconfig
> +++ b/drivers/media/video/Kconfig
> @@ -469,14 +469,14 @@ config VIDEO_OV7670
>
> config VIDEO_MT9P031
> tristate "Aptina MT9P031 support"
> - depends on I2C && VIDEO_V4L2
> + depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
> ---help---
> This is a Video4Linux2 sensor-level driver for the Aptina
> (Micron) mt9p031 5 Mpixel camera.
>
> config VIDEO_MT9T001
> tristate "Aptina MT9T001 support"
> - depends on I2C && VIDEO_V4L2
> + depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
> ---help---
> This is a Video4Linux2 sensor-level driver for the Aptina
> (Micron) mt0t001 3 Mpixel camera.
> diff --git a/drivers/media/video/mt9p031.c b/drivers/media/video/mt9p031.c
> index 8bcb1ce..fc9603f 100644
> --- a/drivers/media/video/mt9p031.c
> +++ b/drivers/media/video/mt9p031.c
> @@ -14,6 +14,7 @@
>
> #include <linux/delay.h>
> #include <linux/device.h>
> +#include <linux/module.h>
> #include <linux/i2c.h>
> #include <linux/log2.h>
> #include <linux/pm.h>
> diff --git a/drivers/media/video/mt9t001.c b/drivers/media/video/mt9t001.c
> index ae75d82..280d01d 100644
> --- a/drivers/media/video/mt9t001.c
> +++ b/drivers/media/video/mt9t001.c
> @@ -13,6 +13,7 @@
> */
>
> #include <linux/i2c.h>
> +#include <linux/module.h>
> #include <linux/log2.h>
> #include <linux/slab.h>
> #include <linux/videodev2.h>
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* [PATCH] drivers/usb: Add module.h to various dwc3 drivers
From: Paul Gortmaker @ 2011-09-30 22:08 UTC (permalink / raw)
To: gregkh; +Cc: linux-usb, linux-next, Paul Gortmaker
These files uses the full set of MODULE_ macros and so need to
include module.h directly.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 443e4fb..20d0503 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -51,6 +51,7 @@
#include <linux/usb/ch9.h>
#include <linux/usb/gadget.h>
+#include <linux/module.h>
#include "core.h"
#include "gadget.h"
diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c
index 08fffe6..b4a654e 100644
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@ -45,6 +45,7 @@
#include <linux/dma-mapping.h>
#include <linux/ioport.h>
#include <linux/io.h>
+#include <linux/module.h>
#include "io.h"
--
1.7.6
^ permalink raw reply related
* [PATCH] staging: add module.h to various iio drivers
From: Paul Gortmaker @ 2011-09-30 22:06 UTC (permalink / raw)
To: gregkh-l3A5Bk7waGM
Cc: linux-iio-u79uwXL29TY76Z2rM5mHXA,
linux-next-u79uwXL29TY76Z2rM5mHXA, Paul Gortmaker
Since they are assuming it is there implicitly and will fail otherwise
with things like:
drivers/staging/iio/impedance-analyzer/ad5933.c:816: warning: type
defaults to ‘int’ in declaration of ‘MODULE_AUTHOR’
drivers/staging/iio/adc/ad7280a.c:990: warning: type defaults to ‘int’
in declaration of ‘MODULE_AUTHOR’
Signed-off-by: Paul Gortmaker <paul.gortmaker-CWA4WttNNZF54TAoqtyWWQ@public.gmane.org>
diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c
index ab6cf9c..6ca4532 100644
--- a/drivers/staging/iio/adc/ad7280a.c
+++ b/drivers/staging/iio/adc/ad7280a.c
@@ -14,6 +14,7 @@
#include <linux/err.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
+#include <linux/module.h>
#include "../iio.h"
#include "../sysfs.h"
diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c
index acc0e69..5783742 100644
--- a/drivers/staging/iio/impedance-analyzer/ad5933.c
+++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
@@ -16,6 +16,7 @@
#include <linux/types.h>
#include <linux/err.h>
#include <linux/delay.h>
+#include <linux/module.h>
#include <asm/div64.h>
#include "../iio.h"
--
1.7.6
^ permalink raw reply related
* [PATCH] drivers/media: fix dependencies in video mt9t001/mt9p031
From: Paul Gortmaker @ 2011-09-30 21:34 UTC (permalink / raw)
To: mchehab; +Cc: rdunlap, sfr, linux-next, linux-media, Paul Gortmaker
In-Reply-To: <4E83A02F.2020309@xenotime.net>
Both mt9t001.c and mt9p031.c have two identical issues, those
being that they will need module.h inclusion for the upcoming
cleanup going on there, and that their dependencies don't limit
selection of configs that will fail to compile as follows:
drivers/media/video/mt9p031.c:457: error: implicit declaration of function ‘v4l2_subdev_get_try_crop’
drivers/media/video/mt9t001.c:787: error: ‘struct v4l2_subdev’ has no member named ‘entity’
The related config options are CONFIG_MEDIA_CONTROLLER and
CONFIG_VIDEO_V4L2_SUBDEV_API. Looking at the code, it appears
that the driver was never intended to work without these enabled,
so add a dependency on CONFIG_VIDEO_V4L2_SUBDEV_API, which in
turn already has a dependency on CONFIG_MEDIA_CONTROLLER.
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 75e43c0..d285c8c 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -469,14 +469,14 @@ config VIDEO_OV7670
config VIDEO_MT9P031
tristate "Aptina MT9P031 support"
- depends on I2C && VIDEO_V4L2
+ depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
---help---
This is a Video4Linux2 sensor-level driver for the Aptina
(Micron) mt9p031 5 Mpixel camera.
config VIDEO_MT9T001
tristate "Aptina MT9T001 support"
- depends on I2C && VIDEO_V4L2
+ depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
---help---
This is a Video4Linux2 sensor-level driver for the Aptina
(Micron) mt0t001 3 Mpixel camera.
diff --git a/drivers/media/video/mt9p031.c b/drivers/media/video/mt9p031.c
index 8bcb1ce..fc9603f 100644
--- a/drivers/media/video/mt9p031.c
+++ b/drivers/media/video/mt9p031.c
@@ -14,6 +14,7 @@
#include <linux/delay.h>
#include <linux/device.h>
+#include <linux/module.h>
#include <linux/i2c.h>
#include <linux/log2.h>
#include <linux/pm.h>
diff --git a/drivers/media/video/mt9t001.c b/drivers/media/video/mt9t001.c
index ae75d82..280d01d 100644
--- a/drivers/media/video/mt9t001.c
+++ b/drivers/media/video/mt9t001.c
@@ -13,6 +13,7 @@
*/
#include <linux/i2c.h>
+#include <linux/module.h>
#include <linux/log2.h>
#include <linux/slab.h>
#include <linux/videodev2.h>
--
1.7.6
^ permalink raw reply related
* Re: linux-next: build failure after merge of the moduleh tree
From: Paul Gortmaker @ 2011-09-30 18:56 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Linus Walleij
In-Reply-To: <20110930145042.4a7ee530848262294b297939@canb.auug.org.au>
On Fri, Sep 30, 2011 at 12:50 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Paul,
>
> After merging the moduleh tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/pinctrl/core.c:80:1: warning: data definition has no type or storage class [enabled by default]
> drivers/pinctrl/core.c:80:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
> drivers/pinctrl/core.c:80:1: warning: parameter names (without types) in function declaration [enabled by default]
> drivers/pinctrl/core.c:86:1: warning: data definition has no type or storage class [enabled by default]
> drivers/pinctrl/core.c:86:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
> drivers/pinctrl/core.c:86:1: warning: parameter names (without types) in function declaration [enabled by default]
> drivers/pinctrl/core.c:152:1: warning: data definition has no type or storage class [enabled by default]
> drivers/pinctrl/core.c:152:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
> drivers/pinctrl/core.c:152:1: warning: parameter names (without types) in function declaration [enabled by default]
> drivers/pinctrl/core.c:590:1: warning: data definition has no type or storage class [enabled by default]
> drivers/pinctrl/core.c:590:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
> drivers/pinctrl/core.c:590:1: warning: parameter names (without types) in function declaration [enabled by default]
> drivers/pinctrl/core.c:614:1: warning: data definition has no type or storage class [enabled by default]
> drivers/pinctrl/core.c:614:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
> drivers/pinctrl/core.c:614:1: warning: parameter names (without types) in function declaration [enabled by default]
> drivers/pinctrl/pinmux.c: In function 'pin_request':
> drivers/pinctrl/pinmux.c:143:2: error: implicit declaration of function 'try_module_get' [-Werror=implicit-function-declaration]
> drivers/pinctrl/pinmux.c: In function 'pin_free':
> drivers/pinctrl/pinmux.c:206:2: error: implicit declaration of function 'module_put' [-Werror=implicit-function-declaration]
> drivers/pinctrl/pinmux.c: At top level:
> drivers/pinctrl/pinmux.c:234:1: warning: data definition has no type or storage class [enabled by default]
> drivers/pinctrl/pinmux.c:234:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
> drivers/pinctrl/pinmux.c:234:1: warning: parameter names (without types) in function declaration [enabled by default]
> drivers/pinctrl/pinmux.c:257:1: warning: data definition has no type or storage class [enabled by default]
> drivers/pinctrl/pinmux.c:257:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
> drivers/pinctrl/pinmux.c:257:1: warning: parameter names (without types) in function declaration [enabled by default]
> drivers/pinctrl/pinmux.c:754:1: warning: data definition has no type or storage class [enabled by default]
> drivers/pinctrl/pinmux.c:754:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
> drivers/pinctrl/pinmux.c:754:1: warning: parameter names (without types) in function declaration [enabled by default]
> drivers/pinctrl/pinmux.c:779:1: warning: data definition has no type or storage class [enabled by default]
> drivers/pinctrl/pinmux.c:779:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
> drivers/pinctrl/pinmux.c:779:1: warning: parameter names (without types) in function declaration [enabled by default]
> drivers/pinctrl/pinmux.c:813:1: warning: data definition has no type or storage class [enabled by default]
> drivers/pinctrl/pinmux.c:813:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
> drivers/pinctrl/pinmux.c:813:1: warning: parameter names (without types) in function declaration [enabled by default]
> drivers/pinctrl/pinmux.c:837:1: warning: data definition has no type or storage class [enabled by default]
> drivers/pinctrl/pinmux.c:837:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
> drivers/pinctrl/pinmux.c:837:1: warning: parameter names (without types) in function declaration [enabled by default]
>
>
> Caused by commit 05f20c997d73 ("drivers: create a pin control subsystem
> v8"), revelealed by the module.h split.
>
> I have applied the following patch for today (Linus, the
> drivers/pinctrl/pinmux.c part of this can be applied to your tree).
I've queued the remaining export.h part to core.c as a post-merge patch in the
modsplit-post-merge queue.
Paul.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 30 Sep 2011 14:39:04 +1000
> Subject: [PATCH] pinctrl: EXPORT_SYMBOL needs export.h
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/pinctrl/core.c | 1 +
> drivers/pinctrl/pinmux.c | 1 +
> 2 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
> index 4229628..f9263b2 100644
> --- a/drivers/pinctrl/core.c
> +++ b/drivers/pinctrl/core.c
> @@ -12,6 +12,7 @@
> #define pr_fmt(fmt) "pinctrl core: " fmt
>
> #include <linux/kernel.h>
> +#include <linux/export.h>
> #include <linux/init.h>
> #include <linux/device.h>
> #include <linux/slab.h>
> diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c
> index 37803f0..6b28f2b 100644
> --- a/drivers/pinctrl/pinmux.c
> +++ b/drivers/pinctrl/pinmux.c
> @@ -12,6 +12,7 @@
> #define pr_fmt(fmt) "pinmux core: " fmt
>
> #include <linux/kernel.h>
> +#include <linux/module.h>
> #include <linux/init.h>
> #include <linux/device.h>
> #include <linux/slab.h>
> --
> 1.7.6.3
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
> --
> To unsubscribe from this list: send the line "unsubscribe linux-next" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply
* Re: [PATCH] intel_sst: fix compile error
From: Paul Gortmaker @ 2011-09-30 17:39 UTC (permalink / raw)
To: Vinod Koul
Cc: Lu Guanqun, gregkh, sfr, linux-next, linux-kernel, alan,
fengguang.wu, devel
In-Reply-To: <1317350095.1573.1786.camel@vkoul-udesk3>
On 11-09-29 10:34 PM, Vinod Koul wrote:
> On Fri, 2011-09-30 at 10:35 +0800, Lu Guanqun wrote:
>> include module.h to fix the following compile errors:
>>
>> drivers/staging/intel_sst/intelmid.c:52: error: expected declaration specifiers or '...' before string constant
>> drivers/staging/intel_sst/intelmid.c:52: warning: data definition has no type or storage class
>> drivers/staging/intel_sst/intelmid.c:52: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
>> drivers/staging/intel_sst/intelmid.c:52: warning: function declaration isn't a prototype
>> drivers/staging/intel_sst/intelmid.c:53: error: expected declaration specifiers or '...' before string constant
>> drivers/staging/intel_sst/intelmid.c:53: warning: data definition has no type or storage class
>> drivers/staging/intel_sst/intelmid.c:53: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
>> drivers/staging/intel_sst/intelmid.c:53: warning: function declaration isn't a prototype
>> drivers/staging/intel_sst/intelmid.c:54: error: expected declaration specifiers or '...' before string constant
>> drivers/staging/intel_sst/intelmid.c:54: warning: data definition has no type or storage class
>> drivers/staging/intel_sst/intelmid.c:54: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
>> drivers/staging/intel_sst/intelmid.c:54: warning: function declaration isn't a prototype
>> drivers/staging/intel_sst/intelmid.c:55: error: expected declaration specifiers or '...' before string constant
>> drivers/staging/intel_sst/intelmid.c:55: warning: data definition has no type or storage class
>> drivers/staging/intel_sst/intelmid.c:55: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
>> drivers/staging/intel_sst/intelmid.c:55: warning: function declaration isn't a prototype
>> drivers/staging/intel_sst/intelmid.c:56: error: expected declaration specifiers or '...' before string constant
>> drivers/staging/intel_sst/intelmid.c:56: warning: data definition has no type or storage class
>> drivers/staging/intel_sst/intelmid.c:56: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
>> drivers/staging/intel_sst/intelmid.c:56: warning: function declaration isn't a prototype
>> drivers/staging/intel_sst/intelmid.c:57: error: expected declaration specifiers or '...' before string constant
>> drivers/staging/intel_sst/intelmid.c:57: warning: data definition has no type or storage class
>> drivers/staging/intel_sst/intelmid.c:57: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
>> drivers/staging/intel_sst/intelmid.c:57: warning: function declaration isn't a prototype
>> drivers/staging/intel_sst/intelmid.c:58: error: expected declaration specifiers or '...' before string constant
>> drivers/staging/intel_sst/intelmid.c:58: warning: data definition has no type or storage class
>> drivers/staging/intel_sst/intelmid.c:58: warning: type defaults to 'int' in declaration of 'MODULE_SUPPORTED_DEVICE'
>> drivers/staging/intel_sst/intelmid.c:58: warning: function declaration isn't a prototype
>> drivers/staging/intel_sst/intelmid.c:64: error: expected ')' before 'int'
>> drivers/staging/intel_sst/intelmid.c:65: error: expected ')' before string constant
>> drivers/staging/intel_sst/intelmid.c:66: error: expected ')' before numeric constant
>> drivers/staging/intel_sst/intelmid.c:67: error: expected ')' before string constant
>> drivers/staging/intel_sst/intelmid.c:461: warning: data definition has no type or storage class
>> drivers/staging/intel_sst/intelmid.c:461: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
>> drivers/staging/intel_sst/intelmid.c:461: warning: parameter names (without types) in function declaration
>> drivers/staging/intel_sst/intelmid.c:475: warning: data definition has no type or storage class
>> drivers/staging/intel_sst/intelmid.c:475: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
>> drivers/staging/intel_sst/intelmid.c:475: warning: parameter names (without types) in function declaration
>> drivers/staging/intel_sst/intelmid.c: In function 'snd_intelmad_probe':
>> drivers/staging/intel_sst/intelmid.c:859: error: 'THIS_MODULE' undeclared (first use in this function)
>> drivers/staging/intel_sst/intelmid.c:859: error: (Each undeclared identifier is reported only once
>> drivers/staging/intel_sst/intelmid.c:859: error: for each function it appears in.)
>> drivers/staging/intel_sst/intelmid.c: At top level:
>> drivers/staging/intel_sst/intelmid.c:989: error: 'THIS_MODULE' undeclared here (not in a function)
A minor nit, but we probably don't need all 70 lines of the
compile failure in the long log. It doesn't really add any
value or information. Just a comment that the file really
needs module.h since it is a module source file would suffice.
Thanks,
Paul.
>>
>> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
>> ---
>> drivers/staging/intel_sst/intelmid.c | 1 +
>> 1 files changed, 1 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/staging/intel_sst/intelmid.c b/drivers/staging/intel_sst/intelmid.c
>> index 25656ad..492b660 100644
>> --- a/drivers/staging/intel_sst/intelmid.c
>> +++ b/drivers/staging/intel_sst/intelmid.c
>> @@ -27,6 +27,7 @@
>>
>> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>>
>> +#include <linux/module.h>
>> #include <linux/slab.h>
>> #include <linux/io.h>
>> #include <linux/platform_device.h>
> Thanks I was midway of creating this fix :)
>
> Acked-by: Vinod Koul <vinod.koul@intel.com>
>
>
^ permalink raw reply
* Re: [PATCH] KVM: x86: Use do_div for tsc deadline calculation
From: Randy Dunlap @ 2011-09-30 17:35 UTC (permalink / raw)
To: Jan Kiszka
Cc: Avi Kivity, Marcelo Tosatti, Stephen Rothwell, linux-next, LKML,
kvm@vger.kernel.org, Liu >> "Liu, Jinsong",
Tian, Kevin
In-Reply-To: <4E85ACFC.1090509@siemens.com>
On 09/30/11 04:50, Jan Kiszka wrote:
> Required on i386 hosts.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Thanks.
> ---
> arch/x86/kvm/lapic.c | 7 ++++---
> 1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
> index f9385ec..92390dc 100644
> --- a/arch/x86/kvm/lapic.c
> +++ b/arch/x86/kvm/lapic.c
> @@ -740,9 +740,10 @@ static void start_apic_timer(struct kvm_lapic *apic)
>
> now = apic->lapic_timer.timer.base->get_time();
> guest_tsc = kvm_x86_ops->read_l1_tsc(vcpu);
> - if (likely(tscdeadline > guest_tsc))
> - ns = (tscdeadline - guest_tsc)
> - * 1000000L / this_tsc_khz;
> + if (likely(tscdeadline > guest_tsc)) {
> + ns = (tscdeadline - guest_tsc) * 1000000ULL;
> + do_div(ns, this_tsc_khz);
> + }
> hrtimer_start(&apic->lapic_timer.timer,
> ktime_add_ns(now, ns), HRTIMER_MODE_ABS);
>
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox