Odroid 3.13.y

Documentation/devicetree/bindings/clock/clk-exynos-audss.txt

@@ -8,12 +8,29 @@ Required Properties:
 
 - compatible: should be one of the following:
  - "samsung,exynos4210-audss-clock" - controller compatible with all Exynos4 SoCs.
- - "samsung,exynos5250-audss-clock" - controller compatible with all Exynos5 SoCs.
-
+ - "samsung,exynos5250-audss-clock" - controller compatible with Exynos5250
+ SoCs.
+ - "samsung,exynos5420-audss-clock" - controller compatible with Exynos5420
+ SoCs.
 - reg: physical base address and length of the controller's register set.
 
 - #clock-cells: should be 1.
 
+- clocks:
+ - pll_ref: Fixed rate PLL reference clock, parent of mout_audss. "fin_pll"
+ is used if not specified.
+ - pll_in: Input PLL to the AudioSS block, parent of mout_audss. "fout_epll"
+ is used if not specified.
+ - cdclk: External i2s clock, parent of mout_i2s. "cdclk0" is used if not
+ specified.
+ - sclk_audio: Audio bus clock, parent of mout_i2s. "sclk_audio0" is used if
+ not specified.
+ - sclk_pcm_in: PCM clock, parent of sclk_pcm. "sclk_pcm0" is used if not
+ specified.
+
+- clock-names: Aliases for the above clocks. They should be "pll_ref",
+ "pll_in", "cdclk", "sclk_audio", and "sclk_pcm_in" respectively.
+
 The following is the list of clocks generated by the controller. Each clock is
 assigned an identifier and client nodes use this identifier to specify the
 clock which they consume. Some of the clocks are available only on a particular
@@ -34,16 +51,30 @@ i2s_bus 6
 sclk_i2s 7
 pcm_bus 8
 sclk_pcm 9
+adma 10 Exynos5420
+
+Example 1: An example of a clock controller node using the default input
+ clock names is listed below.
+
+clock_audss: audss-clock-controller@3810000 {
+ compatible = "samsung,exynos5250-audss-clock";
+ reg = <0x03810000 0x0C>;
+ #clock-cells = <1>;
+};
 
-Example 1: An example of a clock controller node is listed below.
+Example 2: An example of a clock controller node with the input clocks
+ specified.
 
 clock_audss: audss-clock-controller@3810000 {
  compatible = "samsung,exynos5250-audss-clock";
  reg = <0x03810000 0x0C>;
  #clock-cells = <1>;
+ clocks = <&clock 1>, <&clock 7>, <&clock 138>, <&clock 160>,
+ <&ext_i2s_clk>;
+ clock-names = "pll_ref", "pll_in", "sclk_audio", "sclk_pcm_in", "cdclk";
 };
 
-Example 2: I2S controller node that consumes the clock generated by the clock
+Example 3: I2S controller node that consumes the clock generated by the clock
  controller. Refer to the standard clock bindings for information
  about 'clocks' and 'clock-names' property.
 

Documentation/devicetree/bindings/sound/daisy-audio-max98095.txt

@@ -0,0 +1,40 @@
+Google Daisy audio complex
+
+Required properties:
+- compatible : "google,daisy-audio-max988095" or "google,daisy-audio-max98090"
+- samsung,i2s-controller: Reference to the i2s controller that will be used
+ as the CPU DAI.
+- samsung,audio-codec: Reference to the audio codec.
+- clocks: List of clock handles. The following must be specified:
+ - fout_epll: Parent of sclk_epll
+ - sclk_epll: Mux to select parent of epll
+ - mout_audio0: Mux to select parent of sclk_audio0
+ - sclk_audio0: Controls gating of audio bus clock; parent of mout_i2s
+ - mout_audss: Mux to select parent of audio IP clock
+ - mout_i2s: Mux to select parent of i2s clock
+- clock-names: Aliases for the above clocks. They should be "fout_epll",
+ "sclk_epll", "mout_audio0", "sclk_audio0", "mout_audss", and "mout_i2s",
+ respectively.
+
+Optional properties:
+- samsung,hp-det-gpios : The GPIO that detects when headphones are plugged in.
+- samsung,mic-det-gpios : The GPIO that detects when mic is plugged in.
+- card-name : The name that we'll report for the sound card. If not present
+ will be "DAISY-I2S".
+
+Example:
+
+sound {
+ compatible = "google,daisy-audio-max98095";
+
+ samsung,i2s-controller = <&i2s0>;
+ samsung,audio-codec = <&max98095>;
+ samsung,mic-det-gpios = <&gpx2 0 2 0 0>;
+ samsung,hp-det-gpios = <&gpx2 2 2 0 0>;
+ card-name = "DAISY-I2S-98095";
+ clocks = <&clock 3>, <&clock 4>, <&clock 1026>,
+ <&clock 138>, <&clock_audss EXYNOS_MOUT_AUDSS>,
+ <&clock_audss EXYNOS_MOUT_I2S>;
+ clock-names = "fout_epll", "sclk_epll", "mout_audio0",
+ "sclk_audio0", "mout_audss", "mout_i2s";
+};

