1f5b7dcfda
Simple bug fixes that were not considered important enough for inclusion into 3.3. One bug fix was originally intended for 3.3 but accidentally got missed, but is not marked stable because it should only get backported once later fixes also make it into v3.4. Signed-off-by: Arnd Bergmann <arnd@arndb.de> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIVAwUAT2pH4WCrR//JCVInAQI1XQ//ZQfueV+UjZtsF0ybzB4fjaoeKuccgHh8 /I8h0OpAA8PArc0BcSw60zFx90cTBUNXNGNyYRUlRbzmHW6Wlvnkymh1iOEvL0/r wCuTS783tqzmhtwzjGblZdVQ09OhKVr7B+cufFgaPZCMbUxnGRyXWym1rLhCy+kx B88KdF0+Iej/I1aS5Yo5l7/Chucd+epLfPMFeRoV0NPRfTjvSBicLgAKQ6h0Mn4k VQkAiYr03SztPi+nVa7TS0+dtUbd0NU/8Qg3zODH2P9e69nkn2IEYhOhUUuGRK76 /0Yl7Wuo2QanMDBGU9N4EHgHroh1fKHD8rKLIZkGp7tpV+dPmTdPcK/ef256sTlk pOrXe2Abb/QermriYC6JCWHKhH5oG7Wectp9SJC94iOxPpxjJgljj1e/p0IkfVN7 YLy8KQ4TieNJabRQPrb83W4ZFJsLoiWdFVcg/gOUttieBNiLbRyrSXcVe+8t6o+g uBWg9qSHPNbsU9k2xf+bOadurFMHfF4NkkVRg5gSKOXivGL0440ZYnqES1PFYv6i +Lgp0kPsEaMSWwDiA8BCguy3y7DBqisuSdhylWkS6P6dO96732dTBgmvYsp683zO D70bGPLZYM+CGJN5zaGT6U5WNJyCMhxuI2bab46Kd52H0NFDZXTQb2jjORJbpc9H c9LWXp9bdgM= =eLYz -----END PGP SIGNATURE----- Merge branch 'fixes-non-critical' into next/drivers2 fixes-non-critical has already been merged upstream, and there are a handful of annoying context conflicts that it makes sense to resolve before sending up. Part of this is because there was parallel development going on between more urgent fixes and general driver fixups, it should settle down once the lpc32xx platform reaches a more steady state. Conflicts: arch/arm/mach-lpc32xx/clock.c arch/arm/mach-lpc32xx/common.h Signed-off-by: Olof Johansson <olof@lixom.net>
80 lines
2.2 KiB
C
80 lines
2.2 KiB
C
/*
|
|
* arch/arm/mach-lpc32xx/common.h
|
|
*
|
|
* Author: Kevin Wells <kevin.wells@nxp.com>
|
|
*
|
|
* Copyright (C) 2009-2010 NXP Semiconductors
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*/
|
|
|
|
#ifndef __LPC32XX_COMMON_H
|
|
#define __LPC32XX_COMMON_H
|
|
|
|
#include <mach/board.h>
|
|
#include <linux/platform_device.h>
|
|
|
|
/*
|
|
* Arch specific platform device structures
|
|
*/
|
|
extern struct platform_device lpc32xx_watchdog_device;
|
|
extern struct platform_device lpc32xx_i2c0_device;
|
|
extern struct platform_device lpc32xx_i2c1_device;
|
|
extern struct platform_device lpc32xx_i2c2_device;
|
|
extern struct platform_device lpc32xx_tsc_device;
|
|
extern struct platform_device lpc32xx_adc_device;
|
|
extern struct platform_device lpc32xx_rtc_device;
|
|
extern struct platform_device lpc32xx_ohci_device;
|
|
extern struct platform_device lpc32xx_net_device;
|
|
|
|
/*
|
|
* Other arch specific structures and functions
|
|
*/
|
|
extern struct sys_timer lpc32xx_timer;
|
|
extern void __init lpc32xx_init_irq(void);
|
|
extern void __init lpc32xx_map_io(void);
|
|
extern void __init lpc32xx_serial_init(void);
|
|
extern void __init lpc32xx_gpio_init(void);
|
|
extern void lpc23xx_restart(char, const char *);
|
|
|
|
|
|
/*
|
|
* Structure used for setting up and querying the PLLS
|
|
*/
|
|
struct clk_pll_setup {
|
|
int analog_on;
|
|
int cco_bypass_b15;
|
|
int direct_output_b14;
|
|
int fdbk_div_ctrl_b13;
|
|
int pll_p;
|
|
int pll_n;
|
|
u32 pll_m;
|
|
};
|
|
|
|
extern int clk_is_sysclk_mainosc(void);
|
|
extern u32 clk_check_pll_setup(u32 ifreq, struct clk_pll_setup *pllsetup);
|
|
extern u32 clk_get_pllrate_from_reg(u32 inputclk, u32 regval);
|
|
extern u32 clk_get_pclk_div(void);
|
|
|
|
/*
|
|
* Returns the LPC32xx unique 128-bit chip ID
|
|
*/
|
|
extern void lpc32xx_get_uid(u32 devid[4]);
|
|
|
|
extern u32 lpc32xx_return_iram_size(void);
|
|
/*
|
|
* Pointers used for sizing and copying suspend function data
|
|
*/
|
|
extern int lpc32xx_sys_suspend(void);
|
|
extern int lpc32xx_sys_suspend_sz;
|
|
|
|
#endif
|