Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: plat-orion: make gpiochip label unique
enable uncompress log on cpuimx35sd
cpuimx35: fix touchscreen support
cpuimx35sd: fix Kconfig
clock-imx35: fix reboot in internal boot mode
dma: MX3_IPU fix depends
imx_v4_v5_defconfig: update default configuration
cpuimx25sd: fix Kconfig
arm/imx: fix cpufreq section mismatch
ARM:imx:fix pwm period value
ARM: OMAP: hwmod data: fix iva and mailbox hwmods for OMAP 3
+48
-30
+7
-5
arch/arm/configs/imx_v4_v5_defconfig
+7
-5
arch/arm/configs/imx_v4_v5_defconfig
···
18
18
CONFIG_ARCH_IMX_V4_V5=y
19
19
CONFIG_ARCH_MX1ADS=y
20
20
CONFIG_MACH_SCB9328=y
21
+
CONFIG_MACH_APF9328=y
21
22
CONFIG_MACH_MX21ADS=y
22
23
CONFIG_MACH_MX25_3DS=y
23
-
CONFIG_MACH_EUKREA_CPUIMX25=y
24
+
CONFIG_MACH_EUKREA_CPUIMX25SD=y
24
25
CONFIG_MACH_MX27ADS=y
25
26
CONFIG_MACH_PCM038=y
26
27
CONFIG_MACH_CPUIMX27=y
···
73
72
CONFIG_MTD_CFI_INTELEXT=y
74
73
CONFIG_MTD_PHYSMAP=y
75
74
CONFIG_MTD_NAND=y
75
+
CONFIG_MTD_NAND_MXC=y
76
76
CONFIG_MTD_UBI=y
77
77
CONFIG_MISC_DEVICES=y
78
78
CONFIG_EEPROM_AT24=y
79
79
CONFIG_EEPROM_AT25=y
80
80
CONFIG_NETDEVICES=y
81
-
CONFIG_NET_ETHERNET=y
82
-
CONFIG_SMC91X=y
83
81
CONFIG_DM9000=y
82
+
CONFIG_SMC91X=y
84
83
CONFIG_SMC911X=y
85
-
# CONFIG_NETDEV_1000 is not set
86
-
# CONFIG_NETDEV_10000 is not set
84
+
CONFIG_SMSC_PHY=y
87
85
# CONFIG_INPUT_MOUSEDEV is not set
88
86
CONFIG_INPUT_EVDEV=y
89
87
# CONFIG_INPUT_KEYBOARD is not set
···
100
100
CONFIG_I2C_IMX=y
101
101
CONFIG_SPI=y
102
102
CONFIG_SPI_IMX=y
103
+
CONFIG_SPI_SPIDEV=y
103
104
CONFIG_W1=y
104
105
CONFIG_W1_MASTER_MXC=y
105
106
CONFIG_W1_SLAVE_THERM=y
···
140
139
CONFIG_MMC_MXC=y
141
140
CONFIG_NEW_LEDS=y
142
141
CONFIG_LEDS_CLASS=y
142
+
CONFIG_LEDS_GPIO=y
143
143
CONFIG_LEDS_MC13783=y
144
144
CONFIG_LEDS_TRIGGERS=y
145
145
CONFIG_LEDS_TRIGGER_TIMER=y
+4
-4
arch/arm/mach-imx/Kconfig
+4
-4
arch/arm/mach-imx/Kconfig
···
132
132
select IMX_HAVE_PLATFORM_MXC_NAND
133
133
select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
134
134
135
-
config MACH_EUKREA_CPUIMX25
135
+
config MACH_EUKREA_CPUIMX25SD
136
136
bool "Support Eukrea CPUIMX25 Platform"
137
137
select SOC_IMX25
138
138
select IMX_HAVE_PLATFORM_FLEXCAN
···
148
148
149
149
choice
150
150
prompt "Baseboard"
151
-
depends on MACH_EUKREA_CPUIMX25
151
+
depends on MACH_EUKREA_CPUIMX25SD
152
152
default MACH_EUKREA_MBIMXSD25_BASEBOARD
153
153
154
154
config MACH_EUKREA_MBIMXSD25_BASEBOARD
···
542
542
Include support for MX35PDK platform. This includes specific
543
543
configurations for the board and its peripherals.
544
544
545
-
config MACH_EUKREA_CPUIMX35
545
+
config MACH_EUKREA_CPUIMX35SD
546
546
bool "Support Eukrea CPUIMX35 Platform"
547
547
select SOC_IMX35
548
548
select IMX_HAVE_PLATFORM_FLEXCAN
···
560
560
561
561
choice
562
562
prompt "Baseboard"
563
-
depends on MACH_EUKREA_CPUIMX35
563
+
depends on MACH_EUKREA_CPUIMX35SD
564
564
default MACH_EUKREA_MBIMXSD35_BASEBOARD
565
565
566
566
config MACH_EUKREA_MBIMXSD35_BASEBOARD
+2
-2
arch/arm/mach-imx/Makefile
+2
-2
arch/arm/mach-imx/Makefile
···
24
24
25
25
# i.MX25 based machines
26
26
obj-$(CONFIG_MACH_MX25_3DS) += mach-mx25_3ds.o
27
-
obj-$(CONFIG_MACH_EUKREA_CPUIMX25) += mach-eukrea_cpuimx25.o
27
+
obj-$(CONFIG_MACH_EUKREA_CPUIMX25SD) += mach-eukrea_cpuimx25.o
28
28
obj-$(CONFIG_MACH_EUKREA_MBIMXSD25_BASEBOARD) += eukrea_mbimxsd25-baseboard.o
29
29
30
30
# i.MX27 based machines
···
57
57
# i.MX35 based machines
58
58
obj-$(CONFIG_MACH_PCM043) += mach-pcm043.o
59
59
obj-$(CONFIG_MACH_MX35_3DS) += mach-mx35_3ds.o
60
-
obj-$(CONFIG_MACH_EUKREA_CPUIMX35) += mach-cpuimx35.o
60
+
obj-$(CONFIG_MACH_EUKREA_CPUIMX35SD) += mach-cpuimx35.o
61
61
obj-$(CONFIG_MACH_EUKREA_MBIMXSD35_BASEBOARD) += eukrea_mbimxsd35-baseboard.o
62
62
obj-$(CONFIG_MACH_VPR200) += mach-vpr200.o
63
63
+10
-10
arch/arm/mach-imx/clock-imx35.c
+10
-10
arch/arm/mach-imx/clock-imx35.c
···
507
507
508
508
int __init mx35_clocks_init()
509
509
{
510
-
unsigned int cgr2 = 3 << 26, cgr3 = 0;
510
+
unsigned int cgr2 = 3 << 26;
511
511
512
512
#if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_ICEDCC)
513
513
cgr2 |= 3 << 16;
···
521
521
__raw_writel((3 << 18), CCM_BASE + CCM_CGR0);
522
522
__raw_writel((3 << 2) | (3 << 4) | (3 << 6) | (3 << 8) | (3 << 16),
523
523
CCM_BASE + CCM_CGR1);
524
+
__raw_writel(cgr2, CCM_BASE + CCM_CGR2);
525
+
__raw_writel(0, CCM_BASE + CCM_CGR3);
526
+
527
+
clk_enable(&iim_clk);
528
+
imx_print_silicon_rev("i.MX35", mx35_revision());
529
+
clk_disable(&iim_clk);
524
530
525
531
/*
526
532
* Check if we came up in internal boot mode. If yes, we need some
···
535
529
*/
536
530
if (!(__raw_readl(CCM_BASE + CCM_RCSR) & (3 << 10))) {
537
531
/* Additionally turn on UART1, SCC, and IIM clocks */
538
-
cgr2 |= 3 << 16 | 3 << 4;
539
-
cgr3 |= 3 << 2;
532
+
clk_enable(&iim_clk);
533
+
clk_enable(&uart1_clk);
534
+
clk_enable(&scc_clk);
540
535
}
541
-
542
-
__raw_writel(cgr2, CCM_BASE + CCM_CGR2);
543
-
__raw_writel(cgr3, CCM_BASE + CCM_CGR3);
544
-
545
-
clk_enable(&iim_clk);
546
-
imx_print_silicon_rev("i.MX35", mx35_revision());
547
-
clk_disable(&iim_clk);
548
536
549
537
#ifdef CONFIG_MXC_USE_EPIT
550
538
epit_timer_init(&epit1_clk,
+7
-1
arch/arm/mach-imx/mach-cpuimx35.c
+7
-1
arch/arm/mach-imx/mach-cpuimx35.c
···
53
53
.bitrate = 100000,
54
54
};
55
55
56
+
#define TSC2007_IRQGPIO IMX_GPIO_NR(3, 2)
57
+
static int tsc2007_get_pendown_state(void)
58
+
{
59
+
return !gpio_get_value(TSC2007_IRQGPIO);
60
+
}
61
+
56
62
static struct tsc2007_platform_data tsc2007_info = {
57
63
.model = 2007,
58
64
.x_plate_ohms = 180,
65
+
.get_pendown_state = tsc2007_get_pendown_state,
59
66
};
60
67
61
-
#define TSC2007_IRQGPIO IMX_GPIO_NR(3, 2)
62
68
static struct i2c_board_info eukrea_cpuimx35_i2c_devices[] = {
63
69
{
64
70
I2C_BOARD_INFO("pcf8563", 0x51),
-4
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
-4
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
···
3247
3247
3248
3248
/* 3430ES1-only hwmods */
3249
3249
static __initdata struct omap_hwmod *omap3430es1_hwmods[] = {
3250
-
&omap3xxx_iva_hwmod,
3251
3250
&omap3430es1_dss_core_hwmod,
3252
-
&omap3xxx_mailbox_hwmod,
3253
3251
NULL
3254
3252
};
3255
3253
3256
3254
/* 3430ES2+-only hwmods */
3257
3255
static __initdata struct omap_hwmod *omap3430es2plus_hwmods[] = {
3258
-
&omap3xxx_iva_hwmod,
3259
3256
&omap3xxx_dss_core_hwmod,
3260
3257
&omap3xxx_usbhsotg_hwmod,
3261
-
&omap3xxx_mailbox_hwmod,
3262
3258
NULL
3263
3259
};
3264
3260
+1
-1
arch/arm/plat-mxc/cpufreq.c
+1
-1
arch/arm/plat-mxc/cpufreq.c
+1
arch/arm/plat-mxc/include/mach/uncompress.h
+1
arch/arm/plat-mxc/include/mach/uncompress.h
+9
arch/arm/plat-mxc/pwm.c
+9
arch/arm/plat-mxc/pwm.c
···
77
77
do_div(c, period_ns);
78
78
duty_cycles = c;
79
79
80
+
/*
81
+
* according to imx pwm RM, the real period value should be
82
+
* PERIOD value in PWMPR plus 2.
83
+
*/
84
+
if (period_cycles > 2)
85
+
period_cycles -= 2;
86
+
else
87
+
period_cycles = 0;
88
+
80
89
writel(duty_cycles, pwm->mmio_base + MX3_PWMSAR);
81
90
writel(period_cycles, pwm->mmio_base + MX3_PWMPR);
82
91
+5
-1
arch/arm/plat-orion/gpio.c
+5
-1
arch/arm/plat-orion/gpio.c
···
384
384
struct orion_gpio_chip *ochip;
385
385
struct irq_chip_generic *gc;
386
386
struct irq_chip_type *ct;
387
+
char gc_label[16];
387
388
388
389
if (orion_gpio_chip_count == ARRAY_SIZE(orion_gpio_chips))
389
390
return;
390
391
392
+
snprintf(gc_label, sizeof(gc_label), "orion_gpio%d",
393
+
orion_gpio_chip_count);
394
+
391
395
ochip = orion_gpio_chips + orion_gpio_chip_count;
392
-
ochip->chip.label = "orion_gpio";
396
+
ochip->chip.label = kstrdup(gc_label, GFP_KERNEL);
393
397
ochip->chip.request = orion_gpio_request;
394
398
ochip->chip.direction_input = orion_gpio_direction_input;
395
399
ochip->chip.get = orion_gpio_get;
+2
-2
drivers/dma/Kconfig
+2
-2
drivers/dma/Kconfig
···
124
124
125
125
config MX3_IPU
126
126
bool "MX3x Image Processing Unit support"
127
-
depends on ARCH_MX3
127
+
depends on SOC_IMX31 || SOC_IMX35
128
128
select DMA_ENGINE
129
129
default y
130
130
help
···
216
216
217
217
config IMX_SDMA
218
218
tristate "i.MX SDMA support"
219
-
depends on ARCH_MX25 || ARCH_MX3 || ARCH_MX5
219
+
depends on ARCH_MX25 || SOC_IMX31 || SOC_IMX35 || ARCH_MX5
220
220
select DMA_ENGINE
221
221
help
222
222
Support the i.MX SDMA engine. This engine is integrated into