Documentation/devicetree/bindings/sound/hdmi.txt

@@ -0,0 +1,17 @@
+Device-Tree bindings for dummy HDMI codec
+
+Required properties:
+ - compatible: should be "linux,hdmi-audio".
+
+CODEC output pins:
+ * TX
+
+CODEC input pins:
+ * RX
+
+Example node:
+
+ hdmi_audio: hdmi_audio@0 {
+ compatible = "linux,hdmi-audio";
+ status = "okay";
+ };

Documentation/devicetree/bindings/sound/max98090.txt

@@ -0,0 +1,43 @@
+MAX98090 audio CODEC
+
+This device supports I2C only.
+
+Required properties:
+
+- compatible : "maxim,max98090".
+
+- reg : The I2C address of the device.
+
+- interrupts : The CODEC's interrupt output.
+
+Pins on the device (for linking into audio routes):
+
+ * MIC1
+ * MIC2
+ * DMICL
+ * DMICR
+ * IN1
+ * IN2
+ * IN3
+ * IN4
+ * IN5
+ * IN6
+ * IN12
+ * IN34
+ * IN56
+ * HPL
+ * HPR
+ * SPKL
+ * SPKR
+ * RCVL
+ * RCVR
+ * MICBIAS
+
+Example:
+
+audio-codec@10 {
+ compatible = "maxim,max98090";
+ reg = <0x10>;
+ interrupt-parent = <&gpio>;
+ interrupts = <TEGRA_GPIO(H, 4) GPIO_ACTIVE_HIGH>;
+};

arch/arm/boot/dts/exynos5410-odroidxu.dts

@@ -32,20 +32,14 @@
  samsung,mfc-l = <0x51000000 0x800000>;
  };
 
