Minor improvements in ARM DTS for v6.2

1. Aspeed: fix qcom,dc-scm-v1-bmc compatible in the bindings.
 2. Marvell: include bindings in maintainers entry.
 3. Cleanup DTS according to bindings (panel endpoint unit address,
    incorrect spi-max-frequency, generic node names).
 4. Few indentation fixes.
 -----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAmNswkQQHGtyemtAa2Vy
 bmVsLm9yZwAKCRDBN2bmhouD1/wbD/4s09J5k8k5Ta/deRG2wWv8ibMLBVSjqv2e
 oWeBtGlHZMBNSqM7zuIzVReKwiRf3fdYM3M8TIE7dyhpcFT6s4NF2dze+M3NOJf4
 KKYO7Qls1+URz7a5YhsClRv15/dcJTJR3oeBjr7PwXh8jz9pqDJDDVGByzkI1N/Z
 xI+G+TybZifO/0c+sHGniQ/lEhRYGjEzqGyG5iHhAPdPAZp8BSrZn+G5zCILwR7e
 qEfmW06fvZOUJU0WHMWa7dubCLeGRECB/G35pN9qsAvTJY8qDA4OhdsTqUKTwZL4
 mWJBlhKf18zTWXHDyMc1ypoNWdRe9CcsEnOA+1Y6Rx/16M3O7jl0fT8u4T/gpVGF
 H4Ss0pXZdSKeHZe93A4iiY9Q+OenrIOxrEbwJHIkTmmsxS4x9KzJKBvIvEySbKGF
 67g1Ca2r5+G3CdH67RUEpvoF3cWs3rbrNiPHoB0G+7aUpvFjpUd6BQHLR2rz6Rd+
 gVlF/L0h/ZYyfgUFCLwAQXuJJr0HJigpyE2PdZ4AorNIcMApd9SYQWphPnaURC6X
 P+Ql17Ou1c0K+Kmx/+yqR7QCoA8A9e4q/Cdsgi2XAUaKEqAiFkHyCk0HtNMqsQGv
 o7F9y6UY4WNVP8xzskh1khT0anaVmI0kj3I/QQfaCyIPGwnAY0cBsn9OguQJRY59
 JlkD4plj6w==
 =r72Y
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmNyTAgACgkQmmx57+YA
 GNlZ8w/9GFQPPBI/ZbFBLYb64sUEHNa7VbiHHS3h7iXTJJndyI93VqA/+2pYof5Z
 /f18IlBNi2JKYWGPlpgX8L7NUj6G3Rc0ON1EYIwn8zd1USsig0gZ72vUdWuoP/We
 AIN4ucKaVkxGReFq8IDArWtltEAjiqOpKDShrSbmm+bWKX33cZH7EdGHxYL7iEoe
 cxw0JnAf4jXIbJ/XLbqAJVlmW/0SakoBgq4OoTElDkFGL78lk+t7ulYux15gNEX1
 ZfEC4STIBgtGlCkNTZZMXzVX6oj8x8JjP8JPoxQ5VEkNlriw7Rb8SKTbs6EtTvAL
 v3uJYI2TEGLeI1rfuisxBF2+Y21OMoLqtWistm1dHwhqkfW26RRf/rPOPF8W6HP0
 CRT+5Ikm9Z7LRqY4lAE3aJAutNH+FgZ59l/DDS07fUM2xxGgdNXCi6ianwYxoFil
 WV5mn590iac9cyBHF22fDxOSp+TTxeTqNALbWIqah/kG48UeH12e0bdv6U5u0uaD
 1+vHV9uKrTpKACMW75riajdh0ZpyvK9hwn4w1gMpYgA43jUpo63RDmxIYQgPeoxF
 ZbLYYn3YrjRv15IFj0JKzt3wb1utFah/VyB8N110GwPUotU56WvGlSSVhKJSKKia
 eM/MDasw91gnl/R6ByyBR7iUON4ZpyAjgPzRtv4QQzvqRKDVW0o=
 =1+Mw
 -----END PGP SIGNATURE-----

Merge tag 'dt-cleanup-6.2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt into soc/dt

Minor improvements in ARM DTS for v6.2

1. Aspeed: fix qcom,dc-scm-v1-bmc compatible in the bindings.
2. Marvell: include bindings in maintainers entry.
3. Cleanup DTS according to bindings (panel endpoint unit address,
   incorrect spi-max-frequency, generic node names).
4. Few indentation fixes.

* tag 'dt-cleanup-6.2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt:
  dt-bindings: arm: aspeed: adjust qcom,dc-scm-v1-bmc compatible after rename
  ARM: dts: sunxi: correct indentation
  ARM: dts: omap: correct indentation
  ARM: dts: kirkwood: correct indentation
  ARM: dts: armada: correct indentation
  ARM: dts: ti: correct indentation
  ARM: dts: aspeed: align SPI node name with dtschema
  MAINTAINERS: ARM: marvell: include bindings
  ARM: dts: sunplus: sp7021: drop incorrect spi-max-frequency
  ARM: dts: am335x: drop panel endpoint unit address

Link: https://lore.kernel.org/r/20221110092111.18581-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-11-14 15:08:57 +01:00
commit 377eb47039
58 changed files with 273 additions and 273 deletions

View file

@ -82,7 +82,7 @@ properties:
- ibm,tacoma-bmc
- inventec,transformer-bmc
- jabil,rbp-bmc
- nuvia,dc-scm-bmc
- qcom,dc-scm-v1-bmc
- quanta,s6q-bmc
- const: aspeed,ast2600

View file

@ -2341,6 +2341,8 @@ M: Gregory Clement <gregory.clement@bootlin.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git
F: Documentation/devicetree/bindings/arm/marvell/marvell,dove.txt
F: Documentation/devicetree/bindings/arm/marvell/marvell,orion5x.txt
F: Documentation/devicetree/bindings/soc/dove/
F: arch/arm/boot/dts/dove*
F: arch/arm/boot/dts/orion5x*
@ -2357,6 +2359,7 @@ M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git
F: Documentation/devicetree/bindings/arm/marvell/
F: arch/arm/boot/dts/armada*
F: arch/arm/boot/dts/kirkwood*
F: arch/arm/configs/mvebu_*_defconfig

View file

@ -126,7 +126,7 @@ panel {
backlight = <&backlight>;
port {
panel_0: endpoint@0 {
panel_0: endpoint {
remote-endpoint = <&lcdc_0>;
};
};

View file

@ -191,7 +191,7 @@ panel {
backlight = <&lcd_bl>;
port {
panel_0: endpoint@0 {
panel_0: endpoint {
remote-endpoint = <&lcdc_0>;
};
};

View file

@ -16,11 +16,11 @@ vbat: vbat-regulator {
/* Power supply provides a fixed 3.3V @3A */
vmmcsd_fixed: vmmcsd-regulator {
compatible = "regulator-fixed";
regulator-name = "vmmcsd_fixed";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-boot-on;
compatible = "regulator-fixed";
regulator-name = "vmmcsd_fixed";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-boot-on;
};
buttons: push_button {

View file

@ -21,11 +21,11 @@ vbat: vbat-regulator {
/* Power supply provides a fixed 3.3V @3A */
vmmcsd_fixed: vmmcsd-regulator {
compatible = "regulator-fixed";
regulator-name = "vmmcsd_fixed";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-boot-on;
compatible = "regulator-fixed";
regulator-name = "vmmcsd_fixed";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-boot-on;
};
buttons: push_button {

View file

@ -555,11 +555,11 @@ &usb {
};
&usb0 {
dr_mode = "host";
dr_mode = "host";
};
&usb1 {
dr_mode = "host";
dr_mode = "host";
};
&am33xx_pinmux {

View file

@ -26,12 +26,12 @@ memory@80000000 {
reg = <0x80000000 0x10000000>; /* 256 MB */
};
vmmc_fixed: vmmc {
compatible = "regulator-fixed";
regulator-name = "vmmc_fixed";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
vmmc_fixed: vmmc {
compatible = "regulator-fixed";
regulator-name = "vmmc_fixed";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
gpio-keys {
compatible = "gpio-keys-polled";
@ -176,7 +176,7 @@ &davinci_emac {
};
&davinci_mdio {
status = "okay";
status = "okay";
};
&dss {
@ -227,7 +227,7 @@ &mmc1 {
};
&mmc3 {
status = "disabled";
status = "disabled";
};
&usbhshost {

View file

@ -85,11 +85,11 @@ g762: g762@3e {
};
clocks {
g762_clk: g762-oscillator {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <8192>;
};
g762_clk: g762-oscillator {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <8192>;
};
};
gpio-leds {

View file

@ -94,11 +94,11 @@ pca9554: pca9554@23 {
};
clocks {
g762_clk: g762-oscillator {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <8192>;
};
g762_clk: g762-oscillator {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <8192>;
};
};
gpio-leds {

View file

@ -61,8 +61,8 @@ ethernet@74000 {
status = "okay";
phy-mode = "rgmii-id";
fixed-link {
speed = <1000>;
full-duplex;
speed = <1000>;
full-duplex;
};
};
@ -155,18 +155,18 @@ port@0 {
};
port@1 {
reg = <1>;
label = "lan1";
reg = <1>;
label = "lan1";
};
port@2 {
reg = <2>;
label = "lan2";
reg = <2>;
label = "lan2";
};
port@3 {
reg = <3>;
label = "lan3";
reg = <3>;
label = "lan3";
};
port@5 {

View file

@ -91,9 +91,9 @@ usb@51000 {
};
ethernet@70000 {
status = "okay";
phy = <&phy1>;
phy-mode = "sgmii";
status = "okay";
phy = <&phy1>;
phy-mode = "sgmii";
};
sata@a0000 {

View file

@ -121,11 +121,11 @@ sata@a0000 {
};
clocks {
g762_clk: g762-oscillator {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <32768>;
};
g762_clk: g762-oscillator {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <32768>;
};
};
gpio-leds {

View file

@ -77,7 +77,7 @@ aliases {
i2c55 = &imux55;
};
spi_gpio: spi-gpio {
spi_gpio: spi {
num-chipselects = <2>;
cs-gpios = <&gpio0 ASPEED_GPIO(X, 0) GPIO_ACTIVE_LOW>,
<&gpio0 ASPEED_GPIO(X, 1) GPIO_ACTIVE_HIGH>;

View file

@ -44,7 +44,7 @@ chosen {
stdout-path = &uart5;
};
spi_gpio: spi-gpio {
spi_gpio: spi {
num-chipselects = <1>;
cs-gpios = <&gpio0 ASPEED_GPIO(X, 0) GPIO_ACTIVE_LOW>;
};

View file

@ -207,7 +207,7 @@ aliases {
i2c143 = &imux143;
};
spi_gpio: spi-gpio {
spi_gpio: spi {
num-chipselects = <3>;
cs-gpios = <&gpio0 ASPEED_GPIO(X, 0) GPIO_ACTIVE_LOW>,
<0>, /* device reg=<1> does not exist */

View file

@ -67,7 +67,7 @@ ast-adc-hwmon {
* full-duplex SPI transactions are not supported by ASPEED SPI
* Controllers.
*/
spi_gpio: spi-gpio {
spi_gpio: spi {
status = "okay";
compatible = "spi-gpio";
#address-cells = <1>;

View file

@ -25,7 +25,7 @@ memory@80000000 {
* full-duplex SPI transactions are not supported by ASPEED SPI
* Controllers.
*/
spi_gpio: spi-gpio {
spi_gpio: spi {
status = "okay";
compatible = "spi-gpio";
#address-cells = <1>;

View file

@ -187,7 +187,7 @@ ethernet1-port@0 {
/* Wifi model has Atheros chipset on pcie port */
&pciec {
status = "okay";
status = "okay";
};
&pcie0 {

View file

@ -18,7 +18,7 @@ / {
};
&pciec {
status = "okay";
status = "okay";
};
&pcie0 {

View file

@ -18,7 +18,7 @@ / {
};
&pciec {
status = "okay";
status = "okay";
};
&pcie0 {

View file

@ -211,18 +211,18 @@ port@0 {
};
port@1 {
reg = <1>;
label = "lan3";
reg = <1>;
label = "lan3";
};
port@2 {
reg = <2>;
label = "lan2";
reg = <2>;
label = "lan2";
};
port@3 {
reg = <3>;
label = "lan1";
reg = <3>;
label = "lan1";
};
port@4 {
@ -268,7 +268,7 @@ &rtc {
};
&pciec {
status = "okay";
status = "okay";
};
&pcie0 {

View file

@ -43,7 +43,7 @@ &s35390a {
};
&pciec {
status = "okay";
status = "okay";
};
&pcie1 {

View file

@ -47,7 +47,7 @@ &s35390a {
};
&pciec {
status = "okay";
status = "okay";
};
&pcie1 {

View file

@ -187,7 +187,7 @@ ethernet0-port@0 {
};
&pciec {
status = "okay";
status = "okay";
};
&pcie0 {

View file

@ -39,7 +39,7 @@ &nand {
};
&pciec {
status = "okay";
status = "okay";
};
&pcie0 {

View file

@ -223,18 +223,18 @@ port@0 {
};
port@1 {
reg = <1>;
label = "lan1";
reg = <1>;
label = "lan1";
};
port@2 {
reg = <2>;
label = "lan6";
reg = <2>;
label = "lan6";
};
port@3 {
reg = <3>;
label = "lan2";
reg = <3>;
label = "lan2";
};
port@4 {
@ -282,18 +282,18 @@ port@0 {
};
port@1 {
reg = <1>;
label = "lan8";
reg = <1>;
label = "lan8";
};
port@2 {
reg = <2>;
label = "lan4";
reg = <2>;
label = "lan4";
};
port@3 {
reg = <3>;
label = "dmz";
reg = <3>;
label = "dmz";
};
switch1port5: port@5 {

View file

@ -160,7 +160,7 @@ ethernet0-port@0 {
};
&pciec {
status = "okay";
status = "okay";
};
&pcie0 {

View file

@ -156,7 +156,7 @@ hdd_power0: regulator@2 {
};
&pciec {
status = "okay";
status = "okay";
};
&pcie0 {

View file

@ -8,10 +8,10 @@ / {
model = "MPL CEC4";
compatible = "mpl,cec4-10", "mpl,cec4", "marvell,kirkwood-88f6281", "marvell,kirkwood";
memory {
device_type = "memory";
reg = <0x00000000 0x20000000>;
};
memory {
device_type = "memory";
reg = <0x00000000 0x20000000>;
};
chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk";
@ -66,8 +66,8 @@ pmx_sdio_cd: pmx-sdio-cd {
};
};
i2c@11000 {
status = "okay";
i2c@11000 {
status = "okay";
rtc@51 {
compatible = "nxp,pcf8563";
@ -79,7 +79,7 @@ eeprom@57 {
reg = <0x57>;
};
};
};
serial@12000 {
status = "okay";
@ -208,7 +208,7 @@ ethernet1-port@0 {
};
&pciec {
status = "okay";
status = "okay";
};
&pcie0 {

View file

@ -170,7 +170,7 @@ ethernet0-port@0 {
};
&pciec {
status = "okay";
status = "okay";
};
&pcie0 {

View file

@ -131,7 +131,7 @@ partition@9100000 {
};
&pciec {
status = "okay";
status = "okay";
};
&pcie0 {

View file

@ -46,11 +46,11 @@ regulator@2 {
};
clocks {
g762_clk: g762-oscillator {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <32768>;
};
g762_clk: g762-oscillator {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <32768>;
};
};
};

View file

@ -78,11 +78,11 @@ regulator@5 {
};
clocks {
g762_clk: g762-oscillator {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <32768>;
};
g762_clk: g762-oscillator {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <32768>;
};
};
netxbig-leds {

View file

@ -78,11 +78,11 @@ pmx_poweroff: pmx-poweroff {
};
clocks {
g762_clk: g762-oscillator {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <8192>;
};
g762_clk: g762-oscillator {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <8192>;
};
};
i2c@11000 {
@ -266,7 +266,7 @@ ethernet0-port@0 {
/* Connected to NEC uPD720200 USB 3.0 controller */
&pciec {
status = "okay";
status = "okay";
};
&pcie0 {

View file

@ -131,7 +131,7 @@ red-copy {
};
&pciec {
status = "okay";
status = "okay";
};
&pcie0 {

View file

@ -211,7 +211,7 @@ ethernet0-port@0 {
};
&pciec {
status = "okay";
status = "okay";
};
&pcie0 {

View file

@ -224,7 +224,7 @@ ethernet0-port@0 {
};
&pciec {
status = "okay";
status = "okay";
};
&pcie0 {

View file

@ -150,7 +150,7 @@ partition@5040000 {
};
&pciec {
status = "okay";
status = "okay";
};
&pcie0 {

View file

@ -31,10 +31,10 @@ pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_usb_power>;
pinctrl-names = "default";
pmx_usb_power: pmx-usb-power {
marvell,pins = "mpp10";
marvell,function = "gpo";
};
pmx_usb_power: pmx-usb-power {
marvell,pins = "mpp10";
marvell,function = "gpo";
};
};
serial@12000 {
@ -62,43 +62,43 @@ sata@80000 {
};
regulators {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
pinctrl-0 = <&pmx_usb_power>;
pinctrl-names = "default";
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
pinctrl-0 = <&pmx_usb_power>;
pinctrl-names = "default";
usb_power: regulator@0 {
compatible = "regulator-fixed";
reg = <0>;
regulator-name = "USB VBUS";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
enable-active-high;
regulator-always-on;
regulator-boot-on;
gpio = <&gpio0 10 GPIO_ACTIVE_HIGH>;
};
usb_power: regulator@0 {
compatible = "regulator-fixed";
reg = <0>;
regulator-name = "USB VBUS";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
enable-active-high;
regulator-always-on;
regulator-boot-on;
gpio = <&gpio0 10 GPIO_ACTIVE_HIGH>;
};
};
};
&mdio {
status = "okay";
status = "okay";
ethphy0: ethernet-phy@8 {
reg = <8>;
};
ethphy0: ethernet-phy@8 {
reg = <8>;
};
};
&eth0 {
status = "okay";
ethernet0-port@0 {
phy-handle = <&ethphy0>;
};
status = "okay";
ethernet0-port@0 {
phy-handle = <&ethphy0>;
};
};
&pciec {
status = "okay";
status = "okay";
};
&pcie0 {

View file

@ -19,7 +19,7 @@ / {
};
&eth1 {
status = "disabled";
status = "disabled";
};
&switch {

View file

@ -48,7 +48,7 @@ mvsdio@90000 {
cd-gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
/* No WP GPIO */
};
};
};
};
&nand {
@ -126,7 +126,7 @@ ethernet0-port@0 {
};
&pciec {
status = "okay";
status = "okay";
};
&pcie0 {

View file

@ -43,7 +43,7 @@ &s35390a {
};
&pciec {
status = "okay";
status = "okay";
};
&pcie1 {

View file

@ -847,7 +847,7 @@ ethernet1-port@0 {
};
&pciec {
status = "okay";
status = "okay";
};
&pcie0 {

View file

@ -219,7 +219,7 @@ ethernet0-port@0 {
};
&pciec {
status = "okay";
status = "okay";
};
&pcie0 {

View file

@ -86,7 +86,7 @@ &mdio {
status = "okay";
ethphy0: ethernet-phy@X {
/* overwrite reg property in board file */
/* overwrite reg property in board file */
};
};
@ -98,7 +98,7 @@ ethernet0-port@0 {
};
&pciec {
status = "okay";
status = "okay";
};
&pcie0 {

View file

@ -24,9 +24,9 @@ cpu@0 {
};
aliases {
gpio0 = &gpio0;
gpio1 = &gpio1;
i2c0 = &i2c0;
gpio0 = &gpio0;
gpio1 = &gpio1;
i2c0 = &i2c0;
};
mbus@f1000000 {
@ -279,15 +279,15 @@ dma0: xor@60800 {
clocks = <&gate_clk 8>;
xor00 {
interrupts = <5>;
dmacap,memcpy;
dmacap,xor;
interrupts = <5>;
dmacap,memcpy;
dmacap,xor;
};
xor01 {
interrupts = <6>;
dmacap,memcpy;
dmacap,xor;
dmacap,memset;
interrupts = <6>;
dmacap,memcpy;
dmacap,xor;
dmacap,memset;
};
};
@ -299,15 +299,15 @@ dma1: xor@60900 {
clocks = <&gate_clk 16>;
xor00 {
interrupts = <7>;
dmacap,memcpy;
dmacap,xor;
interrupts = <7>;
dmacap,memcpy;
dmacap,xor;
};
xor01 {
interrupts = <8>;
dmacap,memcpy;
dmacap,xor;
dmacap,memset;
interrupts = <8>;
dmacap,memcpy;
dmacap,xor;
dmacap,memset;
};
};

View file

@ -8,9 +8,9 @@
/ {
vddvario: regulator-vddvario {
compatible = "regulator-fixed";
regulator-name = "vddvario";
regulator-always-on;
compatible = "regulator-fixed";
regulator-name = "vddvario";
regulator-always-on;
};
vdd33a: regulator-vdd33a {

View file

@ -12,9 +12,9 @@
/ {
vddvario: regulator-vddvario {
compatible = "regulator-fixed";
regulator-name = "vddvario";
regulator-always-on;
compatible = "regulator-fixed";
regulator-name = "vddvario";
regulator-always-on;
};
vdd33a: regulator-vdd33a {

View file

@ -11,12 +11,12 @@ / {
model = "CompuLab CM-T3517";
compatible = "compulab,omap3-cm-t3517", "ti,am3517", "ti,omap3";
vmmc: regulator-vmmc {
compatible = "regulator-fixed";
regulator-name = "vmmc";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
vmmc: regulator-vmmc {
compatible = "regulator-fixed";
regulator-name = "vmmc";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
wl12xx_vmmc2: wl12xx_vmmc2 {
compatible = "regulator-fixed";

View file

@ -332,7 +332,7 @@ OMAP3_CORE1_IOPAD(0x2106, PIN_OUTPUT | MUX_MODE0) /* dss_data21.dss_data21 */
OMAP3_CORE1_IOPAD(0x2108, PIN_OUTPUT | MUX_MODE0) /* dss_data22.dss_data22 */
OMAP3_CORE1_IOPAD(0x210a, PIN_OUTPUT | MUX_MODE0) /* dss_data23.dss_data23 */
>;
};
};
gps_pins: pinmux_gps_pins {
pinctrl-single,pins = <
@ -853,8 +853,8 @@ &mcbsp4 { /* GSM voice PCM */
};
&hdqw1w {
pinctrl-names = "default";
pinctrl-0 = <&hdq_pins>;
pinctrl-names = "default";
pinctrl-0 = <&hdq_pins>;
};
/* image signal processor within OMAP3 SoC */

View file

@ -301,5 +301,5 @@ &usb_otg_hs {
&vaux1 {
/* Needed for ads7846 */
regulator-name = "vcc";
regulator-name = "vcc";
};

View file

@ -236,27 +236,27 @@ gpmc_pins: pinmux_gpmc_pins {
pinctrl-single,pins = <
/* address lines */
OMAP3_CORE1_IOPAD(0x207a, PIN_OUTPUT | MUX_MODE0) /* gpmc_a1.gpmc_a1 */
OMAP3_CORE1_IOPAD(0x207c, PIN_OUTPUT | MUX_MODE0) /* gpmc_a2.gpmc_a2 */
OMAP3_CORE1_IOPAD(0x207e, PIN_OUTPUT | MUX_MODE0) /* gpmc_a3.gpmc_a3 */
OMAP3_CORE1_IOPAD(0x207a, PIN_OUTPUT | MUX_MODE0) /* gpmc_a1.gpmc_a1 */
OMAP3_CORE1_IOPAD(0x207c, PIN_OUTPUT | MUX_MODE0) /* gpmc_a2.gpmc_a2 */
OMAP3_CORE1_IOPAD(0x207e, PIN_OUTPUT | MUX_MODE0) /* gpmc_a3.gpmc_a3 */
/* data lines, gpmc_d0..d7 not muxable according to TRM */
OMAP3_CORE1_IOPAD(0x209e, PIN_INPUT | MUX_MODE0) /* gpmc_d8.gpmc_d8 */
OMAP3_CORE1_IOPAD(0x20a0, PIN_INPUT | MUX_MODE0) /* gpmc_d9.gpmc_d9 */
OMAP3_CORE1_IOPAD(0x20a2, PIN_INPUT | MUX_MODE0) /* gpmc_d10.gpmc_d10 */
OMAP3_CORE1_IOPAD(0x20a4, PIN_INPUT | MUX_MODE0) /* gpmc_d11.gpmc_d11 */
OMAP3_CORE1_IOPAD(0x20a6, PIN_INPUT | MUX_MODE0) /* gpmc_d12.gpmc_d12 */
OMAP3_CORE1_IOPAD(0x20a8, PIN_INPUT | MUX_MODE0) /* gpmc_d13.gpmc_d13 */
OMAP3_CORE1_IOPAD(0x20aa, PIN_INPUT | MUX_MODE0) /* gpmc_d14.gpmc_d14 */
OMAP3_CORE1_IOPAD(0x20ac, PIN_INPUT | MUX_MODE0) /* gpmc_d15.gpmc_d15 */
OMAP3_CORE1_IOPAD(0x209e, PIN_INPUT | MUX_MODE0) /* gpmc_d8.gpmc_d8 */
OMAP3_CORE1_IOPAD(0x20a0, PIN_INPUT | MUX_MODE0) /* gpmc_d9.gpmc_d9 */
OMAP3_CORE1_IOPAD(0x20a2, PIN_INPUT | MUX_MODE0) /* gpmc_d10.gpmc_d10 */
OMAP3_CORE1_IOPAD(0x20a4, PIN_INPUT | MUX_MODE0) /* gpmc_d11.gpmc_d11 */
OMAP3_CORE1_IOPAD(0x20a6, PIN_INPUT | MUX_MODE0) /* gpmc_d12.gpmc_d12 */
OMAP3_CORE1_IOPAD(0x20a8, PIN_INPUT | MUX_MODE0) /* gpmc_d13.gpmc_d13 */
OMAP3_CORE1_IOPAD(0x20aa, PIN_INPUT | MUX_MODE0) /* gpmc_d14.gpmc_d14 */
OMAP3_CORE1_IOPAD(0x20ac, PIN_INPUT | MUX_MODE0) /* gpmc_d15.gpmc_d15 */
/*
* gpmc_ncs0, gpmc_nadv_ale, gpmc_noe, gpmc_nwe, gpmc_wait0 not muxable
* according to TRM. OneNAND seems to require PIN_INPUT on clock.
*/
OMAP3_CORE1_IOPAD(0x20b0, PIN_OUTPUT | MUX_MODE0) /* gpmc_ncs1.gpmc_ncs1 */
OMAP3_CORE1_IOPAD(0x20be, PIN_INPUT | MUX_MODE0) /* gpmc_clk.gpmc_clk */
>;
OMAP3_CORE1_IOPAD(0x20b0, PIN_OUTPUT | MUX_MODE0) /* gpmc_ncs1.gpmc_ncs1 */
OMAP3_CORE1_IOPAD(0x20be, PIN_INPUT | MUX_MODE0) /* gpmc_clk.gpmc_clk */
>;
};
i2c1_pins: pinmux_i2c1_pins {
@ -738,12 +738,12 @@ tpa6130a2: tpa6130a2@60 {
si4713: si4713@63 {
compatible = "silabs,si4713";
reg = <0x63>;
reg = <0x63>;
interrupts-extended = <&gpio2 21 IRQ_TYPE_EDGE_FALLING>; /* 53 */
reset-gpios = <&gpio6 3 GPIO_ACTIVE_HIGH>; /* 163 */
vio-supply = <&vio>;
vdd-supply = <&vaux1>;
interrupts-extended = <&gpio2 21 IRQ_TYPE_EDGE_FALLING>; /* 53 */
reset-gpios = <&gpio6 3 GPIO_ACTIVE_HIGH>; /* 163 */
vio-supply = <&vio>;
vdd-supply = <&vaux1>;
};
bq24150a: bq24150a@6b {

View file

@ -23,9 +23,9 @@ memory@80000000 {
};
vddvario: regulator-vddvario {
compatible = "regulator-fixed";
regulator-name = "vddvario";
regulator-always-on;
compatible = "regulator-fixed";
regulator-name = "vddvario";
regulator-always-on;
};
vdd33a: regulator-vdd33a {
@ -84,28 +84,28 @@ OMAP3_CORE1_IOPAD(0x21d0, PIN_INPUT_PULLUP | MUX_MODE3) /* mcspi1_cs1.sdmmc3_cmd
uart1_pins: pinmux_uart1_pins {
pinctrl-single,pins = <
OMAP3_CORE1_IOPAD(0x2180, PIN_INPUT | MUX_MODE0) /* uart1_cts.uart1_cts */
OMAP3_CORE1_IOPAD(0x217e, PIN_OUTPUT | MUX_MODE0) /* uart1_rts.uart1_rts */
OMAP3_CORE1_IOPAD(0x2182, WAKEUP_EN | PIN_INPUT | MUX_MODE0) /* uart1_rx.uart1_rx */
OMAP3_CORE1_IOPAD(0x217c, PIN_OUTPUT | MUX_MODE0) /* uart1_tx.uart1_tx */
OMAP3_CORE1_IOPAD(0x2180, PIN_INPUT | MUX_MODE0) /* uart1_cts.uart1_cts */
OMAP3_CORE1_IOPAD(0x217e, PIN_OUTPUT | MUX_MODE0) /* uart1_rts.uart1_rts */
OMAP3_CORE1_IOPAD(0x2182, WAKEUP_EN | PIN_INPUT | MUX_MODE0) /* uart1_rx.uart1_rx */
OMAP3_CORE1_IOPAD(0x217c, PIN_OUTPUT | MUX_MODE0) /* uart1_tx.uart1_tx */
>;
};
uart2_pins: pinmux_uart2_pins {
pinctrl-single,pins = <
OMAP3_CORE1_IOPAD(0x2174, PIN_INPUT_PULLUP | MUX_MODE0) /* uart2_cts.uart2_cts */
OMAP3_CORE1_IOPAD(0x2176, PIN_OUTPUT | MUX_MODE0) /* uart2_rts.uart2_rts */
OMAP3_CORE1_IOPAD(0x217a, PIN_INPUT | MUX_MODE0) /* uart2_rx.uart2_rx */
OMAP3_CORE1_IOPAD(0x2178, PIN_OUTPUT | MUX_MODE0) /* uart2_tx.uart2_tx */
OMAP3_CORE1_IOPAD(0x2174, PIN_INPUT_PULLUP | MUX_MODE0) /* uart2_cts.uart2_cts */
OMAP3_CORE1_IOPAD(0x2176, PIN_OUTPUT | MUX_MODE0) /* uart2_rts.uart2_rts */
OMAP3_CORE1_IOPAD(0x217a, PIN_INPUT | MUX_MODE0) /* uart2_rx.uart2_rx */
OMAP3_CORE1_IOPAD(0x2178, PIN_OUTPUT | MUX_MODE0) /* uart2_tx.uart2_tx */
>;
};
uart3_pins: pinmux_uart3_pins {
pinctrl-single,pins = <
OMAP3_CORE1_IOPAD(0x219a, PIN_INPUT_PULLDOWN | MUX_MODE0) /* uart3_cts_rctx.uart3_cts_rctx */
OMAP3_CORE1_IOPAD(0x219c, PIN_OUTPUT | MUX_MODE0) /* uart3_rts_sd.uart3_rts_sd */
OMAP3_CORE1_IOPAD(0x219e, PIN_INPUT | MUX_MODE0) /* uart3_rx_irrx.uart3_rx_irrx */
OMAP3_CORE1_IOPAD(0x21a0, PIN_OUTPUT | MUX_MODE0) /* uart3_tx_irtx.uart3_tx_irtx */
OMAP3_CORE1_IOPAD(0x219a, PIN_INPUT_PULLDOWN | MUX_MODE0) /* uart3_cts_rctx.uart3_cts_rctx */
OMAP3_CORE1_IOPAD(0x219c, PIN_OUTPUT | MUX_MODE0) /* uart3_rts_sd.uart3_rts_sd */
OMAP3_CORE1_IOPAD(0x219e, PIN_INPUT | MUX_MODE0) /* uart3_rx_irrx.uart3_rx_irrx */
OMAP3_CORE1_IOPAD(0x21a0, PIN_OUTPUT | MUX_MODE0) /* uart3_tx_irtx.uart3_tx_irtx */
>;
};
@ -205,22 +205,22 @@ wlcore: wlcore@2 {
};
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins>;
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins>;
};
&uart2 {
pinctrl-names = "default";
pinctrl-0 = <&uart2_pins>;
pinctrl-names = "default";
pinctrl-0 = <&uart2_pins>;
};
&uart3 {
pinctrl-names = "default";
pinctrl-0 = <&uart3_pins>;
pinctrl-names = "default";
pinctrl-0 = <&uart3_pins>;
};
&uart4 {
status = "disabled";
status = "disabled";
};
&usb_otg_hs {

View file

@ -13,20 +13,20 @@ cpu_thermal: cpu_thermal {
polling-delay = <1000>; /* milliseconds */
/* sensor ID */
thermal-sensors = <&bandgap 0>;
thermal-sensors = <&bandgap 0>;
cpu_trips: trips {
cpu_alert0: cpu_alert {
temperature = <100000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */
type = "passive";
};
cpu_crit: cpu_crit {
temperature = <125000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */
type = "critical";
};
};
cpu_alert0: cpu_alert {
temperature = <100000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */
type = "passive";
};
cpu_crit: cpu_crit {
temperature = <125000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */
type = "critical";
};
};
cpu_cooling_maps: cooling-maps {
map0 {

View file

@ -84,36 +84,36 @@ led1 {
};
lcd0: display {
compatible = "startek,startek-kd050c", "panel-dpi";
label = "lcd";
compatible = "startek,startek-kd050c", "panel-dpi";
label = "lcd";
pinctrl-names = "default";
pinctrl-0 = <&lcd_pins>;
pinctrl-names = "default";
pinctrl-0 = <&lcd_pins>;
enable-gpios = <&gpio8 3 GPIO_ACTIVE_HIGH>;
enable-gpios = <&gpio8 3 GPIO_ACTIVE_HIGH>;
panel-timing {
clock-frequency = <33000000>;
hactive = <800>;
vactive = <480>;
hfront-porch = <40>;
hback-porch = <40>;
hsync-len = <43>;
vback-porch = <29>;
vfront-porch = <13>;
vsync-len = <3>;
hsync-active = <0>;
vsync-active = <0>;
de-active = <1>;
pixelclk-active = <1>;
};
panel-timing {
clock-frequency = <33000000>;
hactive = <800>;
vactive = <480>;
hfront-porch = <40>;
hback-porch = <40>;
hsync-len = <43>;
vback-porch = <29>;
vfront-porch = <13>;
vsync-len = <3>;
hsync-active = <0>;
vsync-active = <0>;
de-active = <1>;
pixelclk-active = <1>;
};
port {
lcd_in: endpoint {
remote-endpoint = <&dpi_lcd_out>;
};
};
};
port {
lcd_in: endpoint {
remote-endpoint = <&dpi_lcd_out>;
};
};
};
hdmi0: connector0 {
compatible = "hdmi-connector";
@ -644,8 +644,8 @@ &usbhsehci {
};
&usb3 {
extcon = <&extcon_usb3>;
vbus-supply = <&smps10_out1_reg>;
extcon = <&extcon_usb3>;
vbus-supply = <&smps10_out1_reg>;
};
&cpu0 {

View file

@ -211,7 +211,6 @@ spi_controller1: spi@f480 {
interrupt-names = "dma_w", "master_risc", "slave_risc";
clocks = <&clkc CLK_SPI_COMBO_1>;
resets = <&rstc RST_SPI_COMBO_1>;
spi-max-frequency = <25000000>;
status = "disabled";
};
@ -225,7 +224,6 @@ spi_controller2: spi@f600 {
interrupt-names = "dma_w", "master_risc", "slave_risc";
clocks = <&clkc CLK_SPI_COMBO_2>;
resets = <&rstc RST_SPI_COMBO_2>;
spi-max-frequency = <25000000>;
status = "disabled";
};
@ -239,7 +237,6 @@ spi_controller3: spi@f780 {
interrupt-names = "dma_w", "master_risc", "slave_risc";
clocks = <&clkc CLK_SPI_COMBO_3>;
resets = <&rstc RST_SPI_COMBO_3>;
spi-max-frequency = <25000000>;
status = "disabled";
};

View file

@ -89,13 +89,13 @@ switch-4 {
};
reg_gmac_3v3: gmac-3v3 {
compatible = "regulator-fixed";
regulator-name = "gmac-3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
startup-delay-us = <100000>;
enable-active-high;
gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>;
compatible = "regulator-fixed";
regulator-name = "gmac-3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
startup-delay-us = <100000>;
enable-active-high;
gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>;
};
wifi_pwrseq: wifi_pwrseq {