Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
kernel_linux
提交
51991d7e
K
kernel_linux
项目概览
OpenHarmony
/
kernel_linux
上一次同步 4 年多
通知
15
Star
8
Fork
2
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kernel_linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
51991d7e
编写于
12月 11, 2017
作者:
T
Tony Lindgren
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'omap-for-v4.15/fixes-dt' into omap-for-v4.16/dt
上级
1239738f
bc686442
变更
27
显示空白变更内容
内联
并排
Showing
27 changed file
with
47 addition
and
13 deletion
+47
-13
Documentation/devicetree/bindings/usb/am33xx-usb.txt
Documentation/devicetree/bindings/usb/am33xx-usb.txt
+2
-0
arch/arm/boot/dts/am33xx.dtsi
arch/arm/boot/dts/am33xx.dtsi
+2
-0
arch/arm/boot/dts/am4372.dtsi
arch/arm/boot/dts/am4372.dtsi
+4
-2
arch/arm/boot/dts/am437x-cm-t43.dts
arch/arm/boot/dts/am437x-cm-t43.dts
+2
-2
arch/arm/boot/dts/dm814x.dtsi
arch/arm/boot/dts/dm814x.dtsi
+1
-0
arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts
arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts
+2
-1
arch/arm/boot/dts/logicpd-som-lv.dtsi
arch/arm/boot/dts/logicpd-som-lv.dtsi
+11
-6
arch/arm/boot/dts/omap3-beagle-xm.dts
arch/arm/boot/dts/omap3-beagle-xm.dts
+1
-0
arch/arm/boot/dts/omap3-beagle.dts
arch/arm/boot/dts/omap3-beagle.dts
+1
-0
arch/arm/boot/dts/omap3-cm-t3x.dtsi
arch/arm/boot/dts/omap3-cm-t3x.dtsi
+2
-0
arch/arm/boot/dts/omap3-evm-common.dtsi
arch/arm/boot/dts/omap3-evm-common.dtsi
+1
-0
arch/arm/boot/dts/omap3-gta04.dtsi
arch/arm/boot/dts/omap3-gta04.dtsi
+1
-0
arch/arm/boot/dts/omap3-igep0020-common.dtsi
arch/arm/boot/dts/omap3-igep0020-common.dtsi
+1
-0
arch/arm/boot/dts/omap3-igep0030-common.dtsi
arch/arm/boot/dts/omap3-igep0030-common.dtsi
+1
-0
arch/arm/boot/dts/omap3-lilly-a83x.dtsi
arch/arm/boot/dts/omap3-lilly-a83x.dtsi
+1
-0
arch/arm/boot/dts/omap3-overo-base.dtsi
arch/arm/boot/dts/omap3-overo-base.dtsi
+1
-0
arch/arm/boot/dts/omap3-pandora-common.dtsi
arch/arm/boot/dts/omap3-pandora-common.dtsi
+1
-0
arch/arm/boot/dts/omap3-tao3530.dtsi
arch/arm/boot/dts/omap3-tao3530.dtsi
+1
-0
arch/arm/boot/dts/omap3.dtsi
arch/arm/boot/dts/omap3.dtsi
+1
-0
arch/arm/boot/dts/omap4-droid4-xt894.dts
arch/arm/boot/dts/omap4-droid4-xt894.dts
+1
-0
arch/arm/boot/dts/omap4-duovero.dtsi
arch/arm/boot/dts/omap4-duovero.dtsi
+1
-0
arch/arm/boot/dts/omap4-panda-common.dtsi
arch/arm/boot/dts/omap4-panda-common.dtsi
+1
-0
arch/arm/boot/dts/omap4-var-som-om44.dtsi
arch/arm/boot/dts/omap4-var-som-om44.dtsi
+1
-0
arch/arm/boot/dts/omap4.dtsi
arch/arm/boot/dts/omap4.dtsi
+1
-2
arch/arm/boot/dts/omap5-board-common.dtsi
arch/arm/boot/dts/omap5-board-common.dtsi
+2
-0
arch/arm/boot/dts/omap5-cm-t54.dts
arch/arm/boot/dts/omap5-cm-t54.dts
+2
-0
arch/arm/boot/dts/omap5.dtsi
arch/arm/boot/dts/omap5.dtsi
+1
-0
未找到文件。
Documentation/devicetree/bindings/usb/am33xx-usb.txt
浏览文件 @
51991d7e
...
@@ -95,6 +95,7 @@ usb: usb@47400000 {
...
@@ -95,6 +95,7 @@ usb: usb@47400000 {
reg = <0x47401300 0x100>;
reg = <0x47401300 0x100>;
reg-names = "phy";
reg-names = "phy";
ti,ctrl_mod = <&ctrl_mod>;
ti,ctrl_mod = <&ctrl_mod>;
#phy-cells = <0>;
};
};
usb0: usb@47401000 {
usb0: usb@47401000 {
...
@@ -141,6 +142,7 @@ usb: usb@47400000 {
...
@@ -141,6 +142,7 @@ usb: usb@47400000 {
reg = <0x47401b00 0x100>;
reg = <0x47401b00 0x100>;
reg-names = "phy";
reg-names = "phy";
ti,ctrl_mod = <&ctrl_mod>;
ti,ctrl_mod = <&ctrl_mod>;
#phy-cells = <0>;
};
};
usb1: usb@47401800 {
usb1: usb@47401800 {
...
...
arch/arm/boot/dts/am33xx.dtsi
浏览文件 @
51991d7e
...
@@ -630,6 +630,7 @@
...
@@ -630,6 +630,7 @@
reg-names = "phy";
reg-names = "phy";
status = "disabled";
status = "disabled";
ti,ctrl_mod = <&usb_ctrl_mod>;
ti,ctrl_mod = <&usb_ctrl_mod>;
#phy-cells = <0>;
};
};
usb0: usb@47401000 {
usb0: usb@47401000 {
...
@@ -678,6 +679,7 @@
...
@@ -678,6 +679,7 @@
reg-names = "phy";
reg-names = "phy";
status = "disabled";
status = "disabled";
ti,ctrl_mod = <&usb_ctrl_mod>;
ti,ctrl_mod = <&usb_ctrl_mod>;
#phy-cells = <0>;
};
};
usb1: usb@47401800 {
usb1: usb@47401800 {
...
...
arch/arm/boot/dts/am4372.dtsi
浏览文件 @
51991d7e
...
@@ -927,7 +927,8 @@
...
@@ -927,7 +927,8 @@
reg = <0x48038000 0x2000>,
reg = <0x48038000 0x2000>,
<0x46000000 0x400000>;
<0x46000000 0x400000>;
reg-names = "mpu", "dat";
reg-names = "mpu", "dat";
interrupts = <80>, <81>;
interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "tx", "rx";
interrupt-names = "tx", "rx";
status = "disabled";
status = "disabled";
dmas = <&edma 8 2>,
dmas = <&edma 8 2>,
...
@@ -941,7 +942,8 @@
...
@@ -941,7 +942,8 @@
reg = <0x4803C000 0x2000>,
reg = <0x4803C000 0x2000>,
<0x46400000 0x400000>;
<0x46400000 0x400000>;
reg-names = "mpu", "dat";
reg-names = "mpu", "dat";
interrupts = <82>, <83>;
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "tx", "rx";
interrupt-names = "tx", "rx";
status = "disabled";
status = "disabled";
dmas = <&edma 10 2>,
dmas = <&edma 10 2>,
...
...
arch/arm/boot/dts/am437x-cm-t43.dts
浏览文件 @
51991d7e
...
@@ -301,8 +301,8 @@
...
@@ -301,8 +301,8 @@
status
=
"okay"
;
status
=
"okay"
;
pinctrl
-
names
=
"default"
;
pinctrl
-
names
=
"default"
;
pinctrl
-
0
=
<&
spi0_pins
>;
pinctrl
-
0
=
<&
spi0_pins
>;
dmas
=
<&
edma
16
dmas
=
<&
edma
16
0
&
edma
17
>;
&
edma
17
0
>;
dma
-
names
=
"tx0"
,
"rx0"
;
dma
-
names
=
"tx0"
,
"rx0"
;
flash
:
w25q64cvzpig
@
0
{
flash
:
w25q64cvzpig
@
0
{
...
...
arch/arm/boot/dts/dm814x.dtsi
浏览文件 @
51991d7e
...
@@ -75,6 +75,7 @@
...
@@ -75,6 +75,7 @@
reg = <0x47401300 0x100>;
reg = <0x47401300 0x100>;
reg-names = "phy";
reg-names = "phy";
ti,ctrl_mod = <&usb_ctrl_mod>;
ti,ctrl_mod = <&usb_ctrl_mod>;
#phy-cells = <0>;
};
};
usb0: usb@47401000 {
usb0: usb@47401000 {
...
...
arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts
浏览文件 @
51991d7e
...
@@ -72,7 +72,8 @@
...
@@ -72,7 +72,8 @@
};
};
&
gpmc
{
&
gpmc
{
ranges
=
<
1
0
0x08000000
0x1000000
>;
/*
CS1
:
16
MB
for
LAN9221
*/
ranges
=
<
0
0
0x30000000
0x1000000
/*
CS0
:
16
MB
for
NAND
*/
1
0
0x2c000000
0x1000000
>;
/*
CS1
:
16
MB
for
LAN9221
*/
ethernet
@
gpmc
{
ethernet
@
gpmc
{
pinctrl
-
names
=
"default"
;
pinctrl
-
names
=
"default"
;
...
...
arch/arm/boot/dts/logicpd-som-lv.dtsi
浏览文件 @
51991d7e
...
@@ -33,11 +33,12 @@
...
@@ -33,11 +33,12 @@
hsusb2_phy: hsusb2_phy {
hsusb2_phy: hsusb2_phy {
compatible = "usb-nop-xceiv";
compatible = "usb-nop-xceiv";
reset-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; /* gpio_4 */
reset-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; /* gpio_4 */
#phy-cells = <0>;
};
};
};
};
&gpmc {
&gpmc {
ranges = <0 0 0x
0
0000000 0x1000000>; /* CS0: 16MB for NAND */
ranges = <0 0 0x
3
0000000 0x1000000>; /* CS0: 16MB for NAND */
nand@0,0 {
nand@0,0 {
compatible = "ti,omap2-nand";
compatible = "ti,omap2-nand";
...
@@ -94,7 +95,7 @@
...
@@ -94,7 +95,7 @@
&mmc3 {
&mmc3 {
interrupts-extended = <&intc 94 &omap3_pmx_core2 0x46>;
interrupts-extended = <&intc 94 &omap3_pmx_core2 0x46>;
pinctrl-0 = <&mmc3_pins>;
pinctrl-0 = <&mmc3_pins
&wl127x_gpio
>;
pinctrl-names = "default";
pinctrl-names = "default";
vmmc-supply = <&wl12xx_vmmc>;
vmmc-supply = <&wl12xx_vmmc>;
non-removable;
non-removable;
...
@@ -105,8 +106,8 @@
...
@@ -105,8 +106,8 @@
wlcore: wlcore@2 {
wlcore: wlcore@2 {
compatible = "ti,wl1273";
compatible = "ti,wl1273";
reg = <2>;
reg = <2>;
interrupt-parent = <&gpio
5
>;
interrupt-parent = <&gpio
1
>;
interrupts = <2
4 IRQ_TYPE_LEVEL_HIGH>; /* gpio 15
2 */
interrupts = <2
IRQ_TYPE_LEVEL_HIGH>; /* gpio
2 */
ref-clock-frequency = <26000000>;
ref-clock-frequency = <26000000>;
};
};
};
};
...
@@ -130,8 +131,6 @@
...
@@ -130,8 +131,6 @@
OMAP3_CORE1_IOPAD(0x2166, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat5.sdmmc3_dat1 */
OMAP3_CORE1_IOPAD(0x2166, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat5.sdmmc3_dat1 */
OMAP3_CORE1_IOPAD(0x2168, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat6.sdmmc3_dat2 */
OMAP3_CORE1_IOPAD(0x2168, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat6.sdmmc3_dat2 */
OMAP3_CORE1_IOPAD(0x216a, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat6.sdmmc3_dat3 */
OMAP3_CORE1_IOPAD(0x216a, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat6.sdmmc3_dat3 */
OMAP3_CORE1_IOPAD(0x2184, PIN_INPUT_PULLUP | MUX_MODE4) /* mcbsp4_clkx.gpio_152 */
OMAP3_CORE1_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4) /* sys_boot1.gpio_3 */
OMAP3_CORE1_IOPAD(0x21d0, PIN_INPUT_PULLUP | MUX_MODE3) /* mcspi1_cs1.sdmmc3_cmd */
OMAP3_CORE1_IOPAD(0x21d0, PIN_INPUT_PULLUP | MUX_MODE3) /* mcspi1_cs1.sdmmc3_cmd */
OMAP3_CORE1_IOPAD(0x21d2, PIN_INPUT_PULLUP | MUX_MODE3) /* mcspi1_cs2.sdmmc_clk */
OMAP3_CORE1_IOPAD(0x21d2, PIN_INPUT_PULLUP | MUX_MODE3) /* mcspi1_cs2.sdmmc_clk */
>;
>;
...
@@ -201,6 +200,12 @@
...
@@ -201,6 +200,12 @@
OMAP3_WKUP_IOPAD(0x2a0e, PIN_OUTPUT | MUX_MODE4) /* sys_boot2.gpio_4 */
OMAP3_WKUP_IOPAD(0x2a0e, PIN_OUTPUT | MUX_MODE4) /* sys_boot2.gpio_4 */
>;
>;
};
};
wl127x_gpio: pinmux_wl127x_gpio_pin {
pinctrl-single,pins = <
OMAP3_WKUP_IOPAD(0x2a0c, PIN_INPUT | MUX_MODE4) /* sys_boot0.gpio_2 */
OMAP3_WKUP_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4) /* sys_boot1.gpio_3 */
>;
};
};
};
&omap3_pmx_core2 {
&omap3_pmx_core2 {
...
...
arch/arm/boot/dts/omap3-beagle-xm.dts
浏览文件 @
51991d7e
...
@@ -90,6 +90,7 @@
...
@@ -90,6 +90,7 @@
compatible
=
"usb-nop-xceiv"
;
compatible
=
"usb-nop-xceiv"
;
reset
-
gpios
=
<&
gpio5
19
GPIO_ACTIVE_LOW
>;
/*
gpio_147
*/
reset
-
gpios
=
<&
gpio5
19
GPIO_ACTIVE_LOW
>;
/*
gpio_147
*/
vcc
-
supply
=
<&
hsusb2_power
>;
vcc
-
supply
=
<&
hsusb2_power
>;
#
phy
-
cells
=
<
0
>;
};
};
tfp410
:
encoder0
{
tfp410
:
encoder0
{
...
...
arch/arm/boot/dts/omap3-beagle.dts
浏览文件 @
51991d7e
...
@@ -64,6 +64,7 @@
...
@@ -64,6 +64,7 @@
compatible
=
"usb-nop-xceiv"
;
compatible
=
"usb-nop-xceiv"
;
reset
-
gpios
=
<&
gpio5
19
GPIO_ACTIVE_LOW
>;
/*
gpio_147
*/
reset
-
gpios
=
<&
gpio5
19
GPIO_ACTIVE_LOW
>;
/*
gpio_147
*/
vcc
-
supply
=
<&
hsusb2_power
>;
vcc
-
supply
=
<&
hsusb2_power
>;
#
phy
-
cells
=
<
0
>;
};
};
sound
{
sound
{
...
...
arch/arm/boot/dts/omap3-cm-t3x.dtsi
浏览文件 @
51991d7e
...
@@ -43,12 +43,14 @@
...
@@ -43,12 +43,14 @@
hsusb1_phy: hsusb1_phy {
hsusb1_phy: hsusb1_phy {
compatible = "usb-nop-xceiv";
compatible = "usb-nop-xceiv";
vcc-supply = <&hsusb1_power>;
vcc-supply = <&hsusb1_power>;
#phy-cells = <0>;
};
};
/* HS USB Host PHY on PORT 2 */
/* HS USB Host PHY on PORT 2 */
hsusb2_phy: hsusb2_phy {
hsusb2_phy: hsusb2_phy {
compatible = "usb-nop-xceiv";
compatible = "usb-nop-xceiv";
vcc-supply = <&hsusb2_power>;
vcc-supply = <&hsusb2_power>;
#phy-cells = <0>;
};
};
ads7846reg: ads7846-reg {
ads7846reg: ads7846-reg {
...
...
arch/arm/boot/dts/omap3-evm-common.dtsi
浏览文件 @
51991d7e
...
@@ -29,6 +29,7 @@
...
@@ -29,6 +29,7 @@
compatible = "usb-nop-xceiv";
compatible = "usb-nop-xceiv";
reset-gpios = <&gpio1 21 GPIO_ACTIVE_LOW>; /* gpio_21 */
reset-gpios = <&gpio1 21 GPIO_ACTIVE_LOW>; /* gpio_21 */
vcc-supply = <&hsusb2_power>;
vcc-supply = <&hsusb2_power>;
#phy-cells = <0>;
};
};
leds {
leds {
...
...
arch/arm/boot/dts/omap3-gta04.dtsi
浏览文件 @
51991d7e
...
@@ -120,6 +120,7 @@
...
@@ -120,6 +120,7 @@
hsusb2_phy
:
hsusb2_phy
{
hsusb2_phy
:
hsusb2_phy
{
compatible
=
"usb-nop-xceiv"
;
compatible
=
"usb-nop-xceiv"
;
reset
-
gpios
=
<&
gpio6
14
GPIO_ACTIVE_LOW
>;
reset
-
gpios
=
<&
gpio6
14
GPIO_ACTIVE_LOW
>;
#
phy
-
cells
=
<
0
>;
};
};
tv0
:
connector
{
tv0
:
connector
{
...
...
arch/arm/boot/dts/omap3-igep0020-common.dtsi
浏览文件 @
51991d7e
...
@@ -58,6 +58,7 @@
...
@@ -58,6 +58,7 @@
compatible = "usb-nop-xceiv";
compatible = "usb-nop-xceiv";
reset-gpios = <&gpio1 24 GPIO_ACTIVE_LOW>; /* gpio_24 */
reset-gpios = <&gpio1 24 GPIO_ACTIVE_LOW>; /* gpio_24 */
vcc-supply = <&hsusb1_power>;
vcc-supply = <&hsusb1_power>;
#phy-cells = <0>;
};
};
tfp410: encoder {
tfp410: encoder {
...
...
arch/arm/boot/dts/omap3-igep0030-common.dtsi
浏览文件 @
51991d7e
...
@@ -37,6 +37,7 @@
...
@@ -37,6 +37,7 @@
hsusb2_phy: hsusb2_phy {
hsusb2_phy: hsusb2_phy {
compatible = "usb-nop-xceiv";
compatible = "usb-nop-xceiv";
reset-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>; /* gpio_54 */
reset-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>; /* gpio_54 */
#phy-cells = <0>;
};
};
};
};
...
...
arch/arm/boot/dts/omap3-lilly-a83x.dtsi
浏览文件 @
51991d7e
...
@@ -51,6 +51,7 @@
...
@@ -51,6 +51,7 @@
hsusb1_phy
:
hsusb1_phy
{
hsusb1_phy
:
hsusb1_phy
{
compatible
=
"usb-nop-xceiv"
;
compatible
=
"usb-nop-xceiv"
;
vcc
-
supply
=
<&
reg_vcc3
>;
vcc
-
supply
=
<&
reg_vcc3
>;
#
phy
-
cells
=
<
0
>;
};
};
};
};
...
...
arch/arm/boot/dts/omap3-overo-base.dtsi
浏览文件 @
51991d7e
...
@@ -51,6 +51,7 @@
...
@@ -51,6 +51,7 @@
compatible = "usb-nop-xceiv";
compatible = "usb-nop-xceiv";
reset-gpios = <&gpio6 23 GPIO_ACTIVE_LOW>; /* gpio_183 */
reset-gpios = <&gpio6 23 GPIO_ACTIVE_LOW>; /* gpio_183 */
vcc-supply = <&hsusb2_power>;
vcc-supply = <&hsusb2_power>;
#phy-cells = <0>;
};
};
/* Regulator to trigger the nPoweron signal of the Wifi module */
/* Regulator to trigger the nPoweron signal of the Wifi module */
...
...
arch/arm/boot/dts/omap3-pandora-common.dtsi
浏览文件 @
51991d7e
...
@@ -205,6 +205,7 @@
...
@@ -205,6 +205,7 @@
compatible = "usb-nop-xceiv";
compatible = "usb-nop-xceiv";
reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; /* GPIO_16 */
reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; /* GPIO_16 */
vcc-supply = <&vaux2>;
vcc-supply = <&vaux2>;
#phy-cells = <0>;
};
};
/* HS USB Host VBUS supply
/* HS USB Host VBUS supply
...
...
arch/arm/boot/dts/omap3-tao3530.dtsi
浏览文件 @
51991d7e
...
@@ -46,6 +46,7 @@
...
@@ -46,6 +46,7 @@
compatible = "usb-nop-xceiv";
compatible = "usb-nop-xceiv";
reset-gpios = <&gpio6 2 GPIO_ACTIVE_LOW>; /* gpio_162 */
reset-gpios = <&gpio6 2 GPIO_ACTIVE_LOW>; /* gpio_162 */
vcc-supply = <&hsusb2_power>;
vcc-supply = <&hsusb2_power>;
#phy-cells = <0>;
};
};
sound {
sound {
...
...
arch/arm/boot/dts/omap3.dtsi
浏览文件 @
51991d7e
...
@@ -715,6 +715,7 @@
...
@@ -715,6 +715,7 @@
compatible = "ti,ohci-omap3";
compatible = "ti,ohci-omap3";
reg = <0x48064400 0x400>;
reg = <0x48064400 0x400>;
interrupts = <76>;
interrupts = <76>;
remote-wakeup-connected;
};
};
usbhsehci: ehci@48064800 {
usbhsehci: ehci@48064800 {
...
...
arch/arm/boot/dts/omap4-droid4-xt894.dts
浏览文件 @
51991d7e
...
@@ -73,6 +73,7 @@
...
@@ -73,6 +73,7 @@
/*
HS
USB
Host
PHY
on
PORT
1
*/
/*
HS
USB
Host
PHY
on
PORT
1
*/
hsusb1_phy
:
hsusb1_phy
{
hsusb1_phy
:
hsusb1_phy
{
compatible
=
"usb-nop-xceiv"
;
compatible
=
"usb-nop-xceiv"
;
#
phy
-
cells
=
<
0
>;
};
};
/*
LCD
regulator
from
sw5
source
*/
/*
LCD
regulator
from
sw5
source
*/
...
...
arch/arm/boot/dts/omap4-duovero.dtsi
浏览文件 @
51991d7e
...
@@ -43,6 +43,7 @@
...
@@ -43,6 +43,7 @@
hsusb1_phy
:
hsusb1_phy
{
hsusb1_phy
:
hsusb1_phy
{
compatible
=
"usb-nop-xceiv"
;
compatible
=
"usb-nop-xceiv"
;
reset
-
gpios
=
<&
gpio2
30
GPIO_ACTIVE_LOW
>;
/*
gpio_62
*/
reset
-
gpios
=
<&
gpio2
30
GPIO_ACTIVE_LOW
>;
/*
gpio_62
*/
#
phy
-
cells
=
<
0
>;
pinctrl
-
names
=
"default"
;
pinctrl
-
names
=
"default"
;
pinctrl
-
0
=
<&
hsusb1phy_pins
>;
pinctrl
-
0
=
<&
hsusb1phy_pins
>;
...
...
arch/arm/boot/dts/omap4-panda-common.dtsi
浏览文件 @
51991d7e
...
@@ -89,6 +89,7 @@
...
@@ -89,6 +89,7 @@
hsusb1_phy: hsusb1_phy {
hsusb1_phy: hsusb1_phy {
compatible = "usb-nop-xceiv";
compatible = "usb-nop-xceiv";
reset-gpios = <&gpio2 30 GPIO_ACTIVE_LOW>; /* gpio_62 */
reset-gpios = <&gpio2 30 GPIO_ACTIVE_LOW>; /* gpio_62 */
#phy-cells = <0>;
vcc-supply = <&hsusb1_power>;
vcc-supply = <&hsusb1_power>;
clocks = <&auxclk3_ck>;
clocks = <&auxclk3_ck>;
clock-names = "main_clk";
clock-names = "main_clk";
...
...
arch/arm/boot/dts/omap4-var-som-om44.dtsi
浏览文件 @
51991d7e
...
@@ -44,6 +44,7 @@
...
@@ -44,6 +44,7 @@
reset
-
gpios
=
<&
gpio6
17
GPIO_ACTIVE_LOW
>;
/*
gpio
177
*/
reset
-
gpios
=
<&
gpio6
17
GPIO_ACTIVE_LOW
>;
/*
gpio
177
*/
vcc
-
supply
=
<&
vbat
>;
vcc
-
supply
=
<&
vbat
>;
#
phy
-
cells
=
<
0
>;
clocks
=
<&
auxclk3_ck
>;
clocks
=
<&
auxclk3_ck
>;
clock
-
names
=
"main_clk"
;
clock
-
names
=
"main_clk"
;
...
...
arch/arm/boot/dts/omap4.dtsi
浏览文件 @
51991d7e
...
@@ -1081,14 +1081,13 @@
...
@@ -1081,14 +1081,13 @@
usbhsohci: ohci@4a064800 {
usbhsohci: ohci@4a064800 {
compatible = "ti,ohci-omap3";
compatible = "ti,ohci-omap3";
reg = <0x4a064800 0x400>;
reg = <0x4a064800 0x400>;
interrupt-parent = <&gic>;
interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
remote-wakeup-connected;
};
};
usbhsehci: ehci@4a064c00 {
usbhsehci: ehci@4a064c00 {
compatible = "ti,ehci-omap";
compatible = "ti,ehci-omap";
reg = <0x4a064c00 0x400>;
reg = <0x4a064c00 0x400>;
interrupt-parent = <&gic>;
interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
};
};
};
};
...
...
arch/arm/boot/dts/omap5-board-common.dtsi
浏览文件 @
51991d7e
...
@@ -73,12 +73,14 @@
...
@@ -73,12 +73,14 @@
clocks = <&auxclk1_ck>;
clocks = <&auxclk1_ck>;
clock-names = "main_clk";
clock-names = "main_clk";
clock-frequency = <19200000>;
clock-frequency = <19200000>;
#phy-cells = <0>;
};
};
/* HS USB Host PHY on PORT 3 */
/* HS USB Host PHY on PORT 3 */
hsusb3_phy: hsusb3_phy {
hsusb3_phy: hsusb3_phy {
compatible = "usb-nop-xceiv";
compatible = "usb-nop-xceiv";
reset-gpios = <&gpio3 15 GPIO_ACTIVE_LOW>; /* gpio3_79 ETH_NRESET */
reset-gpios = <&gpio3 15 GPIO_ACTIVE_LOW>; /* gpio3_79 ETH_NRESET */
#phy-cells = <0>;
};
};
tpd12s015: encoder {
tpd12s015: encoder {
...
...
arch/arm/boot/dts/omap5-cm-t54.dts
浏览文件 @
51991d7e
...
@@ -63,12 +63,14 @@
...
@@ -63,12 +63,14 @@
hsusb2_phy
:
hsusb2_phy
{
hsusb2_phy
:
hsusb2_phy
{
compatible
=
"usb-nop-xceiv"
;
compatible
=
"usb-nop-xceiv"
;
reset
-
gpios
=
<&
gpio3
12
GPIO_ACTIVE_LOW
>;
/*
gpio3_76
HUB_RESET
*/
reset
-
gpios
=
<&
gpio3
12
GPIO_ACTIVE_LOW
>;
/*
gpio3_76
HUB_RESET
*/
#
phy
-
cells
=
<
0
>;
};
};
/*
HS
USB
Host
PHY
on
PORT
3
*/
/*
HS
USB
Host
PHY
on
PORT
3
*/
hsusb3_phy
:
hsusb3_phy
{
hsusb3_phy
:
hsusb3_phy
{
compatible
=
"usb-nop-xceiv"
;
compatible
=
"usb-nop-xceiv"
;
reset
-
gpios
=
<&
gpio3
19
GPIO_ACTIVE_LOW
>;
/*
gpio3_83
ETH_RESET
*/
reset
-
gpios
=
<&
gpio3
19
GPIO_ACTIVE_LOW
>;
/*
gpio3_83
ETH_RESET
*/
#
phy
-
cells
=
<
0
>;
};
};
leds
{
leds
{
...
...
arch/arm/boot/dts/omap5.dtsi
浏览文件 @
51991d7e
...
@@ -940,6 +940,7 @@
...
@@ -940,6 +940,7 @@
compatible = "ti,ohci-omap3";
compatible = "ti,ohci-omap3";
reg = <0x4a064800 0x400>;
reg = <0x4a064800 0x400>;
interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
remote-wakeup-connected;
};
};
usbhsehci: ehci@4a064c00 {
usbhsehci: ehci@4a064c00 {
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录