korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-16 23:45:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

More dts changes for omaps for v5.10 merge window

Browse Source 
Some more dts changes that did not make it to the first set of
 dts changes:
 
 - Drop unnessary nokia,nvm-size property
 
 - A series of changes to use "okay" instead of "ok"
 
 - A series of changes to move boards to use new cpsw switch
   driver and drop the drop legacy cpsw dt node
 
 - A series of changes to fix issues with the GPIO binding
   usage
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAl90Ho0RHHRvbnlAYXRv
 bWlkZS5jb20ACgkQG9Q+yVyrpXP0Jw//bnvHcFvmvl19xKDdo/mnoVcbeMnpeIqV
 ISRCA/ePr8q13k9f9KYM1pdT3oismQTkpGbBpfNL8hx+yXH1c1aDotqIzlwV6SBa
 0dYLtAMx+TuQP7SWDShMaDUiaSiLRU4V1JHZZv+gBLq8IVRHyNCdwdfKirsHO100
 /v0YZqLQcu3tfwn5RGQWsM948ddwQrga+SUNmJGU0sapJFDK6/mOY5B2sbwn8/bz
 nw32jdd1JrV7i92ibzB5FkXZFMIU1SFhQYk4Hl2r5RfGjAvd9I6mciAhh4T340Q7
 AvnGmB0eST7Pd7Wh7j6R8TXNLZfeiRu42Zn1kcRmVMUGZgytBHcSpkI2bu0NkkT+
 gZ431N71ck21yI9dlrR9NGDqhcKccZLtHkJiTqiyPsw3NgHXdUwwsVoJaHD7oVgT
 9BOQrh15IefNY7rT7WjCsRYqjhKi9XokZoIGr6XVgHtwQfT5+qcJBAovHzYry5XO
 5mCMRcxeFML1j23qERemPA9TcftIZ+VdZv/SW5DmjZjmnMhU9vtLSihoozZ9H/xr
 zwZtunLheXpCj1rurdqgYeEYo2sfdIWuhc7CiGyR/vW+M0mLPlHqi/ISGQ4lNkp/
 9AcleCxrirTWA4Ek+iE8qcAONl5LFpjSryTQGR3Pb5K7erwJ1YVasT/XP6N2ELHI
 OuuTTAEuk+8=
 =Df2a
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v5.10/dt-part2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt

More dts changes for omaps for v5.10 merge window

Some more dts changes that did not make it to the first set of
dts changes:

- Drop unnessary nokia,nvm-size property

- A series of changes to use "okay" instead of "ok"

- A series of changes to move boards to use new cpsw switch
  driver and drop the drop legacy cpsw dt node

- A series of changes to fix issues with the GPIO binding
  usage

* tag 'omap-for-v5.10/dt-part2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am3874: iceboard: fix GPIO expander reset GPIOs
  ARM: dts: am335x: t335: align GPIO hog names with dtschema
  ARM: dts: am335x: lxm: fix PCA9539 GPIO expander properties
  ARM: dts: am437x-l4: drop legacy cpsw dt node
  ARM: dts: am437x: switch to new cpsw switch drv
  ARM: dts: am437x-l4: add dt node for new cpsw switchdev driver
  ARM: dts: dra7: drop legacy cpsw dt node
  ARM: dts: am57xx-cl-som-am57x: switch to new cpsw switch drv
  ARM: dts: dra7x-evm: switch to new cpsw switch drv
  ARM: dts: beagle-x15: switch to new cpsw switch drv
  ARM: dts: am57xx-idk: switch to new cpsw switch drv
  ARM: dts: am5729: beagleboneai: switch to new cpsw switch drv
  ARM: dts: am43xx: replace status value "ok" by "okay"
  ARM: dts: dra7xx: replace status value "ok" by "okay"
  ARM: dts: omap: replace status value "ok" by "okay"
  ARM: dts: n9, n950: Remove nokia,nvm-size property

Link: https://lore.kernel.org/r/pull-1601445968-476435@atomide.com-2
Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2020-10-03 12:44:07 -07:00
commit 1ddaaa42ac
57 changed files with 220 additions and 297 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/am335x-lxm.dts
View File

