From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Schocher Date: Thu, 10 Dec 2015 10:38:28 +0100 Subject: [U-Boot] [PATCH v3 4/5] board: atmel: clean up peripheral clock code In-Reply-To: <1449714053-26416-5-git-send-email-wenyou.yang@atmel.com> References: <1449714053-26416-1-git-send-email-wenyou.yang@atmel.com> <1449714053-26416-5-git-send-email-wenyou.yang@atmel.com> Message-ID: <56694814.2090902@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hello Wenyou, Am 10.12.2015 um 03:20 schrieb Wenyou Yang: > Due to introducing the new peripheral clock handle functions, > use these functions to reduce duplicated code. > > Signed-off-by: Wenyou Yang > --- > > Changes in v3: None > Changes in v2: > - fix checkpatch warning. > > board/atmel/at91rm9200ek/at91rm9200ek.c | 1 - > board/atmel/at91rm9200ek/led.c | 5 +---- > board/atmel/at91sam9260ek/at91sam9260ek.c | 15 +++++---------- > board/atmel/at91sam9261ek/at91sam9261ek.c | 8 ++------ > board/atmel/at91sam9261ek/led.c | 6 ++---- > board/atmel/at91sam9263ek/at91sam9263ek.c | 23 +++++++---------------- > board/atmel/at91sam9263ek/led.c | 9 +++------ > board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 20 +++++--------------- > board/atmel/at91sam9m10g45ek/led.c | 7 ++----- > board/atmel/at91sam9n12ek/at91sam9n12ek.c | 6 ++---- > board/atmel/at91sam9rlek/at91sam9rlek.c | 18 ++++++------------ > board/atmel/at91sam9rlek/led.c | 7 ++----- > board/atmel/at91sam9x5ek/at91sam9x5ek.c | 10 +++------- > board/atmel/sama5d2_xplained/sama5d2_xplained.c | 1 - > board/atmel/sama5d3_xplained/sama5d3_xplained.c | 5 ++--- > board/atmel/sama5d3xek/sama5d3xek.c | 5 ++--- > board/atmel/sama5d4_xplained/sama5d4_xplained.c | 5 ++--- > board/atmel/sama5d4ek/sama5d4ek.c | 5 ++--- > board/bluewater/snapper9260/snapper9260.c | 15 +++++---------- > board/calao/usb_a9263/usb_a9263.c | 11 ++++------- > board/egnite/ethernut5/ethernut5.c | 20 ++++++++------------ > board/esd/meesc/meesc.c | 15 ++++++--------- > board/mini-box/picosam9g45/led.c | 7 ++----- > board/mini-box/picosam9g45/picosam9g45.c | 17 ++++------------- > board/ronetix/pm9261/led.c | 7 ++----- > board/ronetix/pm9261/pm9261.c | 22 ++++++---------------- > board/ronetix/pm9263/led.c | 7 ++----- > board/ronetix/pm9263/pm9263.c | 19 +++++-------------- > board/ronetix/pm9g45/pm9g45.c | 20 ++++++-------------- > board/siemens/corvus/board.c | 6 ++---- > board/siemens/smartweb/smartweb.c | 3 +-- > board/siemens/taurus/taurus.c | 3 +-- > 32 files changed, 102 insertions(+), 226 deletions(-) Tested on the smartweb board, see log: http://xeidos.ddns.net/buildbot/builders/smartweb_dfu/builds/29/steps/shell/logs/tbotlog Tested-by: Heiko Schocher bye, Heiko > > diff --git a/board/atmel/at91rm9200ek/at91rm9200ek.c b/board/atmel/at91rm9200ek/at91rm9200ek.c > index 64ab572..4ca8106 100644 > --- a/board/atmel/at91rm9200ek/at91rm9200ek.c > +++ b/board/atmel/at91rm9200ek/at91rm9200ek.c > @@ -14,7 +14,6 @@ > #include > #include > #include > -#include > #include > #include > > diff --git a/board/atmel/at91rm9200ek/led.c b/board/atmel/at91rm9200ek/led.c > index 6761b14..8b62035 100644 > --- a/board/atmel/at91rm9200ek/led.c > +++ b/board/atmel/at91rm9200ek/led.c > @@ -12,7 +12,6 @@ > #include > #include > #include > -#include > #include > #include > > @@ -59,11 +58,9 @@ void red_led_off(void) > > void coloured_LED_init (void) > { > - at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC; > at91_pio_t *pio = (at91_pio_t *)ATMEL_BASE_PIO; > > - /* Enable PIOB clock */ > - writel(1 << ATMEL_ID_PIOB, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_PIOB); > > /* Disable peripherals on LEDs */ > writel(GREEN_LED | YELLOW_LED | RED_LED, &pio->piob.per); > diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c b/board/atmel/at91sam9260ek/at91sam9260ek.c > index 7f14af1..98193bf 100644 > --- a/board/atmel/at91sam9260ek/at91sam9260ek.c > +++ b/board/atmel/at91sam9260ek/at91sam9260ek.c > @@ -11,7 +11,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > > @@ -70,11 +70,9 @@ static void at91sam9260ek_nand_hw_init(void) > #ifdef CONFIG_MACB > static void at91sam9260ek_macb_hw_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > struct at91_port *pioa = (struct at91_port *)ATMEL_BASE_PIOA; > > - /* Enable EMAC clock */ > - writel(1 << ATMEL_ID_EMAC0, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_EMAC0); > > /* > * Disable pull-up on: > @@ -122,12 +120,9 @@ int board_mmc_init(bd_t *bd) > > int board_early_init_f(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > - > - /* Enable clocks for all PIOs */ > - writel((1 << ATMEL_ID_PIOA) | (1 << ATMEL_ID_PIOB) | > - (1 << ATMEL_ID_PIOC), > - &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_PIOA); > + at91_periph_clk_enable(ATMEL_ID_PIOB); > + at91_periph_clk_enable(ATMEL_ID_PIOC); > > return 0; > } > diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c b/board/atmel/at91sam9261ek/at91sam9261ek.c > index 5250474..7b7cd2c 100644 > --- a/board/atmel/at91sam9261ek/at91sam9261ek.c > +++ b/board/atmel/at91sam9261ek/at91sam9261ek.c > @@ -12,7 +12,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -35,7 +34,6 @@ static void at91sam9261ek_nand_hw_init(void) > { > struct at91_smc *smc = (struct at91_smc *)ATMEL_BASE_SMC; > struct at91_matrix *matrix = (struct at91_matrix *)ATMEL_BASE_MATRIX; > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > unsigned long csa; > > /* Enable CS3 */ > @@ -74,7 +72,7 @@ static void at91sam9261ek_nand_hw_init(void) > AT91_SMC_MODE_TDF_CYCLE(2), > &smc->cs[3].mode); > > - writel(1 << ATMEL_ID_PIOC, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_PIOC); > > /* Configure RDY/BSY */ > at91_set_gpio_input(CONFIG_SYS_NAND_READY_PIN, 1); > @@ -161,8 +159,6 @@ void lcd_disable(void) > > static void at91sam9261ek_lcd_hw_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > - > at91_set_A_periph(AT91_PIN_PB1, 0); /* LCDHSYNC */ > at91_set_A_periph(AT91_PIN_PB2, 0); /* LCDDOTCK */ > at91_set_A_periph(AT91_PIN_PB3, 0); /* LCDDEN */ > @@ -186,7 +182,7 @@ static void at91sam9261ek_lcd_hw_init(void) > at91_set_B_periph(AT91_PIN_PB27, 0); /* LCDD22 */ > at91_set_B_periph(AT91_PIN_PB28, 0); /* LCDD23 */ > > - writel(AT91_PMC_HCK1, &pmc->scer); > + at91_system_clk_enable(AT91_PMC_HCK1); > > /* For 9G10EK, let U-Boot allocate the framebuffer in SDRAM */ > #ifdef CONFIG_AT91SAM9261EK > diff --git a/board/atmel/at91sam9261ek/led.c b/board/atmel/at91sam9261ek/led.c > index 18a68d8..485d7ea 100644 > --- a/board/atmel/at91sam9261ek/led.c > +++ b/board/atmel/at91sam9261ek/led.c > @@ -8,17 +8,15 @@ > > #include > #include > -#include > #include > #include > +#include > #include > > void coloured_LED_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > - > /* Enable clock */ > - writel(ATMEL_ID_PIOA, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_PIOA); > > at91_set_gpio_output(CONFIG_RED_LED, 1); > at91_set_gpio_output(CONFIG_GREEN_LED, 1); > diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c > index 927adb0..af68e10 100644 > --- a/board/atmel/at91sam9263ek/at91sam9263ek.c > +++ b/board/atmel/at91sam9263ek/at91sam9263ek.c > @@ -11,7 +11,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -39,7 +38,6 @@ static void at91sam9263ek_nand_hw_init(void) > unsigned long csa; > at91_smc_t *smc = (at91_smc_t *) ATMEL_BASE_SMC0; > at91_matrix_t *matrix = (at91_matrix_t *) ATMEL_BASE_MATRIX; > - at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC; > > /* Enable CS3 */ > csa = readl(&matrix->csa[0]) | AT91_MATRIX_CSA_EBI_CS3A; > @@ -68,8 +66,8 @@ static void at91sam9263ek_nand_hw_init(void) > AT91_SMC_MODE_TDF_CYCLE(2), > &smc->cs[3].mode); > > - writel(1 << ATMEL_ID_PIOA | 1 << ATMEL_ID_PIOCDE, > - &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_PIOA); > + at91_periph_clk_enable(ATMEL_ID_PIOCDE); > > /* Configure RDY/BSY */ > at91_set_gpio_input(CONFIG_SYS_NAND_READY_PIN, 1); > @@ -82,11 +80,9 @@ static void at91sam9263ek_nand_hw_init(void) > #ifdef CONFIG_MACB > static void at91sam9263ek_macb_hw_init(void) > { > - at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC; > at91_pio_t *pio = (at91_pio_t *) ATMEL_BASE_PIO; > > - /* Enable clock */ > - writel(1 << ATMEL_ID_EMAC, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_EMAC); > > /* > * Disable pull-up on: > @@ -139,8 +135,6 @@ void lcd_disable(void) > > static void at91sam9263ek_lcd_hw_init(void) > { > - at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC; > - > at91_set_a_periph(AT91_PIO_PORTC, 1, 0); /* LCDHSYNC */ > at91_set_a_periph(AT91_PIO_PORTC, 2, 0); /* LCDDOTCK */ > at91_set_a_periph(AT91_PIO_PORTC, 3, 0); /* LCDDEN */ > @@ -164,7 +158,7 @@ static void at91sam9263ek_lcd_hw_init(void) > at91_set_a_periph(AT91_PIO_PORTC, 26, 0); /* LCDD22 */ > at91_set_a_periph(AT91_PIO_PORTC, 27, 0); /* LCDD23 */ > > - writel(1 << ATMEL_ID_LCDC, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_LCDC); > gd->fb_base = ATMEL_BASE_SRAM0; > } > > @@ -226,12 +220,9 @@ int board_mmc_init(bd_t *bd) > > int board_early_init_f(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > - > - /* Enable clocks for all PIOs */ > - writel((1 << ATMEL_ID_PIOA) | (1 << ATMEL_ID_PIOB) | > - (1 << ATMEL_ID_PIOCDE), > - &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_PIOA); > + at91_periph_clk_enable(ATMEL_ID_PIOB); > + at91_periph_clk_enable(ATMEL_ID_PIOCDE); > > at91_seriald_hw_init(); > return 0; > diff --git a/board/atmel/at91sam9263ek/led.c b/board/atmel/at91sam9263ek/led.c > index e317d99..21d81de 100644 > --- a/board/atmel/at91sam9263ek/led.c > +++ b/board/atmel/at91sam9263ek/led.c > @@ -9,16 +9,13 @@ > #include > #include > #include > -#include > #include > +#include > > void coloured_LED_init(void) > { > - /* Enable clock */ > - at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC; > - > - writel(1 << ATMEL_ID_PIOB | 1 << ATMEL_ID_PIOCDE, > - &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_PIOB); > + at91_periph_clk_enable(ATMEL_ID_PIOB); > > at91_set_gpio_output(CONFIG_RED_LED, 1); > at91_set_gpio_output(CONFIG_GREEN_LED, 1); > diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c > index 2fea56f..b67fd76 100644 > --- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c > +++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c > @@ -12,7 +12,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -36,7 +35,6 @@ void at91sam9m10g45ek_nand_hw_init(void) > { > struct at91_smc *smc = (struct at91_smc *)ATMEL_BASE_SMC; > struct at91_matrix *matrix = (struct at91_matrix *)ATMEL_BASE_MATRIX; > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > unsigned long csa; > > /* Enable CS3 */ > @@ -63,7 +61,7 @@ void at91sam9m10g45ek_nand_hw_init(void) > AT91_SMC_MODE_TDF_CYCLE(3), > &smc->cs[3].mode); > > - writel(1 << ATMEL_ID_PIOC, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_PIOC); > > /* Configure RDY/BSY */ > at91_set_gpio_input(CONFIG_SYS_NAND_READY_PIN, 1); > @@ -130,13 +128,11 @@ static void ddr2_conf(struct atmel_mpddr *ddr2) > > void mem_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > struct atmel_mpddr ddr2; > > ddr2_conf(&ddr2); > > - /* enable DDR2 clock */ > - writel(AT91_PMC_DDR, &pmc->scer); > + at91_system_clk_enable(AT91_PMC_DDR); > > /* DDRAM2 Controller initialize */ > ddr2_init(ATMEL_BASE_DDRSDRC0, ATMEL_BASE_CS6, &ddr2); > @@ -146,9 +142,7 @@ void mem_init(void) > #ifdef CONFIG_CMD_USB > static void at91sam9m10g45ek_usb_hw_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > - > - writel(1 << ATMEL_ID_PIODE, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_PIODE); > > at91_set_gpio_output(AT91_PIN_PD1, 0); > at91_set_gpio_output(AT91_PIN_PD3, 0); > @@ -158,11 +152,9 @@ static void at91sam9m10g45ek_usb_hw_init(void) > #ifdef CONFIG_MACB > static void at91sam9m10g45ek_macb_hw_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > struct at91_port *pioa = (struct at91_port *)ATMEL_BASE_PIOA; > > - /* Enable clock */ > - writel(1 << ATMEL_ID_EMAC, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_EMAC); > > /* > * Disable pull-up on: > @@ -222,8 +214,6 @@ void lcd_disable(void) > > static void at91sam9m10g45ek_lcd_hw_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > - > at91_set_A_periph(AT91_PIN_PE0, 0); /* LCDDPWR */ > at91_set_A_periph(AT91_PIN_PE2, 0); /* LCDCC */ > at91_set_A_periph(AT91_PIN_PE3, 0); /* LCDVSYNC */ > @@ -255,7 +245,7 @@ static void at91sam9m10g45ek_lcd_hw_init(void) > at91_set_A_periph(AT91_PIN_PE29, 0); /* LCDD22 */ > at91_set_A_periph(AT91_PIN_PE30, 0); /* LCDD23 */ > > - writel(1 << ATMEL_ID_LCDC, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_LCDC); > > gd->fb_base = CONFIG_AT91SAM9G45_LCD_BASE; > } > diff --git a/board/atmel/at91sam9m10g45ek/led.c b/board/atmel/at91sam9m10g45ek/led.c > index fe98723..866052e 100644 > --- a/board/atmel/at91sam9m10g45ek/led.c > +++ b/board/atmel/at91sam9m10g45ek/led.c > @@ -9,15 +9,12 @@ > #include > #include > #include > -#include > +#include > #include > > void coloured_LED_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > - > - /* Enable clock */ > - writel(1 << ATMEL_ID_PIODE, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_PIODE); > > at91_set_gpio_output(CONFIG_RED_LED, 1); > at91_set_gpio_output(CONFIG_GREEN_LED, 1); > diff --git a/board/atmel/at91sam9n12ek/at91sam9n12ek.c b/board/atmel/at91sam9n12ek/at91sam9n12ek.c > index 59bc535..49e34b2 100644 > --- a/board/atmel/at91sam9n12ek/at91sam9n12ek.c > +++ b/board/atmel/at91sam9n12ek/at91sam9n12ek.c > @@ -10,7 +10,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -208,9 +207,8 @@ void at91sam9n12ek_usb_hw_init(void) > > int board_early_init_f(void) > { > - /* Enable clocks for all PIOs */ > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > - writel((1 << ATMEL_ID_PIOAB) | (1 << ATMEL_ID_PIOCD), &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_PIOAB); > + at91_periph_clk_enable(ATMEL_ID_PIOCD); > > at91_seriald_hw_init(); > return 0; > diff --git a/board/atmel/at91sam9rlek/at91sam9rlek.c b/board/atmel/at91sam9rlek/at91sam9rlek.c > index f995cef..9ef2864 100644 > --- a/board/atmel/at91sam9rlek/at91sam9rlek.c > +++ b/board/atmel/at91sam9rlek/at91sam9rlek.c > @@ -12,7 +12,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -36,7 +35,6 @@ static void at91sam9rlek_nand_hw_init(void) > { > struct at91_smc *smc = (struct at91_smc *)ATMEL_BASE_SMC; > struct at91_matrix *matrix = (struct at91_matrix *)ATMEL_BASE_MATRIX; > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > unsigned long csa; > > /* Enable CS3 */ > @@ -64,7 +62,7 @@ static void at91sam9rlek_nand_hw_init(void) > AT91_SMC_MODE_TDF_CYCLE(2), > &smc->cs[3].mode); > > - writel(1 << ATMEL_ID_PIOD, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_PIOD); > > /* Configure RDY/BSY */ > at91_set_gpio_input(CONFIG_SYS_NAND_READY_PIN, 1); > @@ -106,8 +104,6 @@ void lcd_disable(void) > } > static void at91sam9rlek_lcd_hw_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > - > at91_set_B_periph(AT91_PIN_PC1, 0); /* LCDPWR */ > at91_set_A_periph(AT91_PIN_PC5, 0); /* LCDHSYNC */ > at91_set_A_periph(AT91_PIN_PC6, 0); /* LCDDOTCK */ > @@ -130,7 +126,7 @@ static void at91sam9rlek_lcd_hw_init(void) > at91_set_B_periph(AT91_PIN_PC24, 0); /* LCDD22 */ > at91_set_B_periph(AT91_PIN_PC25, 0); /* LCDD23 */ > > - writel(1 << ATMEL_ID_LCDC, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_LCDC); > } > > #ifdef CONFIG_LCD_INFO > @@ -174,12 +170,10 @@ int board_mmc_init(bd_t *bis) > > int board_early_init_f(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > - > - /* Enable clocks for all PIOs */ > - writel((1 << ATMEL_ID_PIOA) | (1 << ATMEL_ID_PIOB) | > - (1 << ATMEL_ID_PIOC) | (1 << ATMEL_ID_PIOD), > - &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_PIOA); > + at91_periph_clk_enable(ATMEL_ID_PIOB); > + at91_periph_clk_enable(ATMEL_ID_PIOC); > + at91_periph_clk_enable(ATMEL_ID_PIOD); > > return 0; > } > diff --git a/board/atmel/at91sam9rlek/led.c b/board/atmel/at91sam9rlek/led.c > index fede59c..d593aba 100644 > --- a/board/atmel/at91sam9rlek/led.c > +++ b/board/atmel/at91sam9rlek/led.c > @@ -8,16 +8,13 @@ > > #include > #include > -#include > +#include > #include > #include > > void coloured_LED_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > - > - /* Enable clock */ > - writel(ATMEL_ID_PIOD, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_PIOD); > > at91_set_gpio_output(CONFIG_RED_LED, 1); > at91_set_gpio_output(CONFIG_GREEN_LED, 1); > diff --git a/board/atmel/at91sam9x5ek/at91sam9x5ek.c b/board/atmel/at91sam9x5ek/at91sam9x5ek.c > index 1738a2b..23ca71a 100644 > --- a/board/atmel/at91sam9x5ek/at91sam9x5ek.c > +++ b/board/atmel/at91sam9x5ek/at91sam9x5ek.c > @@ -9,10 +9,9 @@ > #include > #include > #include > -#include > #include > -#include > #include > +#include > #include > #include > #include > @@ -39,7 +38,6 @@ static void at91sam9x5ek_nand_hw_init(void) > { > struct at91_smc *smc = (struct at91_smc *)ATMEL_BASE_SMC; > struct at91_matrix *matrix = (struct at91_matrix *)ATMEL_BASE_MATRIX; > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > unsigned long csa; > > /* Enable CS3 */ > @@ -72,7 +70,7 @@ static void at91sam9x5ek_nand_hw_init(void) > AT91_SMC_MODE_TDF_CYCLE(1), > &smc->cs[3].mode); > > - writel(1 << ATMEL_ID_PIOCD, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_PIOCD); > > /* Configure RDY/BSY */ > at91_set_gpio_input(CONFIG_SYS_NAND_READY_PIN, 1); > @@ -141,8 +139,6 @@ void lcd_disable(void) > > static void at91sam9x5ek_lcd_hw_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > - > if (has_lcdc()) { > at91_set_a_periph(AT91_PIO_PORTC, 26, 0); /* LCDPWM */ > at91_set_a_periph(AT91_PIO_PORTC, 27, 0); /* LCDVSYNC */ > @@ -176,7 +172,7 @@ static void at91sam9x5ek_lcd_hw_init(void) > at91_set_a_periph(AT91_PIO_PORTC, 22, 0); /* LCDD22 */ > at91_set_a_periph(AT91_PIO_PORTC, 23, 0); /* LCDD23 */ > > - writel(1 << ATMEL_ID_LCDC, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_LCDC); > } > } > > diff --git a/board/atmel/sama5d2_xplained/sama5d2_xplained.c b/board/atmel/sama5d2_xplained/sama5d2_xplained.c > index 0b3397f..241c165 100644 > --- a/board/atmel/sama5d2_xplained/sama5d2_xplained.c > +++ b/board/atmel/sama5d2_xplained/sama5d2_xplained.c > @@ -15,7 +15,6 @@ > #include > #include > #include > -#include > #include > #include > #include > diff --git a/board/atmel/sama5d3_xplained/sama5d3_xplained.c b/board/atmel/sama5d3_xplained/sama5d3_xplained.c > index 7a01149..d180b41 100644 > --- a/board/atmel/sama5d3_xplained/sama5d3_xplained.c > +++ b/board/atmel/sama5d3_xplained/sama5d3_xplained.c > @@ -184,14 +184,13 @@ static void ddr2_conf(struct atmel_mpddr *ddr2) > > void mem_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > struct atmel_mpddr ddr2; > > ddr2_conf(&ddr2); > > - /* enable MPDDR clock */ > + /* Enable MPDDR clock */ > at91_periph_clk_enable(ATMEL_ID_MPDDRC); > - writel(AT91_PMC_DDR, &pmc->scer); > + at91_system_clk_enable(AT91_PMC_DDR); > > /* DDRAM2 Controller initialize */ > ddr2_init(ATMEL_BASE_MPDDRC, ATMEL_BASE_DDRCS, &ddr2); > diff --git a/board/atmel/sama5d3xek/sama5d3xek.c b/board/atmel/sama5d3xek/sama5d3xek.c > index 7c95f33..777e57e 100644 > --- a/board/atmel/sama5d3xek/sama5d3xek.c > +++ b/board/atmel/sama5d3xek/sama5d3xek.c > @@ -443,14 +443,13 @@ static void ddr2_conf(struct atmel_mpddr *ddr2) > > void mem_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > struct atmel_mpddr ddr2; > > ddr2_conf(&ddr2); > > - /* enable MPDDR clock */ > + /* Enable MPDDR clock */ > at91_periph_clk_enable(ATMEL_ID_MPDDRC); > - writel(AT91_PMC_DDR, &pmc->scer); > + at91_system_clk_enable(AT91_PMC_DDR); > > /* DDRAM2 Controller initialize */ > ddr2_init(ATMEL_BASE_MPDDRC, ATMEL_BASE_DDRCS, &ddr2); > diff --git a/board/atmel/sama5d4_xplained/sama5d4_xplained.c b/board/atmel/sama5d4_xplained/sama5d4_xplained.c > index db45331..e95310c 100644 > --- a/board/atmel/sama5d4_xplained/sama5d4_xplained.c > +++ b/board/atmel/sama5d4_xplained/sama5d4_xplained.c > @@ -383,14 +383,13 @@ static void ddr2_conf(struct atmel_mpddr *ddr2) > > void mem_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > struct atmel_mpddr ddr2; > > ddr2_conf(&ddr2); > > - /* enable MPDDR clock */ > + /* Enable MPDDR clock */ > at91_periph_clk_enable(ATMEL_ID_MPDDRC); > - writel(AT91_PMC_DDR, &pmc->scer); > + at91_system_clk_enable(AT91_PMC_DDR); > > /* DDRAM2 Controller initialize */ > ddr2_init(ATMEL_BASE_MPDDRC, ATMEL_BASE_DDRCS, &ddr2); > diff --git a/board/atmel/sama5d4ek/sama5d4ek.c b/board/atmel/sama5d4ek/sama5d4ek.c > index 357b223..c92e2588 100644 > --- a/board/atmel/sama5d4ek/sama5d4ek.c > +++ b/board/atmel/sama5d4ek/sama5d4ek.c > @@ -379,14 +379,13 @@ static void ddr2_conf(struct atmel_mpddr *ddr2) > > void mem_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > struct atmel_mpddr ddr2; > > ddr2_conf(&ddr2); > > - /* enable MPDDR clock */ > + /* Enable MPDDR clock */ > at91_periph_clk_enable(ATMEL_ID_MPDDRC); > - writel(AT91_PMC_DDR, &pmc->scer); > + at91_system_clk_enable(AT91_PMC_DDR); > > /* DDRAM2 Controller initialize */ > ddr2_init(ATMEL_BASE_MPDDRC, ATMEL_BASE_DDRCS, &ddr2); > diff --git a/board/bluewater/snapper9260/snapper9260.c b/board/bluewater/snapper9260/snapper9260.c > index 95633b0..2d1a89e 100644 > --- a/board/bluewater/snapper9260/snapper9260.c > +++ b/board/bluewater/snapper9260/snapper9260.c > @@ -15,7 +15,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > #include > @@ -31,11 +31,9 @@ DECLARE_GLOBAL_DATA_PTR; > > static void macb_hw_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > struct at91_port *pioa = (struct at91_port *)ATMEL_BASE_PIOA; > > - /* Enable clock */ > - writel(1 << ATMEL_ID_EMAC0, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_EMAC0); > > /* Disable pull-ups to prevent PHY going into test mode */ > writel(pin_to_mask(AT91_PIN_PA14) | > @@ -108,12 +106,9 @@ static void nand_hw_init(void) > > int board_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > - > - /* Enable PIO clocks */ > - writel((1 << ATMEL_ID_PIOA) | > - (1 << ATMEL_ID_PIOB) | > - (1 << ATMEL_ID_PIOC), &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_PIOA); > + at91_periph_clk_enable(ATMEL_ID_PIOB); > + at91_periph_clk_enable(ATMEL_ID_PIOC); > > /* The mach-type is the same for both Snapper 9260 and 9G20 */ > gd->bd->bi_arch_number = MACH_TYPE_SNAPPER_9260; > diff --git a/board/calao/usb_a9263/usb_a9263.c b/board/calao/usb_a9263/usb_a9263.c > index 266e950..d627b24 100644 > --- a/board/calao/usb_a9263/usb_a9263.c > +++ b/board/calao/usb_a9263/usb_a9263.c > @@ -12,7 +12,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > #include > @@ -43,7 +43,6 @@ static void usb_a9263_nand_hw_init(void) > unsigned long csa; > at91_smc_t *smc = (at91_smc_t *)ATMEL_BASE_SMC0; > at91_matrix_t *matrix = (at91_matrix_t *)ATMEL_BASE_MATRIX; > - at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC; > > /* Enable CS3 */ > csa = readl(&matrix->csa[0]) | AT91_MATRIX_CSA_EBI_CS3A; > @@ -66,7 +65,8 @@ static void usb_a9263_nand_hw_init(void) > AT91_SMC_MODE_DBW_8 | > AT91_SMC_MODE_TDF_CYCLE(2), &smc->cs[3].mode); > > - writel(1 << ATMEL_ID_PIOA | 1 << ATMEL_ID_PIOCDE, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_PIOA); > + at91_periph_clk_enable(ATMEL_ID_PIOCDE); > > /* Configure RDY/BSY */ > gpio_request(CONFIG_SYS_NAND_READY_PIN, "NAND ready/busy"); > @@ -81,10 +81,7 @@ static void usb_a9263_nand_hw_init(void) > #ifdef CONFIG_MACB > static void usb_a9263_macb_hw_init(void) > { > - at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC; > - > - /* Enable clock */ > - writel(1 << ATMEL_ID_EMAC, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_EMAC); > > /* > * Disable pull-up on: > diff --git a/board/egnite/ethernut5/ethernut5.c b/board/egnite/ethernut5/ethernut5.c > index 67d3984..2c8e978 100644 > --- a/board/egnite/ethernut5/ethernut5.c > +++ b/board/egnite/ethernut5/ethernut5.c > @@ -67,8 +67,8 @@ > #include > #include > #include > -#include > #include > +#include > #include > #include > #include > @@ -151,12 +151,10 @@ static void ethernut5_nand_hw_init(void) > */ > int board_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > + at91_periph_clk_enable(ATMEL_ID_PIOA); > + at91_periph_clk_enable(ATMEL_ID_PIOB); > + at91_periph_clk_enable(ATMEL_ID_PIOC); > > - /* Enable clocks for all PIOs */ > - writel((1 << ATMEL_ID_PIOA) | (1 << ATMEL_ID_PIOB) | > - (1 << ATMEL_ID_PIOC), > - &pmc->pcer); > /* Set adress of boot parameters. */ > gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; > /* Initialize UARTs and power management. */ > @@ -179,10 +177,9 @@ int board_eth_init(bd_t *bis) > { > const char *devname; > unsigned short mode; > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > > - /* Enable on-chip EMAC clock. */ > - writel(1 << ATMEL_ID_EMAC0, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_EMAC0); > + > /* Need to reset PHY via power management. */ > ethernut5_phy_reset(); > /* Set peripheral pins. */ > @@ -211,10 +208,8 @@ int board_eth_init(bd_t *bis) > #ifdef CONFIG_GENERIC_ATMEL_MCI > int board_mmc_init(bd_t *bd) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > + at91_periph_clk_enable(ATMEL_ID_MCI); > > - /* Enable MCI clock. */ > - writel(1 << ATMEL_ID_MCI, &pmc->pcer); > /* Initialize MCI hardware. */ > at91_mci_hw_init(); > /* Register the device. */ > @@ -229,6 +224,7 @@ int board_mmc_getcd(struct mmc *mmc) > > #ifdef CONFIG_ATMEL_SPI > /* > + > * Note, that u-boot uses different code for SPI bus access. While > * memory routines use automatic chip select control, the serial > * flash support requires 'manual' GPIO control. Thus, we switch > diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c > index b7f9f90..fe781dc 100644 > --- a/board/esd/meesc/meesc.c > +++ b/board/esd/meesc/meesc.c > @@ -87,9 +87,8 @@ static void meesc_nand_hw_init(void) > #ifdef CONFIG_MACB > static void meesc_macb_hw_init(void) > { > - at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC; > - /* Enable clock */ > - writel(1 << ATMEL_ID_EMAC, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_EMAC); > + > at91_macb_hw_init(); > } > #endif > @@ -244,12 +243,10 @@ int misc_init_r(void) > > int board_early_init_f(void) > { > - at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC; > - > - /* enable all clocks */ > - writel((1 << ATMEL_ID_PIOA) | (1 << ATMEL_ID_PIOB) | > - (1 << ATMEL_ID_PIOCDE) | (1 << ATMEL_ID_UHP), > - &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_PIOA); > + at91_periph_clk_enable(ATMEL_ID_PIOB); > + at91_periph_clk_enable(ATMEL_ID_PIOCDE); > + at91_periph_clk_enable(ATMEL_ID_UHP); > > at91_seriald_hw_init(); > > diff --git a/board/mini-box/picosam9g45/led.c b/board/mini-box/picosam9g45/led.c > index dc1013a..3fb6a7b 100644 > --- a/board/mini-box/picosam9g45/led.c > +++ b/board/mini-box/picosam9g45/led.c > @@ -9,15 +9,12 @@ > #include > #include > #include > -#include > +#include > #include > > void coloured_LED_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > - > - /* Enable clock */ > - writel(1 << ATMEL_ID_PIODE, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_PIODE); > > at91_set_gpio_output(CONFIG_GREEN_LED, 1); > > diff --git a/board/mini-box/picosam9g45/picosam9g45.c b/board/mini-box/picosam9g45/picosam9g45.c > index afbd6ce..b768fbf 100644 > --- a/board/mini-box/picosam9g45/picosam9g45.c > +++ b/board/mini-box/picosam9g45/picosam9g45.c > @@ -17,7 +17,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -80,15 +79,13 @@ static void ddr2_conf(struct atmel_mpddr *ddr2) > > void mem_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > struct at91_matrix *mat = (struct at91_matrix *)ATMEL_BASE_MATRIX; > struct atmel_mpddr ddr2; > unsigned long csa; > > ddr2_conf(&ddr2); > > - /* enable DDR2 clock */ > - writel(AT91_PMC_DDR, &pmc->scer); > + at91_system_clk_enable(AT91_PMC_DDR); > > /* Chip select 1 is for DDR2/SDRAM */ > csa = readl(&mat->ebicsa); > @@ -105,9 +102,7 @@ void mem_init(void) > #ifdef CONFIG_CMD_USB > static void picosam9g45_usb_hw_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > - > - writel(1 << ATMEL_ID_PIODE, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_PIODE); > > at91_set_gpio_output(AT91_PIN_PD1, 0); > at91_set_gpio_output(AT91_PIN_PD3, 0); > @@ -117,11 +112,9 @@ static void picosam9g45_usb_hw_init(void) > #ifdef CONFIG_MACB > static void picosam9g45_macb_hw_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > struct at91_port *pioa = (struct at91_port *)ATMEL_BASE_PIOA; > > - /* Enable clock */ > - writel(1 << ATMEL_ID_EMAC, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_EMAC); > > /* > * Disable pull-up on: > @@ -181,8 +174,6 @@ void lcd_disable(void) > > static void picosam9g45_lcd_hw_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > - > at91_set_A_periph(AT91_PIN_PE0, 0); /* LCDDPWR */ > at91_set_A_periph(AT91_PIN_PE2, 0); /* LCDCC */ > at91_set_A_periph(AT91_PIN_PE3, 0); /* LCDVSYNC */ > @@ -214,7 +205,7 @@ static void picosam9g45_lcd_hw_init(void) > at91_set_A_periph(AT91_PIN_PE29, 0); /* LCDD22 */ > at91_set_A_periph(AT91_PIN_PE30, 0); /* LCDD23 */ > > - writel(1 << ATMEL_ID_LCDC, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_LCDC); > > gd->fb_base = CONFIG_AT91SAM9G45_LCD_BASE; > } > diff --git a/board/ronetix/pm9261/led.c b/board/ronetix/pm9261/led.c > index cc4c2a0..53e353a 100644 > --- a/board/ronetix/pm9261/led.c > +++ b/board/ronetix/pm9261/led.c > @@ -9,15 +9,12 @@ > > #include > #include > -#include > +#include > #include > > void coloured_LED_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > - > - /* Enable clock */ > - writel(1 << ATMEL_ID_PIOC, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_PIOC); > > gpio_direction_output(CONFIG_RED_LED, 1); > gpio_direction_output(CONFIG_GREEN_LED, 1); > diff --git a/board/ronetix/pm9261/pm9261.c b/board/ronetix/pm9261/pm9261.c > index b96f745..3cc01cb 100644 > --- a/board/ronetix/pm9261/pm9261.c > +++ b/board/ronetix/pm9261/pm9261.c > @@ -14,7 +14,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -41,7 +40,6 @@ static void pm9261_nand_hw_init(void) > unsigned long csa; > struct at91_smc *smc = (struct at91_smc *)ATMEL_BASE_SMC; > struct at91_matrix *matrix = (struct at91_matrix *)ATMEL_BASE_MATRIX; > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > > /* Enable CS3 */ > csa = readl(&matrix->csa) | AT91_MATRIX_CSA_EBI_CS3A; > @@ -69,9 +67,8 @@ static void pm9261_nand_hw_init(void) > AT91_SMC_MODE_TDF_CYCLE(2), > &smc->cs[3].mode); > > - writel(1 << ATMEL_ID_PIOA | > - 1 << ATMEL_ID_PIOC, > - &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_PIOA); > + at91_periph_clk_enable(ATMEL_ID_PIOC); > > /* Configure RDY/BSY */ > gpio_direction_input(CONFIG_SYS_NAND_READY_PIN); > @@ -89,7 +86,6 @@ static void pm9261_nand_hw_init(void) > static void pm9261_dm9000_hw_init(void) > { > struct at91_smc *smc = (struct at91_smc *)ATMEL_BASE_SMC; > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > > /* Configure SMC CS2 for DM9000 */ > writel(AT91_SMC_SETUP_NWE(2) | AT91_SMC_SETUP_NCS_WR(0) | > @@ -110,7 +106,7 @@ static void pm9261_dm9000_hw_init(void) > &smc->cs[2].mode); > > /* Configure Interrupt pin as input, no pull-up */ > - writel(1 << ATMEL_ID_PIOA, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_PIOA); > at91_set_pio_input(AT91_PIO_PORTA, 24, 0); > } > #endif > @@ -145,8 +141,6 @@ void lcd_disable(void) > > static void pm9261_lcd_hw_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > - > at91_set_a_periph(AT91_PIO_PORTB, 1, 0); /* LCDHSYNC */ > at91_set_a_periph(AT91_PIO_PORTB, 2, 0); /* LCDDOTCK */ > at91_set_a_periph(AT91_PIO_PORTB, 3, 0); /* LCDDEN */ > @@ -170,7 +164,7 @@ static void pm9261_lcd_hw_init(void) > at91_set_b_periph(AT91_PIO_PORTB, 27, 0); /* LCDD22 */ > at91_set_b_periph(AT91_PIO_PORTB, 28, 0); /* LCDD23 */ > > - writel(1 << 17, &pmc->scer); /* LCD controller Clock, AT91SAM9261 only */ > + at91_system_clk_enable(AT91_PMC_HCK1); > > gd->fb_base = ATMEL_BASE_SRAM; > } > @@ -224,12 +218,8 @@ void lcd_show_board_info(void) > > int board_early_init_f(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > - > - /* Enable clocks for some PIOs */ > - writel(1 << ATMEL_ID_PIOA | > - 1 << ATMEL_ID_PIOC, > - &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_PIOA); > + at91_periph_clk_enable(ATMEL_ID_PIOC); > > at91_seriald_hw_init(); > > diff --git a/board/ronetix/pm9263/led.c b/board/ronetix/pm9263/led.c > index bfc2310..8025a20 100644 > --- a/board/ronetix/pm9263/led.c > +++ b/board/ronetix/pm9263/led.c > @@ -9,15 +9,12 @@ > > #include > #include > -#include > +#include > #include > > void coloured_LED_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > - > - /* Enable clock */ > - writel(1 << ATMEL_ID_PIOB, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_PIOB); > > gpio_direction_output(CONFIG_RED_LED, 1); > gpio_direction_output(CONFIG_GREEN_LED, 1); > diff --git a/board/ronetix/pm9263/pm9263.c b/board/ronetix/pm9263/pm9263.c > index 1b00f08..276ff80 100644 > --- a/board/ronetix/pm9263/pm9263.c > +++ b/board/ronetix/pm9263/pm9263.c > @@ -14,7 +14,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -78,8 +77,6 @@ static void pm9263_nand_hw_init(void) > #ifdef CONFIG_MACB > static void pm9263_macb_hw_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > - > /* > * PB27 enables the 50MHz oscillator for Ethernet PHY > * 1 - enable > @@ -88,8 +85,7 @@ static void pm9263_macb_hw_init(void) > at91_set_pio_output(AT91_PIO_PORTB, 27, 1); > at91_set_pio_value(AT91_PIO_PORTB, 27, 1); /* 1- enable, 0 - disable */ > > - /* Enable clock */ > - writel(1 << ATMEL_ID_EMAC, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_EMAC); > > /* > * Disable pull-up on: > @@ -231,8 +227,6 @@ static int pm9263_lcd_hw_psram_init(void) > > static void pm9263_lcd_hw_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > - > at91_set_a_periph(AT91_PIO_PORTC, 0, 0); /* LCDVSYNC */ > at91_set_a_periph(AT91_PIO_PORTC, 1, 0); /* LCDHSYNC */ > at91_set_a_periph(AT91_PIO_PORTC, 2, 0); /* LCDDOTCK */ > @@ -257,7 +251,7 @@ static void pm9263_lcd_hw_init(void) > at91_set_a_periph(AT91_PIO_PORTC, 26, 0); /* LCDD22 */ > at91_set_a_periph(AT91_PIO_PORTC, 27, 0); /* LCDD23 */ > > - writel(1 << ATMEL_ID_LCDC, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_LCDC); > > /* Power Control */ > at91_set_pio_output(AT91_PIO_PORTA, 22, 1); > @@ -323,12 +317,9 @@ void lcd_show_board_info(void) > > int board_early_init_f(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > - > - /* Enable clocks for all PIOs */ > - writel((1 << ATMEL_ID_PIOA) | (1 << ATMEL_ID_PIOB) | > - (1 << ATMEL_ID_PIOCDE), > - &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_PIOA); > + at91_periph_clk_enable(ATMEL_ID_PIOB); > + at91_periph_clk_enable(ATMEL_ID_PIOCDE); > > at91_seriald_hw_init(); > > diff --git a/board/ronetix/pm9g45/pm9g45.c b/board/ronetix/pm9g45/pm9g45.c > index efc4133..c2707e0 100644 > --- a/board/ronetix/pm9g45/pm9g45.c > +++ b/board/ronetix/pm9g45/pm9g45.c > @@ -17,7 +17,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -39,7 +38,6 @@ static void pm9g45_nand_hw_init(void) > unsigned long csa; > struct at91_smc *smc = (struct at91_smc *)ATMEL_BASE_SMC; > struct at91_matrix *matrix = (struct at91_matrix *)ATMEL_BASE_MATRIX; > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > > /* Enable CS3 */ > csa = readl(&matrix->ccr[6]) | AT91_MATRIX_CSA_EBI_CS3A; > @@ -63,7 +61,7 @@ static void pm9g45_nand_hw_init(void) > AT91_SMC_MODE_TDF_CYCLE(3), > &smc->cs[3].mode); > > - writel(1 << ATMEL_ID_PIOC, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_PIOC); > > #ifdef CONFIG_SYS_NAND_READY_PIN > /* Configure RDY/BSY */ > @@ -78,8 +76,6 @@ static void pm9g45_nand_hw_init(void) > #ifdef CONFIG_MACB > static void pm9g45_macb_hw_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > - > /* > * PD2 enables the 50MHz oscillator for Ethernet PHY > * 1 - enable > @@ -88,8 +84,7 @@ static void pm9g45_macb_hw_init(void) > at91_set_pio_output(AT91_PIO_PORTD, 2, 1); > at91_set_pio_value(AT91_PIO_PORTD, 2, 1); /* 1- enable, 0 - disable */ > > - /* Enable clock */ > - writel(1 << ATMEL_ID_EMAC, &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_EMAC); > > /* > * Disable pull-up on: > @@ -114,13 +109,10 @@ static void pm9g45_macb_hw_init(void) > > int board_early_init_f(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > - > - /* Enable clocks for all PIOs */ > - writel((1 << ATMEL_ID_PIOA) | > - (1 << ATMEL_ID_PIOB) | > - (1 << ATMEL_ID_PIOC) | > - (1 << ATMEL_ID_PIODE), &pmc->pcer); > + at91_periph_clk_enable(ATMEL_ID_PIOA); > + at91_periph_clk_enable(ATMEL_ID_PIOB); > + at91_periph_clk_enable(ATMEL_ID_PIOC); > + at91_periph_clk_enable(ATMEL_ID_PIODE); > > at91_seriald_hw_init(); > > diff --git a/board/siemens/corvus/board.c b/board/siemens/corvus/board.c > index 28985b8..8729fe9 100644 > --- a/board/siemens/corvus/board.c > +++ b/board/siemens/corvus/board.c > @@ -17,7 +17,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -147,13 +146,11 @@ static void ddr2_conf(struct atmel_mpddr *ddr2) > > void mem_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > struct atmel_mpddr ddr2; > > ddr2_conf(&ddr2); > > - /* enable DDR2 clock */ > - writel(AT91_PMC_DDR, &pmc->scer); > + at91_system_clk_enable(AT91_PMC_DDR); > > /* DDRAM2 Controller initialize */ > ddr2_init(ATMEL_BASE_DDRSDRC0, ATMEL_BASE_CS6, &ddr2); > @@ -214,6 +211,7 @@ void at91_udp_hw_init(void) > > /* Enable UPLL clock */ > writel(AT91_PMC_UPLLEN | AT91_PMC_BIASEN, &pmc->uckr); > + > /* Enable UDPHS clock */ > at91_periph_clk_enable(ATMEL_ID_UDPHS); > } > diff --git a/board/siemens/smartweb/smartweb.c b/board/siemens/smartweb/smartweb.c > index d82f1b7..e7ee65c 100644 > --- a/board/siemens/smartweb/smartweb.c > +++ b/board/siemens/smartweb/smartweb.c > @@ -22,7 +22,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -126,7 +125,7 @@ void at91_udp_hw_init(void) > /* Enable UDPCK clock, MCK is enabled in at91_clock_init() */ > at91_periph_clk_enable(ATMEL_ID_UDP); > > - writel(AT91SAM926x_PMC_UDP, &pmc->scer); > + at91_system_clk_enable(AT91SAM926x_PMC_UDP); > } > > struct at91_udc_data board_udc_data = { > diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c > index 72c5e60..9374064 100644 > --- a/board/siemens/taurus/taurus.c > +++ b/board/siemens/taurus/taurus.c > @@ -18,7 +18,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -300,7 +299,7 @@ void at91_udp_hw_init(void) > /* Enable UDPCK clock, MCK is enabled in at91_clock_init() */ > at91_periph_clk_enable(ATMEL_ID_UDP); > > - writel(AT91SAM926x_PMC_UDP, &pmc->scer); > + at91_system_clk_enable(AT91SAM926x_PMC_UDP); > } > > struct at91_udc_data board_udc_data = { > -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany