diff options
| -rw-r--r-- | arch/arm/boot/dts/ti/omap/am335x-icev2-prueth-overlay.dtso | 136 | ||||
| -rw-r--r-- | arch/arm/boot/dts/ti/omap/am33xx-l4.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/ti/omap/dm8148-evm.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/ti/omap/dm816x-clocks.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/ti/omap/dra7-l4.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi | 10 | ||||
| -rw-r--r-- | arch/arm/boot/dts/ti/omap/omap3-cm-t3x30.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/ti/omap/omap3-n950-n9.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/ti/omap/omap3-overo-common-lcd35.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/ti/omap/omap3-overo-common-lcd43.dtsi | 2 |
10 files changed, 82 insertions, 82 deletions
diff --git a/arch/arm/boot/dts/ti/omap/am335x-icev2-prueth-overlay.dtso b/arch/arm/boot/dts/ti/omap/am335x-icev2-prueth-overlay.dtso index ffed1f3d046a..c0f32c889f69 100644 --- a/arch/arm/boot/dts/ti/omap/am335x-icev2-prueth-overlay.dtso +++ b/arch/arm/boot/dts/ti/omap/am335x-icev2-prueth-overlay.dtso @@ -19,61 +19,61 @@ #include <dt-bindings/clock/am3.h> &{/} { - /* Dual-MAC Ethernet application node on PRU-ICSS */ - pruss_eth: pruss-eth { - compatible = "ti,am3359-prueth"; - ti,prus = <&pru0>, <&pru1>; - sram = <&ocmcram>; - ti,mii-rt = <&pruss_mii_rt>; - ti,iep = <&pruss_iep>; - ti,ecap = <&pruss_ecap>; - interrupts = <20 2 2>, <21 3 3>; - interrupt-names = "rx_hp", "rx_lp"; - interrupt-parent = <&pruss_intc>; - - pinctrl-0 = <&pruss_eth_default>; - pinctrl-names = "default"; - - ethernet-ports { - #address-cells = <1>; - #size-cells = <0>; - pruss_emac0: ethernet-port@0 { - reg = <0>; - phy-handle = <&pruss_eth0_phy>; - phy-mode = "mii"; - interrupts = <20 2 2>, <26 6 6>, <23 6 6>; - interrupt-names = "rx", "emac_ptp_tx", - "hsr_ptp_tx"; - /* Filled in by bootloader */ - local-mac-address = [00 00 00 00 00 00]; - }; - - pruss_emac1: ethernet-port@1 { - reg = <1>; - phy-handle = <&pruss_eth1_phy>; - phy-mode = "mii"; - interrupts = <21 3 3>, <27 9 7>, <24 9 7>; - interrupt-names = "rx", "emac_ptp_tx", - "hsr_ptp_tx"; - /* Filled in by bootloader */ - local-mac-address = [00 00 00 00 00 00]; - }; - }; - }; + /* Dual-MAC Ethernet application node on PRU-ICSS */ + pruss_eth: pruss-eth { + compatible = "ti,am3359-prueth"; + ti,prus = <&pru0>, <&pru1>; + sram = <&ocmcram>; + ti,mii-rt = <&pruss_mii_rt>; + ti,iep = <&pruss_iep>; + ti,ecap = <&pruss_ecap>; + interrupts = <20 2 2>, <21 3 3>; + interrupt-names = "rx_hp", "rx_lp"; + interrupt-parent = <&pruss_intc>; + + pinctrl-0 = <&pruss_eth_default>; + pinctrl-names = "default"; + + ethernet-ports { + #address-cells = <1>; + #size-cells = <0>; + pruss_emac0: ethernet-port@0 { + reg = <0>; + phy-handle = <&pruss_eth0_phy>; + phy-mode = "mii"; + interrupts = <20 2 2>, <26 6 6>, <23 6 6>; + interrupt-names = "rx", "emac_ptp_tx", + "hsr_ptp_tx"; + /* Filled in by bootloader */ + local-mac-address = [00 00 00 00 00 00]; + }; + + pruss_emac1: ethernet-port@1 { + reg = <1>; + phy-handle = <&pruss_eth1_phy>; + phy-mode = "mii"; + interrupts = <21 3 3>, <27 9 7>, <24 9 7>; + interrupt-names = "rx", "emac_ptp_tx", + "hsr_ptp_tx"; + /* Filled in by bootloader */ + local-mac-address = [00 00 00 00 00 00]; + }; + }; + }; }; &am33xx_pinmux { /* MDIO node for PRU-ICSS */ - pruss_mdio_default: pruss-mdio-default-pins { - pinctrl-single,pins = < + pruss_mdio_default: pruss-mdio-default-pins { + pinctrl-single,pins = < AM33XX_IOPAD(0x88c, PIN_OUTPUT | MUX_MODE5) /* (V12) gpmc_clk.pr1_mdio_mdclk */ AM33XX_IOPAD(0x888, PIN_INPUT | MUX_MODE5) /* (T13) gpmc_csn3.pr1_mdio_data */ - >; - }; + >; + }; /* Pinmux configuration for PRU-ICSS */ - pruss_eth_default: pruss-eth-default-pins { - pinctrl-single,pins = < + pruss_eth_default: pruss-eth-default-pins { + pinctrl-single,pins = < AM33XX_IOPAD(0x8a0, PIN_INPUT | MUX_MODE2) /* (R1) lcd_data0.pr1_mii_mt0_clk */ AM33XX_IOPAD(0x8b4, PIN_OUTPUT | MUX_MODE2) /* (T2) lcd_data5.pr1_mii0_txd0 */ AM33XX_IOPAD(0x8b0, PIN_OUTPUT | MUX_MODE2) /* (T1) lcd_data4.pr1_mii0_txd1 */ @@ -105,14 +105,14 @@ AM33XX_IOPAD(0x86c, PIN_INPUT | MUX_MODE5) /* (V17) gpmc_a11.pr1_mii1_rxer */ AM33XX_IOPAD(0x878, PIN_INPUT | MUX_MODE5) /* (U18) gpmc_be1n.pr1_mii1_rxlink */ AM33XX_IOPAD(0x8ec, PIN_INPUT | MUX_MODE2) /* (R6) lcd_ac_bias_en.pr1_mii1_crs */ - >; - }; + >; + }; }; &gpio3 { - mux-mii-hog { + mux-mii-hog { status = "disabled"; - }; + }; mux-mii-hog-0 { gpio-hog; @@ -129,28 +129,28 @@ * conflict with PRU-ICSS */ &mac_sw { - status = "disabled"; + status = "disabled"; }; &davinci_mdio_sw { - status = "disabled"; + status = "disabled"; }; /* PRU-ICSS MDIO configuration */ &pruss_mdio { - pinctrl-0 = <&pruss_mdio_default>; - pinctrl-names = "default"; - reset-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>; - reset-delay-us = <2>; /* PHY datasheet states 1uS min */ - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; - - pruss_eth0_phy: ethernet-phy@1 { - reg = <1>; - }; - - pruss_eth1_phy: ethernet-phy@3 { - reg = <3>; - }; + pinctrl-0 = <&pruss_mdio_default>; + pinctrl-names = "default"; + reset-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>; + reset-delay-us = <2>; /* PHY datasheet states 1uS min */ + status = "okay"; + #address-cells = <1>; + #size-cells = <0>; + + pruss_eth0_phy: ethernet-phy@1 { + reg = <1>; + }; + + pruss_eth1_phy: ethernet-phy@3 { + reg = <3>; + }; }; diff --git a/arch/arm/boot/dts/ti/omap/am33xx-l4.dtsi b/arch/arm/boot/dts/ti/omap/am33xx-l4.dtsi index 8a693c478bea..57a45609f9f5 100644 --- a/arch/arm/boot/dts/ti/omap/am33xx-l4.dtsi +++ b/arch/arm/boot/dts/ti/omap/am33xx-l4.dtsi @@ -1870,7 +1870,7 @@ gpio2: gpio@0 { compatible = "ti,omap4-gpio"; - gpio-ranges = <&am33xx_pinmux 0 34 18>, + gpio-ranges = <&am33xx_pinmux 0 34 18>, <&am33xx_pinmux 18 77 4>, <&am33xx_pinmux 22 56 10>; gpio-controller; diff --git a/arch/arm/boot/dts/ti/omap/dm8148-evm.dts b/arch/arm/boot/dts/ti/omap/dm8148-evm.dts index 57a9eef09f6f..8236d9eb438a 100644 --- a/arch/arm/boot/dts/ti/omap/dm8148-evm.dts +++ b/arch/arm/boot/dts/ti/omap/dm8148-evm.dts @@ -99,7 +99,7 @@ }; &mmc1 { - status = "disabled"; + status = "disabled"; }; &mmc2 { @@ -111,7 +111,7 @@ }; &mmc3 { - status = "disabled"; + status = "disabled"; }; &pincntl { diff --git a/arch/arm/boot/dts/ti/omap/dm816x-clocks.dtsi b/arch/arm/boot/dts/ti/omap/dm816x-clocks.dtsi index 338449b32a18..76ebc6c3c3e5 100644 --- a/arch/arm/boot/dts/ti/omap/dm816x-clocks.dtsi +++ b/arch/arm/boot/dts/ti/omap/dm816x-clocks.dtsi @@ -177,7 +177,7 @@ compatible = "ti,gate-clock"; clocks = <&sysclk2_ck>; ti,bit-shift = <1>; - reg = <0x15dc>; + reg = <0x15dc>; }; audio_pll_a_ck: audio_pll_a_ck@35c { diff --git a/arch/arm/boot/dts/ti/omap/dra7-l4.dtsi b/arch/arm/boot/dts/ti/omap/dra7-l4.dtsi index 9df7648c4b79..a595745afe59 100644 --- a/arch/arm/boot/dts/ti/omap/dra7-l4.dtsi +++ b/arch/arm/boot/dts/ti/omap/dra7-l4.dtsi @@ -1695,9 +1695,9 @@ reg = <0x0 0x100>; interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>; clock-frequency = <48000000>; - status = "disabled"; dmas = <&sdma_xbar 55>, <&sdma_xbar 56>; dma-names = "tx", "rx"; + status = "disabled"; }; }; diff --git a/arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi b/arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi index a0c53d9c2625..28b4f12b82a7 100644 --- a/arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi +++ b/arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi @@ -91,22 +91,22 @@ }; &cpu_alert0 { - temperature = <80000>; /* millicelsius */ + temperature = <80000>; /* millicelsius */ }; &cpu0 { - /* + /* * Note that the 1.2GiHz mode is enabled for all SoC variants for * the Motorola Android Linux v3.0.8 based kernel. */ - operating-points = < - /* kHz uV */ + operating-points = < + /* kHz uV */ 300000 1025000 600000 1200000 800000 1313000 1008000 1375000 1200000 1375000 - >; + >; }; &dss { diff --git a/arch/arm/boot/dts/ti/omap/omap3-cm-t3x30.dtsi b/arch/arm/boot/dts/ti/omap/omap3-cm-t3x30.dtsi index 0e942513560d..6c4916ec41b4 100644 --- a/arch/arm/boot/dts/ti/omap/omap3-cm-t3x30.dtsi +++ b/arch/arm/boot/dts/ti/omap/omap3-cm-t3x30.dtsi @@ -29,7 +29,7 @@ >; }; - hsusb0_pins: hsusb0-pins { + hsusb0_pins: hsusb0-pins { pinctrl-single,pins = < OMAP3_CORE1_IOPAD(0x21a2, PIN_OUTPUT | MUX_MODE0) /* hsusb0_clk.hsusb0_clk */ OMAP3_CORE1_IOPAD(0x21a4, PIN_OUTPUT | MUX_MODE0) /* hsusb0_stp.hsusb0_stp */ diff --git a/arch/arm/boot/dts/ti/omap/omap3-n950-n9.dtsi b/arch/arm/boot/dts/ti/omap/omap3-n950-n9.dtsi index aa4fcdbedd8f..519f7b42a59a 100644 --- a/arch/arm/boot/dts/ti/omap/omap3-n950-n9.dtsi +++ b/arch/arm/boot/dts/ti/omap/omap3-n950-n9.dtsi @@ -287,7 +287,7 @@ pinctrl-names = "default"; pinctrl-0 = <&accelerator_pins>; - interrupts-extended = <&gpio6 20 IRQ_TYPE_EDGE_FALLING>, <&gpio6 21 IRQ_TYPE_EDGE_FALLING>; /* 180, 181 */ + interrupts-extended = <&gpio6 20 IRQ_TYPE_EDGE_FALLING>, <&gpio6 21 IRQ_TYPE_EDGE_FALLING>; /* 180, 181 */ /* click flags */ st,click-single-x; diff --git a/arch/arm/boot/dts/ti/omap/omap3-overo-common-lcd35.dtsi b/arch/arm/boot/dts/ti/omap/omap3-overo-common-lcd35.dtsi index 0da561a23f36..2f7a4a717359 100644 --- a/arch/arm/boot/dts/ti/omap/omap3-overo-common-lcd35.dtsi +++ b/arch/arm/boot/dts/ti/omap/omap3-overo-common-lcd35.dtsi @@ -103,7 +103,7 @@ backlight { compatible = "gpio-backlight"; - + pinctrl-names = "default"; pinctrl-0 = <&backlight_pins>; gpios = <&gpio5 17 GPIO_ACTIVE_HIGH>; /* gpio_145 */ diff --git a/arch/arm/boot/dts/ti/omap/omap3-overo-common-lcd43.dtsi b/arch/arm/boot/dts/ti/omap/omap3-overo-common-lcd43.dtsi index 981f02f088f8..35701f596972 100644 --- a/arch/arm/boot/dts/ti/omap/omap3-overo-common-lcd43.dtsi +++ b/arch/arm/boot/dts/ti/omap/omap3-overo-common-lcd43.dtsi @@ -134,7 +134,7 @@ backlight { compatible = "gpio-backlight"; - + pinctrl-names = "default"; pinctrl-0 = <&backlight_pins>; gpios = <&gpio5 17 GPIO_ACTIVE_HIGH>; /* gpio_145 */ |