- clocks {
- compatible = "simple-bus";
- #address-cells = <1>;
- #size-cells = <0>;
-
- fin_pll: clock-fin-pll {
- compatible = "fixed-clock";
- reg = <0>;
- #clock-cells = <0>;
+ fixed-rate-clocks {
+ xxti {
+ compatible = "samsung,clock-xxti";
  clock-frequency = <24000000>;
- clock-output-names = "fin_pll";
  };
  };
 
+
  mmc@12200000 {
  status = "okay";
  num-slots = <1>;
@@ -82,27 +76,27 @@
  };
  };
 
- leds {
- compatible = "gpio-leds";
- hearbeat {
- label = "red:heartbeart";
- gpios = <&gpb2 2 GPIO_ACTIVE_HIGH>;
- default-state = "off";
- linux,default-trigger = "heartbeat";
- };
- eMMC {
- label = "green:activity";
- gpios = <&gpb2 1 GPIO_ACTIVE_HIGH>;
- default-state = "off";
- linux,default-trigger = "mmc0";
- };
- microSD {
- label = "blue:activity";
- gpios = <&gpx2 3 GPIO_ACTIVE_HIGH>;
- default-state = "off";
- linux,default-trigger = "mmc1";
- };
- };
+ leds {
+ compatible = "gpio-leds";
+ hearbeat {
+ label = "red:heartbeart";
+ gpios = <&gpx2 3 GPIO_ACTIVE_HIGH>;
+ default-state = "off";
+ linux,default-trigger = "heartbeat";
+ };
+ eMMC {
+ label = "green:activity";
+ gpios = <&gpb2 1 GPIO_ACTIVE_HIGH>;
+ default-state = "off";
+ linux,default-trigger = "mmc0";
+ };
+ microSD {
+ label = "blue:activity";
+ gpios = <&gpb2 2 GPIO_ACTIVE_HIGH>;
+ default-state = "off";
+ linux,default-trigger = "mmc1";
+ };
+ };
 
  pinctrl@13400000 {
  max77802_irq: max77802-irq {
@@ -125,7 +119,7 @@
  };
  };
 
- pinctrl@14000000 {
+ pinctrl@14000000 {
  usb3_overcur0_u2: usb3-overcur0-u2 {
  samsung,pins = "gpk3-0";
  samsung,pin-function = <2>;
@@ -169,11 +163,11 @@
  };
  };
 
- /* ic21 */
+ /* i2c1 */
  i2c@12C70000 {
  status = "okay";
  clock-frequency = <400000>;
- codec@10 {
+ max98090: codec@10 {
  compatible = "maxim,max98090";
  reg = <0x10>;
  interrupts = <2 0>;
@@ -184,7 +178,7 @@
  };
  };
 
- /* ic22 */
+ /* i2c2 */
  i2c@12C80000 {
  samsung,i2c-sda-delay = <100>;
  samsung,i2c-max-bus-freq = <66000>;
@@ -234,27 +228,27 @@
 
  hdmi {
  hpd-gpio = <&gpx3 7 0>;
- pinctrl-names = "default";
- pinctrl-0 = <&hdmi_hpd_irq>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&hdmi_hpd_irq>;
  hdmi-en-supply = <&fixed_regulator>;
  vdd_osc-supply = <&ldo10_reg>;
  vdd_pll-supply = <&ldo8_reg>;
  vdd-supply = <&ldo8_reg>;
  phy = <&hdmiphy>;
  };
 
- fixed_regulator: fixed_regulator@0 {
- compatible = "regulator-fixed";
- regulator-name = "hdmi-en";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- };
+ fixed_regulator: fixed_regulator@0 {
+ compatible = "regulator-fixed";
+ regulator-name = "hdmi-en";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ };
 
  /* hsic24 */
  hsi2c@12CA0000 {
  status = "okay";
  samsung,hs-mode;
- clock-frequency = <1000000>;
+ clock-frequency = <1000000>;
 
  max77802-pmic@9 {
  compatible = "maxim,max77802";
@@ -540,4 +534,32 @@
  status = "okay";
  };
 
+ hdmiphy@145D0000 {
+ compatible = "samsung,exynos5410-odroidxu-hdmiphy";
+ };
+
+
+ i2s@03830000 {
+ status = "okay";
+ };
+
+ sound {
+ compatible = "google,daisy-audio-max98090";
+
+ samsung,i2s-controller = <&i2s0>;
+ samsung,audio-codec = <&max98090>;
+ card-name = "ODROID-I2S-98090";
+ clocks = <&clock CLK_FOUT_EPLL>, <&clock CLK_SCLK_EPLL>, <&clock CLK_MOUT_AUDIO0>,
+ <&clock CLK_SCLK_MAUDIO0>, <&clock_audss EXYNOS_MOUT_AUDSS>,
+ <&clock_audss EXYNOS_MOUT_I2S>;
+ clock-names = "fout_epll", "sclk_epll", "mout_audio0",
+ "sclk_audio0", "mout_audss", "mout_i2s";
+ };
+
+ firmware@02073000 {
+ compatible = "samsung,secure-firmware";
+ reg = <0x02073000 0x1000>;
+ };
+
+
 };

arch/arm/boot/dts/exynos5410-pinctrl.dtsi

@@ -653,7 +653,7 @@
 
  pwm0_out: pwm0-out {
  samsung,pins = "gpb2-0";
- samsung,pin-fuction = <2>;
+ samsung,pin-function = <2>;
  samsung,pin-pud = <0>;
  samsung,pin-drv = <0>;
  };