Commit a64240a6 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'samsung-dt-4.20-2' of...

Merge tag 'samsung-dt-4.20-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt

Samsung DTS ARM changes for v4.20

1. Bring up DSI and HDMI on Exynos5250 Arndale.
2. Use the new way of setting external wakeup interrupts on S5Pv210.
3. Use proper cpufreq suspend OPP to fix suspend/wakeup from RAM on Snow
   Chromebook (Exynos5250).
4. Fully describe regualtors on Odroid XU3-family boards.
5. Fix sound in Snow-rev5 Chromebook.
6. Fix regulators configuration on Peach Pi/Pit Chromebooks (Exynos5420)
   which should be always on.
7. Fix pull control on PMIC interrupt lines on multiple boards which
   essentially fixes waking up by RTC.
8. Add PMIC interrupts on Exynos4210 UniversalC210 board.
9. Add external SD card support for Trats board (Exynos4210).
10. Correct audio subsystem parent clock on Peach Chromebooks.
11. Minor cleanups.

* tag 'samsung-dt-4.20-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Correct audio subsystem parent clock on Peach Chromebooks
  ARM: dts: exynos: Add external SD card support for Trats board
  ARM: dts: exynos: Disable pull control for PMIC IRQ line on Artik5 board
  ARM: dts: exynos: Disable pull control for S5M8767 PMIC
  ARM: dts: exynos: Remove double SD card detect pin inversion
  ARM: dts: exynos: Add missing PMIC interrupts on UniversalC210 board
  ARM: dts: exynos: Disable pull control for MAX8997 interrupts on Origen
  ARM: dts: exynos: Fix regulators configuration on Peach Pi/Pit Chromebooks
  ARM: dts: exynos: Fix sound in Snow-rev5 Chromebook
  ARM: dts: exynos: Add LDO28 regulator on Exynos5422 Odroid boards
  ARM: dts: exynos: Disable unused PMIC regulators on Exynos5422 Odroid boards
  ARM: dts: exynos: Add unused PMIC regulators on Exynos5422 Odroid boards
  ARM: dts: exynos: Add missing used PMIC regulators on Exynos5422 Odroid boards
  ARM: dts: exynos: Mark 1 GHz CPU OPP as suspend OPP on Exynos5250
  ARM: dts: exynos: Convert exynos5250.dtsi to opp-v2 bindings
  ARM: dts: s5pv210: Switch to S5Pv210 specific pinctrl wakeup compatible
  ARM: dts: exynos: Fix HDMI-HPD line handling on Arndale
  ARM: dts: exynos: Use i2c-gpio for HDMI-DDC on Arndale
  ARM: dts: exynos: Add DSI and panel nodes on Arndale
  ARM: dts: exynos: Add DSI node on Exynos5250
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 47188a85 ff1e37c6
......@@ -69,6 +69,8 @@ s2mps14_pmic@66 {
compatible = "samsung,s2mps14-pmic";
interrupt-parent = <&gpx3>;
interrupts = <5 IRQ_TYPE_NONE>;
pinctrl-names = "default";
pinctrl-0 = <&s2mps14_irq>;
reg = <0x66>;
s2mps14_osc: clocks {
......@@ -350,6 +352,11 @@ wlanen: wlanen {
samsung,pin-drv = <EXYNOS4_PIN_DRV_LV3>;
samsung,pin-val = <1>;
};
s2mps14_irq: s2mps14-irq {
samsung,pins = "gpx3-5";
samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
};
};
&rtc {
......
......@@ -151,6 +151,8 @@ max8997_pmic@66 {
reg = <0x66>;
interrupt-parent = <&gpx0>;
interrupts = <4 IRQ_TYPE_NONE>, <3 IRQ_TYPE_NONE>;
pinctrl-names = "default";
pinctrl-0 = <&max8997_irq>;
max8997,pmic-buck1-dvs-voltage = <1350000>;
max8997,pmic-buck2-dvs-voltage = <1100000>;
......@@ -288,6 +290,13 @@ buck7_reg: BUCK7 {
};
};
&pinctrl_1 {
max8997_irq: max8997-irq {
samsung,pins = "gpx0-3", "gpx0-4";
samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
};
};
&sdhci_0 {
bus-width = <4>;
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_cd>;
......
......@@ -385,6 +385,12 @@ camsensor_reg: LDO16 {
regulator-max-microvolt = <1800000>;
};
tflash_reg: LDO17 {
regulator-name = "VTF_2.8V";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
};
vddq_reg: LDO21 {
regulator-name = "VDDQ_M1M2_1.2V";
regulator-min-microvolt = <1200000>;
......@@ -452,6 +458,15 @@ &sdhci_0 {
status = "okay";
};
&sdhci_2 {
bus-width = <4>;
pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4>;
pinctrl-names = "default";
vmmc-supply = <&tflash_reg>;
cd-gpios = <&gpx3 4 GPIO_ACTIVE_LOW>;
status = "okay";
};
&serial_0 {
status = "okay";
};
......
......@@ -310,6 +310,9 @@ vdd_arm_reg: pmic@60 {
pmic@66 {
compatible = "national,lp3974";
interrupts-extended = <&gpx0 7 0>, <&gpx2 7 0>;
pinctrl-names = "default";
pinctrl-0 = <&lp3974_irq>;
reg = <0x66>;
max8998,pmic-buck1-default-dvs-idx = <0>;
......@@ -503,6 +506,11 @@ port@0 {
};
&pinctrl_1 {
lp3974_irq: lp3974-irq {
samsung,pins = "gpx0-7", "gpx2-7";
samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
};
hdmi_hpd: hdmi-hpd {
samsung,pins = "gpx3-7";
samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
......@@ -537,8 +545,7 @@ &sdhci_2 {
pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4>;
pinctrl-names = "default";
vmmc-supply = <&ldo5_reg>;
cd-gpios = <&gpx3 4 GPIO_ACTIVE_HIGH>;
cd-inverted;
cd-gpios = <&gpx3 4 GPIO_ACTIVE_LOW>;
status = "okay";
};
......
......@@ -1269,8 +1269,7 @@ &rtc {
&sdhci_2 {
bus-width = <4>;
cd-gpios = <&gpx3 4 GPIO_ACTIVE_HIGH>;
cd-inverted;
cd-gpios = <&gpx3 4 GPIO_ACTIVE_LOW>;
pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4 &sdhci2_cd>;
pinctrl-names = "default";
vmmc-supply = <&ldo21_reg>;
......
......@@ -539,8 +539,7 @@ &sdhci_2 {
pinctrl-names = "default";
vmmc-supply = <&ldo21_reg>;
vqmmc-supply = <&ldo4_reg>;
cd-gpios = <&gpk2 2 GPIO_ACTIVE_HIGH>;
cd-inverted;
cd-gpios = <&gpk2 2 GPIO_ACTIVE_LOW>;
status = "okay";
};
......
......@@ -71,6 +71,17 @@ wakeup {
};
};
panel: panel {
compatible = "boe,hv070wsa-100";
power-supply = <&vcc_3v3_reg>;
enable-gpios = <&gpd1 3 GPIO_ACTIVE_HIGH>;
port {
panel_ep: endpoint {
remote-endpoint = <&bridge_out_ep>;
};
};
};
regulators {
compatible = "simple-bus";
#address-cells = <1>;
......@@ -97,6 +108,30 @@ reg_hdmi_en: regulator@2 {
reg = <2>;
regulator-name = "hdmi-en";
};
vcc_1v2_reg: regulator@3 {
compatible = "regulator-fixed";
reg = <3>;
regulator-name = "VCC_1V2";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
};
vcc_1v8_reg: regulator@4 {
compatible = "regulator-fixed";
reg = <4>;
regulator-name = "VCC_1V8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
vcc_3v3_reg: regulator@5 {
compatible = "regulator-fixed";
reg = <5>;
regulator-name = "VCC_3V3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
};
fixed-rate-clocks {
......@@ -119,6 +154,32 @@ &cpu0 {
cpu0-supply = <&buck2_reg>;
};
&dsi_0 {
vddcore-supply = <&ldo8_reg>;
vddio-supply = <&ldo10_reg>;
samsung,pll-clock-frequency = <24000000>;
samsung,burst-clock-frequency = <320000000>;
samsung,esc-clock-frequency = <10000000>;
status = "okay";
bridge@0 {
reg = <0>;
compatible = "toshiba,tc358764";
vddc-supply = <&vcc_1v2_reg>;
vddio-supply = <&vcc_1v8_reg>;
vddlvds-supply = <&vcc_3v3_reg>;
reset-gpios = <&gpd1 6 GPIO_ACTIVE_LOW>;
#address-cells = <1>;
#size-cells = <0>;
port@1 {
reg = <1>;
bridge_out_ep: endpoint {
remote-endpoint = <&panel_ep>;
};
};
};
};
&dp {
status = "okay";
samsung,color-space = <0>;
......@@ -149,9 +210,11 @@ &fimd {
};
&hdmi {
pinctrl-names = "default";
pinctrl-0 = <&hdmi_hpd>;
status = "okay";
ddc = <&i2c_2>;
hpd-gpios = <&gpx3 7 GPIO_ACTIVE_LOW>;
ddc = <&i2c_ddc>;
hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
vdd_osc-supply = <&ldo10_reg>;
vdd_pll-supply = <&ldo8_reg>;
vdd-supply = <&ldo8_reg>;
......@@ -168,6 +231,8 @@ s5m8767_pmic@66 {
reg = <0x66>;
interrupt-parent = <&gpx3>;
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&s5m8767_irq>;
vinb1-supply = <&main_dc_reg>;
vinb2-supply = <&main_dc_reg>;
......@@ -452,13 +517,6 @@ buck9_reg: BUCK9 {
};
};
&i2c_2 {
status = "okay";
/* used by HDMI DDC */
samsung,i2c-sda-delay = <100>;
samsung,i2c-max-bus-freq = <66000>;
};
&i2c_3 {
status = "okay";
......@@ -535,6 +593,13 @@ &mmc_2 {
cap-sd-highspeed;
};
&pinctrl_0 {
s5m8767_irq: s5m8767-irq {
samsung,pins = "gpx3-2";
samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
};
};
&rtc {
status = "okay";
};
......@@ -547,3 +612,22 @@ &sata_phy {
status = "okay";
samsung,exynos-sataphy-i2c-phandle = <&sata_phy_i2c>;
};
&soc {
/*
* For unknown reasons HDMI-DDC does not work with Exynos I2C
* controllers. Lets use software I2C over GPIO pins as a workaround.
*/
i2c_ddc: i2c-gpio {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_gpio_bus>;
status = "okay";
compatible = "i2c-gpio";
gpios = <&gpa0 6 0 /* sda */
&gpa0 7 0 /* scl */
>;
i2c-gpio,delay-us = <2>;
#address-cells = <1>;
#size-cells = <0>;
};
};
......@@ -225,6 +225,12 @@ i2c2_hs_bus: i2c2-hs-bus {
samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
};
i2c2_gpio_bus: i2c2-gpio-bus {
samsung,pins = "gpa0-6", "gpa0-7";
samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
};
uart2_data: uart2-data {
samsung,pins = "gpa1-0", "gpa1-1";
samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
......@@ -593,6 +599,11 @@ hdmi_cec: hdmi-cec {
samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
};
hdmi_hpd: hdmi-hpd {
samsung,pins = "gpx3-7";
samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
};
};
&pinctrl_1 {
......
......@@ -20,6 +20,14 @@ sound {
samsung,model = "Snow-I2S-MAX98090";
samsung,audio-codec = <&max98090>;
cpu {
sound-dai = <&i2s0 0>;
};
codec {
sound-dai = <&max98090 0>, <&hdmi>;
};
};
};
......@@ -31,6 +39,9 @@ max98090: codec@10 {
interrupt-parent = <&gpx0>;
pinctrl-names = "default";
pinctrl-0 = <&max98090_irq>;
clocks = <&pmu_system_controller 0>;
clock-names = "mclk";
#sound-dai-cells = <1>;
};
};
......
......@@ -54,62 +54,109 @@ cpu0: cpu@0 {
device_type = "cpu";
compatible = "arm,cortex-a15";
reg = <0>;
clock-frequency = <1700000000>;
clocks = <&clock CLK_ARM_CLK>;
clock-names = "cpu";
clock-latency = <140000>;
operating-points = <
1700000 1300000
1600000 1250000
1500000 1225000
1400000 1200000
1300000 1150000
1200000 1125000
1100000 1100000
1000000 1075000
900000 1050000
800000 1025000
700000 1012500
600000 1000000
500000 975000
400000 950000
300000 937500
200000 925000
>;
operating-points-v2 = <&cpu0_opp_table>;
#cooling-cells = <2>; /* min followed by max */
};
cpu@1 {
device_type = "cpu";
compatible = "arm,cortex-a15";
reg = <1>;
clock-frequency = <1700000000>;
clocks = <&clock CLK_ARM_CLK>;
clock-names = "cpu";
clock-latency = <140000>;
operating-points = <
1700000 1300000
1600000 1250000
1500000 1225000
1400000 1200000
1300000 1150000
1200000 1125000
1100000 1100000
1000000 1075000
900000 1050000
800000 1025000
700000 1012500
600000 1000000
500000 975000
400000 950000
300000 937500
200000 925000
>;
operating-points-v2 = <&cpu0_opp_table>;
#cooling-cells = <2>; /* min followed by max */
};
};
cpu0_opp_table: opp_table0 {
compatible = "operating-points-v2";
opp-shared;
opp-200000000 {
opp-hz = /bits/ 64 <200000000>;
opp-microvolt = <925000>;
clock-latency-ns = <140000>;
};
opp-300000000 {
opp-hz = /bits/ 64 <300000000>;
opp-microvolt = <937500>;
clock-latency-ns = <140000>;
};
opp-400000000 {
opp-hz = /bits/ 64 <400000000>;
opp-microvolt = <950000>;
clock-latency-ns = <140000>;
};
opp-500000000 {
opp-hz = /bits/ 64 <500000000>;
opp-microvolt = <975000>;
clock-latency-ns = <140000>;
};
opp-600000000 {
opp-hz = /bits/ 64 <600000000>;
opp-microvolt = <1000000>;
clock-latency-ns = <140000>;
};
opp-700000000 {
opp-hz = /bits/ 64 <700000000>;
opp-microvolt = <1012500>;
clock-latency-ns = <140000>;
};
opp-800000000 {
opp-hz = /bits/ 64 <800000000>;
opp-microvolt = <1025000>;
clock-latency-ns = <140000>;
};
opp-900000000 {
opp-hz = /bits/ 64 <900000000>;
opp-microvolt = <1050000>;
clock-latency-ns = <140000>;
};
opp-1000000000 {
opp-hz = /bits/ 64 <1000000000>;
opp-microvolt = <1075000>;
clock-latency-ns = <140000>;
opp-suspend;
};
opp-1100000000 {
opp-hz = /bits/ 64 <1100000000>;
opp-microvolt = <1100000>;
clock-latency-ns = <140000>;
};
opp-1200000000 {
opp-hz = /bits/ 64 <1200000000>;
opp-microvolt = <1125000>;
clock-latency-ns = <140000>;
};
opp-1300000000 {
opp-hz = /bits/ 64 <1300000000>;
opp-microvolt = <1150000>;
clock-latency-ns = <140000>;
};
opp-1400000000 {
opp-hz = /bits/ 64 <1400000000>;
opp-microvolt = <1200000>;
clock-latency-ns = <140000>;
};
opp-1500000000 {
opp-hz = /bits/ 64 <1500000000>;
opp-microvolt = <1225000>;
clock-latency-ns = <140000>;
};
opp-1600000000 {
opp-hz = /bits/ 64 <1600000000>;
opp-microvolt = <1250000>;
clock-latency-ns = <140000>;
};
opp-1700000000 {
opp-hz = /bits/ 64 <1700000000>;
opp-microvolt = <1300000>;
clock-latency-ns = <140000>;
};
};
soc: soc {
sysram@2020000 {
compatible = "mmio-sram";
......@@ -756,6 +803,27 @@ dp_phy: video-phy {
#phy-cells = <0>;
};
mipi_phy: video-phy@10040710 {
compatible = "samsung,s5pv210-mipi-video-phy";
reg = <0x10040710 0x100>;
#phy-cells = <1>;
syscon = <&pmu_system_controller>;
};
dsi_0: dsi@14500000 {
compatible = "samsung,exynos4210-mipi-dsi";
reg = <0x14500000 0x10000>;
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
samsung,power-domain = <&pd_disp1>;
phys = <&mipi_phy 3>;
phy-names = "dsim";
clocks = <&clock CLK_DSIM0>, <&clock CLK_SCLK_MIPI1>;
clock-names = "bus_clk", "sclk_mipi";
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
};
adc: adc@12d10000 {
compatible = "samsung,exynos-adc-v1";
reg = <0x12D10000 0x100>;
......
......@@ -153,7 +153,7 @@ &adc {
&clock_audss {
assigned-clocks = <&clock_audss EXYNOS_MOUT_AUDSS>;
assigned-clock-parents = <&clock CLK_FOUT_EPLL>;
assigned-clock-parents = <&clock CLK_MAU_EPLL>;
};
&cpu0 {
......@@ -312,6 +312,7 @@ buck7_reg: BUCK7 {
regulator-name = "vdd_1v35";
regulator-min-microvolt = <1350000>;
regulator-max-microvolt = <1350000>;
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
regulator-on-in-suspend;
......@@ -333,6 +334,7 @@ buck9_reg: BUCK9 {
regulator-name = "vdd_2v";
regulator-min-microvolt = <2000000>;
regulator-max-microvolt = <2000000>;
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
regulator-on-in-suspend;
......@@ -343,6 +345,7 @@ buck10_reg: BUCK10 {
regulator-name = "vdd_1v8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
regulator-on-in-suspend;
......
......@@ -154,6 +154,13 @@ ldo1_reg: LDO1 {
regulator-always-on;
};
ldo2_reg: LDO2 {
regulator-name = "vdd_ldo2";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
};
ldo3_reg: LDO3 {
regulator-name = "vddq_mmc0";
regulator-min-microvolt = <1800000>;
......@@ -216,10 +223,10 @@ ldo11_reg: LDO11 {
};
ldo12_reg: LDO12 {
/* Unused */
regulator-name = "vdd_ldo12";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <2375000>;
};
ldo13_reg: LDO13 {
......@@ -228,6 +235,13 @@ ldo13_reg: LDO13 {
regulator-max-microvolt = <2800000>;
};
ldo14_reg: LDO14 {
/* Unused */
regulator-name = "vdd_ldo14";
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <3950000>;
};
ldo15_reg: LDO15 {
regulator-name = "vdd_ldo15";
regulator-min-microvolt = <3300000>;
......@@ -236,10 +250,10 @@ ldo15_reg: LDO15 {
};
ldo16_reg: LDO16 {
/* Unused */
regulator-name = "vdd_ldo16";
regulator-min-microvolt = <2200000>;
regulator-max-microvolt = <2200000>;
regulator-always-on;
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <3950000>;
};
ldo17_reg: LDO17 {
......@@ -261,20 +275,139 @@ ldo19_reg: LDO19 {
regulator-max-microvolt = <2800000>;
};
ldo24_reg: LDO24 {
regulator-name = "tsp_io";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
ldo20_reg: LDO20 {
/* Unused */
regulator-name = "vdd_ldo20";
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <3950000>;
};
ldo21_reg: LDO21 {
/* Unused */
regulator-name = "vdd_ldo21";
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <3950000>;
};
ldo22_reg: LDO22 {
/* Unused */
regulator-name = "vdd_ldo22";
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <2375000>;
};
ldo23_reg: LDO23 {
regulator-name = "vdd_mifs";
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>;
regulator-always-on;
};
ldo24_reg: LDO24 {
/* Unused */
regulator-name = "vdd_ldo24";
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <3950000>;
};
ldo25_reg: LDO25 {
/* Unused */
regulator-name = "vdd_ldo25";
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <3950000>;
};
ldo26_reg: LDO26 {
/* Used on XU3, XU3-Lite and XU4 */
regulator-name = "vdd_ldo26";
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <3950000>;
};
ldo27_reg: LDO27 {
regulator-name = "vdd_g3ds";
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
regulator-always-on;
};
ldo28_reg: LDO28 {
/* Used on XU3 */
regulator-name = "vdd_ldo28";
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <3950000>;
};
ldo29_reg: LDO29 {
/* Unused */
regulator-name = "vdd_ldo29";
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <3950000>;
};
ldo30_reg: LDO30 {
/* Unused */
regulator-name = "vdd_ldo30";
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <3950000>;
};
ldo31_reg: LDO31 {
/* Unused */
regulator-name = "vdd_ldo31";
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <3950000>;
};
ldo32_reg: LDO32 {
/* Unused */
regulator-name = "vdd_ldo32";
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <3950000>;
};
ldo33_reg: LDO33 {
/* Unused */
regulator-name = "vdd_ldo33";
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <3950000>;
};
ldo34_reg: LDO34 {
/* Unused */
regulator-name = "vdd_ldo34";
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <3950000>;
};
ldo35_reg: LDO35 {
/* Unused */
regulator-name = "vdd_ldo35";
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <2375000>;
};
ldo36_reg: LDO36 {
/* Unused */
regulator-name = "vdd_ldo36";
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <3950000>;
};
ldo37_reg: LDO37 {
/* Unused */
regulator-name = "vdd_ldo37";
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <3950000>;
};
ldo38_reg: LDO38 {
/* Unused */
regulator-name = "vdd_ldo38";
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <3950000>;
};
buck1_reg: BUCK1 {
regulator-name = "vdd_mif";
regulator-min-microvolt = <800000>;
......
......@@ -367,6 +367,12 @@ &i2c_2 {
status = "okay";
};
&ldo26_reg {
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
regulator-always-on;
};
&mixer {
status = "okay";
};
......
......@@ -49,6 +49,12 @@ ina231@45 {
};
};
&ldo28_reg {
regulator-name = "dp_p3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
&pwm {
/*
* PWM 0 -- fan
......
......@@ -153,7 +153,7 @@ &adc {
&clock_audss {
assigned-clocks = <&clock_audss EXYNOS_MOUT_AUDSS>;
assigned-clock-parents = <&clock CLK_FOUT_EPLL>;
assigned-clock-parents = <&clock CLK_MAU_EPLL>;
};
&cpu0 {
......@@ -312,6 +312,7 @@ buck7_reg: BUCK7 {
regulator-name = "vdd_1v35";
regulator-min-microvolt = <1350000>;
regulator-max-microvolt = <1350000>;
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
regulator-on-in-suspend;
......@@ -333,6 +334,7 @@ buck9_reg: BUCK9 {
regulator-name = "vdd_2v";
regulator-min-microvolt = <2000000>;
regulator-max-microvolt = <2000000>;
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
regulator-on-in-suspend;
......@@ -343,6 +345,7 @@ buck10_reg: BUCK10 {
regulator-name = "vdd_1v8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
regulator-on-in-suspend;
......
......@@ -120,7 +120,7 @@ pinctrl0: pinctrl@e0200000 {
interrupts = <30>;
wakeup-interrupt-controller {
compatible = "samsung,exynos4210-wakeup-eint";
compatible = "samsung,s5pv210-wakeup-eint";
interrupts = <16>;
interrupt-parent = <&vic0>;
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment