mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-28 23:24:50 +00:00
More Ux500 device tree updates for the v5.4 kernel:
- Drop TV-OUT muxgroup from the HREF pin control - Fix up BU21013 touchpad from Dmitry - Split of AB8500 config in its own DTSI - Drop the unused USB regulator config - Add proper thermal zone for the CPU -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEElDRnuGcz/wPCXQWMQRCzN7AZXXMFAl1miDgACgkQQRCzN7AZ XXP1iA//cfSbd6ltsZLkDEPscHYQn8LyoMi1DPbrP5wxGSVqKQ0nPWJlhFBax3y9 4V7uUaZKMAgWY6X+omr8g2OGe++ZETqOkRN1Fgg7ltSVVuaoXahgDBQ+mfUFbcsQ zbyvGR4RdmhkzLU0rQoYnmlZaAlmYjNuGYBR7FhCOB2sGs/bPw8FfXvefdeN9P8v EJuihO0iH2Qsp63GzYc7Tqif1fpaOjcHBOgxmrRl4Cewx1gux3dv8AUoqeRBtObJ aI77w4jP09I0yPiYWAJ0EBiSAOk5zYh8gG/P2id6ma26HyCb42n21HeM5en+qaTL SMuy6WgVPudCoeZiqbXjj+M/m6USwAivm7DDw6lCArpEjRjWoDhGxQKI1LWUwvG1 nRySkj9N3obl6ojrWwDZ6QUYnuEYoM+hsM0B4pm8cDnCqVv6WnjlnUZ3FLeteLej PvQIwchtk6tCe5wnkeC8MQF10WXObsV4hcqEMH5yxHeTgMZGSuVRyAUeQXaosUyD DMoHhBGJlsFs6xHmR/xpi7zdLu2vZn4cl22DK/N252JGpVuQV1tG6yxOS2z6QBUp J2Y/2QIBohcW/T2GUltMuoMf35BR+ECH05LsaiNKCYgWVSc4rpNryv+Y6aSyJ7t5 iLmJPYEc/nSmkOpbz9CifFlJYiVvfoG5IAaiJCWYKdMbX9nP248= =JGg5 -----END PGP SIGNATURE----- Merge tag 'ux500-dts-v5.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into arm/dt More Ux500 device tree updates for the v5.4 kernel: - Drop TV-OUT muxgroup from the HREF pin control - Fix up BU21013 touchpad from Dmitry - Split of AB8500 config in its own DTSI - Drop the unused USB regulator config - Add proper thermal zone for the CPU * tag 'ux500-dts-v5.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: ARM: dts: ux500: Update thermal zone ARM: dts: ux500: Remove ab8500_ldo_usb regulator from device tree ARM: dts: ux500: Move ab8500 nodes to ste-ab8500.dtsi ARM: ux500: improve BU21013 touchpad bindings ARM: dts: ux500: Drop TV-out muxgroup on HREFs Link: https://lore.kernel.org/r/CACRpkdZ9Xvx+rg-hFVgG61_i2CdQSs+nZq5FXkkK2-3Ce9ooWg@mail.gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
commit
a3829f9952
8 changed files with 286 additions and 246 deletions
228
arch/arm/boot/dts/ste-ab8500.dtsi
Normal file
228
arch/arm/boot/dts/ste-ab8500.dtsi
Normal file
|
|
@ -0,0 +1,228 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
/*
|
||||
* Copyright 2012 Linaro Ltd
|
||||
*/
|
||||
|
||||
#include <dt-bindings/clock/ste-ab8500.h>
|
||||
|
||||
/ {
|
||||
soc {
|
||||
prcmu@80157000 {
|
||||
ab8500 {
|
||||
compatible = "stericsson,ab8500";
|
||||
interrupt-parent = <&intc>;
|
||||
interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-controller;
|
||||
#interrupt-cells = <2>;
|
||||
|
||||
ab8500_clock: clock-controller {
|
||||
compatible = "stericsson,ab8500-clk";
|
||||
#clock-cells = <1>;
|
||||
};
|
||||
|
||||
ab8500_gpio: ab8500-gpio {
|
||||
compatible = "stericsson,ab8500-gpio";
|
||||
gpio-controller;
|
||||
#gpio-cells = <2>;
|
||||
};
|
||||
|
||||
ab8500-rtc {
|
||||
compatible = "stericsson,ab8500-rtc";
|
||||
interrupts = <17 IRQ_TYPE_LEVEL_HIGH
|
||||
18 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "60S", "ALARM";
|
||||
};
|
||||
|
||||
ab8500-gpadc {
|
||||
compatible = "stericsson,ab8500-gpadc";
|
||||
interrupts = <32 IRQ_TYPE_LEVEL_HIGH
|
||||
39 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "HW_CONV_END", "SW_CONV_END";
|
||||
vddadc-supply = <&ab8500_ldo_tvout_reg>;
|
||||
};
|
||||
|
||||
ab8500_battery: ab8500_battery {
|
||||
stericsson,battery-type = "LIPO";
|
||||
thermistor-on-batctrl;
|
||||
};
|
||||
|
||||
ab8500_fg {
|
||||
compatible = "stericsson,ab8500-fg";
|
||||
battery = <&ab8500_battery>;
|
||||
};
|
||||
|
||||
ab8500_btemp {
|
||||
compatible = "stericsson,ab8500-btemp";
|
||||
battery = <&ab8500_battery>;
|
||||
};
|
||||
|
||||
ab8500_charger {
|
||||
compatible = "stericsson,ab8500-charger";
|
||||
battery = <&ab8500_battery>;
|
||||
vddadc-supply = <&ab8500_ldo_tvout_reg>;
|
||||
};
|
||||
|
||||
ab8500_chargalg {
|
||||
compatible = "stericsson,ab8500-chargalg";
|
||||
battery = <&ab8500_battery>;
|
||||
};
|
||||
|
||||
ab8500_usb {
|
||||
compatible = "stericsson,ab8500-usb";
|
||||
interrupts = < 90 IRQ_TYPE_LEVEL_HIGH
|
||||
96 IRQ_TYPE_LEVEL_HIGH
|
||||
14 IRQ_TYPE_LEVEL_HIGH
|
||||
15 IRQ_TYPE_LEVEL_HIGH
|
||||
79 IRQ_TYPE_LEVEL_HIGH
|
||||
74 IRQ_TYPE_LEVEL_HIGH
|
||||
75 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "ID_WAKEUP_R",
|
||||
"ID_WAKEUP_F",
|
||||
"VBUS_DET_F",
|
||||
"VBUS_DET_R",
|
||||
"USB_LINK_STATUS",
|
||||
"USB_ADP_PROBE_PLUG",
|
||||
"USB_ADP_PROBE_UNPLUG";
|
||||
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 {
|
||||
compatible = "stericsson,ab8500-poweron-key";
|
||||
interrupts = <6 IRQ_TYPE_LEVEL_HIGH
|
||||
7 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "ONKEY_DBF", "ONKEY_DBR";
|
||||
};
|
||||
|
||||
ab8500-sysctrl {
|
||||
compatible = "stericsson,ab8500-sysctrl";
|
||||
};
|
||||
|
||||
ab8500-pwm {
|
||||
compatible = "stericsson,ab8500-pwm";
|
||||
clocks = <&ab8500_clock AB8500_SYSCLK_INT>;
|
||||
clock-names = "intclk";
|
||||
};
|
||||
|
||||
ab8500-debugfs {
|
||||
compatible = "stericsson,ab8500-debug";
|
||||
};
|
||||
|
||||
codec: ab8500-codec {
|
||||
compatible = "stericsson,ab8500-codec";
|
||||
|
||||
V-AUD-supply = <&ab8500_ldo_audio_reg>;
|
||||
V-AMIC1-supply = <&ab8500_ldo_anamic1_reg>;
|
||||
V-AMIC2-supply = <&ab8500_ldo_anamic2_reg>;
|
||||
V-DMIC-supply = <&ab8500_ldo_dmic_reg>;
|
||||
|
||||
clocks = <&ab8500_clock AB8500_SYSCLK_AUDIO>;
|
||||
clock-names = "audioclk";
|
||||
|
||||
stericsson,earpeice-cmv = <950>; /* Units in mV. */
|
||||
};
|
||||
|
||||
ext_regulators: ab8500-ext-regulators {
|
||||
compatible = "stericsson,ab8500-ext-regulator";
|
||||
|
||||
ab8500_ext1_reg: ab8500_ext1 {
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
regulator-boot-on;
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
ab8500_ext2_reg: ab8500_ext2 {
|
||||
regulator-min-microvolt = <1360000>;
|
||||
regulator-max-microvolt = <1360000>;
|
||||
regulator-boot-on;
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
ab8500_ext3_reg: ab8500_ext3 {
|
||||
regulator-min-microvolt = <3400000>;
|
||||
regulator-max-microvolt = <3400000>;
|
||||
regulator-boot-on;
|
||||
};
|
||||
};
|
||||
|
||||
ab8500-regulators {
|
||||
compatible = "stericsson,ab8500-regulator";
|
||||
vin-supply = <&ab8500_ext3_reg>;
|
||||
|
||||
// supplies to the display/camera
|
||||
ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
|
||||
regulator-min-microvolt = <2500000>;
|
||||
regulator-max-microvolt = <2900000>;
|
||||
regulator-boot-on;
|
||||
/* BUG: If turned off MMC will be affected. */
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
// supplies to the on-board eMMC
|
||||
ab8500_ldo_aux2_reg: ab8500_ldo_aux2 {
|
||||
regulator-min-microvolt = <1100000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
};
|
||||
|
||||
// supply for VAUX3; SDcard slots
|
||||
ab8500_ldo_aux3_reg: ab8500_ldo_aux3 {
|
||||
regulator-min-microvolt = <1100000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
};
|
||||
|
||||
// supply for v-intcore12; VINTCORE12 LDO
|
||||
ab8500_ldo_intcore_reg: ab8500_ldo_intcore {
|
||||
};
|
||||
|
||||
// supply for tvout; gpadc; TVOUT LDO
|
||||
ab8500_ldo_tvout_reg: ab8500_ldo_tvout {
|
||||
};
|
||||
|
||||
// supply for ab8500-vaudio; VAUDIO LDO
|
||||
ab8500_ldo_audio_reg: ab8500_ldo_audio {
|
||||
};
|
||||
|
||||
// supply for v-anamic1 VAMIC1 LDO
|
||||
ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 {
|
||||
};
|
||||
|
||||
// supply for v-amic2; VAMIC2 LDO; reuse constants for AMIC1
|
||||
ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 {
|
||||
};
|
||||
|
||||
// supply for v-dmic; VDMIC LDO
|
||||
ab8500_ldo_dmic_reg: ab8500_ldo_dmic {
|
||||
};
|
||||
|
||||
// supply for U8500 CSI/DSI; VANA LDO
|
||||
ab8500_ldo_ana_reg: ab8500_ldo_ana {
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
sound {
|
||||
stericsson,audio-codec = <&codec>;
|
||||
clocks = <&prcmu_clk PRCMU_SYSCLK>, <&ab8500_clock AB8500_SYSCLK_ULP>, <&ab8500_clock AB8500_SYSCLK_INT>;
|
||||
clock-names = "sysclk", "ulpclk", "intclk";
|
||||
};
|
||||
|
||||
mcde@a0350000 {
|
||||
vana-supply = <&ab8500_ldo_ana_reg>;
|
||||
|
||||
dsi@a0351000 {
|
||||
vana-supply = <&ab8500_ldo_ana_reg>;
|
||||
};
|
||||
dsi@a0352000 {
|
||||
vana-supply = <&ab8500_ldo_ana_reg>;
|
||||
};
|
||||
dsi@a0353000 {
|
||||
vana-supply = <&ab8500_ldo_ana_reg>;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -8,7 +8,6 @@
|
|||
#include <dt-bindings/mfd/dbx500-prcmu.h>
|
||||
#include <dt-bindings/arm/ux500_pm_domains.h>
|
||||
#include <dt-bindings/gpio/gpio.h>
|
||||
#include <dt-bindings/clock/ste-ab8500.h>
|
||||
|
||||
/ {
|
||||
#address-cells = <1>;
|
||||
|
|
@ -44,6 +43,7 @@ CPU0: cpu@300 {
|
|||
clocks = <&prcmu_clk PRCMU_ARMSS>;
|
||||
clock-names = "cpu";
|
||||
clock-latency = <20000>;
|
||||
#cooling-cells = <2>;
|
||||
};
|
||||
CPU1: cpu@301 {
|
||||
device_type = "cpu";
|
||||
|
|
@ -52,6 +52,39 @@ CPU1: cpu@301 {
|
|||
};
|
||||
};
|
||||
|
||||
thermal-zones {
|
||||
/*
|
||||
* Thermal zone for the SoC, using the thermal sensor in the
|
||||
* PRCMU for temperature and the cpufreq driver for passive
|
||||
* cooling.
|
||||
*/
|
||||
cpu_thermal: cpu-thermal {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <1000>;
|
||||
|
||||
thermal-sensors = <&thermal>;
|
||||
|
||||
trips {
|
||||
cpu_alert: cpu-alert {
|
||||
temperature = <70000>;
|
||||
hysteresis = <2000>;
|
||||
type = "passive";
|
||||
};
|
||||
cpu-crit {
|
||||
temperature = <85000>;
|
||||
hysteresis = <0>;
|
||||
type = "critical";
|
||||
};
|
||||
};
|
||||
|
||||
cooling-maps {
|
||||
trip = <&cpu_alert>;
|
||||
cooling-device = <&CPU0 0 2>;
|
||||
contribution = <100>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
soc {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
|
@ -502,33 +535,14 @@ prcmu-timer-4@80157450 {
|
|||
reg = <0x80157450 0xC>;
|
||||
};
|
||||
|
||||
thermal@801573c0 {
|
||||
thermal: thermal@801573c0 {
|
||||
compatible = "stericsson,db8500-thermal";
|
||||
reg = <0x801573c0 0x40>;
|
||||
interrupt-parent = <&prcmu>;
|
||||
interrupts = <21 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<22 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "IRQ_HOTMON_LOW", "IRQ_HOTMON_HIGH";
|
||||
num-trips = <4>;
|
||||
|
||||
trip0-temp = <70000>;
|
||||
trip0-type = "active";
|
||||
trip0-cdev-num = <1>;
|
||||
trip0-cdev-name0 = "thermal-cpufreq-0";
|
||||
|
||||
trip1-temp = <75000>;
|
||||
trip1-type = "active";
|
||||
trip1-cdev-num = <1>;
|
||||
trip1-cdev-name0 = "thermal-cpufreq-0";
|
||||
|
||||
trip2-temp = <80000>;
|
||||
trip2-type = "active";
|
||||
trip2-cdev-num = <1>;
|
||||
trip2-cdev-name0 = "thermal-cpufreq-0";
|
||||
|
||||
trip3-temp = <85000>;
|
||||
trip3-type = "critical";
|
||||
trip3-cdev-num = <0>;
|
||||
#thermal-sensor-cells = <0>;
|
||||
};
|
||||
|
||||
db8500-prcmu-regulators {
|
||||
|
|
@ -617,206 +631,6 @@ db8500_esram34_reg: db8500_esram34 {
|
|||
db8500_esram34_ret_reg: db8500_esram34_ret {
|
||||
};
|
||||
};
|
||||
|
||||
ab8500 {
|
||||
compatible = "stericsson,ab8500";
|
||||
interrupt-parent = <&intc>;
|
||||
interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-controller;
|
||||
#interrupt-cells = <2>;
|
||||
|
||||
ab8500_clock: clock-controller {
|
||||
compatible = "stericsson,ab8500-clk";
|
||||
#clock-cells = <1>;
|
||||
};
|
||||
|
||||
ab8500_gpio: ab8500-gpio {
|
||||
compatible = "stericsson,ab8500-gpio";
|
||||
gpio-controller;
|
||||
#gpio-cells = <2>;
|
||||
};
|
||||
|
||||
ab8500-rtc {
|
||||
compatible = "stericsson,ab8500-rtc";
|
||||
interrupts = <17 IRQ_TYPE_LEVEL_HIGH
|
||||
18 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "60S", "ALARM";
|
||||
};
|
||||
|
||||
ab8500-gpadc {
|
||||
compatible = "stericsson,ab8500-gpadc";
|
||||
interrupts = <32 IRQ_TYPE_LEVEL_HIGH
|
||||
39 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "HW_CONV_END", "SW_CONV_END";
|
||||
vddadc-supply = <&ab8500_ldo_tvout_reg>;
|
||||
};
|
||||
|
||||
ab8500_battery: ab8500_battery {
|
||||
stericsson,battery-type = "LIPO";
|
||||
thermistor-on-batctrl;
|
||||
};
|
||||
|
||||
ab8500_fg {
|
||||
compatible = "stericsson,ab8500-fg";
|
||||
battery = <&ab8500_battery>;
|
||||
};
|
||||
|
||||
ab8500_btemp {
|
||||
compatible = "stericsson,ab8500-btemp";
|
||||
battery = <&ab8500_battery>;
|
||||
};
|
||||
|
||||
ab8500_charger {
|
||||
compatible = "stericsson,ab8500-charger";
|
||||
battery = <&ab8500_battery>;
|
||||
vddadc-supply = <&ab8500_ldo_tvout_reg>;
|
||||
};
|
||||
|
||||
ab8500_chargalg {
|
||||
compatible = "stericsson,ab8500-chargalg";
|
||||
battery = <&ab8500_battery>;
|
||||
};
|
||||
|
||||
ab8500_usb {
|
||||
compatible = "stericsson,ab8500-usb";
|
||||
interrupts = < 90 IRQ_TYPE_LEVEL_HIGH
|
||||
96 IRQ_TYPE_LEVEL_HIGH
|
||||
14 IRQ_TYPE_LEVEL_HIGH
|
||||
15 IRQ_TYPE_LEVEL_HIGH
|
||||
79 IRQ_TYPE_LEVEL_HIGH
|
||||
74 IRQ_TYPE_LEVEL_HIGH
|
||||
75 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "ID_WAKEUP_R",
|
||||
"ID_WAKEUP_F",
|
||||
"VBUS_DET_F",
|
||||
"VBUS_DET_R",
|
||||
"USB_LINK_STATUS",
|
||||
"USB_ADP_PROBE_PLUG",
|
||||
"USB_ADP_PROBE_UNPLUG";
|
||||
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 {
|
||||
compatible = "stericsson,ab8500-poweron-key";
|
||||
interrupts = <6 IRQ_TYPE_LEVEL_HIGH
|
||||
7 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "ONKEY_DBF", "ONKEY_DBR";
|
||||
};
|
||||
|
||||
ab8500-sysctrl {
|
||||
compatible = "stericsson,ab8500-sysctrl";
|
||||
};
|
||||
|
||||
ab8500-pwm {
|
||||
compatible = "stericsson,ab8500-pwm";
|
||||
clocks = <&ab8500_clock AB8500_SYSCLK_INT>;
|
||||
clock-names = "intclk";
|
||||
};
|
||||
|
||||
ab8500-debugfs {
|
||||
compatible = "stericsson,ab8500-debug";
|
||||
};
|
||||
|
||||
codec: ab8500-codec {
|
||||
compatible = "stericsson,ab8500-codec";
|
||||
|
||||
V-AUD-supply = <&ab8500_ldo_audio_reg>;
|
||||
V-AMIC1-supply = <&ab8500_ldo_anamic1_reg>;
|
||||
V-AMIC2-supply = <&ab8500_ldo_anamic2_reg>;
|
||||
V-DMIC-supply = <&ab8500_ldo_dmic_reg>;
|
||||
|
||||
clocks = <&ab8500_clock AB8500_SYSCLK_AUDIO>;
|
||||
clock-names = "audioclk";
|
||||
|
||||
stericsson,earpeice-cmv = <950>; /* Units in mV. */
|
||||
};
|
||||
|
||||
ext_regulators: ab8500-ext-regulators {
|
||||
compatible = "stericsson,ab8500-ext-regulator";
|
||||
|
||||
ab8500_ext1_reg: ab8500_ext1 {
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
regulator-boot-on;
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
ab8500_ext2_reg: ab8500_ext2 {
|
||||
regulator-min-microvolt = <1360000>;
|
||||
regulator-max-microvolt = <1360000>;
|
||||
regulator-boot-on;
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
ab8500_ext3_reg: ab8500_ext3 {
|
||||
regulator-min-microvolt = <3400000>;
|
||||
regulator-max-microvolt = <3400000>;
|
||||
regulator-boot-on;
|
||||
};
|
||||
};
|
||||
|
||||
ab8500-regulators {
|
||||
compatible = "stericsson,ab8500-regulator";
|
||||
vin-supply = <&ab8500_ext3_reg>;
|
||||
|
||||
// supplies to the display/camera
|
||||
ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
|
||||
regulator-min-microvolt = <2500000>;
|
||||
regulator-max-microvolt = <2900000>;
|
||||
regulator-boot-on;
|
||||
/* BUG: If turned off MMC will be affected. */
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
// supplies to the on-board eMMC
|
||||
ab8500_ldo_aux2_reg: ab8500_ldo_aux2 {
|
||||
regulator-min-microvolt = <1100000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
};
|
||||
|
||||
// supply for VAUX3; SDcard slots
|
||||
ab8500_ldo_aux3_reg: ab8500_ldo_aux3 {
|
||||
regulator-min-microvolt = <1100000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
};
|
||||
|
||||
// supply for v-intcore12; VINTCORE12 LDO
|
||||
ab8500_ldo_intcore_reg: ab8500_ldo_intcore {
|
||||
};
|
||||
|
||||
// supply for tvout; gpadc; TVOUT LDO
|
||||
ab8500_ldo_tvout_reg: ab8500_ldo_tvout {
|
||||
};
|
||||
|
||||
// supply for ab8500-usb; USB LDO
|
||||
ab8500_ldo_usb_reg: ab8500_ldo_usb {
|
||||
};
|
||||
|
||||
// supply for ab8500-vaudio; VAUDIO LDO
|
||||
ab8500_ldo_audio_reg: ab8500_ldo_audio {
|
||||
};
|
||||
|
||||
// supply for v-anamic1 VAMIC1 LDO
|
||||
ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 {
|
||||
};
|
||||
|
||||
// supply for v-amic2; VAMIC2 LDO; reuse constants for AMIC1
|
||||
ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 {
|
||||
};
|
||||
|
||||
// supply for v-dmic; VDMIC LDO
|
||||
ab8500_ldo_dmic_reg: ab8500_ldo_dmic {
|
||||
};
|
||||
|
||||
// supply for U8500 CSI/DSI; VANA LDO
|
||||
ab8500_ldo_ana_reg: ab8500_ldo_ana {
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
i2c@80004000 {
|
||||
|
|
@ -1130,9 +944,6 @@ sdi5_per3@80008000 {
|
|||
sound {
|
||||
compatible = "stericsson,snd-soc-mop500";
|
||||
stericsson,cpu-dai = <&msp1 &msp3>;
|
||||
stericsson,audio-codec = <&codec>;
|
||||
clocks = <&prcmu_clk PRCMU_SYSCLK>, <&ab8500_clock AB8500_SYSCLK_ULP>, <&ab8500_clock AB8500_SYSCLK_INT>;
|
||||
clock-names = "sysclk", "ulpclk", "intclk";
|
||||
};
|
||||
|
||||
msp0: msp@80123000 {
|
||||
|
|
@ -1239,7 +1050,6 @@ mcde@a0350000 {
|
|||
reg = <0xa0350000 0x1000>;
|
||||
interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
|
||||
epod-supply = <&db8500_b2r2_mcde_reg>;
|
||||
vana-supply = <&ab8500_ldo_ana_reg>;
|
||||
clocks = <&prcmu_clk PRCMU_MCDECLK>, /* Main MCDE clock */
|
||||
<&prcmu_clk PRCMU_LCDCLK>, /* LCD clock */
|
||||
<&prcmu_clk PRCMU_PLLDSI>; /* HDMI clock */
|
||||
|
|
@ -1252,7 +1062,6 @@ mcde@a0350000 {
|
|||
dsi0: dsi@a0351000 {
|
||||
compatible = "ste,mcde-dsi";
|
||||
reg = <0xa0351000 0x1000>;
|
||||
vana-supply = <&ab8500_ldo_ana_reg>;
|
||||
clocks = <&prcmu_clk PRCMU_DSI0CLK>, <&prcmu_clk PRCMU_DSI0ESCCLK>;
|
||||
clock-names = "hs", "lp";
|
||||
#address-cells = <1>;
|
||||
|
|
@ -1261,7 +1070,6 @@ dsi0: dsi@a0351000 {
|
|||
dsi1: dsi@a0352000 {
|
||||
compatible = "ste,mcde-dsi";
|
||||
reg = <0xa0352000 0x1000>;
|
||||
vana-supply = <&ab8500_ldo_ana_reg>;
|
||||
clocks = <&prcmu_clk PRCMU_DSI1CLK>, <&prcmu_clk PRCMU_DSI1ESCCLK>;
|
||||
clock-names = "hs", "lp";
|
||||
#address-cells = <1>;
|
||||
|
|
@ -1270,7 +1078,6 @@ dsi1: dsi@a0352000 {
|
|||
dsi2: dsi@a0353000 {
|
||||
compatible = "ste,mcde-dsi";
|
||||
reg = <0xa0353000 0x1000>;
|
||||
vana-supply = <&ab8500_ldo_ana_reg>;
|
||||
/* This DSI port only has the Low Power / Energy Save clock */
|
||||
clocks = <&prcmu_clk PRCMU_DSI2ESCCLK>;
|
||||
clock-names = "lp";
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@
|
|||
* Copyright 2014 Linaro Ltd.
|
||||
*/
|
||||
|
||||
#include "ste-ab8500.dtsi"
|
||||
|
||||
/ {
|
||||
soc {
|
||||
prcmu@80157000 {
|
||||
|
|
|
|||
|
|
@ -607,7 +607,6 @@ default_mux1 {
|
|||
groups =
|
||||
"lcdvsi0_a_1", /* VSI0 for LCD */
|
||||
"lcd_d0_d7_a_1", /* Data lines */
|
||||
"lcd_d8_d11_a_1", /* TV-out */
|
||||
"lcdvsi1_a_1"; /* VSI1 for HDMI */
|
||||
};
|
||||
default_mux2 {
|
||||
|
|
|
|||
|
|
@ -234,10 +234,6 @@ ab8500_ldo_tvout_reg: ab8500_ldo_tvout {
|
|||
regulator-name = "V-TVOUT";
|
||||
};
|
||||
|
||||
ab8500_ldo_usb_reg: ab8500_ldo_usb {
|
||||
regulator-name = "dummy";
|
||||
};
|
||||
|
||||
ab8500_ldo_audio_reg: ab8500_ldo_audio {
|
||||
regulator-name = "V-AUD";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@
|
|||
*/
|
||||
|
||||
/dts-v1/;
|
||||
#include <dt-bindings/gpio/gpio.h>
|
||||
#include <dt-bindings/interrupt-controller/irq.h>
|
||||
#include "ste-hrefprev60.dtsi"
|
||||
#include "ste-href-stuib.dtsi"
|
||||
|
||||
|
|
@ -23,12 +25,16 @@ soc {
|
|||
i2c@80110000 {
|
||||
/* Only one of these will be used */
|
||||
bu21013_tp@5c {
|
||||
touch-gpio = <&gpio2 12 0x4>;
|
||||
reset-gpio = <&tc3589x_gpio 13 0x4>;
|
||||
interrupt-parent = <&gpio2>;
|
||||
interrupts = <12 IRQ_TYPE_LEVEL_LOW>;
|
||||
touch-gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
|
||||
reset-gpios = <&tc3589x_gpio 13 GPIO_LINE_OPEN_DRAIN>;
|
||||
};
|
||||
bu21013_tp@5d {
|
||||
touch-gpio = <&gpio2 12 0x4>;
|
||||
reset-gpio = <&tc3589x_gpio 13 0x4>;
|
||||
interrupt-parent = <&gpio2>;
|
||||
interrupts = <12 IRQ_TYPE_LEVEL_LOW>;
|
||||
touch-gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
|
||||
reset-gpios = <&tc3589x_gpio 13 GPIO_LINE_OPEN_DRAIN>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@
|
|||
*/
|
||||
|
||||
/dts-v1/;
|
||||
#include <dt-bindings/gpio/gpio.h>
|
||||
#include <dt-bindings/interrupt-controller/irq.h>
|
||||
#include "ste-hrefv60plus.dtsi"
|
||||
#include "ste-href-stuib.dtsi"
|
||||
|
||||
|
|
@ -25,12 +27,16 @@ soc {
|
|||
i2c@80110000 {
|
||||
/* Only one of these will be used */
|
||||
bu21013_tp@5c {
|
||||
touch-gpio = <&gpio2 20 0x4>;
|
||||
reset-gpio = <&gpio4 17 0x4>;
|
||||
interrupt-parent = <&gpio2>;
|
||||
interrupts = <20 IRQ_TYPE_LEVEL_LOW>;
|
||||
touch-gpios = <&gpio2 20 GPIO_ACTIVE_LOW>;
|
||||
reset-gpios = <&gpio4 17 GPIO_LINE_OPEN_DRAIN>;
|
||||
};
|
||||
bu21013_tp@5d {
|
||||
touch-gpio = <&gpio2 20 0x4>;
|
||||
reset-gpio = <&gpio4 17 0x4>;
|
||||
interrupt-parent = <&gpio2>;
|
||||
interrupts = <20 IRQ_TYPE_LEVEL_LOW>;
|
||||
touch-gpios = <&gpio2 20 GPIO_ACTIVE_LOW>;
|
||||
reset-gpios = <&gpio4 17 GPIO_LINE_OPEN_DRAIN>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -445,10 +445,6 @@ ab8500_ldo_tvout_reg: ab8500_ldo_tvout {
|
|||
regulator-name = "V-TVOUT";
|
||||
};
|
||||
|
||||
ab8500_ldo_usb_reg: ab8500_ldo_usb {
|
||||
regulator-name = "dummy";
|
||||
};
|
||||
|
||||
ab8500_ldo_audio_reg: ab8500_ldo_audio {
|
||||
regulator-name = "V-AUD";
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue