Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 276496
b: refs/heads/master
c: 5d34840
h: refs/heads/master
v: v3
  • Loading branch information
Dong Aisheng authored and Shawn Guo committed Dec 2, 2011
1 parent ac8b42b commit 7c0a59e
Show file tree
Hide file tree
Showing 13 changed files with 25 additions and 32 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 58a394b3fae8b08e3efb04b740cb85aa4fe98d29
refs/heads/master: 5d348401ed03450395ce674594c1c08c7d85bd8d
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-at91/at91rm9200_devices.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {}
* USB Device (Gadget)
* -------------------------------------------------------------------- */

#ifdef CONFIG_USB_AT91
#ifdef CONFIG_USB_GADGET_AT91
static struct at91_udc_data udc_data;

static struct resource udc_resources[] = {
Expand Down
6 changes: 3 additions & 3 deletions trunk/arch/arm/mach-at91/at91sam9260.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,9 @@ static struct clk_lookup periph_clocks_lookups[] = {
CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk),
CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.0", &tc1_clk),
CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc2_clk),
CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tc3_clk),
CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.1", &tc4_clk),
CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.1", &tc5_clk),
CLKDEV_CON_DEV_ID("t3_clk", "atmel_tcb.1", &tc3_clk),
CLKDEV_CON_DEV_ID("t4_clk", "atmel_tcb.1", &tc4_clk),
CLKDEV_CON_DEV_ID("t5_clk", "atmel_tcb.1", &tc5_clk),
CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc_clk),
/* more usart lookup table for DT entries */
CLKDEV_CON_DEV_ID("usart", "fffff200.serial", &mck),
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-at91/at91sam9260_devices.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {}
* USB Device (Gadget)
* -------------------------------------------------------------------- */

#ifdef CONFIG_USB_AT91
#ifdef CONFIG_USB_GADGET_AT91
static struct at91_udc_data udc_data;

static struct resource udc_resources[] = {
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-at91/at91sam9261_devices.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {}
* USB Device (Gadget)
* -------------------------------------------------------------------- */

#ifdef CONFIG_USB_AT91
#ifdef CONFIG_USB_GADGET_AT91
static struct at91_udc_data udc_data;

static struct resource udc_resources[] = {
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-at91/at91sam9263_devices.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {}
* USB Device (Gadget)
* -------------------------------------------------------------------- */

#ifdef CONFIG_USB_AT91
#ifdef CONFIG_USB_GADGET_AT91
static struct at91_udc_data udc_data;

static struct resource udc_resources[] = {
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-at91/include/mach/system_rev.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#define BOARD_HAVE_NAND_16BIT (1 << 31)
static inline int board_have_nand_16bit(void)
{
return (system_rev & BOARD_HAVE_NAND_16BIT) ? 1 : 0;
return system_rev & BOARD_HAVE_NAND_16BIT;
}

#endif /* __ARCH_SYSTEM_REV_H__ */
9 changes: 4 additions & 5 deletions trunk/arch/arm/mach-imx/mach-imx6q.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,14 @@ static void __init imx6q_map_io(void)
imx6q_clock_map_io();
}

static int __init imx6q_gpio_add_irq_domain(struct device_node *np,
static void __init imx6q_gpio_add_irq_domain(struct device_node *np,
struct device_node *interrupt_parent)
{
static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS;
static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS -
32 * 7; /* imx6q gets 7 gpio ports */

gpio_irq_base -= 32;
irq_domain_add_simple(np, gpio_irq_base);

return 0;
gpio_irq_base += 32;
}

static const struct of_device_id imx6q_irq_match[] __initconst = {
Expand Down
12 changes: 5 additions & 7 deletions trunk/arch/arm/mach-mx5/imx51-dt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,20 @@ static const struct of_dev_auxdata imx51_auxdata_lookup[] __initconst = {
{ /* sentinel */ }
};

static int __init imx51_tzic_add_irq_domain(struct device_node *np,
static void __init imx51_tzic_add_irq_domain(struct device_node *np,
struct device_node *interrupt_parent)
{
irq_domain_add_simple(np, 0);
return 0;
}

static int __init imx51_gpio_add_irq_domain(struct device_node *np,
static void __init imx51_gpio_add_irq_domain(struct device_node *np,
struct device_node *interrupt_parent)
{
static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS;
static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS -
32 * 4; /* imx51 gets 4 gpio ports */

gpio_irq_base -= 32;
irq_domain_add_simple(np, gpio_irq_base);

return 0;
gpio_irq_base += 32;
}

static const struct of_device_id imx51_irq_match[] __initconst = {
Expand Down
12 changes: 5 additions & 7 deletions trunk/arch/arm/mach-mx5/imx53-dt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,20 @@ static const struct of_dev_auxdata imx53_auxdata_lookup[] __initconst = {
{ /* sentinel */ }
};

static int __init imx53_tzic_add_irq_domain(struct device_node *np,
static void __init imx53_tzic_add_irq_domain(struct device_node *np,
struct device_node *interrupt_parent)
{
irq_domain_add_simple(np, 0);
return 0;
}

static int __init imx53_gpio_add_irq_domain(struct device_node *np,
static void __init imx53_gpio_add_irq_domain(struct device_node *np,
struct device_node *interrupt_parent)
{
static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS;
static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS -
32 * 7; /* imx53 gets 7 gpio ports */

gpio_irq_base -= 32;
irq_domain_add_simple(np, gpio_irq_base);

return 0;
gpio_irq_base += 32;
}

static const struct of_device_id imx53_irq_match[] __initconst = {
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/arm/mach-mxs/module-tx28.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ static const iomux_cfg_t tx28_fec1_pads[] __initconst = {
MX28_PAD_ENET0_CRS__ENET1_RX_EN,
};

static struct fec_platform_data tx28_fec0_data = {
static const struct fec_platform_data tx28_fec0_data __initconst = {
.phy = PHY_INTERFACE_MODE_RMII,
};

static struct fec_platform_data tx28_fec1_data = {
static const struct fec_platform_data tx28_fec1_data __initconst = {
.phy = PHY_INTERFACE_MODE_RMII,
};

Expand Down
1 change: 0 additions & 1 deletion trunk/arch/arm/mach-prima2/pm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include <linux/kernel.h>
#include <linux/suspend.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/of_device.h>
Expand Down
1 change: 0 additions & 1 deletion trunk/arch/arm/mach-prima2/prima2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

#include <linux/init.h>
#include <linux/kernel.h>
#include <asm/sizes.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <linux/of.h>
Expand Down

0 comments on commit 7c0a59e

Please sign in to comment.