leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dts changes for omap variants for v5.4

Browse Source 
Remove regulator-boot-off properties that we never had in the mainline
 kernel so they won't do anything. We add stdout-path for gta04, and
 make am335x-boneblue use am335x-osd335x-common.dtsi file.
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAl1gZ14RHHRvbnlAYXRv
 bWlkZS5jb20ACgkQG9Q+yVyrpXOEuRAAopDCOC3rJST6vk20mVGe8VI+teyErjWi
 oLtZqsvJ8IgMz3oKGxrpsUU9OX1PtBlnQk/UlyyEGvHKHJCqmNXgAef1ZQ3f8pSH
 nxqIMAZVMW2RKW1UIY432zN7V7/BbKhMXJnCk9AQhiuy3myL2P02a0+RPyVHT9IF
 0o+6j7JqPQ20UsKTqqe0x78HJxfsGq4XGbJCs2RYYmrhOmYLnQ8lVP4s2o+8lLT7
 nPH4fL0BNpiPzUEmL80fcyuq9jJwzbUnzYPAZTcVs4N1eZK9VYH7VA4Z7LvdwmLC
 H4S0Ov70kQ4QpVoX79OGtf4eeeZHDWi2F3QyLDgAAOF9+kuz2CNCYSIqnNBez/4p
 3ptnFnZneiU2GxnP8SQEfCQVCJ74HC6JRqpaM7AYpTXhYmkFy8N4Rp2che53c6in
 ogRdejW+4XEM87wdsXAghH32Y9H4hvtp13bEvBDN9BiZt/Ok8WFTsBOVtlZ0DGgw
 Gf42oKqWvYPMhkwq2Q5qH9CWuHYsTghNCKiufYh6s/muMgWP7Jxg2vVV3JbGFOq2
 CvR5xw7V0rMoULKwmHvVSm3/21RLvdNRJMqEhhjvF+590pQPqX1/w5WuIOTRo/u1
 +Y1Qwiq7zLEy8GrzM58EiDdes48rpkeKN29QNhJavwK1uKF5QFXy8H5hk2xcfYGK
 PmPTZnUhMFg=
 =Utq2
 -----END PGP SIGNATURE-----

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

dts changes for omap variants for v5.4

Remove regulator-boot-off properties that we never had in the mainline
kernel so they won't do anything. We add stdout-path for gta04, and
make am335x-boneblue use am335x-osd335x-common.dtsi file.

* tag 'omap-for-v5.4/dt-take2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am335x-boneblue: Use of am335x-osd335x-common.dtsi
  ARM: dts: gta04: define chosen/stdout-path
  ARM: dts: omap3-n950-n9: Remove regulator-boot-off property
  ARM: dts: am335x-cm-t335: Remove regulator-boot-off property

Link: https://lore.kernel.org/r/pull-1566599057-142651@atomide.com-2
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2019-09-03 16:01:08 +02:00
commit af6ba9d2d6
4 changed files with 6 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
arch/arm/boot/dts/am335x-boneblue.dts
View File

@ -5,23 +5,13 @@
/dts-v1/;
#include "am33xx.dtsi"
#include "am335x-osd335x-common.dtsi"
#include <dt-bindings/interrupt-controller/irq.h>
/ {
model = "TI AM335x BeagleBone Blue";
compatible = "ti,am335x-bone-blue", "ti,am33xx";
cpus {
cpu@0 {
cpu0-supply = <&dcdc2_reg>;
};
};
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x20000000>; /* 512 MB */
};
chosen {
stdout-path = &uart0;
};
@ -142,13 +132,6 @@
>;
};
i2c0_pins: pinmux_i2c0_pins {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_I2C0_SDA, PIN_INPUT_PULLUP, MUX_MODE0) /* (C17) I2C0_SDA.I2C0_SDA */
AM33XX_PADCONF(AM335X_PIN_I2C0_SCL, PIN_INPUT_PULLUP, MUX_MODE0) /* (C16) I2C0_SCL.I2C0_SCL */
>;
};
i2c2_pins: pinmux_i2c2_pins {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_UART1_CTSN, PIN_INPUT_PULLUP, MUX_MODE3) /* (D18) uart1_ctsn.I2C2_SDA */
@ -328,16 +311,6 @@
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay";
clock-frequency = <400000>;
tps: tps@24 {
reg = <0x24>;
};
baseboard_eeprom: baseboard_eeprom@50 {
compatible = "atmel,24c256";
reg = <0x50>;
@ -381,66 +354,13 @@
/include/ "tps65217.dtsi"
&tps {
interrupts = <7>; /* NMI */
interrupt-parent = <&intc>;
/delete-property/ ti,pmic-shutdown-controller;
charger {
interrupts = <0>, <1>;
interrupt-names = "USB", "AC";
status = "okay";
};
pwrbutton {
interrupts = <2>;
status = "okay";
};
regulators {
dcdc1_reg: regulator@0 {
regulator-name = "vdds_dpr";
regulator-always-on;
};
dcdc2_reg: regulator@1 {
/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
regulator-name = "vdd_mpu";
regulator-min-microvolt = <925000>;
regulator-max-microvolt = <1351500>;
regulator-boot-on;
regulator-always-on;
};
dcdc3_reg: regulator@2 {
/* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
regulator-name = "vdd_core";
regulator-min-microvolt = <925000>;
regulator-max-microvolt = <1150000>;
regulator-boot-on;
regulator-always-on;
};
ldo1_reg: regulator@3 {
regulator-name = "vio,vrtc,vdds";
regulator-always-on;
};
ldo2_reg: regulator@4 {
regulator-name = "vdd_3v3aux";
regulator-always-on;
};
ldo3_reg: regulator@5 {
regulator-name = "vdd_1v8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
};
ldo4_reg: regulator@6 {
regulator-name = "vdd_3v3a";
regulator-always-on;
};
};
};
&mmc1 {
@ -502,14 +422,6 @@
};
};
&aes {
status = "okay";
};
&sham {
status = "okay";
};
&rtc {
system-power-controller;
clocks = <&clk_32768_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>;

1
arch/arm/boot/dts/am335x-cm-t335.dts
View File

@ -44,7 +44,6 @@
regulator-name = "vwlan_fixed";
gpio = <&gpio0 20 GPIO_ACTIVE_HIGH>; /* gpio0_20 */
enable-active-high;
regulator-boot-off;
};
backlight {

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

@ -24,6 +24,10 @@
reg = <0x80000000 0x20000000>; /* 512 MB */
};
chosen {
stdout-path = &uart3;
};
aliases {
display0 = &lcd;
display1 = &tv0;

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

@ -41,7 +41,6 @@
regulator-name = "VWLAN";
gpio = <&gpio2 3 GPIO_ACTIVE_HIGH>; /* gpio 35 */
enable-active-high;
regulator-boot-off;
};
leds {