Merge branch 'drm-tda998x-devel' of git://git.armlinux.org.uk/~rmk/linux-arm into...

This adds the ASoC codec interfaces for TDA998x HDMI audio from
Jyri Sarha.

* 'drm-tda998x-devel' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: dts: am335x-boneblack: Add HDMI audio support
  drm/i2c: tda998x: Register ASoC hdmi-codec and add audio DT binding
  drm/i2c: tda998x: Improve tda998x_configure_audio() audio related pdata

diff --combined arch/arm/boot/dts/am335x-boneblack.dts
index ca72167,6bbb1fe..528559b
--- 1/arch/arm/boot/dts/am335x-boneblack.dts
--- 2/arch/arm/boot/dts/am335x-boneblack.dts
+++ b/arch/arm/boot/dts/am335x-boneblack.dts
@@@ -9,6 -9,7 +9,7 @@@
  
  #include "am33xx.dtsi"
  #include "am335x-bone-common.dtsi"
+ #include <dt-bindings/display/tda998x.h>
  
  / {
        model = "TI AM335x BeagleBone Black";
@@@ -33,17 -34,6 +34,17 @@@
        status = "okay";
  };
  
 +&cpu0_opp_table {
 +      /*
 +       * All PG 2.0 silicon may not support 1GHz but some of the early
 +       * BeagleBone Blacks have PG 2.0 silicon which is guaranteed
 +       * to support 1GHz OPP so enable it for PG 2.0 on this board.
 +       */
 +      oppnitro@1000000000 {
 +              opp-supported-hw = <0x06 0x0100>;
 +      };
 +};
 +
  &am33xx_pinmux {
        nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins {
                pinctrl-single,pins = <
@@@ -75,6 -65,16 +76,16 @@@
                        AM33XX_IOPAD(0x9b0, PIN_OUTPUT_PULLDOWN | MUX_MODE3)    /* xdma_event_intr0 */
                >;
        };
+ 
+       mcasp0_pins: mcasp0_pins {
+               pinctrl-single,pins = <
+                       AM33XX_IOPAD(0x9ac, PIN_INPUT_PULLUP | MUX_MODE0) /* mcasp0_ahcklx.mcasp0_ahclkx */
+                       AM33XX_IOPAD(0x99c, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mcasp0_ahclkr.mcasp0_axr2*/
+                       AM33XX_IOPAD(0x994, PIN_OUTPUT_PULLUP | MUX_MODE0) /* mcasp0_fsx.mcasp0_fsx */
+                       AM33XX_IOPAD(0x990, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mcasp0_aclkx.mcasp0_aclkx */
+                       AM33XX_IOPAD(0x86c, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a11.GPIO1_27 */
+               >;
+       };
  };
  
  &lcdc {
@@@ -87,16 -87,22 +98,22 @@@
  };
  
  &i2c0 {
-       tda19988 {
+       tda19988: tda19988 {
                compatible = "nxp,tda998x";
                reg = <0x70>;
+ 
                pinctrl-names = "default", "off";
                pinctrl-0 = <&nxp_hdmi_bonelt_pins>;
                pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>;
  
-               port {
-                       hdmi_0: endpoint@0 {
-                               remote-endpoint = <&lcdc_0>;
+               #sound-dai-cells = <0>;
+               audio-ports = < TDA998x_I2S     0x03>;
+ 
+               ports {
+                       port@0 {
+                               hdmi_0: endpoint@0 {
+                                       remote-endpoint = <&lcdc_0>;
+                               };
                        };
                };
        };
@@@ -105,3 -111,49 +122,49 @@@
  &rtc {
        system-power-controller;
  };
+ 
+ &mcasp0       {
+       #sound-dai-cells = <0>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&mcasp0_pins>;
+       status = "okay";
+       op-mode = <0>;  /* MCASP_IIS_MODE */
+       tdm-slots = <2>;
+       serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */
+                       0 0 1 0
+               >;
+       tx-num-evt = <32>;
+       rx-num-evt = <32>;
+ };
+ 
+ / {
+       clk_mcasp0_fixed: clk_mcasp0_fixed {
+               #clock-cells = <0>;
+               compatible = "fixed-clock";
+               clock-frequency = <24576000>;
+       };
+ 
+       clk_mcasp0: clk_mcasp0 {
+               #clock-cells = <0>;
+               compatible = "gpio-gate-clock";
+               clocks = <&clk_mcasp0_fixed>;
+               enable-gpios = <&gpio1 27 0>; /* BeagleBone Black Clk enable on GPIO1_27 */
+       };
+ 
+       sound {
+               compatible = "simple-audio-card";
+               simple-audio-card,name = "TI BeagleBone Black";
+               simple-audio-card,format = "i2s";
+               simple-audio-card,bitclock-master = <&dailink0_master>;
+               simple-audio-card,frame-master = <&dailink0_master>;
+ 
+               dailink0_master: simple-audio-card,cpu {
+                       sound-dai = <&mcasp0>;
+                       clocks = <&clk_mcasp0>;
+               };
+ 
+               simple-audio-card,codec {
+                       sound-dai = <&tda19988>;
+               };
+       };
+ };

diff --combined drivers/gpu/drm/i2c/Kconfig
index 4d341db,088f278..a6c92be
--- 1/drivers/gpu/drm/i2c/Kconfig
--- 2/drivers/gpu/drm/i2c/Kconfig
+++ b/drivers/gpu/drm/i2c/Kconfig
@@@ -1,6 -1,12 +1,6 @@@
  menu "I2C encoder or helper chips"
       depends on DRM && DRM_KMS_HELPER && I2C
  
 -config DRM_I2C_ADV7511
 -      tristate "AV7511 encoder"
 -      select REGMAP_I2C
 -      help
 -        Support for the Analog Device ADV7511(W) and ADV7513 HDMI encoders.
 -
  config DRM_I2C_CH7006
        tristate "Chrontel ch7006 TV encoder"
        default m if DRM_NOUVEAU
@@@ -22,6 -28,7 +22,7 @@@ config DRM_I2C_SIL16
  config DRM_I2C_NXP_TDA998X
        tristate "NXP Semiconductors TDA998X HDMI encoder"
        default m if DRM_TILCDC
+       select SND_SOC_HDMI_CODEC if SND_SOC
        help
          Support for NXP Semiconductors TDA998X HDMI encoders.