Skip to content

BCM270x: Clean out unused code #1011

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 7, 2015
Merged

BCM270x: Clean out unused code #1011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9da7815
fixup: BCM2709: Remove unused clock implementation
notro Jun 7, 2015
5f8d28b
BCM270x: Remove bcm2708_systemtimer and bcm2708_powerman
notro Jun 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 0 additions & 50 deletions arch/arm/mach-bcm2708/bcm2708.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,33 +465,6 @@ static struct platform_device bcm2708_gpio_device = {
};
#endif

static struct resource bcm2708_systemtimer_resources[] = {
[0] = { /* system timer access */
.start = ST_BASE,
.end = ST_BASE + SZ_4K - 1,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_TIMER3,
.end = IRQ_TIMER3,
.flags = IORESOURCE_IRQ,
}

};

static u64 systemtimer_dmamask = DMA_BIT_MASK(DMA_MASK_BITS_COMMON);

static struct platform_device bcm2708_systemtimer_device = {
.name = "bcm2708_systemtimer",
.id = -1, /* only one VideoCore I/O area */
.resource = bcm2708_systemtimer_resources,
.num_resources = ARRAY_SIZE(bcm2708_systemtimer_resources),
.dev = {
.dma_mask = &systemtimer_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(DMA_MASK_BITS_COMMON),
},
};

#ifdef CONFIG_MMC_BCM2835 /* Arasan emmc SD (new) */
static struct resource bcm2835_emmc_resources[] = {
[0] = {
Expand Down Expand Up @@ -520,27 +493,6 @@ struct platform_device bcm2835_emmc_device = {
};
#endif /* CONFIG_MMC_BCM2835 */

static struct resource bcm2708_powerman_resources[] = {
[0] = {
.start = PM_BASE,
.end = PM_BASE + SZ_256 - 1,
.flags = IORESOURCE_MEM,
},
};

static u64 powerman_dmamask = DMA_BIT_MASK(DMA_MASK_BITS_COMMON);

struct platform_device bcm2708_powerman_device = {
.name = "bcm2708_powerman",
.id = 0,
.num_resources = ARRAY_SIZE(bcm2708_powerman_resources),
.resource = bcm2708_powerman_resources,
.dev = {
.dma_mask = &powerman_dmamask,
.coherent_dma_mask = 0xffffffffUL},
};


static struct platform_device bcm2708_alsa_devices[] = {
[0] = {
.name = "bcm2835_AUD0",
Expand Down Expand Up @@ -938,10 +890,8 @@ void __init bcm2708_init(void)
w1_gpio_pdata.ext_pullup_enable_pin = w1_gpio_pullup;
bcm_register_device_dt(&w1_device);
#endif
bcm_register_device(&bcm2708_systemtimer_device);
bcm_register_device_dt(&bcm2708_fb_device);
bcm_register_device_dt(&bcm2708_usb_device);
bcm_register_device(&bcm2708_powerman_device);

#ifdef CONFIG_MMC_BCM2835
bcm_register_device_dt(&bcm2835_emmc_device);
Expand Down
54 changes: 0 additions & 54 deletions arch/arm/mach-bcm2709/bcm2709.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,35 +485,6 @@ static struct platform_device bcm2708_gpio_device = {
};
#endif

#ifdef SYSTEM_TIMER
static struct resource bcm2708_systemtimer_resources[] = {
[0] = { /* system timer access */
.start = ST_BASE,
.end = ST_BASE + SZ_4K - 1,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_TIMER3,
.end = IRQ_TIMER3,
.flags = IORESOURCE_IRQ,
}

};

static u64 systemtimer_dmamask = DMA_BIT_MASK(DMA_MASK_BITS_COMMON);

static struct platform_device bcm2708_systemtimer_device = {
.name = "bcm2708_systemtimer",
.id = -1, /* only one VideoCore I/O area */
.resource = bcm2708_systemtimer_resources,
.num_resources = ARRAY_SIZE(bcm2708_systemtimer_resources),
.dev = {
.dma_mask = &systemtimer_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(DMA_MASK_BITS_COMMON),
},
};
#endif

#ifdef CONFIG_MMC_BCM2835 /* Arasan emmc SD (new) */
static struct resource bcm2835_emmc_resources[] = {
[0] = {
Expand Down Expand Up @@ -542,27 +513,6 @@ struct platform_device bcm2835_emmc_device = {
};
#endif /* CONFIG_MMC_BCM2835 */

static struct resource bcm2708_powerman_resources[] = {
[0] = {
.start = PM_BASE,
.end = PM_BASE + SZ_256 - 1,
.flags = IORESOURCE_MEM,
},
};

static u64 powerman_dmamask = DMA_BIT_MASK(DMA_MASK_BITS_COMMON);

struct platform_device bcm2708_powerman_device = {
.name = "bcm2708_powerman",
.id = 0,
.num_resources = ARRAY_SIZE(bcm2708_powerman_resources),
.resource = bcm2708_powerman_resources,
.dev = {
.dma_mask = &powerman_dmamask,
.coherent_dma_mask = 0xffffffffUL},
};


static struct platform_device bcm2708_alsa_devices[] = {
[0] = {
.name = "bcm2835_AUD0",
Expand Down Expand Up @@ -959,13 +909,9 @@ void __init bcm2709_init(void)
w1_gpio_pdata.pin = w1_gpio_pin;
w1_gpio_pdata.ext_pullup_enable_pin = w1_gpio_pullup;
bcm_register_device_dt(&w1_device);
#endif
#ifdef SYSTEM_TIMER
bcm_register_device(&bcm2708_systemtimer_device);
#endif
bcm_register_device_dt(&bcm2708_fb_device);
bcm_register_device_dt(&bcm2708_usb_device);
bcm_register_device(&bcm2708_powerman_device);

#ifdef CONFIG_MMC_BCM2835
bcm_register_device_dt(&bcm2835_emmc_device);
Expand Down
61 changes: 0 additions & 61 deletions arch/arm/mach-bcm2709/clock.c
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions arch/arm/mach-bcm2709/clock.h
View file
Open in desktop

This file was deleted.