Ux500 Device Tree updates for v4.11:
This cleans the device tree a bit and rectifies some clocking bugs. They are in a sense regressions, but there is no hurry for this platform. -----BEGIN PGP SIGNATURE----- iQIcBAABAgAGBQJYkamEAAoJEEEQszewGV1z6TIP/2qHFkXa3PfMFp0gP8yR4tY/ ExRZk0ssWGhVNjn/Kfvf30IqyuUL6rDs+squSd69PCDGKcM1b23X5EvcnZ/CVFRe lBRM1JH0Ko+y1snk/CNDu4KTXsumUZq11nyFVBAwzupcnkgeVM12kFrK3mQHeMGO MvT2GTz2iD520zlLlxbWYaF4jCADPMPLFl4U8vXRNXVF53XqDbXno+hbdYzDVwb2 oTCScdDkdBmQmAT/wWkm+nqlvVfEdtSOHoHMSe9yFcgL+VD1Gt7+p/BtRnb5X8e4 nZFNAAZLSAmhFDKQr8qaZcMlHoFYUWKRzY1SeWvn38SWDE977P5Rqi5t9zaq5I5d nzpQ9psmpPQcnNgW7/n0AM2KI9DDjkeknvZuRyBk2ovjnaLZag40T/r1H5RkEt3p HFR+YMkfUrWGJaKxC9M/egCvaRmZTJQDsgZmPD3ot7HmS2rucC/Mhl5jtM9pnB9U kIb30msf0l9PZKc2C5HLN214WRD+x9kEKTJ++eF530tuP1kVACa+9E8vIIHNIynk OACSHBQBO+rTKhi3r00DaDqMyI1UlBKAetaGkhVSgVMbxwWWmWRkU0dFR0zWdAXY 0IuUrsX6j8qinFg46Hl4ztUf8Q4r0aujjtYNYArVKPdXYHueSdOOM83/uXJ1paX2 2QehPr665FMuCXKQ1ZJP =QJk8 -----END PGP SIGNATURE----- Merge tag 'ux500-dt-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt Pull "Ux500 Device Tree updates for v4.11" from Linus Walleij: This cleans the device tree a bit and rectifies some clocking bugs. They are in a sense regressions, but there is no hurry for this platform. * tag 'ux500-dt-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: ARM: dts: add the AB8500 sysclk to the device trees ARM: dts: Ux500: move USB PHY pins to PHY device ARM: dts: push MMC/SD to board and add comments
This commit is contained in:
commit
a121efc23b
|
@ -669,6 +669,8 @@
|
|||
vddulpivio18-supply = <&ab8500_ldo_intcore_reg>;
|
||||
v-ape-supply = <&db8500_vape_reg>;
|
||||
musb_1v8-supply = <&db8500_vsmps2_reg>;
|
||||
clocks = <&prcmu_clk PRCMU_SYSCLK>;
|
||||
clock-names = "sysclk";
|
||||
};
|
||||
|
||||
ab8500-ponkey {
|
||||
|
|
|
@ -19,12 +19,6 @@
|
|||
};
|
||||
|
||||
soc {
|
||||
usb_per5@a03e0000 {
|
||||
pinctrl-names = "default", "sleep";
|
||||
pinctrl-0 = <&musb_default_mode>;
|
||||
pinctrl-1 = <&musb_sleep_mode>;
|
||||
};
|
||||
|
||||
uart@80120000 {
|
||||
pinctrl-names = "default", "sleep";
|
||||
pinctrl-0 = <&uart0_default_mode>;
|
||||
|
@ -111,6 +105,7 @@
|
|||
pinctrl-1 = <&i2c3_sleep_mode>;
|
||||
};
|
||||
|
||||
/* ST6G3244ME level translator for 1.8/2.9 V */
|
||||
vmmci: regulator-gpio {
|
||||
compatible = "regulator-gpio";
|
||||
|
||||
|
@ -120,7 +115,6 @@
|
|||
regulator-type = "voltage";
|
||||
|
||||
startup-delay-us = <100>;
|
||||
enable-active-high;
|
||||
|
||||
states = <1800000 0x1
|
||||
2900000 0x0>;
|
||||
|
@ -197,6 +191,8 @@
|
|||
|
||||
stericsson,cpu-dai = <&msp1 &msp3>;
|
||||
stericsson,audio-codec = <&codec>;
|
||||
clocks = <&prcmu_clk PRCMU_SYSCLK>;
|
||||
clock-names = "sysclk";
|
||||
};
|
||||
|
||||
msp0: msp@80123000 {
|
||||
|
@ -225,6 +221,12 @@
|
|||
ab8500-gpio {
|
||||
};
|
||||
|
||||
ab8500_usb {
|
||||
pinctrl-names = "default", "sleep";
|
||||
pinctrl-0 = <&musb_default_mode>;
|
||||
pinctrl-1 = <&musb_sleep_mode>;
|
||||
};
|
||||
|
||||
ab8500-regulators {
|
||||
ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
|
||||
regulator-name = "V-DISPLAY";
|
||||
|
|
|
@ -74,6 +74,7 @@
|
|||
vmmci: regulator-gpio {
|
||||
gpios = <&tc3589x_gpio 18 GPIO_ACTIVE_HIGH>;
|
||||
enable-gpio = <&tc3589x_gpio 17 GPIO_ACTIVE_HIGH>;
|
||||
enable-active-high;
|
||||
};
|
||||
|
||||
pinctrl {
|
||||
|
|
|
@ -146,6 +146,7 @@
|
|||
vmmci: regulator-gpio {
|
||||
gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;
|
||||
enable-gpio = <&gpio5 9 GPIO_ACTIVE_HIGH>;
|
||||
enable-active-high;
|
||||
};
|
||||
|
||||
pinctrl {
|
||||
|
|
|
@ -159,17 +159,13 @@
|
|||
"", "", "", "", "", "", "", "";
|
||||
};
|
||||
|
||||
usb_per5@a03e0000 {
|
||||
pinctrl-names = "default", "sleep";
|
||||
pinctrl-0 = <&musb_default_mode>;
|
||||
pinctrl-1 = <&musb_sleep_mode>;
|
||||
};
|
||||
|
||||
sound {
|
||||
compatible = "stericsson,snd-soc-mop500";
|
||||
|
||||
stericsson,cpu-dai = <&msp1 &msp3>;
|
||||
stericsson,audio-codec = <&codec>;
|
||||
clocks = <&prcmu_clk PRCMU_SYSCLK>;
|
||||
clock-names = "sysclk";
|
||||
};
|
||||
|
||||
msp0: msp@80123000 {
|
||||
|
@ -216,11 +212,15 @@
|
|||
};
|
||||
};
|
||||
|
||||
/* ST6G3244ME level translator for 1.8/2.9 V */
|
||||
vmmci: regulator-gpio {
|
||||
compatible = "regulator-gpio";
|
||||
|
||||
/* GPIO228 SD_SEL */
|
||||
gpios = <&gpio7 4 GPIO_ACTIVE_HIGH>;
|
||||
/* GPIO217 MMC_EN */
|
||||
enable-gpio = <&gpio6 25 GPIO_ACTIVE_HIGH>;
|
||||
enable-active-high;
|
||||
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <2900000>;
|
||||
|
@ -228,7 +228,6 @@
|
|||
regulator-type = "voltage";
|
||||
|
||||
startup-delay-us = <100>;
|
||||
enable-active-high;
|
||||
|
||||
states = <1800000 0x1
|
||||
2900000 0x0>;
|
||||
|
@ -448,6 +447,12 @@
|
|||
"PM_GPIO42"; /* AB8500 GPIO42 */
|
||||
};
|
||||
|
||||
ab8500_usb {
|
||||
pinctrl-names = "default", "sleep";
|
||||
pinctrl-0 = <&musb_default_mode>;
|
||||
pinctrl-1 = <&musb_sleep_mode>;
|
||||
};
|
||||
|
||||
ext_regulators: ab8500-ext-regulators {
|
||||
ab8500_ext1_reg: ab8500_ext1 {
|
||||
regulator-name = "ab8500-ext-supply1";
|
||||
|
@ -546,6 +551,7 @@
|
|||
sdi0_default_mode: sdi0_default {
|
||||
snowball_mux {
|
||||
function = "mc0";
|
||||
/* Add the DAT31 pin even if it is not really used */
|
||||
groups = "mc0dat31dir_a_1";
|
||||
};
|
||||
snowball_cfg1 {
|
||||
|
|
Loading…
Reference in a new issue