Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
packages
kernel
linux
Commits
b7edf9cc
Commit
b7edf9cc
authored
Apr 08, 2019
by
Lorenzo "Palinuro" Faletra
Browse files
Import Upstream version 4.19.28
parent
be93c8bb
Changes
769
Hide whitespace changes
Inline
Side-by-side
Documentation/devicetree/bindings/eeprom/at24.txt
View file @
b7edf9cc
...
...
@@ -27,6 +27,7 @@ Required properties:
"atmel,24c256",
"atmel,24c512",
"atmel,24c1024",
"atmel,24c2048",
If <manufacturer> is not "atmel", then a fallback must be used
with the same <model> and "atmel" as manufacturer.
...
...
Makefile
View file @
b7edf9cc
# SPDX-License-Identifier: GPL-2.0
VERSION
=
4
PATCHLEVEL
=
19
SUBLEVEL
=
2
0
SUBLEVEL
=
2
8
EXTRAVERSION
=
NAME
=
"People's Front"
...
...
arch/alpha/include/asm/irq.h
View file @
b7edf9cc
...
...
@@ -56,15 +56,15 @@
#elif defined(CONFIG_ALPHA_DP264) || \
defined(CONFIG_ALPHA_LYNX) || \
defined(CONFIG_ALPHA_SHARK) || \
defined(CONFIG_ALPHA_EIGER)
defined(CONFIG_ALPHA_SHARK)
# define NR_IRQS 64
#elif defined(CONFIG_ALPHA_TITAN)
#define NR_IRQS 80
#elif defined(CONFIG_ALPHA_RAWHIDE) || \
defined(CONFIG_ALPHA_TAKARA)
defined(CONFIG_ALPHA_TAKARA) || \
defined(CONFIG_ALPHA_EIGER)
# define NR_IRQS 128
#elif defined(CONFIG_ALPHA_WILDFIRE)
...
...
arch/alpha/mm/fault.c
View file @
b7edf9cc
...
...
@@ -78,7 +78,7 @@ __load_new_mm_context(struct mm_struct *next_mm)
/* Macro for exception fixup code to access integer registers. */
#define dpf_reg(r) \
(((unsigned long *)regs)[(r) <= 8 ? (r) : (r) <= 15 ? (r)-16 : \
(r) <= 18 ? (r)+
8
: (r)-10])
(r) <= 18 ? (r)+
10
: (r)-10])
asmlinkage
void
do_page_fault
(
unsigned
long
address
,
unsigned
long
mmcsr
,
...
...
arch/arc/include/asm/bitops.h
View file @
b7edf9cc
...
...
@@ -340,7 +340,7 @@ static inline __attribute__ ((const)) int __fls(unsigned long x)
/*
* __ffs: Similar to ffs, but zero based (0-31)
*/
static
inline
__attribute__
((
const
))
int
__ffs
(
unsigned
long
word
)
static
inline
__attribute__
((
const
))
unsigned
long
__ffs
(
unsigned
long
word
)
{
if
(
!
word
)
return
word
;
...
...
@@ -400,9 +400,9 @@ static inline __attribute__ ((const)) int ffs(unsigned long x)
/*
* __ffs: Similar to ffs, but zero based (0-31)
*/
static
inline
__attribute__
((
const
))
int
__ffs
(
unsigned
long
x
)
static
inline
__attribute__
((
const
))
unsigned
long
__ffs
(
unsigned
long
x
)
{
int
n
;
unsigned
long
n
;
asm
volatile
(
" ffs.f %0, %1
\n
"
/* 0:31; 31(Z) if src 0 */
...
...
arch/arc/include/asm/cache.h
View file @
b7edf9cc
...
...
@@ -52,6 +52,17 @@
#define cache_line_size() SMP_CACHE_BYTES
#define ARCH_DMA_MINALIGN SMP_CACHE_BYTES
/*
* Make sure slab-allocated buffers are 64-bit aligned when atomic64_t uses
* ARCv2 64-bit atomics (LLOCKD/SCONDD). This guarantess runtime 64-bit
* alignment for any atomic64_t embedded in buffer.
* Default ARCH_SLAB_MINALIGN is __alignof__(long long) which has a relaxed
* value of 4 (and not 8) in ARC ABI.
*/
#if defined(CONFIG_ARC_HAS_LL64) && defined(CONFIG_ARC_HAS_LLSC)
#define ARCH_SLAB_MINALIGN 8
#endif
extern
void
arc_cache_init
(
void
);
extern
char
*
arc_cache_mumbojumbo
(
int
cpu_id
,
char
*
buf
,
int
len
);
extern
void
read_decode_cache_bcr
(
void
);
...
...
arch/arc/kernel/head.S
View file @
b7edf9cc
...
...
@@ -17,6 +17,7 @@
#include <asm/entry.h>
#include <asm/arcregs.h>
#include <asm/cache.h>
#include <asm/irqflags.h>
.
macro
CPU_EARLY_SETUP
...
...
@@ -47,6 +48,15 @@
sr
r5
,
[
ARC_REG_DC_CTRL
]
1
:
#ifdef CONFIG_ISA_ARCV2
; Unaligned access is disabled at reset, so re-enable early as
; gcc 7.3.1 (ARC GNU 2018.03) onwards generates unaligned access
; by default
lr
r5
,
[
status32
]
bset
r5
,
r5
,
STATUS_AD_BIT
kflag
r5
#endif
.
endm
.
section
.
init
.
text
,
"ax"
,
@
progbits
...
...
@@ -93,9 +103,9 @@ ENTRY(stext)
#ifdef CONFIG_ARC_UBOOT_SUPPORT
; Uboot - kernel ABI
; r0 = [0] No uboot interaction, [1] cmdline in r2, [2] DTB in r2
; r1 = magic number (
board identity, unused
as of now
; r1 = magic number (
always zero
as of now
)
; r2 = pointer to uboot provided cmdline or external DTB in mem
; These are handled later in
setup
_ar
ch
()
; These are handled later in
handle_uboot
_ar
gs
()
st
r0
,
[
@
uboot_tag
]
st
r2
,
[
@
uboot_arg
]
#endif
...
...
arch/arc/kernel/setup.c
View file @
b7edf9cc
...
...
@@ -449,43 +449,80 @@ void setup_processor(void)
arc_chk_core_config
();
}
static
inline
int
is_kernel
(
unsigned
long
addr
)
static
inline
bool
uboot_arg_invalid
(
unsigned
long
addr
)
{
if
(
addr
>=
(
unsigned
long
)
_stext
&&
addr
<=
(
unsigned
long
)
_end
)
return
1
;
return
0
;
/*
* Check that it is a untranslated address (although MMU is not enabled
* yet, it being a high address ensures this is not by fluke)
*/
if
(
addr
<
PAGE_OFFSET
)
return
true
;
/* Check that address doesn't clobber resident kernel image */
return
addr
>=
(
unsigned
long
)
_stext
&&
addr
<=
(
unsigned
long
)
_end
;
}
void
__init
setup_arch
(
char
**
cmdline_p
)
#define IGNORE_ARGS "Ignore U-boot args: "
/* uboot_tag values for U-boot - kernel ABI revision 0; see head.S */
#define UBOOT_TAG_NONE 0
#define UBOOT_TAG_CMDLINE 1
#define UBOOT_TAG_DTB 2
void
__init
handle_uboot_args
(
void
)
{
bool
use_embedded_dtb
=
true
;
bool
append_cmdline
=
false
;
#ifdef CONFIG_ARC_UBOOT_SUPPORT
/* make sure that uboot passed pointer to cmdline/dtb is valid */
if
(
uboot_tag
&&
is_kernel
((
unsigned
long
)
uboot_arg
))
panic
(
"Invalid uboot arg
\n
"
);
/* check that we know this tag */
if
(
uboot_tag
!=
UBOOT_TAG_NONE
&&
uboot_tag
!=
UBOOT_TAG_CMDLINE
&&
uboot_tag
!=
UBOOT_TAG_DTB
)
{
pr_warn
(
IGNORE_ARGS
"invalid uboot tag: '%08x'
\n
"
,
uboot_tag
);
goto
ignore_uboot_args
;
}
if
(
uboot_tag
!=
UBOOT_TAG_NONE
&&
uboot_arg_invalid
((
unsigned
long
)
uboot_arg
))
{
pr_warn
(
IGNORE_ARGS
"invalid uboot arg: '%px'
\n
"
,
uboot_arg
);
goto
ignore_uboot_args
;
}
/* see if U-boot passed an external Device Tree blob */
if
(
uboot_tag
==
UBOOT_TAG_DTB
)
{
machine_desc
=
setup_machine_fdt
((
void
*
)
uboot_arg
);
/* See if u-boot passed an external Device Tree blob */
machine_desc
=
setup_machine_fdt
(
uboot_arg
);
/* uboot_tag == 2 */
if
(
!
machine_desc
)
/* external Device Tree blob is invalid - use embedded one */
use_embedded_dtb
=
!
machine_desc
;
}
if
(
uboot_tag
==
UBOOT_TAG_CMDLINE
)
append_cmdline
=
true
;
ignore_uboot_args:
#endif
{
/* No, so try the
embedded
one */
if
(
use_
embedded
_dtb
)
{
machine_desc
=
setup_machine_fdt
(
__dtb_start
);
if
(
!
machine_desc
)
panic
(
"Embedded DT invalid
\n
"
);
}
/*
* If we are here, it is established that @uboot_arg didn't
* point to DT blob. Instead if u-boot says it is cmdline,
* append to embedded DT cmdline.
* setup_machine_fdt() would have populated @boot_command_line
*/
if
(
uboot_tag
==
1
)
{
/* Ensure a whitespace between the 2 cmdlines */
strlcat
(
boot_command_line
,
" "
,
COMMAND_LINE_SIZE
);
strlcat
(
boot_command_line
,
uboot_arg
,
COMMAND_LINE_SIZE
);
}
/*
* NOTE: @boot_command_line is populated by setup_machine_fdt() so this
* append processing can only happen after.
*/
if
(
append_cmdline
)
{
/* Ensure a whitespace between the 2 cmdlines */
strlcat
(
boot_command_line
,
" "
,
COMMAND_LINE_SIZE
);
strlcat
(
boot_command_line
,
uboot_arg
,
COMMAND_LINE_SIZE
);
}
}
void
__init
setup_arch
(
char
**
cmdline_p
)
{
handle_uboot_args
();
/* Save unparsed command line copy for /proc/cmdline */
*
cmdline_p
=
boot_command_line
;
...
...
arch/arc/kernel/troubleshoot.c
View file @
b7edf9cc
...
...
@@ -18,6 +18,8 @@
#include
<asm/arcregs.h>
#include
<asm/irqflags.h>
#define ARC_PATH_MAX 256
/*
* Common routine to print scratch regs (r0-r12) or callee regs (r13-r25)
* -Prints 3 regs per line and a CR.
...
...
@@ -58,11 +60,12 @@ static void show_callee_regs(struct callee_regs *cregs)
print_reg_file
(
&
(
cregs
->
r13
),
13
);
}
static
void
print_task_path_n_nm
(
struct
task_struct
*
tsk
,
char
*
buf
)
static
void
print_task_path_n_nm
(
struct
task_struct
*
tsk
)
{
char
*
path_nm
=
NULL
;
struct
mm_struct
*
mm
;
struct
file
*
exe_file
;
char
buf
[
ARC_PATH_MAX
];
mm
=
get_task_mm
(
tsk
);
if
(
!
mm
)
...
...
@@ -72,7 +75,7 @@ static void print_task_path_n_nm(struct task_struct *tsk, char *buf)
mmput
(
mm
);
if
(
exe_file
)
{
path_nm
=
file_path
(
exe_file
,
buf
,
255
);
path_nm
=
file_path
(
exe_file
,
buf
,
ARC_PATH_MAX
-
1
);
fput
(
exe_file
);
}
...
...
@@ -80,10 +83,9 @@ static void print_task_path_n_nm(struct task_struct *tsk, char *buf)
pr_info
(
"Path: %s
\n
"
,
!
IS_ERR
(
path_nm
)
?
path_nm
:
"?"
);
}
static
void
show_faulting_vma
(
unsigned
long
address
,
char
*
buf
)
static
void
show_faulting_vma
(
unsigned
long
address
)
{
struct
vm_area_struct
*
vma
;
char
*
nm
=
buf
;
struct
mm_struct
*
active_mm
=
current
->
active_mm
;
/* can't use print_vma_addr() yet as it doesn't check for
...
...
@@ -96,8 +98,11 @@ static void show_faulting_vma(unsigned long address, char *buf)
* if the container VMA is not found
*/
if
(
vma
&&
(
vma
->
vm_start
<=
address
))
{
char
buf
[
ARC_PATH_MAX
];
char
*
nm
=
"?"
;
if
(
vma
->
vm_file
)
{
nm
=
file_path
(
vma
->
vm_file
,
buf
,
PAGE_SIZE
-
1
);
nm
=
file_path
(
vma
->
vm_file
,
buf
,
ARC_PATH_MAX
-
1
);
if
(
IS_ERR
(
nm
))
nm
=
"?"
;
}
...
...
@@ -173,13 +178,8 @@ void show_regs(struct pt_regs *regs)
{
struct
task_struct
*
tsk
=
current
;
struct
callee_regs
*
cregs
;
char
*
buf
;
buf
=
(
char
*
)
__get_free_page
(
GFP_KERNEL
);
if
(
!
buf
)
return
;
print_task_path_n_nm
(
tsk
,
buf
);
print_task_path_n_nm
(
tsk
);
show_regs_print_info
(
KERN_INFO
);
show_ecr_verbose
(
regs
);
...
...
@@ -189,7 +189,7 @@ void show_regs(struct pt_regs *regs)
(
void
*
)
regs
->
blink
,
(
void
*
)
regs
->
ret
);
if
(
user_mode
(
regs
))
show_faulting_vma
(
regs
->
ret
,
buf
);
/* faulting code, not data */
show_faulting_vma
(
regs
->
ret
);
/* faulting code, not data */
pr_info
(
"[STAT32]: 0x%08lx"
,
regs
->
status32
);
...
...
@@ -221,8 +221,6 @@ void show_regs(struct pt_regs *regs)
cregs
=
(
struct
callee_regs
*
)
current
->
thread
.
callee_reg
;
if
(
cregs
)
show_callee_regs
(
cregs
);
free_page
((
unsigned
long
)
buf
);
}
void
show_kernel_fault_diag
(
const
char
*
str
,
struct
pt_regs
*
regs
,
...
...
arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts
View file @
b7edf9cc
...
...
@@ -13,7 +13,7 @@ chosen {
bootargs
=
"console=ttyS4,115200 earlyprintk"
;
};
memory
{
memory
@
80000000
{
reg
=
<
0x80000000
0x40000000
>;
};
...
...
arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts
View file @
b7edf9cc
...
...
@@ -13,7 +13,7 @@ chosen {
bootargs
=
"earlyprintk"
;
};
memory
{
memory
@
80000000
{
reg
=
<
0x80000000
0x20000000
>;
};
...
...
arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts
View file @
b7edf9cc
...
...
@@ -14,7 +14,7 @@ chosen {
bootargs
=
"console=ttyS4,115200 earlyprintk"
;
};
memory
{
memory
@
80000000
{
reg
=
<
0x80000000
0x40000000
>;
};
...
...
@@ -322,4 +322,3 @@ &ibt {
&
adc
{
status
=
"okay"
;
};
arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts
View file @
b7edf9cc
...
...
@@ -17,7 +17,7 @@ chosen {
bootargs
=
"console=ttyS4,115200 earlyprintk"
;
};
memory
{
memory
@
80000000
{
reg
=
<
0x80000000
0x20000000
>;
};
...
...
arch/arm/boot/dts/da850-evm.dts
View file @
b7edf9cc
...
...
@@ -94,6 +94,28 @@ vbat: fixedregulator0 {
regulator
-
boot
-
on
;
};
baseboard_3v3
:
fixedregulator
-
3
v3
{
/*
TPS73701DCQ
*/
compatible
=
"regulator-fixed"
;
regulator
-
name
=
"baseboard_3v3"
;
regulator
-
min
-
microvolt
=
<
3300000
>;
regulator
-
max
-
microvolt
=
<
3300000
>;
vin
-
supply
=
<&
vbat
>;
regulator
-
always
-
on
;
regulator
-
boot
-
on
;
};
baseboard_1v8
:
fixedregulator
-
1
v8
{
/*
TPS73701DCQ
*/
compatible
=
"regulator-fixed"
;
regulator
-
name
=
"baseboard_1v8"
;
regulator
-
min
-
microvolt
=
<
1800000
>;
regulator
-
max
-
microvolt
=
<
1800000
>;
vin
-
supply
=
<&
vbat
>;
regulator
-
always
-
on
;
regulator
-
boot
-
on
;
};
backlight_lcd
:
backlight
-
regulator
{
compatible
=
"regulator-fixed"
;
regulator
-
name
=
"lcd_backlight_pwr"
;
...
...
@@ -105,7 +127,7 @@ backlight_lcd: backlight-regulator {
sound
{
compatible
=
"simple-audio-card"
;
simple
-
audio
-
card
,
name
=
"DA850
/
OMAP
-
L138 EVM"
;
simple
-
audio
-
card
,
name
=
"DA850
-
OMAPL138 EVM"
;
simple
-
audio
-
card
,
widgets
=
"Line"
,
"Line In"
,
"Line"
,
"Line Out"
;
...
...
@@ -210,10 +232,9 @@ tlv320aic3106: tlv320aic3106@18 {
/*
Regulators
*/
IOVDD
-
supply
=
<&
vdcdc2_reg
>;
/*
Derived
from
VBAT
:
Baseboard
3.3
V
/
1.8
V
*/
AVDD
-
supply
=
<&
vbat
>;
DRVDD
-
supply
=
<&
vbat
>;
DVDD
-
supply
=
<&
vbat
>;
AVDD
-
supply
=
<&
baseboard_3v3
>;
DRVDD
-
supply
=
<&
baseboard_3v3
>;
DVDD
-
supply
=
<&
baseboard_1v8
>;
};
tca6416
:
gpio
@
20
{
compatible
=
"ti,tca6416"
;
...
...
arch/arm/boot/dts/da850-lcdk.dts
View file @
b7edf9cc
...
...
@@ -39,9 +39,39 @@ dsp_memory_region: dsp-memory@c3000000 {
};
};
vcc_5vd
:
fixedregulator
-
vcc_5vd
{
compatible
=
"regulator-fixed"
;
regulator
-
name
=
"vcc_5vd"
;
regulator
-
min
-
microvolt
=
<
5000000
>;
regulator
-
max
-
microvolt
=
<
5000000
>;
regulator
-
boot
-
on
;
};
vcc_3v3d
:
fixedregulator
-
vcc_3v3d
{
/*
TPS650250
-
VDCDC1
*/
compatible
=
"regulator-fixed"
;
regulator
-
name
=
"vcc_3v3d"
;
regulator
-
min
-
microvolt
=
<
3300000
>;
regulator
-
max
-
microvolt
=
<
3300000
>;
vin
-
supply
=
<&
vcc_5vd
>;
regulator
-
always
-
on
;
regulator
-
boot
-
on
;
};
vcc_1v8d
:
fixedregulator
-
vcc_1v8d
{
/*
TPS650250
-
VDCDC2
*/
compatible
=
"regulator-fixed"
;
regulator
-
name
=
"vcc_1v8d"
;
regulator
-
min
-
microvolt
=
<
1800000
>;
regulator
-
max
-
microvolt
=
<
1800000
>;
vin
-
supply
=
<&
vcc_5vd
>;
regulator
-
always
-
on
;
regulator
-
boot
-
on
;
};
sound
{
compatible
=
"simple-audio-card"
;
simple
-
audio
-
card
,
name
=
"DA850
/
OMAP
-
L138 LCDK"
;
simple
-
audio
-
card
,
name
=
"DA850
-
OMAPL138 LCDK"
;
simple
-
audio
-
card
,
widgets
=
"Line"
,
"Line In"
,
"Line"
,
"Line Out"
;
...
...
@@ -221,6 +251,12 @@ tlv320aic3106: tlv320aic3106@18 {
compatible
=
"ti,tlv320aic3106"
;
reg
=
<
0x18
>;
status
=
"okay"
;
/*
Regulators
*/
IOVDD
-
supply
=
<&
vcc_3v3d
>;
AVDD
-
supply
=
<&
vcc_3v3d
>;
DRVDD
-
supply
=
<&
vcc_3v3d
>;
DVDD
-
supply
=
<&
vcc_1v8d
>;
};
};
...
...
arch/arm/boot/dts/da850.dtsi
View file @
b7edf9cc
...
...
@@ -476,7 +476,7 @@ i2c1: i2c@228000 {
clocksource
:
timer
@
20000
{
compatible
=
"ti,da830-timer"
;
reg
=
<
0x20000
0x1000
>;
interrupts
=
<
1
2
>,
<
13
>;
interrupts
=
<
2
1
>,
<
22
>;
interrupt
-
names
=
"tint12"
,
"tint34"
;
clocks
=
<&
pll0_auxclk
>;
};
...
...
arch/arm/boot/dts/gemini-dlink-dir-685.dts
View file @
b7edf9cc
...
...
@@ -274,20 +274,16 @@ partition@0 {
read-only;
};
/*
*
Between the boot loader and the rootfs i
s the kernel
*
in a custom Storlink format flashed from the boot
*
menu. The rootfs is in squashfs format
.
*
This firmware image contain
s the kernel
catenated
*
with the squashfs root filesystem. For some reason
*
this is called "upgrade" on the vendor system
.
*/
partition@1800c0 {
label = "rootfs";
reg = <0x001800c0 0x01dbff40>;
read-only;
};
partition@1f40000 {
partition@40000 {
label = "upgrade";
reg = <0x0
1f
40000 0x0
00
40000>;
reg = <0x0
00
40000 0x0
1f
40000>;
read-only;
};
/* RGDB, Residental Gateway Database? */
partition@1f80000 {
label = "rgdb";
reg = <0x01f80000 0x00040000>;
...
...
arch/arm/boot/dts/imx51-zii-rdu1.dts
View file @
b7edf9cc
...
...
@@ -477,6 +477,15 @@ &fec {
};
&
gpio1
{
gpio
-
line
-
names
=
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
"hp-amp-shutdown-b"
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
;
unused
-
sd3
-
wp
-
gpio
{
/*
*
See
pinctrl_esdhc1
below
for
more
details
on
this
...
...
@@ -501,9 +510,6 @@ eeprom@50 {
hpa1
:
amp
@
60
{
compatible
=
"ti,tpa6130a2"
;
reg
=
<
0x60
>;
pinctrl
-
names
=
"default"
;
pinctrl
-
0
=
<&
pinctrl_ampgpio
>;
power
-
gpio
=
<&
gpio1
9
GPIO_ACTIVE_HIGH
>;
Vdd
-
supply
=
<&
reg_3p3v
>;
};
...
...
@@ -677,7 +683,10 @@ &wdog1 {
};
&
iomuxc
{
pinctrl_ampgpio
:
ampgpiogrp
{
pinctrl
-
names
=
"default"
;
pinctrl
-
0
=
<&
pinctrl_hog
>;
pinctrl_hog
:
hoggrp
{
fsl
,
pins
=
<
MX51_PAD_GPIO1_9__GPIO1_9
0x5e
>;
...
...
arch/arm/boot/dts/kirkwood-dnskw.dtsi
View file @
b7edf9cc
...
...
@@ -36,8 +36,8 @@ gpio_fan {
compatible
=
"gpio-fan"
;
pinctrl
-
0
=
<&
pmx_fan_high_speed
&
pmx_fan_low_speed
>;
pinctrl
-
names
=
"default"
;
gpios
=
<&
gpio1
14
GPIO_ACTIVE_
LOW
&
gpio1
13
GPIO_ACTIVE_
LOW
>;
gpios
=
<&
gpio1
14
GPIO_ACTIVE_
HIGH
&
gpio1
13
GPIO_ACTIVE_
HIGH
>;
gpio
-
fan
,
speed
-
map
=
<
0
0
3000
1
6000
2
>;
...
...
arch/arm/boot/dts/mmp2.dtsi
View file @
b7edf9cc
...
...
@@ -220,12 +220,15 @@ twsi1: i2c@d4011000 {
status = "disabled";
};
twsi2: i2c@d40
25
000 {
twsi2: i2c@d40
31
000 {
compatible = "mrvl,mmp-twsi";
reg = <0xd4025000 0x1000>;
interrupts = <58>;
reg = <0xd4031000 0x1000>;
interrupt-parent = <&intcmux17>;
interrupts = <0>;
clocks = <&soc_clocks MMP2_CLK_TWSI1>;
resets = <&soc_clocks MMP2_CLK_TWSI1>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};
...
...
Prev
1
2
3
4
5
…
39
Next
Write
Preview
Supports
Markdown
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