Skip to content

L
linux
Commit 1fbdc247 authored by Olof Johansson's avatar Olof Johansson
Browse files
Options

Merge tag 'samsung-dt-5.2' of... 

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

Samsung DTS ARM changes for v5.2

1. Use proper ADC on Exynos4412.
2. Extend the Exynos5420 Arndale Octa board with: CPU cooling maps,
   unused regulators, ADC and UHS-I SD card support.  Beside that adjust
   regulators to proper level and add always-on when needed.
3. Extend the Exynos5260: high speed I2C and proper external interrupts.
   Also fix shared external interrupt line and use better PLL for MMC
   clocks.
4. Fix audio recording (broken around v5.1) and microphone recording
   (since v4.14) on Exynos5422 Odroid XU3 boards.
5. Minor cleanups (stdout-path and bootargs).

* tag 'samsung-dt-5.2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Remove console argument from bootargs
  ARM: dts: exynos: Use stdout-path property instead of console in bootargs
  ARM: dts: exynos: Fix spelling mistake of EXYNOS5420
  ARM: dts: exynos: Fix audio (microphone) routing on Odroid XU3
  ARM: dts: exynos: Always enable necessary APIO_1V8 and ABB_1V8 regulators on Arndale Octa
  ARM: dts: exynos: Extend the eMMC node on Arndale Octa
  ARM: dts: exynos: Add support for UHS-I SD cards on Arndale Octa
  ARM: dts: exynos: Adjust ldo23 and ldo27 to lower levels on Arndale Octa
  ARM: dts: exynos: Fix audio routing on Odroid XU3
  ARM: dts: exynos: Enable ADC on Arndale Octa
  ARM: dts: exynos: Fix interrupt for shared EINTs on Exynos5260
  ARM: dts: exynos: Add interrupts for dedicated EINTs on Exynos5260
  ARM: dts: exynos: Add high speed I2C ports for Exynos5260
  ARM: dts: exynos: Use bustop PLL as the source for MMC clocks on Exynos5260
  ARM: dts: exynos: Order nodes alphabetically in Arndale Octa
  ARM: dts: exynos: Add CPU cooling on Arndale Octa
  ARM: dts: exynos: Add unused PMIC regulators on Arndale Octa board
  ARM: dts: exynos: Use stdout path property on Arndale Octa board
  ARM: dts: exynos: Document regulator used by ADC on Odroid U3
  ARM: dts: exynos: Use ADC for Exynos4x12 on Exynos4412
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 2140eaf2 8cc76b1c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 477 additions and 35 deletions
arch/arm/boot/dts/exynos4210-origen.dts
View file @ 1fbdc247
......@@ -30,8 +30,8 @@ memory@40000000 {
};
chosen {
bootargs ="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC2,115200 init=/linuxrc";
stdout-path = &serial_2;
bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M init=/linuxrc";
stdout-path = "serial2:115200n8";
};
mmc_reg: voltage-regulator {
......
arch/arm/boot/dts/exynos4210-smdkv310.dts
View file @ 1fbdc247
......@@ -26,8 +26,8 @@ memory@40000000 {
};
chosen {
bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc";
stdout-path = &serial_1;
bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M init=/linuxrc";
stdout-path = "serial1:115200n8";
};
fixed-rate-clocks {
......
arch/arm/boot/dts/exynos4210-trats.dts
View file @ 1fbdc247
......@@ -26,8 +26,8 @@ memory@40000000 {
};
chosen {
bootargs = "console=ttySAC2,115200N8 root=/dev/mmcblk0p5 rootwait earlyprintk panic=5";
stdout-path = &serial_2;
bootargs = "root=/dev/mmcblk0p5 rootwait earlyprintk panic=5";
stdout-path = "serial2:115200n8";
};
regulators {
......
arch/arm/boot/dts/exynos4210-universal_c210.dts
View file @ 1fbdc247
......@@ -24,8 +24,8 @@ memory@40000000 {
};
chosen {
bootargs = "console=ttySAC2,115200N8 root=/dev/mmcblk0p5 rw rootwait earlyprintk panic=5 maxcpus=1";
stdout-path = &serial_2;
bootargs = "root=/dev/mmcblk0p5 rw rootwait earlyprintk panic=5 maxcpus=1";
stdout-path = "serial2:115200n8";
};
......
arch/arm/boot/dts/exynos4412-odroidu3.dts
View file @ 1fbdc247
......@@ -66,6 +66,11 @@ map2 {
};
};
&adc {
vdd-supply = <&ldo10_reg>;
/* Nothing connected to ADC inputs, keep it disabled */
};
/* Supply for LAN9730/SMSC95xx */
&buck8_reg {
regulator-name = "BUCK8_P3V3";
......
arch/arm/boot/dts/exynos4412-origen.dts
View file @ 1fbdc247
......@@ -25,8 +25,7 @@ memory@40000000 {
};
chosen {
bootargs ="console=ttySAC2,115200";
stdout-path = &serial_2;
stdout-path = "serial2:115200n8";
};
firmware@203f000 {
......
arch/arm/boot/dts/exynos4412-smdk4412.dts
View file @ 1fbdc247
......@@ -23,8 +23,8 @@ memory@40000000 {
};
chosen {
bootargs ="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc";
stdout-path = &serial_1;
bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M init=/linuxrc";
stdout-path = "serial1:115200n8";
};
fixed-rate-clocks {
......
arch/arm/boot/dts/exynos4412-trats2.dts
View file @ 1fbdc247
......@@ -22,6 +22,7 @@ memory@40000000 {
};
chosen {
bootargs = "console=ttySAC2,115200N8 root=/dev/mmcblk0p5 rootwait earlyprintk panic=5";
bootargs = "root=/dev/mmcblk0p5 rootwait earlyprintk panic=5";
stdout-path = "serial2:115200n8";
};
};
arch/arm/boot/dts/exynos4412.dtsi
View file @ 1fbdc247
......@@ -274,7 +274,7 @@ watchdog: watchdog@10060000 {
};
adc: adc@126c0000 {
compatible = "samsung,exynos-adc-v1";
compatible = "samsung,exynos4212-adc";
reg = <0x126C0000 0x100>;
interrupt-parent = <&combiner>;
interrupts = <10 3>;
......
arch/arm/boot/dts/exynos5250-smdk5250.dts
View file @ 1fbdc247
......@@ -24,7 +24,8 @@ memory@40000000 {
};
chosen {
bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC2,115200 init=/linuxrc";
bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M init=/linuxrc";
stdout-path = "serial2:115200n8";
};
vdd: fixed-regulator-vdd {
......
arch/arm/boot/dts/exynos5260-pinctrl.dtsi
View file @ 1fbdc247
......@@ -153,6 +153,14 @@ gpx0: gpx0 {
#gpio-cells = <2>;
interrupt-controller;
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
#interrupt-cells = <2>;
};
......@@ -161,6 +169,14 @@ gpx1: gpx1 {
#gpio-cells = <2>;
interrupt-controller;
interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>;
#interrupt-cells = <2>;
};
......
arch/arm/boot/dts/exynos5260-xyref5260.dts
View file @ 1fbdc247
......@@ -19,7 +19,7 @@ memory@20000000 {
};
chosen {
bootargs = "console=ttySAC2,115200";
stdout-path = "serial2:115200n8";
};
fin_pll: xxti {
......
arch/arm/boot/dts/exynos5260.dtsi
View file @ 1fbdc247
......@@ -17,6 +17,10 @@ / {
#size-cells = <1>;
aliases {
i2c0 = &hsi2c_0;
i2c1 = &hsi2c_1;
i2c2 = &hsi2c_2;
i2c3 = &hsi2c_3;
pinctrl0 = &pinctrl_0;
pinctrl1 = &pinctrl_1;
pinctrl2 = &pinctrl_2;
......@@ -223,7 +227,7 @@ pinctrl_0: pinctrl@11600000 {
wakeup-interrupt-controller {
compatible = "samsung,exynos4210-wakeup-eint";
interrupt-parent = <&gic>;
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
};
};
......@@ -288,6 +292,14 @@ mmc_0: mmc@12140000 {
#size-cells = <0>;
clocks = <&clock_fsys FSYS_CLK_MMC0>, <&clock_top TOP_SCLK_MMC0>;
clock-names = "biu", "ciu";
assigned-clocks =
<&clock_top TOP_MOUT_SCLK_FSYS_MMC0_SDCLKIN_A>,
<&clock_top TOP_MOUT_SCLK_FSYS_MMC0_SDCLKIN_B>,
<&clock_top TOP_SCLK_MMC0>;
assigned-clock-parents =
<&clock_top TOP_MOUT_BUSTOP_PLL_USER>,
<&clock_top TOP_MOUT_SCLK_FSYS_MMC0_SDCLKIN_A>;
assigned-clock-rates = <0>, <0>, <800000000>;
fifo-depth = <64>;
status = "disabled";
};
......@@ -300,6 +312,14 @@ mmc_1: mmc@12150000 {
#size-cells = <0>;
clocks = <&clock_fsys FSYS_CLK_MMC1>, <&clock_top TOP_SCLK_MMC1>;
clock-names = "biu", "ciu";
assigned-clocks =
<&clock_top TOP_MOUT_SCLK_FSYS_MMC1_SDCLKIN_A>,
<&clock_top TOP_MOUT_SCLK_FSYS_MMC1_SDCLKIN_B>,
<&clock_top TOP_SCLK_MMC1>;
assigned-clock-parents =
<&clock_top TOP_MOUT_BUSTOP_PLL_USER>,
<&clock_top TOP_MOUT_SCLK_FSYS_MMC1_SDCLKIN_A>;
assigned-clock-rates = <0>, <0>, <800000000>;
fifo-depth = <64>;
status = "disabled";
};
......@@ -312,9 +332,69 @@ mmc_2: mmc@12160000 {
#size-cells = <0>;
clocks = <&clock_fsys FSYS_CLK_MMC2>, <&clock_top TOP_SCLK_MMC2>;
clock-names = "biu", "ciu";
assigned-clocks =
<&clock_top TOP_MOUT_SCLK_FSYS_MMC2_SDCLKIN_A>,
<&clock_top TOP_MOUT_SCLK_FSYS_MMC2_SDCLKIN_B>,
<&clock_top TOP_SCLK_MMC2>;
assigned-clock-parents =
<&clock_top TOP_MOUT_BUSTOP_PLL_USER>,
<&clock_top TOP_MOUT_SCLK_FSYS_MMC2_SDCLKIN_A>;
assigned-clock-rates = <0>, <0>, <800000000>;
fifo-depth = <64>;
status = "disabled";
};
hsi2c_0: hsi2c@12da0000 {
compatible = "samsung,exynos5260-hsi2c";
reg = <0x12DA0000 0x1000>;
interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&i2c0_hs_bus>;
clocks = <&clock_peri PERI_CLK_HSIC0>;
clock-names = "hsi2c";
status = "disabled";
};
hsi2c_1: hsi2c@12db0000 {
compatible = "samsung,exynos5260-hsi2c";
reg = <0x12DB0000 0x1000>;
interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&i2c1_hs_bus>;
clocks = <&clock_peri PERI_CLK_HSIC1>;
clock-names = "hsi2c";
status = "disabled";
};
hsi2c_2: hsi2c@12dc0000 {
compatible = "samsung,exynos5260-hsi2c";
reg = <0x12DC0000 0x1000>;
interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&i2c2_hs_bus>;
clocks = <&clock_peri PERI_CLK_HSIC2>;
clock-names = "hsi2c";
status = "disabled";
};
hsi2c_3: hsi2c@12dd0000 {
compatible = "samsung,exynos5260-hsi2c";
reg = <0x12DD0000 0x1000>;
interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&i2c3_hs_bus>;
clocks = <&clock_peri PERI_CLK_HSIC3>;
clock-names = "hsi2c";
status = "disabled";
};
};
};
......
arch/arm/boot/dts/exynos5410-smdk5410.dts
View file @ 1fbdc247
......@@ -19,7 +19,7 @@ memory@40000000 {
};
chosen {
bootargs = "console=ttySAC2,115200";
stdout-path = "serial2:115200n8";
};
fin_pll: xxti {
......
arch/arm/boot/dts/exynos5420-smdk5420.dts
View file @ 1fbdc247
......@@ -21,7 +21,8 @@ memory@20000000 {
};
chosen {
bootargs = "console=ttySAC2,115200 init=/linuxrc";
bootargs = "init=/linuxrc";
stdout-path = "serial2:115200n8";
};
fixed-rate-clocks {
......
arch/arm/boot/dts/exynos5420.dtsi
View file @ 1fbdc247
......@@ -5,7 +5,7 @@
* Copyright (c) 2013 Samsung Electronics Co., Ltd.
* http://www.samsung.com
*
* SAMSUNG EXYNOS54200 SoC device nodes are listed in this file.
* SAMSUNG EXYNOS5420 SoC device nodes are listed in this file.
* EXYNOS5420 based board files can include this file and provide
* values for board specfic bindings.
*/
......
arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi
View file @ 1fbdc247
......@@ -22,11 +22,12 @@ sound: sound {
"Headphone Jack", "HPL",
"Headphone Jack", "HPR",
"Headphone Jack", "MICBIAS",
"IN1", "Headphone Jack",
"IN12", "Headphone Jack",
"Speakers", "SPKL",
"Speakers", "SPKR",
"I2S Playback", "Mixer DAI TX",
"HiFi Playback", "Mixer DAI TX";
"HiFi Playback", "Mixer DAI TX",
"Mixer DAI RX", "HiFi Capture";
assigned-clocks = <&clock CLK_MOUT_EPLL>,
<&clock CLK_MOUT_MAU_EPLL>,
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7