@ -160,11 +160,15 @@
serial_config1: serial_config1@20 {
compatible = "nxp,pca9539";
reg = <0x20>;
gpio-controller;
#gpio-cells = <2>;
};
serial_config2: serial_config2@21 {
compatible = "nxp,pca9539";
reg = <0x21>;
gpio-controller;
#gpio-cells = <2>;
};
tps: tps@2d {

4
arch/arm/boot/dts/am335x-sbc-t335.dts
View File

@ -155,13 +155,13 @@
gpio-controller;
#gpio-cells = <2>;
reg = <0x26>;
dvi_ena {
dvi-ena-hog {
gpio-hog;
gpios = <13 GPIO_ACTIVE_HIGH>;
output-high;
line-name = "dvi-enable";
};
lcd_ena {
lcd-ena-hog {
gpio-hog;
gpios = <11 GPIO_ACTIVE_HIGH>;
output-high;

4
arch/arm/boot/dts/am3517-evm-ui.dtsi
View File

@ -183,14 +183,14 @@
};
&mcbsp1 {
status = "ok";
status = "okay";
#sound-dai-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&mcbsp1_pins>;
};
&mcbsp2 {
status = "ok";
status = "okay";
#sound-dai-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&mcbsp2_pins>;

2
arch/arm/boot/dts/am3517-evm.dts
View File

@ -176,7 +176,7 @@
};
&dss {
status = "ok";
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&dss_dpi_pins>;

8
arch/arm/boot/dts/am3874-iceboard.dts
View File

@ -195,7 +195,7 @@
"FMCA_PG_C2M", "FMCA_PRSNT_M2C_L", "FMCA_CLK_DIR", "SFP_LOS",
"FMCB_EN_12V0", "FMCB_EN_3V3", "FMCB_EN_VADJ", "FMCB_PG_M2C",
"FMCB_PG_C2M", "FMCB_PRSNT_M2C_L", "FMCB_CLK_DIR", "SFP_ModPrsL";
reset_gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;
reset-gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;
};
u42: pca9575@21 {
@ -208,7 +208,7 @@
"QSFPA_LPMode", "QSFPB_ModPrsL", "QSFPB_IntL", "QSFPB_ResetL",
"SFP_TxFault", "SFP_TxDisable", "SFP_RS0", "SFP_RS1",
"QSFPB_ModSelL", "QSFPB_LPMode", "SEL_SFP", "ARM_MR";
reset_gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;
reset-gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;
};
u48: pca9575@22 {
@ -227,7 +227,7 @@
"GP_SW5", "GP_SW6", "GP_SW7", "GP_SW8",
"GP_LED8", "GP_LED7", "GP_LED6", "GP_LED5",
"GP_LED4", "GP_LED3", "GP_LED2", "GP_LED1";
reset_gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;
reset-gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;
};
u59: pca9575@23 {
@ -240,7 +240,7 @@
"GTX1V8PowerFault", "PHYAPowerFault", "PHYBPowerFault", "ArmPowerFault",
"BP_SLOW_GPIO0", "BP_SLOW_GPIO1", "BP_SLOW_GPIO2", "BP_SLOW_GPIO3",
"BP_SLOW_GPIO4", "BP_SLOW_GPIO5", "__unused_u59_p16", "__unused_u59_p17";
reset_gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;
reset-gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;
};
tmp100@48 { compatible = "ti,tmp100"; reg = <0x48>; };

4
arch/arm/boot/dts/am4372.dtsi
View File

@ -35,8 +35,8 @@
serial3 = &uart3;
serial4 = &uart4;
serial5 = &uart5;
ethernet0 = &cpsw_emac0;
ethernet1 = &cpsw_emac1;
ethernet0 = &cpsw_port1;
ethernet1 = &cpsw_port2;
spi0 = &qspi;
};

14
arch/arm/boot/dts/am437x-cm-t43.dts
View File

@ -325,17 +325,15 @@
};
};
&mac {
&mac_sw {
pinctrl-names = "default";
pinctrl-0 = <&cpsw_default>;
dual_emac = <1>;
status = "okay";
};
&davinci_mdio {
&davinci_mdio_sw {
pinctrl-names = "default";
pinctrl-0 = <&davinci_mdio_default>;
status = "okay";
ethphy0: ethernet-phy@0 {
reg = <0>;
@ -346,16 +344,16 @@
};
};
&cpsw_emac0 {
&cpsw_port1 {
phy-handle = <&ethphy0>;
phy-mode = "rgmii-txid";
dual_emac_res_vlan = <1>;
ti,dual-emac-pvid = <1>;
};
&cpsw_emac1 {
&cpsw_port2 {
phy-handle = <&ethphy1>;
phy-mode = "rgmii-txid";
dual_emac_res_vlan = <2>;
ti,dual-emac-pvid = <2>;
};
&dwc3_1 {

15
arch/arm/boot/dts/am437x-gp-evm.dts
View File

@ -906,28 +906,31 @@
status = "okay";
};
&mac {
slaves = <1>;
&mac_sw {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>;
status = "okay";
};
&davinci_mdio {
&davinci_mdio_sw {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>;
status = "okay";
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
&cpsw_emac0 {
&cpsw_port1 {
phy-handle = <&ethphy0>;
phy-mode = "rgmii-rxid";
ti,dual-emac-pvid = <1>;
};
&cpsw_port2 {
status = "disabled";
};
&elm {
@ -1024,7 +1027,7 @@
};
&dss {
status = "ok";
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&dss_pins>;

13
arch/arm/boot/dts/am437x-idk-evm.dts
View File

@ -483,28 +483,31 @@
};
};
&mac {
slaves = <1>;
&mac_sw {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>;
status = "okay";
};
&davinci_mdio {
&davinci_mdio_sw {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>;
status = "okay";
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
&cpsw_emac0 {
&cpsw_port1 {
phy-handle = <&ethphy0>;
phy-mode = "rgmii-rxid";
ti,dual-emac-pvid = <1>;
};
&cpsw_port2 {
status = "disabled";
};
&rtc {

77
arch/arm/boot/dts/am437x-l4.dtsi
View File

@ -521,54 +521,57 @@
#size-cells = <1>;
ranges = <0x0 0x100000 0x8000>;
mac: ethernet@0 {
compatible = "ti,am4372-cpsw","ti,cpsw";
reg = <0x0 0x800
0x1200 0x100>;
mac_sw: switch@0 {
compatible = "ti,am4372-cpsw","ti,cpsw-switch";
reg = <0x0 0x4000>;
ranges = <0 0 0x4000>;
clocks = <&cpsw_125mhz_gclk>, <&dpll_clksel_mac_clk>;
clock-names = "fck", "50mclk";
assigned-clocks = <&dpll_clksel_mac_clk>;
assigned-clock-rates = <50000000>;
#address-cells = <1>;
#size-cells = <1>;
syscon = <&scm_conf>;
status = "disabled";
interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH
GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH
GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH
GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <1>;
clocks = <&cpsw_125mhz_gclk>, <&cpsw_cpts_rft_clk>,
<&dpll_clksel_mac_clk>;
clock-names = "fck", "cpts", "50mclk";
assigned-clocks = <&dpll_clksel_mac_clk>;
assigned-clock-rates = <50000000>;
status = "disabled";
cpdma_channels = <8>;
ale_entries = <1024>;
bd_ram_size = <0x2000>;
mac_control = <0x20>;
slaves = <2>;
active_slave = <0>;
cpts_clock_mult = <0x80000000>;
cpts_clock_shift = <29>;
ranges = <0 0 0x8000>;
syscon = <&scm_conf>;
interrupt-names = "rx_thresh", "rx", "tx", "misc";
davinci_mdio: mdio@1000 {
compatible = "ti,am4372-mdio","ti,cpsw-mdio","ti,davinci_mdio";
reg = <0x1000 0x100>;
clocks = <&cpsw_125mhz_clkctrl AM4_CPSW_125MHZ_CPGMAC0_CLKCTRL 0>;
ethernet-ports {
#address-cells = <1>;
#size-cells = <0>;
cpsw_port1: port@1 {
reg = <1>;
label = "port1";
mac-address = [ 00 00 00 00 00 00 ];
phys = <&phy_gmii_sel 1 0>;
};
cpsw_port2: port@2 {
reg = <2>;
label = "port2";
mac-address = [ 00 00 00 00 00 00 ];
phys = <&phy_gmii_sel 2 0>;
};
};
davinci_mdio_sw: mdio@1000 {
compatible = "ti,am4372-mdio", "ti,cpsw-mdio","ti,davinci_mdio";
clocks = <&cpsw_125mhz_gclk>;
clock-names = "fck";
#address-cells = <1>;
#size-cells = <0>;
bus_freq = <1000000>;
status = "disabled";
reg = <0x1000 0x100>;
};
cpsw_emac0: slave@200 {
/* Filled in by U-Boot */
mac-address = [ 00 00 00 00 00 00 ];
phys = <&phy_gmii_sel 1 0>;
};
cpsw_emac1: slave@300 {
/* Filled in by U-Boot */
mac-address = [ 00 00 00 00 00 00 ];
phys = <&phy_gmii_sel 2 0>;
cpts {
clocks = <&cpsw_cpts_rft_clk>;
clock-names = "cpts";
};
};
};

2
arch/arm/boot/dts/am437x-sbc-t43.dts
View File

@ -136,7 +136,7 @@
};
&dss {
status = "ok";
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&dss_pinctrl_default>;

14
arch/arm/boot/dts/am437x-sk-evm.dts
View File

@ -792,19 +792,17 @@
};
};
&mac {
&mac_sw {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>;
dual_emac = <1>;
status = "okay";
};
&davinci_mdio {
&davinci_mdio_sw {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>;
status = "okay";
ethphy0: ethernet-phy@4 {
reg = <4>;
@ -815,16 +813,16 @@
};
};
&cpsw_emac0 {
&cpsw_port1 {
phy-handle = <&ethphy0>;
phy-mode = "rgmii-rxid";
dual_emac_res_vlan = <1>;
ti,dual-emac-pvid = <1>;
};
&cpsw_emac1 {
&cpsw_port2 {
phy-handle = <&ethphy1>;
phy-mode = "rgmii-rxid";
dual_emac_res_vlan = <2>;
ti,dual-emac-pvid = <2>;
};
&elm {

15
arch/arm/boot/dts/am43x-epos-evm.dts
View File

@ -550,29 +550,32 @@
cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
};
&mac {
&mac_sw {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>;
status = "okay";
slaves = <1>;
};
&davinci_mdio {
&davinci_mdio_sw {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>;
status = "okay";
ethphy0: ethernet-phy@16 {
reg = <16>;
};
};
&cpsw_emac0 {
&cpsw_port1 {
phy-handle = <&ethphy0>;
phy-mode = "rmii";
phys = <&phy_gmii_sel 1 1>;
ti,dual-emac-pvid = <1>;
};
&cpsw_port2 {
status = "disabled";
};
&i2c0 {
@ -948,7 +951,7 @@
};
&dss {
status = "ok";
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&dss_pins>;

27
arch/arm/boot/dts/am571x-idk.dts
View File

@ -208,30 +208,3 @@
pinctrl-1 = <&mmc2_pins_hs>;
pinctrl-2 = <&mmc2_pins_ddr_rev20 &mmc2_iodelay_ddr_conf>;
};
&mac_sw {
pinctrl-names = "default", "sleep";
status = "okay";
};
&cpsw_port1 {
phy-handle = <&ethphy0_sw>;
phy-mode = "rgmii-rxid";
ti,dual-emac-pvid = <1>;
};
&cpsw_port2 {
phy-handle = <&ethphy1_sw>;
phy-mode = "rgmii-rxid";
ti,dual-emac-pvid = <2>;
};
&davinci_mdio_sw {
ethphy0_sw: ethernet-phy@0 {
reg = <0>;
};
ethphy1_sw: ethernet-phy@1 {
reg = <1>;
};
};

14
arch/arm/boot/dts/am5729-beagleboneai.dts
View File

@ -488,25 +488,29 @@
status = "okay";
};
&davinci_mdio {
&davinci_mdio_sw {
reset-gpios = <&gpio2 23 GPIO_ACTIVE_LOW>;
reset-delay-us = <2>;
phy0: ethernet-phy@1 {
phy0: ethernet-phy@4 {
reg = <4>;
eee-broken-100tx;
eee-broken-1000t;
};
};
&mac {
slaves = <1>;
&mac_sw {
status = "okay";
};
&cpsw_emac0 {
&cpsw_port1 {
phy-handle = <&phy0>;
phy-mode = "rgmii-rxid";
ti,dual-emac-pvid = <1>;
};
&cpsw_port2 {
status = "disabled";
};
&ocp {

5
arch/arm/boot/dts/am572x-idk.dts
View File

@ -27,8 +27,3 @@
pinctrl-1 = <&mmc2_pins_hs>;
pinctrl-2 = <&mmc2_pins_ddr_rev20>;
};
&mac {
status = "okay";
dual_emac;
};

5
arch/arm/boot/dts/am574x-idk.dts
View File

@ -36,11 +36,6 @@
pinctrl-2 = <&mmc2_pins_default>;
};
&mac {
status = "okay";
dual_emac;
};
&m_can0 {
status = "disabled";
};

19
arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
View File

@ -451,7 +451,7 @@
<&dra7_pmx_core 0x3f8>;
};
&davinci_mdio {
&davinci_mdio_sw {
phy0: ethernet-phy@1 {
reg = <1>;
};
@ -461,21 +461,20 @@
};
};
&mac {
&mac_sw {
status = "okay";
dual_emac;
};
&cpsw_emac0 {
&cpsw_port1 {
phy-handle = <&phy0>;
phy-mode = "rgmii-rxid";
dual_emac_res_vlan = <1>;
ti,dual-emac-pvid = <1>;
};
&cpsw_emac1 {
&cpsw_port2 {
phy-handle = <&phy1>;
phy-mode = "rgmii-rxid";
dual_emac_res_vlan = <2>;
ti,dual-emac-pvid = <2>;
};
&mmc1 {
@ -582,13 +581,13 @@
};
&dss {
status = "ok";
status = "okay";
vdda_video-supply = <&ldoln_reg>;
};
&hdmi {
status = "ok";
status = "okay";
vdda-supply = <&ldo4_reg>;
port {
@ -599,7 +598,7 @@
};
&pcie1_rc {
status = "ok";
status = "okay";
gpios = <&gpio2 8 GPIO_ACTIVE_LOW>;
};

13
arch/arm/boot/dts/am57xx-cl-som-am57x.dts
View File

@ -546,27 +546,26 @@
};
};
&mac {
&mac_sw {
status = "okay";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_pins_default>;
pinctrl-1 = <&cpsw_pins_sleep>;
dual_emac;
};
&cpsw_emac0 {
&cpsw_port1 {
phy-handle = <&ethphy0>;
phy-mode = "rgmii-txid";
dual_emac_res_vlan = <0>;
ti,dual-emac-pvid = <1>;
};
&cpsw_emac1 {
&cpsw_port2 {
phy-handle = <&ethphy1>;
phy-mode = "rgmii-txid";
dual_emac_res_vlan = <1>;
ti,dual-emac-pvid = <2>;
};
&davinci_mdio {
&davinci_mdio_sw {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_pins_default>;
pinctrl-1 = <&davinci_mdio_pins_sleep>;

14
arch/arm/boot/dts/am57xx-idk-common.dtsi
View File

@ -448,19 +448,23 @@
ext-clk-src;
};
&cpsw_emac0 {
&mac_sw {
status = "okay";
};
&cpsw_port1 {
phy-handle = <&ethphy0>;
phy-mode = "rgmii-rxid";
dual_emac_res_vlan = <1>;
ti,dual-emac-pvid = <1>;
};
&cpsw_emac1 {
&cpsw_port2 {
phy-handle = <&ethphy1>;
phy-mode = "rgmii-rxid";
dual_emac_res_vlan = <2>;
ti,dual-emac-pvid = <2>;
};
&davinci_mdio {
&davinci_mdio_sw {
ethphy0: ethernet-phy@0 {
reg = <0>;
};

4
arch/arm/boot/dts/am57xx-sbc-am57x.dts
View File

@ -120,7 +120,7 @@
};
&dss {
status = "ok";
status = "okay";
vdda_video-supply = <&ldoln_reg>;
@ -148,7 +148,7 @@
};
&hdmi {
status = "ok";
status = "okay";
vdda-supply = <&ldo4_reg>;
pinctrl-names = "default";

15
arch/arm/boot/dts/dra7-evm.dts
View File

@ -537,24 +537,23 @@
ti,no-idle-on-init;
};
&mac {
&mac_sw {
status = "okay";
dual_emac;
};
&cpsw_emac0 {
&cpsw_port1 {
phy-handle = <&ethphy0>;
phy-mode = "rgmii";
dual_emac_res_vlan = <1>;
ti,dual-emac-pvid = <1>;
};
&cpsw_emac1 {
&cpsw_port2 {
phy-handle = <&ethphy1>;
phy-mode = "rgmii";
dual_emac_res_vlan = <2>;
ti,dual-emac-pvid = <2>;
};
&davinci_mdio {
&davinci_mdio_sw {
ethphy0: ethernet-phy@2 {
reg = <2>;
};
@ -565,7 +564,7 @@
};
&dcan1 {
status = "ok";
status = "okay";
pinctrl-names = "default", "sleep", "active";
pinctrl-0 = <&dcan1_pins_sleep>;
pinctrl-1 = <&dcan1_pins_sleep>;

54
arch/arm/boot/dts/dra7-l4.dtsi
View File

@ -3038,60 +3038,6 @@
*/
ti,no-idle;
mac: ethernet@0 {
compatible = "ti,dra7-cpsw","ti,cpsw";
clocks = <&gmac_main_clk>, <&gmac_clkctrl DRA7_GMAC_GMAC_CLKCTRL 25>;
clock-names = "fck", "cpts";
cpdma_channels = <8>;
ale_entries = <1024>;
bd_ram_size = <0x2000>;
mac_control = <0x20>;
slaves = <2>;
active_slave = <0>;
cpts_clock_mult = <0x784CFE14>;
cpts_clock_shift = <29>;
reg = <0x0 0x1000
0x1200 0x2e00>;
#address-cells = <1>;
#size-cells = <1>;
/*
* rx_thresh_pend
* rx_pend
* tx_pend
* misc_pend
*/
interrupts = <GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>;
ranges = <0 0 0x4000>;
syscon = <&scm_conf>;
status = "disabled";
davinci_mdio: mdio@1000 {
compatible = "ti,cpsw-mdio","ti,davinci_mdio";
clocks = <&gmac_main_clk>;
clock-names = "fck";
#address-cells = <1>;
#size-cells = <0>;
bus_freq = <1000000>;
reg = <0x1000 0x100>;
};
cpsw_emac0: slave@200 {
/* Filled in by U-Boot */
mac-address = [ 00 00 00 00 00 00 ];
phys = <&phy_gmii_sel 1>;
};
cpsw_emac1: slave@300 {
/* Filled in by U-Boot */
mac-address = [ 00 00 00 00 00 00 ];
phys = <&phy_gmii_sel 2>;
};
};
mac_sw: switch@0 {
compatible = "ti,dra7-cpsw-switch","ti,cpsw-switch";
reg = <0x0 0x4000>;

4
arch/arm/boot/dts/dra7.dtsi
View File

@ -37,8 +37,8 @@
serial7 = &uart8;
serial8 = &uart9;
serial9 = &uart10;
ethernet0 = &cpsw_emac0;
ethernet1 = &cpsw_emac1;
ethernet0 = &cpsw_port1;
ethernet1 = &cpsw_port2;
d_can0 = &dcan1;
d_can1 = &dcan2;
spi0 = &qspi;

14
arch/arm/boot/dts/dra71-evm.dts
View File

@ -219,26 +219,26 @@
vqmmc-supply = <&evm_1v8_sw>;
};
&mac {
&mac_sw {
mode-gpios = <&pcf_gpio_21 4 GPIO_ACTIVE_LOW>,
<&pcf_hdmi 9 GPIO_ACTIVE_LOW>, /* P11 */
<&pcf_hdmi 10 GPIO_ACTIVE_LOW>; /* P12 */
dual_emac;
status = "okay";
};
&cpsw_emac0 {
&cpsw_port1 {
phy-handle = <&dp83867_0>;
phy-mode = "rgmii-id";
dual_emac_res_vlan = <1>;
ti,dual-emac-pvid = <1>;
};
&cpsw_emac1 {
&cpsw_port2 {
phy-handle = <&dp83867_1>;
phy-mode = "rgmii-id";
dual_emac_res_vlan = <2>;
ti,dual-emac-pvid = <2>;
};
&davinci_mdio {
&davinci_mdio_sw {
dp83867_0: ethernet-phy@2 {
reg = <2>;
ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_25_NS>;

10
arch/arm/boot/dts/dra72-evm-common.dtsi
View File

@ -462,12 +462,8 @@
};
};
&mac {
status = "okay";
};
&dcan1 {
status = "ok";
status = "okay";
pinctrl-names = "default", "sleep", "active";
pinctrl-0 = <&dcan1_pins_sleep>;
pinctrl-1 = <&dcan1_pins_sleep>;
@ -536,11 +532,11 @@
};
&dss {
status = "ok";
status = "okay";
};
&hdmi {
status = "ok";
status = "okay";
port {
hdmi_out: endpoint {

14
arch/arm/boot/dts/dra72-evm-revc.dts
View File

@ -77,26 +77,26 @@
interrupts = <30 IRQ_TYPE_EDGE_FALLING>;
};
&mac {
&mac_sw {
mode-gpios = <&pcf_gpio_21 4 GPIO_ACTIVE_LOW>,
<&pcf_hdmi 9 GPIO_ACTIVE_LOW>, /* P11 */
<&pcf_hdmi 10 GPIO_ACTIVE_LOW>; /* P12 */
dual_emac;
status = "okay";
};
&cpsw_emac0 {
&cpsw_port1 {
phy-handle = <&dp83867_0>;
phy-mode = "rgmii-id";
dual_emac_res_vlan = <1>;
ti,dual-emac-pvid = <1>;
};
&cpsw_emac1 {
&cpsw_port2 {
phy-handle = <&dp83867_1>;
phy-mode = "rgmii-id";
dual_emac_res_vlan = <2>;
ti,dual-emac-pvid = <2>;
};
&davinci_mdio {
&davinci_mdio_sw {
dp83867_0: ethernet-phy@2 {
reg = <2>;
ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_25_NS>;

13
arch/arm/boot/dts/dra72-evm.dts
View File

@ -69,17 +69,22 @@
interrupts = <11 IRQ_TYPE_EDGE_FALLING>;
};
&mac {
slaves = <1>;
&mac_sw {
mode-gpios = <&pcf_gpio_21 4 GPIO_ACTIVE_HIGH>;
status = "okay";
};
&cpsw_emac0 {
&cpsw_port1 {
phy-handle = <&ethphy0>;
phy-mode = "rgmii";
ti,dual-emac-pvid = <1>;
};
&davinci_mdio {
&cpsw_port2 {
status = "disabled";
};
&davinci_mdio_sw {
ethphy0: ethernet-phy@3 {
reg = <3>;
};

18
arch/arm/boot/dts/dra76-evm.dts
View File

@ -475,25 +475,23 @@
status = "disabled";
};
&mac {
&mac_sw {
status = "okay";
dual_emac;
};
&cpsw_emac0 {
&cpsw_port1 {
phy-handle = <&dp83867_0>;
phy-mode = "rgmii-id";
dual_emac_res_vlan = <1>;
ti,dual-emac-pvid = <1>;
};
&cpsw_emac1 {
&cpsw_port2 {
phy-handle = <&dp83867_1>;
phy-mode = "rgmii-id";
dual_emac_res_vlan = <2>;
ti,dual-emac-pvid = <2>;
};
&davinci_mdio {
&davinci_mdio_sw {
dp83867_0: ethernet-phy@2 {
reg = <2>;
ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_25_NS>;
@ -522,12 +520,12 @@
};
&dss {
status = "ok";
status = "okay";
vdda_video-supply = <&ldo5_reg>;
};
&hdmi {
status = "ok";
status = "okay";
vdda-supply = <&ldo1_reg>;

2
arch/arm/boot/dts/logicpd-som-lv-baseboard.dtsi
View File

@ -79,7 +79,7 @@
};
&dss {
status = "ok";
status = "okay";
vdds_dsi-supply = <&vpll2>;
vdda_video-supply = <&video_reg>;
pinctrl-names = "default";

2
arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi
View File

@ -115,7 +115,7 @@
};
&dss {
status = "ok";
status = "okay";
vdds_dsi-supply = <&vpll2>;
vdda_video-supply = <&vpll2>;
pinctrl-names = "default";

4
arch/arm/boot/dts/omap3-beagle-xm.dts
View File

@ -389,7 +389,7 @@
};
&dss {
status = "ok";
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <
@ -406,7 +406,7 @@
};
&venc {
status = "ok";
status = "okay";
vdda-supply = <&vdac>;

6
arch/arm/boot/dts/omap3-beagle.dts
View File

@ -386,7 +386,7 @@
};
&dss {
status = "ok";
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&dss_dpi_pins>;
@ -400,7 +400,7 @@
};
&venc {
status = "ok";
status = "okay";
vdda-supply = <&vdac>;
@ -413,7 +413,7 @@
};
&gpmc {
status = "ok";
status = "okay";
ranges = <0 0 0x30000000 0x1000000>; /* CS0 space, 16MB */
/* Chip select 0 */

2
arch/arm/boot/dts/omap3-cm-t3517.dts
View File

@ -147,7 +147,7 @@
};
&dss {
status = "ok";
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <

2
arch/arm/boot/dts/omap3-cm-t3530.dts
View File

@ -49,7 +49,7 @@
};
&dss {
status = "ok";
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <

2
arch/arm/boot/dts/omap3-cm-t3730.dts
View File

@ -87,7 +87,7 @@
};
&dss {
status = "ok";
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <

4
arch/arm/boot/dts/omap3-cm-t3x.dtsi
View File

@ -246,7 +246,7 @@
};
&venc {
status = "ok";
status = "okay";
port {
venc_out: endpoint {
@ -257,7 +257,7 @@
};
&mcbsp2 {
status = "ok";
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&mcbsp2_pins>;

4
arch/arm/boot/dts/omap3-devkit8000-common.dtsi
View File

@ -337,7 +337,7 @@
};
&dss {
status = "ok";
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&dss_dpi_pins>;
@ -361,7 +361,7 @@
};
&venc {
status = "ok";
status = "okay";
vdda-supply = <&vdac>;

8
arch/arm/boot/dts/omap3-gta04.dtsi
View File

@ -822,27 +822,27 @@
};
&mcbsp1 { /* FM Transceiver PCM */
status = "ok";
status = "okay";
#sound-dai-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&mcbsp1_pins>;
};
&mcbsp2 { /* TPS65950 I2S */
status = "ok";
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&mcbsp2_pins>;
};
&mcbsp3 { /* Bluetooth PCM */
status = "ok";
status = "okay";
#sound-dai-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&mcbsp3_pins>;
};
&mcbsp4 { /* GSM voice PCM */
status = "ok";
status = "okay";
#sound-dai-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&mcbsp4_pins>;

2
arch/arm/boot/dts/omap3-ha-lcd.dts
View File

@ -100,7 +100,7 @@
};
&dss {
status = "ok";
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&dss_dpi_pins>;

2
arch/arm/boot/dts/omap3-igep0020-common.dtsi
View File

@ -245,7 +245,7 @@
};
&dss {
status = "ok";
status = "okay";
port {
dpi_out: endpoint {

1
arch/arm/boot/dts/omap3-n9.dts
View File

@ -23,7 +23,6 @@
vana-supply = <&vaux3>;
clocks = <&isp 0>;
clock-frequency = <9600000>;
nokia,nvm-size = <(16 * 64)>;
flash-leds = <&as3645a_flash &as3645a_indicator>;
port {
smia_1_1: endpoint {

6
arch/arm/boot/dts/omap3-n900.dts
View File

@ -1083,7 +1083,7 @@
};
&dss {
status = "ok";
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&dss_sdi_pins>;
@ -1106,7 +1106,7 @@
};
&venc {
status = "ok";
status = "okay";
vdda-supply = <&vdac>;
@ -1119,7 +1119,7 @@
};
&mcbsp2 {
status = "ok";
status = "okay";
};
&ssi_port1 {

5
arch/arm/boot/dts/omap3-n950.dts
View File

@ -76,7 +76,6 @@
vana-supply = <&vaux3>;
clocks = <&isp 0>;
clock-frequency = <9600000>;
nokia,nvm-size = <(16 * 64)>;
flash-leds = <&as3645a_flash &as3645a_indicator>;
port {
smia_1_1: endpoint {
@ -205,13 +204,13 @@
};
&dss {
status = "ok";
status = "okay";
vdda_video-supply = <&vdac>;
};
&dsi {
status = "ok";
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&dsi_pins>;

2
arch/arm/boot/dts/omap3-overo-common-dvi.dtsi
View File

@ -48,7 +48,7 @@
};
&dss {
status = "ok";
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&dss_dpi_pins>;

2
arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi
View File

@ -76,7 +76,7 @@
};
&dss {
status = "ok";
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&dss_dpi_pins>;

2
arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi
View File

@ -75,7 +75,7 @@
};
&dss {
status = "ok";
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&dss_dpi_pins>;

4
arch/arm/boot/dts/omap3-pandora-common.dtsi
View File

@ -702,7 +702,7 @@
};
&venc {
status = "ok";
status = "okay";
vdda-supply = <&vdac>;
@ -718,7 +718,7 @@
pinctrl-names = "default";
pinctrl-0 = < &dss_dpi_pins >;
status = "ok";
status = "okay";
vdds_dsi-supply = <&vpll2>;
port {

2
arch/arm/boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi
View File

@ -46,7 +46,7 @@
};
&dss {
status = "ok";
status = "okay";
port {
dpi_out: endpoint {
remote-endpoint = <&lcd_in>;

2
arch/arm/boot/dts/omap3-thunder.dts
View File

@ -64,7 +64,7 @@
};
&dss {
status = "ok";
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&dss_dpi_pins>;

2
arch/arm/boot/dts/omap34xx.dtsi
View File

@ -183,7 +183,7 @@
};
&ssi {
status = "ok";
status = "okay";
clocks = <&ssi_ssr_fck>,
<&ssi_sst_fck>,

2
arch/arm/boot/dts/omap36xx.dtsi
View File

@ -235,7 +235,7 @@
};
&ssi {
status = "ok";
status = "okay";
clocks = <&ssi_ssr_fck>,
<&ssi_sst_fck>,

4
arch/arm/boot/dts/omap4-duovero-parlor.dts
View File

@ -171,11 +171,11 @@
};
&dss {
status = "ok";
status = "okay";
};
&hdmi {
status = "ok";
status = "okay";
vdda-supply = <&vdac>;
pinctrl-names = "default";

6
arch/arm/boot/dts/omap4-panda-common.dtsi
View File

@ -566,7 +566,7 @@
};
&dss {
status = "ok";
status = "okay";
port {
dpi_out: endpoint {
@ -577,12 +577,12 @@
};
&dsi2 {
status = "ok";
status = "okay";
vdd-supply = <&vcxio>;
};
&hdmi {
status = "ok";
status = "okay";
vdda-supply = <&vdac>;
port {

8
arch/arm/boot/dts/omap4-sdp.dts
View File

@ -648,11 +648,11 @@
};
&dss {
status = "ok";
status = "okay";
};
&dsi1 {
status = "ok";
status = "okay";
vdd-supply = <&vcxio>;
port {
@ -678,7 +678,7 @@
};
&dsi2 {
status = "ok";
status = "okay";
vdd-supply = <&vcxio>;
port {
@ -704,7 +704,7 @@
};
&hdmi {
status = "ok";
status = "okay";
vdda-supply = <&vdac>;
port {

4
arch/arm/boot/dts/omap5-board-common.dtsi
View File

@ -743,11 +743,11 @@
};
&dss {
status = "ok";
status = "okay";
};
&hdmi {
status = "ok";
status = "okay";
/* vdda-supply populated in board specific dts file */

6
arch/arm/boot/dts/omap5-cm-t54.dts
View File

@ -653,7 +653,7 @@
};
&dss {
status = "ok";
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&dss_dpi_pins>;
@ -677,12 +677,12 @@
};
&dsi2 {
status = "ok";
status = "okay";
vdd-supply = <&ldo4_reg>;
};
&hdmi {
status = "ok";
status = "okay";
vdda-supply = <&ldo4_reg>;
pinctrl-names = "default";