Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
143ed290
Commit
143ed290
authored
Aug 12, 2011
by
Arnd Bergmann
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'imx-fixes-for-arnd' of
git://git.pengutronix.de/git/imx/linux-2.6
into fixes
parents
ac9cf9ff
d9c92783
Changes
12
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
63 additions
and
31 deletions
+63
-31
arch/arm/mach-imx/clock-imx25.c
arch/arm/mach-imx/clock-imx25.c
+3
-0
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
+13
-0
arch/arm/mach-imx/mach-mx31ads.c
arch/arm/mach-imx/mach-mx31ads.c
+2
-2
arch/arm/mach-imx/mach-mx31lilly.c
arch/arm/mach-imx/mach-mx31lilly.c
+1
-1
arch/arm/mach-mx5/board-cpuimx51.c
arch/arm/mach-mx5/board-cpuimx51.c
+1
-1
arch/arm/mach-mx5/board-mx51_babbage.c
arch/arm/mach-mx5/board-mx51_babbage.c
+1
-1
arch/arm/mach-mx5/board-mx51_efikamx.c
arch/arm/mach-mx5/board-mx51_efikamx.c
+3
-3
arch/arm/mach-mx5/board-mx51_efikasb.c
arch/arm/mach-mx5/board-mx51_efikasb.c
+8
-7
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/clock-mx51-mx53.c
+5
-1
arch/arm/mach-mx5/mx51_efika.c
arch/arm/mach-mx5/mx51_efika.c
+1
-1
arch/arm/plat-mxc/include/mach/debug-macro.S
arch/arm/plat-mxc/include/mach/debug-macro.S
+8
-0
arch/arm/plat-mxc/include/mach/iomux-mx53.h
arch/arm/plat-mxc/include/mach/iomux-mx53.h
+17
-14
No files found.
arch/arm/mach-imx/clock-imx25.c
View file @
143ed290
...
...
@@ -331,6 +331,9 @@ int __init mx25_clocks_init(void)
__raw_writel
(
__raw_readl
(
CRM_BASE
+
0x64
)
|
(
1
<<
7
)
|
(
1
<<
0
),
CRM_BASE
+
0x64
);
/* Clock source for gpt is ahb_div */
__raw_writel
(
__raw_readl
(
CRM_BASE
+
0x64
)
&
~
(
1
<<
5
),
CRM_BASE
+
0x64
);
mxc_timer_init
(
&
gpt_clk
,
MX25_IO_ADDRESS
(
MX25_GPT1_BASE_ADDR
),
54
);
return
0
;
...
...
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
View file @
143ed290
...
...
@@ -30,6 +30,7 @@
#include <linux/input.h>
#include <linux/gpio.h>
#include <linux/delay.h>
#include <sound/tlv320aic32x4.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
...
...
@@ -196,6 +197,17 @@ static struct pca953x_platform_data visstrim_m10_pca9555_pdata = {
.
invert
=
0
,
};
static
struct
aic32x4_pdata
visstrim_m10_aic32x4_pdata
=
{
.
power_cfg
=
AIC32X4_PWR_MICBIAS_2075_LDOIN
|
AIC32X4_PWR_AVDD_DVDD_WEAK_DISABLE
|
AIC32X4_PWR_AIC32X4_LDO_ENABLE
|
AIC32X4_PWR_CMMODE_LDOIN_RANGE_18_36
|
AIC32X4_PWR_CMMODE_HP_LDOIN_POWERED
,
.
micpga_routing
=
AIC32X4_MICPGA_ROUTE_LMIC_IN2R_10K
|
AIC32X4_MICPGA_ROUTE_RMIC_IN1L_10K
,
.
swapdacs
=
false
,
};
static
struct
i2c_board_info
visstrim_m10_i2c_devices
[]
=
{
{
I2C_BOARD_INFO
(
"pca9555"
,
0x20
),
...
...
@@ -203,6 +215,7 @@ static struct i2c_board_info visstrim_m10_i2c_devices[] = {
},
{
I2C_BOARD_INFO
(
"tlv320aic32x4"
,
0x18
),
.
platform_data
=
&
visstrim_m10_aic32x4_pdata
,
}
};
...
...
arch/arm/mach-imx/mach-mx31ads.c
View file @
143ed290
...
...
@@ -468,7 +468,7 @@ static struct i2c_board_info __initdata mx31ads_i2c1_devices[] = {
#endif
};
static
void
mxc_init_i2c
(
void
)
static
void
__init
mxc_init_i2c
(
void
)
{
i2c_register_board_info
(
1
,
mx31ads_i2c1_devices
,
ARRAY_SIZE
(
mx31ads_i2c1_devices
));
...
...
@@ -486,7 +486,7 @@ static unsigned int ssi_pins[] = {
MX31_PIN_STXD5__STXD5
,
};
static
void
mxc_init_audio
(
void
)
static
void
__init
mxc_init_audio
(
void
)
{
imx31_add_imx_ssi
(
0
,
NULL
);
mxc_iomux_setup_multiple_pins
(
ssi_pins
,
ARRAY_SIZE
(
ssi_pins
),
"ssi"
);
...
...
arch/arm/mach-imx/mach-mx31lilly.c
View file @
143ed290
...
...
@@ -192,7 +192,7 @@ static struct mxc_usbh_platform_data usbh2_pdata __initdata = {
.
portsc
=
MXC_EHCI_MODE_ULPI
|
MXC_EHCI_UTMI_8BIT
,
};
static
void
lilly1131_usb_init
(
void
)
static
void
__init
lilly1131_usb_init
(
void
)
{
imx31_add_mxc_ehci_hs
(
1
,
&
usbh1_pdata
);
...
...
arch/arm/mach-mx5/board-cpuimx51.c
View file @
143ed290
...
...
@@ -81,7 +81,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
.
flags
=
UPF_BOOT_AUTOCONF
|
UPF_SKIP_TEST
|
UPF_IOREMAP
,
},
{
.
mapbase
=
(
unsigned
long
)(
MX51_CS1_BASE_ADDR
+
0x2000000
),
.
irq
=
irq_to_gpio
(
CPUIMX51_QUARTD_GPIO
),
.
irq
=
gpio_to_irq
(
CPUIMX51_QUARTD_GPIO
),
.
irqflags
=
IRQF_TRIGGER_HIGH
,
.
uartclk
=
CPUIMX51_QUART_XTAL
,
.
regshift
=
CPUIMX51_QUART_REGSHIFT
,
...
...
arch/arm/mach-mx5/board-mx51_babbage.c
View file @
143ed290
...
...
@@ -369,7 +369,7 @@ static void __init mx51_babbage_init(void)
ARRAY_SIZE
(
mx51babbage_pads
));
imx51_add_imx_uart
(
0
,
&
uart_pdata
);
imx51_add_imx_uart
(
1
,
&
uart_pdata
);
imx51_add_imx_uart
(
1
,
NULL
);
imx51_add_imx_uart
(
2
,
&
uart_pdata
);
babbage_fec_reset
();
...
...
arch/arm/mach-mx5/board-mx51_efikamx.c
View file @
143ed290
...
...
@@ -108,9 +108,9 @@ static void __init mx51_efikamx_board_id(void)
gpio_request
(
EFIKAMX_PCBID2
,
"pcbid2"
);
gpio_direction_input
(
EFIKAMX_PCBID2
);
id
=
gpio_get_value
(
EFIKAMX_PCBID0
);
id
|=
gpio_get_value
(
EFIKAMX_PCBID1
)
<<
1
;
id
|=
gpio_get_value
(
EFIKAMX_PCBID2
)
<<
2
;
id
=
gpio_get_value
(
EFIKAMX_PCBID0
)
?
1
:
0
;
id
|=
(
gpio_get_value
(
EFIKAMX_PCBID1
)
?
1
:
0
)
<<
1
;
id
|=
(
gpio_get_value
(
EFIKAMX_PCBID2
)
?
1
:
0
)
<<
2
;
switch
(
id
)
{
case
7
:
...
...
arch/arm/mach-mx5/board-mx51_efikasb.c
View file @
143ed290
...
...
@@ -156,23 +156,24 @@ static struct gpio_keys_button mx51_efikasb_keys[] = {
{
.
code
=
KEY_POWER
,
.
gpio
=
EFIKASB_PWRKEY
,
.
type
=
EV_
PWR
,
.
type
=
EV_
KEY
,
.
desc
=
"Power Button"
,
.
wakeup
=
1
,
.
debounce_interval
=
10
,
/* ms */
.
active_low
=
1
,
},
{
.
code
=
SW_LID
,
.
gpio
=
EFIKASB_LID
,
.
type
=
EV_SW
,
.
desc
=
"Lid Switch"
,
.
active_low
=
1
,
},
{
/* SW_RFKILLALL vs KEY_RFKILL ? */
.
code
=
SW_RFKILL_ALL
,
.
code
=
KEY_RFKILL
,
.
gpio
=
EFIKASB_RFKILL
,
.
type
=
EV_
SW
,
.
type
=
EV_
KEY
,
.
desc
=
"rfkill"
,
.
active_low
=
1
,
},
};
...
...
@@ -224,8 +225,8 @@ static void __init mx51_efikasb_board_id(void)
gpio_request
(
EFIKASB_PCBID1
,
"pcb id1"
);
gpio_direction_input
(
EFIKASB_PCBID1
);
id
=
gpio_get_value
(
EFIKASB_PCBID0
);
id
|=
gpio_get_value
(
EFIKASB_PCBID1
)
<<
1
;
id
=
gpio_get_value
(
EFIKASB_PCBID0
)
?
1
:
0
;
id
|=
(
gpio_get_value
(
EFIKASB_PCBID1
)
?
1
:
0
)
<<
1
;
switch
(
id
)
{
default:
...
...
arch/arm/mach-mx5/clock-mx51-mx53.c
View file @
143ed290
...
...
@@ -271,7 +271,11 @@ static int _clk_pll_enable(struct clk *clk)
int
i
=
0
;
pllbase
=
_get_pll_base
(
clk
);
reg
=
__raw_readl
(
pllbase
+
MXC_PLL_DP_CTL
)
|
MXC_PLL_DP_CTL_UPEN
;
reg
=
__raw_readl
(
pllbase
+
MXC_PLL_DP_CTL
);
if
(
reg
&
MXC_PLL_DP_CTL_UPEN
)
return
0
;
reg
|=
MXC_PLL_DP_CTL_UPEN
;
__raw_writel
(
reg
,
pllbase
+
MXC_PLL_DP_CTL
);
/* Wait for lock */
...
...
arch/arm/mach-mx5/mx51_efika.c
View file @
143ed290
...
...
@@ -186,7 +186,7 @@ static int initialize_usbh1_port(struct platform_device *pdev)
mdelay
(
10
);
return
mx51_initialize_usb_hw
(
0
,
MXC_EHCI_ITC_NO_THRESHOLD
);
return
mx51_initialize_usb_hw
(
pdev
->
id
,
MXC_EHCI_ITC_NO_THRESHOLD
);
}
static
struct
mxc_usbh_platform_data
usbh1_config
=
{
...
...
arch/arm/plat-mxc/include/mach/debug-macro.S
View file @
143ed290
...
...
@@ -44,6 +44,14 @@
#define UART_PADDR MX51_UART1_BASE_ADDR
#endif
/*
iMX50
/53
have
same
addresses
,
but
not
iMX51
*/
#if defined(CONFIG_SOC_IMX50) || defined(CONFIG_SOC_IMX53)
#ifdef UART_PADDR
#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
#endif
#define UART_PADDR MX53_UART1_BASE_ADDR
#endif
#define UART_VADDR IMX_IO_ADDRESS(UART_PADDR)
.
macro
addruart
,
rp
,
rv
...
...
arch/arm/plat-mxc/include/mach/iomux-mx53.h
View file @
143ed290
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment