Commit d533aa718f76e14f551485564faa3f89f5659553

Authored by Eric Lee
1 parent d39d21ee47

Apply TI's patches and modify defconfig files

Showing 2 changed files with 14 additions and 10 deletions Side-by-side Diff

arch/arm/boot/dts/am335x-smarc-common.dtsi
... ... @@ -89,6 +89,11 @@
89 89 model = "TI AM335x SMARCT335X";
90 90 compatible = "ti,am335x-smarct335x", "ti,am33xx";
91 91  
  92 + aliases {
  93 + rtc0 = &s35390a;
  94 + rtc1 = &rtc;
  95 + };
  96 +
92 97 cpus {
93 98 cpu@0 {
94 99 cpu0-supply = <&dcdc2_reg>;
... ... @@ -650,7 +655,7 @@
650 655 /* VDD_MPU voltage limits 0.95V - 1.325V with +/-4% tolerance */
651 656 regulator-name = "vdd_mpu";
652 657 regulator-min-microvolt = <925000>;
653   - regulator-max-microvolt = <1378000>;
  658 + regulator-max-microvolt = <1351500>;
654 659 regulator-boot-on;
655 660 regulator-always-on;
656 661 };
... ... @@ -808,7 +813,6 @@
808 813 };
809 814  
810 815 &rtc {
811   - status = "disabled";
812   - ext-clk-src;
  816 + ext-clk-src;
813 817 };
arch/arm/configs/smarc_t335x_defconfig
... ... @@ -616,12 +616,11 @@
616 616 CONFIG_CPU_IDLE=y
617 617 CONFIG_CPU_IDLE_GOV_LADDER=y
618 618 CONFIG_CPU_IDLE_GOV_MENU=y
619   -CONFIG_DT_IDLE_STATES=y
620 619  
621 620 #
622 621 # ARM CPU Idle Drivers
623 622 #
624   -CONFIG_ARM_CPUIDLE=y
  623 +# CONFIG_ARM_CPUIDLE is not set
625 624 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
626 625  
627 626 #
... ... @@ -1169,7 +1168,8 @@
1169 1168 CONFIG_FIRMWARE_IN_KERNEL=y
1170 1169 CONFIG_EXTRA_FIRMWARE="am335x-pm-firmware.elf am335x-evm-scale-data.bin"
1171 1170 CONFIG_EXTRA_FIRMWARE_DIR="firmware"
1172   -# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
  1171 +CONFIG_FW_LOADER_USER_HELPER=y
  1172 +CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
1173 1173 CONFIG_WANT_DEV_COREDUMP=y
1174 1174 CONFIG_ALLOW_DEV_COREDUMP=y
1175 1175 CONFIG_DEV_COREDUMP=y
1176 1176  
... ... @@ -4071,10 +4071,10 @@
4071 4071 # CONFIG_ASYNC_TX_DMA is not set
4072 4072 # CONFIG_DMATEST is not set
4073 4073 # CONFIG_AUXDISPLAY is not set
4074   -CONFIG_UIO=m
  4074 +CONFIG_UIO=y
4075 4075 # CONFIG_UIO_CIF is not set
4076   -# CONFIG_UIO_PDRV_GENIRQ is not set
4077   -# CONFIG_UIO_DMEM_GENIRQ is not set
  4076 +CONFIG_UIO_PDRV_GENIRQ=y
  4077 +CONFIG_UIO_DMEM_GENIRQ=y
4078 4078 # CONFIG_UIO_AEC is not set
4079 4079 # CONFIG_UIO_SERCOS3 is not set
4080 4080 # CONFIG_UIO_PCI_GENERIC is not set
... ... @@ -4189,7 +4189,7 @@
4189 4189 # CONFIG_EXTCON_SM5502 is not set
4190 4190 CONFIG_EXTCON_USB_GPIO=m
4191 4191 CONFIG_MEMORY=y
4192   -CONFIG_TI_EMIF=m
  4192 +CONFIG_TI_EMIF=y
4193 4193 CONFIG_OMAP_GPMC=y
4194 4194 CONFIG_OMAP_GPMC_DEBUG=y
4195 4195 CONFIG_TI_EMIF_SRAM=y