Merge branch 'ingenic-tcu-v5.4' into mips-next

Merge the Ingenic TCU patchset from the ingenic-tcu-v5.4 branch which
was created to enable follow-on changes in other subsystems.

Signed-off-by: Paul Burton <paul.burton@mips.com>

diff --cc arch/mips/boot/dts/ingenic/jz4740.dtsi
Simple merge

diff --cc arch/mips/boot/dts/ingenic/qi_lb60.dts
index 51a0443559e341ef879472f9cfc0ae32dd005c9d,01b8c917cb33def6ab486347f020e98abde3971a..7a371d9c5a33f70ae61adfabb3611715cfee35e3
--- 1/arch/mips/boot/dts/ingenic/qi_lb60.dts
--- 2/arch/mips/boot/dts/ingenic/qi_lb60.dts
+++ b/arch/mips/boot/dts/ingenic/qi_lb60.dts
@@@ -2,17 -2,7 +2,17 @@@
  /dts-v1/;
  
  #include "jz4740.dtsi"
- #include <dt-bindings/gpio/gpio.h>
 +
 +#include <dt-bindings/gpio/gpio.h>
 +#include <dt-bindings/iio/adc/ingenic,adc.h>
+ #include <dt-bindings/clock/ingenic,tcu.h>
 +#include <dt-bindings/input/input.h>
 +
 +#define KEY_QI_QI     KEY_F13
 +#define KEY_QI_UPRED  KEY_RIGHTALT
 +#define KEY_QI_VOLUP  KEY_VOLUMEUP
 +#define KEY_QI_VOLDOWN        KEY_VOLUMEDOWN
 +#define KEY_QI_FN     KEY_LEFTCTRL
  
  / {
        compatible = "qi,lb60", "ingenic,jz4740";
@@@ -326,27 -31,10 +326,33 @@@
                groups = "uart0-data";
                bias-disable;
        };
 +
 +      pins_mmc: mmc {
 +              mmc {
 +                      function = "mmc";
 +                      groups = "mmc-1bit", "mmc-4bit";
 +                      bias-disable;
 +              };
 +
 +              mmc-gpios {
 +                      pins = "PD0", "PD2";
 +                      bias-disable;
 +              };
 +      };
 +};
 +
 +&mmc {
 +      bus-width = <4>;
 +      max-frequency = <24000000>;
 +      cd-gpios = <&gpd 0 GPIO_ACTIVE_HIGH>;
 +      vmmc-supply = <&mmc_power>;
 +
 +      pinctrl-names = "default";
 +      pinctrl-0 = <&pins_mmc>;
  };
+ 
+ &tcu {
+       /* 750 kHz for the system timer and clocksource */
+       assigned-clocks = <&tcu TCU_CLK_TIMER0>, <&tcu TCU_CLK_TIMER1>;
+       assigned-clock-rates = <750000>, <750000>;
+ };