mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-22 14:27:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'samsung-dt-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/dt

Browse Source 
Samsung DTS ARM changes for v5.13

1. Configure battery charger and front camera on GT-I9100 phone.
2. Fix in several boards the Maxim PMIC/MUIC/fuel gauge interrupt flags
   to match real type of interrupt coming from the device.
3. Correct DTS with dtschema.  This brings back the commit adding input
   clock to CMU in Exynos4412 Odroid which was reverted some time ago
   due to unsupported deferred probes (now supported and tested).

* tag 'samsung-dt-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Add front camera support to I9100
  ARM: dts: exynos: white-space cleanups
  ARM: dts: exynos: replace deprecated NTC/Murata compatibles
  ARM: dts: exynos: add input clock to CMU in Exynos4412 Odroid
  ARM: dts: s5pv210: correct fuel gauge interrupt trigger level on Fascinate family
  ARM: dts: exynos: correct PMIC interrupt trigger level on Snow
  ARM: dts: exynos: correct PMIC interrupt trigger level on SMDK5250
  ARM: dts: exynos: correct PMIC interrupt trigger level on P4 Note family
  ARM: dts: exynos: correct PMIC interrupt trigger level on Odroid X/U3 family
  ARM: dts: exynos: correct PMIC interrupt trigger level on Midas family
  ARM: dts: exynos: correct MUIC interrupt trigger level on Midas family
  ARM: dts: exynos: correct fuel gauge interrupt trigger level on Midas family
  ARM: dts: exynos: correct fuel gauge interrupt trigger level on P4 Note family
  ARM: dts: exynos: correct fuel gauge interrupt trigger level on GT-I9100
  ARM: dts: exynos: add charger supply for I9100

Link: https://lore.kernel.org/r/20210407065828.7213-1-krzysztof.kozlowski@canonical.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2021-04-07 17:38:07 +02:00
parent 36de77e35f 7f4ebf3e4c
commit 59206cf877
12 changed files with 110 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/exynos3250-monk.dts
View File

