mirror of
https://github.com/torvalds/linux.git
synced 2026-05-31 18:43:33 +02:00
ARM: dts: ti: omap updates for v6.18
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEe4dGDhaSf6n1v/EMWTcYmtP7xmUFAmjNyJ0ACgkQWTcYmtP7 xmUpIw/+JhGlNb2wuh12dcZpyljrK6sdQHNxFU2tqhzI7+KMqv65vHR5GH/4sqwS X8CfVOoKMuk4mqMxTkhiINcwexvLbzzEWNNdaIUJM+SmIBJRE3+76HFR1At7vHkE U26m7p+Ej6ooj753lqEpdRA09o2YnzUxQp46G8urt77HRjQkEp7L5Bqi5OsEWrB7 qoh/wlITFSbn4bZwTpTxD6gvDjanl0EirE55YtHnxWqgdSwTf5aV0vaL0cDtf1PL abBIvqCzAoGoZnk+p+5G5ZAh0aDqGLyph9dbkBFey4zLaHLjZtp+XbFLzSHejiQf aDlM/904cdXlnKeEK0hN3/bQGR46qHuM3ph0eva/vMdN95UJHudoYWfg94NO7LjB 90SR9IYSy/LYG3xCr/EGTlPKreoYhM3UhBu+mNTlY02a7D4byjDU31NaUt1h6R8C acIE9njJTQqx13KrodsW2Ymt1upDXsr7LGklv1i9UlwLBXwBvkaFRu8u55XaMcs0 lsbJYHiz4RsViTYx+SldjBqigNvKVWb8OI8VZDXRia39rEY1HBpOfobPgbHwyyB3 X9NEe4WyWpT8ulalug9c2erR0frh4Cvj7s9oPXb4MzuEu9S7qvWmdRVAikja3Qow K3RDkLH99I7sfhjp1789dhyRg0WgLAf+irkIZKdEyWdM6mjNMVA= =id8D -----END PGP SIGNATURE----- Merge tag 'omap-for-v6.18/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap into soc/dt ARM: dts: ti: omap updates for v6.18 These are all minor corrections to the dts files. * tag 'omap-for-v6.18/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap: ARM: dts: omap: am335x-cm-t335: Remove unused mcasp num-serializer property ARM: dts: ti: omap: omap3-devkit8000-lcd: Fix ti,keep-vref-on property to use correct boolean syntax in DTS ARM: dts: ti: omap: am335x-baltos: Fix ti,en-ck32k-xtal property in DTS to use correct boolean syntax ARM: dts: omap: Minor whitespace cleanup ARM: dts: omap: dm816x: Split 'reg' per entry ARM: dts: omap: dm814x: Split 'reg' per entry ARM: dts: am33xx-l4: fix UART compatible ARM: dts: ti: omap4: Use generic "ethernet" as node name Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
26116b98d6
|
|
@ -269,7 +269,7 @@ &tps {
|
|||
vcc7-supply = <&vbat>;
|
||||
vccio-supply = <&vbat>;
|
||||
|
||||
ti,en-ck32k-xtal = <1>;
|
||||
ti,en-ck32k-xtal;
|
||||
|
||||
regulators {
|
||||
vrtc_reg: regulator@0 {
|
||||
|
|
|
|||
|
|
@ -483,8 +483,6 @@ &mcasp1 {
|
|||
|
||||
op-mode = <0>; /* MCASP_IIS_MODE */
|
||||
tdm-slots = <2>;
|
||||
/* 16 serializers */
|
||||
num-serializer = <16>;
|
||||
serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */
|
||||
0 0 2 1 0 0 0 0 0 0 0 0 0 0 0 0
|
||||
>;
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ &i2c1 {
|
|||
|
||||
sgtl5000: sgtl5000@a {
|
||||
compatible = "fsl,sgtl5000";
|
||||
reg =<0xa>;
|
||||
reg = <0xa>;
|
||||
clocks = <&clk12m>;
|
||||
micbias-resistor-k-ohms = <4>;
|
||||
micbias-voltage-m-volts = <2250>;
|
||||
|
|
@ -155,7 +155,7 @@ sgtl5000: sgtl5000@a {
|
|||
|
||||
tda9988: tda9988@70 {
|
||||
compatible = "nxp,tda998x";
|
||||
reg =<0x70>;
|
||||
reg = <0x70>;
|
||||
audio-ports = <TDA998x_I2S 1>;
|
||||
|
||||
#sound-dai-cells = <0>;
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ clocks {
|
|||
audio_mclk_fixed: oscillator@0 {
|
||||
compatible = "fixed-clock";
|
||||
#clock-cells = <0>;
|
||||
clock-frequency = <24576000>; /* 24.576MHz */
|
||||
clock-frequency = <24576000>; /* 24.576MHz */
|
||||
};
|
||||
|
||||
audio_mclk: audio_mclk_gate@0 {
|
||||
|
|
|
|||
|
|
@ -200,7 +200,7 @@ SYSC_OMAP2_SOFTRESET |
|
|||
ranges = <0x0 0x9000 0x1000>;
|
||||
|
||||
uart0: serial@0 {
|
||||
compatible = "ti,am3352-uart", "ti,omap3-uart";
|
||||
compatible = "ti,am3352-uart";
|
||||
clock-frequency = <48000000>;
|
||||
reg = <0x0 0x1000>;
|
||||
interrupts = <72>;
|
||||
|
|
@ -1108,7 +1108,7 @@ SYSC_OMAP2_SOFTRESET |
|
|||
ranges = <0x0 0x22000 0x1000>;
|
||||
|
||||
uart1: serial@0 {
|
||||
compatible = "ti,am3352-uart", "ti,omap3-uart";
|
||||
compatible = "ti,am3352-uart";
|
||||
clock-frequency = <48000000>;
|
||||
reg = <0x0 0x1000>;
|
||||
interrupts = <73>;
|
||||
|
|
@ -1139,7 +1139,7 @@ SYSC_OMAP2_SOFTRESET |
|
|||
ranges = <0x0 0x24000 0x1000>;
|
||||
|
||||
uart2: serial@0 {
|
||||
compatible = "ti,am3352-uart", "ti,omap3-uart";
|
||||
compatible = "ti,am3352-uart";
|
||||
clock-frequency = <48000000>;
|
||||
reg = <0x0 0x1000>;
|
||||
interrupts = <74>;
|
||||
|
|
@ -1457,10 +1457,10 @@ SYSC_OMAP2_SOFTRESET |
|
|||
|
||||
gpio1: gpio@0 {
|
||||
compatible = "ti,omap4-gpio";
|
||||
gpio-ranges = <&am33xx_pinmux 0 0 8>,
|
||||
<&am33xx_pinmux 8 90 4>,
|
||||
<&am33xx_pinmux 12 12 16>,
|
||||
<&am33xx_pinmux 28 30 4>;
|
||||
gpio-ranges = <&am33xx_pinmux 0 0 8>,
|
||||
<&am33xx_pinmux 8 90 4>,
|
||||
<&am33xx_pinmux 12 12 16>,
|
||||
<&am33xx_pinmux 28 30 4>;
|
||||
gpio-controller;
|
||||
#gpio-cells = <2>;
|
||||
interrupt-controller;
|
||||
|
|
@ -1770,7 +1770,7 @@ SYSC_OMAP2_SOFTRESET |
|
|||
ranges = <0x0 0xa6000 0x1000>;
|
||||
|
||||
uart3: serial@0 {
|
||||
compatible = "ti,am3352-uart", "ti,omap3-uart";
|
||||
compatible = "ti,am3352-uart";
|
||||
clock-frequency = <48000000>;
|
||||
reg = <0x0 0x1000>;
|
||||
interrupts = <44>;
|
||||
|
|
@ -1799,7 +1799,7 @@ SYSC_OMAP2_SOFTRESET |
|
|||
ranges = <0x0 0xa8000 0x1000>;
|
||||
|
||||
uart4: serial@0 {
|
||||
compatible = "ti,am3352-uart", "ti,omap3-uart";
|
||||
compatible = "ti,am3352-uart";
|
||||
clock-frequency = <48000000>;
|
||||
reg = <0x0 0x1000>;
|
||||
interrupts = <45>;
|
||||
|
|
@ -1828,7 +1828,7 @@ SYSC_OMAP2_SOFTRESET |
|
|||
ranges = <0x0 0xaa000 0x1000>;
|
||||
|
||||
uart5: serial@0 {
|
||||
compatible = "ti,am3352-uart", "ti,omap3-uart";
|
||||
compatible = "ti,am3352-uart";
|
||||
clock-frequency = <48000000>;
|
||||
reg = <0x0 0x1000>;
|
||||
interrupts = <46>;
|
||||
|
|
|
|||
|
|
@ -461,10 +461,10 @@ &cppi41dma 26 1 &cppi41dma 27 1
|
|||
|
||||
cppi41dma: dma-controller@2000 {
|
||||
compatible = "ti,am3359-cppi41";
|
||||
reg = <0x0000 0x1000>,
|
||||
<0x2000 0x1000>,
|
||||
<0x3000 0x1000>,
|
||||
<0x4000 0x4000>;
|
||||
reg = <0x0000 0x1000>,
|
||||
<0x2000 0x1000>,
|
||||
<0x3000 0x1000>,
|
||||
<0x4000 0x4000>;
|
||||
reg-names = "glue", "controller", "scheduler", "queuemgr";
|
||||
interrupts = <17>;
|
||||
interrupt-names = "glue";
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ led3 {
|
|||
gpio_fan: gpio_fan {
|
||||
/* Based on 5v 500mA AFB02505HHB */
|
||||
compatible = "gpio-fan";
|
||||
gpios = <&tps659038_gpio 2 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&tps659038_gpio 2 GPIO_ACTIVE_HIGH>;
|
||||
gpio-fan,speed-map = <0 0>,
|
||||
<13000 1>;
|
||||
#cooling-cells = <2>;
|
||||
|
|
|
|||
|
|
@ -155,10 +155,10 @@ &cppi41dma 26 1 &cppi41dma 27 1
|
|||
|
||||
cppi41dma: dma-controller@47402000 {
|
||||
compatible = "ti,am3359-cppi41";
|
||||
reg = <0x47400000 0x1000
|
||||
0x47402000 0x1000
|
||||
0x47403000 0x1000
|
||||
0x47404000 0x4000>;
|
||||
reg = <0x47400000 0x1000>,
|
||||
<0x47402000 0x1000>,
|
||||
<0x47403000 0x1000>,
|
||||
<0x47404000 0x4000>;
|
||||
reg-names = "glue", "controller", "scheduler", "queuemgr";
|
||||
interrupts = <17>;
|
||||
interrupt-names = "glue";
|
||||
|
|
|
|||
|
|
@ -643,10 +643,10 @@ &cppi41dma 26 1 &cppi41dma 27 1
|
|||
|
||||
cppi41dma: dma-controller@47402000 {
|
||||
compatible = "ti,am3359-cppi41";
|
||||
reg = <0x47400000 0x1000
|
||||
0x47402000 0x1000
|
||||
0x47403000 0x1000
|
||||
0x47404000 0x4000>;
|
||||
reg = <0x47400000 0x1000>,
|
||||
<0x47402000 0x1000>,
|
||||
<0x47403000 0x1000>,
|
||||
<0x47404000 0x4000>;
|
||||
reg-names = "glue", "controller", "scheduler", "queuemgr";
|
||||
interrupts = <17>;
|
||||
interrupt-names = "glue";
|
||||
|
|
|
|||
|
|
@ -267,8 +267,8 @@ usb2_phy1: phy@4000 {
|
|||
syscon-phy-power = <&scm_conf 0x300>;
|
||||
clocks = <&usb_phy1_always_on_clk32k>,
|
||||
<&l3init_clkctrl DRA7_L3INIT_USB_OTG_SS1_CLKCTRL 8>;
|
||||
clock-names = "wkupclk",
|
||||
"refclk";
|
||||
clock-names = "wkupclk",
|
||||
"refclk";
|
||||
#phy-cells = <0>;
|
||||
};
|
||||
|
||||
|
|
@ -279,8 +279,8 @@ usb2_phy2: phy@5000 {
|
|||
syscon-phy-power = <&scm_conf 0xe74>;
|
||||
clocks = <&usb_phy2_always_on_clk32k>,
|
||||
<&l3init_clkctrl DRA7_L3INIT_USB_OTG_SS2_CLKCTRL 8>;
|
||||
clock-names = "wkupclk",
|
||||
"refclk";
|
||||
clock-names = "wkupclk",
|
||||
"refclk";
|
||||
#phy-cells = <0>;
|
||||
};
|
||||
|
||||
|
|
@ -294,9 +294,9 @@ usb3_phy1: phy@4400 {
|
|||
clocks = <&usb_phy3_always_on_clk32k>,
|
||||
<&sys_clkin1>,
|
||||
<&l3init_clkctrl DRA7_L3INIT_USB_OTG_SS1_CLKCTRL 8>;
|
||||
clock-names = "wkupclk",
|
||||
"sysclk",
|
||||
"refclk";
|
||||
clock-names = "wkupclk",
|
||||
"sysclk",
|
||||
"refclk";
|
||||
#phy-cells = <0>;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -83,10 +83,10 @@ lp8733: lp8733@60 {
|
|||
compatible = "ti,lp8733";
|
||||
reg = <0x60>;
|
||||
|
||||
buck0-in-supply =<&vsys_3v3>;
|
||||
buck1-in-supply =<&vsys_3v3>;
|
||||
ldo0-in-supply =<&evm_5v0>;
|
||||
ldo1-in-supply =<&evm_5v0>;
|
||||
buck0-in-supply = <&vsys_3v3>;
|
||||
buck1-in-supply = <&vsys_3v3>;
|
||||
ldo0-in-supply = <&evm_5v0>;
|
||||
ldo1-in-supply = <&evm_5v0>;
|
||||
|
||||
lp8733_regulators: regulators {
|
||||
lp8733_buck0_reg: buck0 {
|
||||
|
|
@ -131,10 +131,10 @@ lp8732: lp8732@61 {
|
|||
compatible = "ti,lp8732";
|
||||
reg = <0x61>;
|
||||
|
||||
buck0-in-supply =<&vsys_3v3>;
|
||||
buck1-in-supply =<&vsys_3v3>;
|
||||
ldo0-in-supply =<&vsys_3v3>;
|
||||
ldo1-in-supply =<&vsys_3v3>;
|
||||
buck0-in-supply = <&vsys_3v3>;
|
||||
buck1-in-supply = <&vsys_3v3>;
|
||||
ldo0-in-supply = <&vsys_3v3>;
|
||||
ldo1-in-supply = <&vsys_3v3>;
|
||||
|
||||
lp8732_regulators: regulators {
|
||||
lp8732_buck0_reg: buck0 {
|
||||
|
|
|
|||
|
|
@ -275,8 +275,8 @@ filesystem@680000 {
|
|||
|
||||
ethernet@6,0 {
|
||||
compatible = "davicom,dm9000";
|
||||
reg = <6 0x000 2>,
|
||||
<6 0x400 2>; /* CS6, offset 0 and 0x400, IO size 2 */
|
||||
reg = <6 0x000 2>,
|
||||
<6 0x400 2>; /* CS6, offset 0 and 0x400, IO size 2 */
|
||||
bank-width = <2>;
|
||||
interrupt-parent = <&gpio1>;
|
||||
interrupts = <25 IRQ_TYPE_LEVEL_LOW>;
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ ads7846@0 {
|
|||
ti,debounce-max = /bits/ 16 <10>;
|
||||
ti,debounce-tol = /bits/ 16 <5>;
|
||||
ti,debounce-rep = /bits/ 16 <1>;
|
||||
ti,keep-vref-on = <1>;
|
||||
ti,keep-vref-on;
|
||||
ti,settle-delay-usec = /bits/ 16 <150>;
|
||||
|
||||
wakeup-source;
|
||||
|
|
|
|||
|
|
@ -57,8 +57,8 @@ &mmc1_pins
|
|||
&mmc1_aux_pins
|
||||
>;
|
||||
|
||||
wp-gpios = <&gpio2 27 GPIO_ACTIVE_HIGH>; /* gpio_59 */
|
||||
cd-gpios = <&gpio5 16 GPIO_ACTIVE_HIGH>; /* gpio_144 */
|
||||
wp-gpios = <&gpio2 27 GPIO_ACTIVE_HIGH>; /* gpio_59 */
|
||||
cd-gpios = <&gpio5 16 GPIO_ACTIVE_HIGH>; /* gpio_144 */
|
||||
};
|
||||
|
||||
&dss {
|
||||
|
|
|
|||
|
|
@ -467,7 +467,7 @@ &mcspi1 {
|
|||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&mcspi1_pins>;
|
||||
|
||||
eth@0 {
|
||||
ethernet@0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&ks8851_pins>;
|
||||
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@ &mcspi1 {
|
|||
pinctrl-0 = <&mcspi1_pins>;
|
||||
status = "okay";
|
||||
|
||||
eth@0 {
|
||||
ethernet@0 {
|
||||
compatible = "ks8851";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&ks8851_irq_pins>;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user