@@ -142,7 +142,7 @@ &adc {
assigned-clock-rates = <6000000>;
thermistor-ap {
compatible = "ntc,ncp15wb473";
compatible = "murata,ncp15wb473";
pullup-uv = <1800000>;
pullup-ohm = <100000>;
pulldown-ohm = <100000>;
@@ -150,7 +150,7 @@ thermistor-ap {
};
thermistor-battery {
compatible = "ntc,ncp15wb473";
compatible = "murata,ncp15wb473";
pullup-uv = <1800000>;
pullup-ohm = <100000>;
pulldown-ohm = <100000>;

4
arch/arm/boot/dts/exynos3250-rinato.dts
View File

@@ -142,7 +142,7 @@ &adc {
assigned-clock-rates = <6000000>;
thermistor-ap {
compatible = "ntc,ncp15wb473";
compatible = "murata,ncp15wb473";
pullup-uv = <1800000>;
pullup-ohm = <100000>;
pulldown-ohm = <100000>;
@@ -150,7 +150,7 @@ thermistor-ap {
};
thermistor-battery {
compatible = "ntc,ncp15wb473";
compatible = "murata,ncp15wb473";
pullup-uv = <1800000>;
pullup-ohm = <100000>;
pulldown-ohm = <100000>;

56
arch/arm/boot/dts/exynos4210-i9100.dts
View File

@@ -136,7 +136,7 @@ battery@36 {
compatible = "maxim,max17042";
interrupt-parent = <&gpx2>;
interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
pinctrl-0 = <&max17042_fuel_irq>;
pinctrl-names = "default";
@@ -147,6 +147,36 @@ battery@36 {
};
};
i2c_s5k5baf: i2c-gpio-1 {
compatible = "i2c-gpio";
#address-cells = <1>;
#size-cells = <0>;
sda-gpios = <&gpc1 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
scl-gpios = <&gpc1 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
i2c-gpio,delay-us = <2>;
image-sensor@2d {
compatible = "samsung,s5k5baf";
reg = <0x2d>;
vdda-supply = <&cam_io_en_reg>;
vddreg-supply = <&vt_core_15v_reg>;
vddio-supply = <&vtcam_reg>;
clocks = <&camera 0>;
clock-names = "mclk";
stbyn-gpios = <&gpl2 0 GPIO_ACTIVE_LOW>;
rstn-gpios = <&gpl2 1 GPIO_ACTIVE_LOW>;
clock-frequency = <24000000>;
port {
s5k5bafx_ep: endpoint {
remote-endpoint = <&csis1_ep>;
data-lanes = <1>;
};
};
};
};
spi-3 {
compatible = "spi-gpio";
#address-cells = <1>;
@@ -220,7 +250,29 @@ pmic_ap_clk: pmic-ap-clk {
};
&camera {
pinctrl-0 = <&cam_port_a_clk_active>;
pinctrl-names = "default";
status = "okay";
assigned-clocks = <&clock CLK_MOUT_CAM0>, <&clock CLK_MOUT_CAM1>;
assigned-clock-parents = <&clock CLK_XUSBXTI>, <&clock CLK_XUSBXTI>;
};
&csis_1 {
status = "okay";
vddcore-supply = <&vusb_reg>;
vddio-supply = <&vmipi_reg>;
clock-frequency = <160000000>;
#address-cells = <1>;
#size-cells = <0>;
port@4 {
reg = <4>;
csis1_ep: endpoint {
remote-endpoint = <&s5k5bafx_ep>;
data-lanes = <1>;
samsung,csis-hs-settle = <6>;
};
};
};
&cpu0 {
@@ -384,6 +436,8 @@ pmic@66 {
pinctrl-0 = <&max8997_irq>, <&otg_gp>, <&usb_sel>;
pinctrl-names = "default";
charger-supply = <&charger_reg>;
regulators {
vadc_reg: LDO1 {
regulator-name = "VADC_3.3V_C210";

6
arch/arm/boot/dts/exynos4412-midas.dtsi
View File

@@ -173,7 +173,7 @@ i2c_max77693: i2c-gpio-1 {
pmic@66 {
compatible = "maxim,max77693";
interrupt-parent = <&gpx1>;
interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
interrupts = <5 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&max77693_irq>;
reg = <0x66>;
@@ -221,7 +221,7 @@ i2c_max77693_fuel: i2c-gpio-3 {
fuel-gauge@36 {
compatible = "maxim,max17047";
interrupt-parent = <&gpx2>;
interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&max77693_fuel_irq>;
reg = <0x36>;
@@ -665,7 +665,7 @@ &i2c_7 {
max77686: pmic@9 {
compatible = "maxim,max77686";
interrupt-parent = <&gpx0>;
interrupts = <7 IRQ_TYPE_NONE>;
interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
pinctrl-0 = <&max77686_irq>;
pinctrl-names = "default";
reg = <0x09>;

5
arch/arm/boot/dts/exynos4412-odroid-common.dtsi
View File

@@ -2,7 +2,7 @@
/*
* Common definition for Hardkernel's Exynos4412 based ODROID-X/X2/U2/U3 boards
* device tree source
*/
*/
#include <dt-bindings/sound/samsung-i2s.h>
#include <dt-bindings/input/input.h>
@@ -122,6 +122,7 @@ &camera {
};
&clock {
clocks = <&clock CLK_XUSBXTI>;
assigned-clocks = <&clock CLK_FOUT_EPLL>;
assigned-clock-rates = <45158401>;
};
@@ -278,7 +279,7 @@ usb3503: usb-hub@8 {
max77686: pmic@9 {
compatible = "maxim,max77686";
interrupt-parent = <&gpx3>;
interrupts = <2 IRQ_TYPE_NONE>;
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&max77686_irq>;
reg = <0x09>;

3
arch/arm/boot/dts/exynos4412-odroidx.dts
View File

@@ -84,7 +84,8 @@ hub@1 {
ethernet: usbether@1 {
compatible = "usb0424,ec00";
reg = <1>;
local-mac-address = [00 00 00 00 00 00]; /* Filled in by a bootloader */
/* Filled in by a bootloader */
local-mac-address = [00 00 00 00 00 00];
};
};
};

4
arch/arm/boot/dts/exynos4412-p4note.dtsi
View File

@@ -146,7 +146,7 @@ fuel-gauge@36 {
pinctrl-0 = <&fuel_alert_irq>;
pinctrl-names = "default";
interrupt-parent = <&gpx2>;
interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
maxim,rsns-microohm = <10000>;
maxim,over-heat-temp = <600>;
maxim,over-volt = <4300>;
@@ -322,7 +322,7 @@ &i2c_7 {
max77686: pmic@9 {
compatible = "maxim,max77686";
interrupt-parent = <&gpx0>;
interrupts = <7 IRQ_TYPE_NONE>;
interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
pinctrl-0 = <&max77686_irq>;
pinctrl-names = "default";
reg = <0x09>;

48
arch/arm/boot/dts/exynos4412-ppmu-common.dtsi
View File

@@ -7,41 +7,41 @@
*/
&ppmu_dmc0 {
status = "okay";
status = "okay";
events {
ppmu_dmc0_3: ppmu-event3-dmc0 {
event-name = "ppmu-event3-dmc0";
};
};
events {
ppmu_dmc0_3: ppmu-event3-dmc0 {
event-name = "ppmu-event3-dmc0";
};
};
};
&ppmu_dmc1 {
status = "okay";
status = "okay";
events {
ppmu_dmc1_3: ppmu-event3-dmc1 {
event-name = "ppmu-event3-dmc1";
};
};
events {
ppmu_dmc1_3: ppmu-event3-dmc1 {
event-name = "ppmu-event3-dmc1";
};
};
};
&ppmu_leftbus {
status = "okay";
status = "okay";
events {
ppmu_leftbus_3: ppmu-event3-leftbus {
event-name = "ppmu-event3-leftbus";
};
};
events {
ppmu_leftbus_3: ppmu-event3-leftbus {
event-name = "ppmu-event3-leftbus";
};
};
};
&ppmu_rightbus {
status = "okay";
status = "okay";
events {
ppmu_rightbus_3: ppmu-event3-rightbus {
event-name = "ppmu-event3-rightbus";
};
};
events {
ppmu_rightbus_3: ppmu-event3-rightbus {
event-name = "ppmu-event3-rightbus";
};
};
};

2
arch/arm/boot/dts/exynos5250-smdk5250.dts
View File

@@ -134,7 +134,7 @@ max77686: pmic@9 {
compatible = "maxim,max77686";
reg = <0x09>;
interrupt-parent = <&gpx3>;
interrupts = <2 IRQ_TYPE_NONE>;
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&max77686_irq>;
#clock-cells = <1>;

2
arch/arm/boot/dts/exynos5250-snow-common.dtsi
View File

@@ -292,7 +292,7 @@ &i2c_0 {
max77686: pmic@9 {
compatible = "maxim,max77686";
interrupt-parent = <&gpx3>;
interrupts = <2 IRQ_TYPE_NONE>;
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&max77686_irq>;
wakeup-source;

28
arch/arm/boot/dts/exynos5410-pinctrl.dtsi
View File

@@ -235,13 +235,13 @@ gpx0: gpx0 {
interrupt-parent = <&combiner>;
#interrupt-cells = <2>;
interrupts = <23 0>,
<24 0>,
<25 0>,
<25 1>,
<26 0>,
<26 1>,
<27 0>,
<27 1>;
<24 0>,
<25 0>,
<25 1>,
<26 0>,
<26 1>,
<27 0>,
<27 1>;
};
gpx1: gpx1 {
@@ -252,13 +252,13 @@ gpx1: gpx1 {
interrupt-parent = <&combiner>;
#interrupt-cells = <2>;
interrupts = <28 0>,
<28 1>,
<29 0>,
<29 1>,
<30 0>,
<30 1>,
<31 0>,
<31 1>;
<28 1>,
<29 0>,
<29 1>,
<30 0>,
<30 1>,
<31 0>,
<31 1>;
};
gpx2: gpx2 {

2
arch/arm/boot/dts/s5pv210-fascinate4g.dts
View File

@@ -115,7 +115,7 @@ &fg {
compatible = "maxim,max77836-battery";
interrupt-parent = <&gph3>;
interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&fg_irq>;