target/linux/brcm2708/patches-4.9/0121-ARM64-Make-it-work-again-on-4.9-1790.patch

   1 From fe3c34c6196cfc708a515e44dd432da0e6cc0aba Mon Sep 17 00:00:00 2001
   2 From: Electron752 <mzoran@crowfest.net>
   3 Date: Thu, 12 Jan 2017 07:07:08 -0800
   4 Subject: [PATCH] ARM64: Make it work again on 4.9 (#1790)
   5
   6 * Invoke the dtc compiler with the same options used in arm mode.
   7 * ARM64 now uses the bcm2835 platform just like ARM32.
   8 * ARM64: Update bcmrpi3_defconfig
   9
  10 Signed-off-by: Michael Zoran <mzoran@crowfest.net>
  11 ---
  12  arch/arm64/Kconfig.platforms          |  22 ------
  13  arch/arm64/boot/dts/broadcom/Makefile |  10 ++-
  14  arch/arm64/boot/dts/overlays          |   1 +
  15  arch/arm64/configs/bcmrpi3_defconfig  | 126 ++++++++++------------------------
  16  4 files changed, 48 insertions(+), 111 deletions(-)
  17  create mode 120000 arch/arm64/boot/dts/overlays
  18
  19 diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
  20 index 7d213c2c..101794f 100644
  21 --- a/arch/arm64/Kconfig.platforms
  22 +++ b/arch/arm64/Kconfig.platforms
  23 @@ -1,27 +1,5 @@
  24  menu "Platform selection"
  25
  26 -config MACH_BCM2709
  27 -        bool
  28 -
  29 -config ARCH_BCM2709
  30 -        bool "Broadcom BCM2709 family"
  31 -        select MACH_BCM2709
  32 -        select HAVE_SMP
  33 -        select ARM_AMBA
  34 -        select COMMON_CLK
  35 -        select ARCH_HAS_CPUFREQ
  36 -        select GENERIC_CLOCKEVENTS
  37 -        select MULTI_IRQ_HANDLER
  38 -        select SPARSE_IRQ
  39 -        select MFD_SYSCON
  40 -        select VC4
  41 -        select USE_OF
  42 -        select ARCH_REQUIRE_GPIOLIB
  43 -        select PINCTRL
  44 -        select PINCTRL_BCM2835
  45 -        help
  46 -          This enables support for Broadcom BCM2709 boards.
  47 -
  48  config ARCH_SUNXI
  49         bool "Allwinner sunxi 64-bit SoC Family"
  50         select GENERIC_IRQ_CHIP
  51 diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile
  52 index 2152448..7aa03be 100644
  53 --- a/arch/arm64/boot/dts/broadcom/Makefile
  54 +++ b/arch/arm64/boot/dts/broadcom/Makefile
  55 @@ -1,7 +1,15 @@
  56 +# Enable fixups to support overlays on BCM2835 platforms
  57 +
  58 +ifeq ($(CONFIG_ARCH_BCM2835),y)
  59 +DTC_FLAGS ?= -@ -H epapr
  60 +endif
  61 +
  62  dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb
  63  dtb-$(CONFIG_ARCH_BCM_IPROC) += ns2-svk.dtb
  64  dtb-$(CONFIG_ARCH_VULCAN) += vulcan-eval.dtb
  65 -dtb-$(CONFIG_ARCH_BCM2709) += bcm2710-rpi-3-b.dtb
  66 +dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-3-b.dtb
  67 +
  68 +dts-dirs += ../overlays
  69
  70  always         := $(dtb-y)
  71  subdir-y       := $(dts-dirs)
  72 diff --git a/arch/arm64/boot/dts/overlays b/arch/arm64/boot/dts/overlays
  73 new file mode 120000
  74 index 0000000..ded0864
  75 --- /dev/null
  76 +++ b/arch/arm64/boot/dts/overlays
  77 @@ -0,0 +1 @@
  78 +../../../arm/boot/dts/overlays
  79 \ No newline at end of file
  80 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
  81 index 53da5c7..c7e891d 100644
  82 --- a/arch/arm64/configs/bcmrpi3_defconfig
  83 +++ b/arch/arm64/configs/bcmrpi3_defconfig
  84 @@ -1,52 +1,9 @@
  85 -# CONFIG_ARM_PATCH_PHYS_VIRT is not set
  86 -CONFIG_PHYS_OFFSET=0
  87  CONFIG_LOCALVERSION="-v8"
  88  # CONFIG_LOCALVERSION_AUTO is not set
  89 -CONFIG_64BIT=y
  90  CONFIG_SYSVIPC=y
  91  CONFIG_POSIX_MQUEUE=y
  92  CONFIG_NO_HZ=y
  93  CONFIG_HIGH_RES_TIMERS=y
  94 -
  95 -#
  96 -# ARM errata workarounds via the alternatives framework
  97 -#
  98 -CONFIG_ARM64_ERRATUM_826319=n
  99 -CONFIG_ARM64_ERRATUM_827319=n
 100 -CONFIG_ARM64_ERRATUM_824069=n
 101 -CONFIG_ARM64_ERRATUM_819472=n
 102 -CONFIG_ARM64_ERRATUM_832075=n
 103 -CONFIG_ARM64_ERRATUM_845719=n
 104 -CONFIG_ARM64_ERRATUM_843419=n
 105 -CONFIG_CAVIUM_ERRATUM_22375=n
 106 -CONFIG_CAVIUM_ERRATUM_23154=n
 107 -CONFIG_CAVIUM_ERRATUM_27456=n
 108 -CONFIG_ARM64_4K_PAGES=y
 109 -CONFIG_ARM64_VA_BITS_39=y
 110 -CONFIG_ARM64_VA_BITS=39
 111 -CONFIG_SCHED_MC=y
 112 -CONFIG_NR_CPUS=4
 113 -CONFIG_HOTPLUG_CPU=y
 114 -CONFIG_ARMV8_DEPRECATED=y
 115 -CONFIG_SWP_EMULATION=y
 116 -CONFIG_CP15_BARRIER_EMULATION=y
 117 -CONFIG_SETEND_EMULATION=y
 118 -
 119 -#
 120 -# ARMv8.1 architectural features
 121 -#
 122 -CONFIG_ARM64_HW_AFDBM=y
 123 -CONFIG_ARM64_PAN=y
 124 -CONFIG_ARM64_LSE_ATOMICS=y
 125 -CONFIG_ARM64_VHE=y
 126 -
 127 -#
 128 -# ARMv8.2 architectural features
 129 -#
 130 -CONFIG_ARM64_UAO=y
 131 -CONFIG_ARM64_MODULE_CMODEL_LARGE=n
 132 -CONFIG_RANDOMIZE_BASE=n
 133 -
 134  CONFIG_BSD_PROCESS_ACCT=y
 135  CONFIG_BSD_PROCESS_ACCT_V3=y
 136  CONFIG_TASKSTATS=y
 137 @@ -55,7 +12,6 @@ CONFIG_TASK_XACCT=y
 138  CONFIG_TASK_IO_ACCOUNTING=y
 139  CONFIG_IKCONFIG=m
 140  CONFIG_IKCONFIG_PROC=y
 141 -CONFIG_NMI_LOG_BUF_SHIFT=12
 142  CONFIG_MEMCG=y
 143  CONFIG_BLK_CGROUP=y
 144  CONFIG_CGROUP_FREEZER=y
 145 @@ -69,54 +25,49 @@ CONFIG_BLK_DEV_INITRD=y
 146  CONFIG_EMBEDDED=y
 147  # CONFIG_COMPAT_BRK is not set
 148  CONFIG_PROFILING=y
 149 -CONFIG_OPROFILE=m
 150  CONFIG_KPROBES=y
 151  CONFIG_JUMP_LABEL=y
 152  CONFIG_MODULES=y
 153  CONFIG_MODULE_UNLOAD=y
 154  CONFIG_MODVERSIONS=y
 155  CONFIG_MODULE_SRCVERSION_ALL=y
 156 -CONFIG_TRIM_UNUSED_KSYMS=y
 157  CONFIG_BLK_DEV_THROTTLING=y
 158  CONFIG_PARTITION_ADVANCED=y
 159  CONFIG_MAC_PARTITION=y
 160  CONFIG_CFQ_GROUP_IOSCHED=y
 161 -CONFIG_ARCH_BCM2709=y
 162 -# CONFIG_CACHE_L2X0 is not set
 163 -CONFIG_SMP=y
 164 -CONFIG_HAVE_ARM_ARCH_TIMER=y
 165 -CONFIG_VMSPLIT_2G=y
 166 -CONFIG_PREEMPT_VOLUNTARY=y
 167 -CONFIG_AEABI=y
 168 -CONFIG_OABI_COMPAT=y
 169 -# CONFIG_CPU_SW_DOMAIN_PAN is not set
 170 +CONFIG_ARCH_BCM2835=y
 171 +# CONFIG_CAVIUM_ERRATUM_22375 is not set
 172 +# CONFIG_CAVIUM_ERRATUM_23154 is not set
 173 +# CONFIG_CAVIUM_ERRATUM_27456 is not set
 174 +CONFIG_SCHED_MC=y
 175 +CONFIG_NR_CPUS=4
 176 +CONFIG_PREEMPT=y
 177 +CONFIG_HZ_1000=y
 178  CONFIG_CLEANCACHE=y
 179  CONFIG_FRONTSWAP=y
 180  CONFIG_CMA=y
 181  CONFIG_ZSMALLOC=m
 182  CONFIG_PGTABLE_MAPPING=y
 183 -CONFIG_UACCESS_WITH_MEMCPY=y
 184  CONFIG_SECCOMP=y
 185 -# CONFIG_ATAGS is not set
 186 -CONFIG_ZBOOT_ROM_TEXT=0x0
 187 -CONFIG_ZBOOT_ROM_BSS=0x0
 188 +CONFIG_ARMV8_DEPRECATED=y
 189 +CONFIG_SWP_EMULATION=y
 190 +CONFIG_CP15_BARRIER_EMULATION=y
 191 +CONFIG_SETEND_EMULATION=y
 192  CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
 193 +CONFIG_BINFMT_MISC=y
 194 +CONFIG_COMPAT=y
 195 +# CONFIG_SUSPEND is not set
 196 +CONFIG_PM=y
 197 +CONFIG_CPU_IDLE=y
 198 +CONFIG_ARM_CPUIDLE=y
 199  CONFIG_CPU_FREQ=y
 200 +CONFIG_CPU_FREQ_STAT=y
 201  CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=y
 202  CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 203  CONFIG_CPU_FREQ_GOV_USERSPACE=y
 204  CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 205  CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 206  CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 207 -CONFIG_VFP=y
 208 -CONFIG_NEON=y
 209 -CONFIG_KERNEL_MODE_NEON=y
 210 -CONFIG_BINFMT_MISC=m
 211 -CONFIG_COMPAT=y
 212 -CONFIG_SYSVIPC_COMPAT=y
 213 -
 214 -# CONFIG_SUSPEND is not set
 215 -CONFIG_PM=y
 216  CONFIG_NET=y
 217  CONFIG_PACKET=y
 218  CONFIG_UNIX=y
 219 @@ -437,6 +388,7 @@ CONFIG_BT_MRVL=m
 220  CONFIG_BT_MRVL_SDIO=m
 221  CONFIG_BT_ATH3K=m
 222  CONFIG_BT_WILINK=m
 223 +CONFIG_CFG80211=m
 224  CONFIG_MAC80211=m
 225  CONFIG_MAC80211_MESH=y
 226  CONFIG_WIMAX=m
 227 @@ -490,7 +442,6 @@ CONFIG_BONDING=m
 228  CONFIG_DUMMY=m
 229  CONFIG_IFB=m
 230  CONFIG_MACVLAN=m
 231 -CONFIG_IPVLAN=m
 232  CONFIG_VXLAN=m
 233  CONFIG_NETCONSOLE=m
 234  CONFIG_TUN=m
 235 @@ -579,8 +530,6 @@ CONFIG_RT2800USB_RT3573=y
 236  CONFIG_RT2800USB_RT53XX=y
 237  CONFIG_RT2800USB_RT55XX=y
 238  CONFIG_RT2800USB_UNKNOWN=y
 239 -CONFIG_RTL8187=m
 240 -CONFIG_RTL8192CU=n
 241  CONFIG_USB_ZD1201=m
 242  CONFIG_ZD1211RW=m
 243  CONFIG_MAC80211_HWSIM=m
 244 @@ -606,7 +555,7 @@ CONFIG_JOYSTICK_RPISENSE=m
 245  CONFIG_INPUT_TOUCHSCREEN=y
 246  CONFIG_TOUCHSCREEN_ADS7846=m
 247  CONFIG_TOUCHSCREEN_EGALAX=m
 248 -CONFIG_TOUCHSCREEN_FT6236=m
 249 +CONFIG_TOUCHSCREEN_EKTF2127=m
 250  CONFIG_TOUCHSCREEN_RPI_FT5406=m
 251  CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
 252  CONFIG_TOUCHSCREEN_STMPE=m
 253 @@ -626,10 +575,8 @@ CONFIG_SERIO_RAW=m
 254  CONFIG_GAMEPORT=m
 255  CONFIG_GAMEPORT_NS558=m
 256  CONFIG_GAMEPORT_L4=m
 257 -CONFIG_BRCM_CHAR_DRIVERS=n
 258 -CONFIG_BCM_VC_CMA=n
 259 -CONFIG_BCM_VCIO=n
 260 -CONFIG_BCM_VC_SM=n
 261 +# CONFIG_BCM2835_DEVGPIOMEM is not set
 262 +# CONFIG_BCM2835_SMI_DEV is not set
 263  # CONFIG_LEGACY_PTYS is not set
 264  # CONFIG_DEVKMEM is not set
 265  CONFIG_SERIAL_8250=y
 266 @@ -638,6 +585,9 @@ CONFIG_SERIAL_8250_CONSOLE=y
 267  # CONFIG_SERIAL_8250_DMA is not set
 268  CONFIG_SERIAL_8250_NR_UARTS=1
 269  CONFIG_SERIAL_8250_RUNTIME_UARTS=0
 270 +CONFIG_SERIAL_8250_EXTENDED=y
 271 +CONFIG_SERIAL_8250_SHARE_IRQ=y
 272 +CONFIG_SERIAL_8250_BCM2835AUX=y
 273  CONFIG_SERIAL_OF_PLATFORM=y
 274  CONFIG_SERIAL_AMBA_PL011=y
 275  CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 276 @@ -650,6 +600,7 @@ CONFIG_I2C=y
 277  CONFIG_I2C_CHARDEV=m
 278  CONFIG_I2C_MUX_PCA954x=m
 279  CONFIG_I2C_BCM2708=m
 280 +CONFIG_I2C_BCM2835=m
 281  CONFIG_I2C_GPIO=m
 282  CONFIG_SPI=y
 283  CONFIG_SPI_BCM2835=m
 284 @@ -681,13 +632,13 @@ CONFIG_W1_SLAVE_DS2780=m
 285  CONFIG_W1_SLAVE_DS2781=m
 286  CONFIG_W1_SLAVE_DS28E04=m
 287  CONFIG_W1_SLAVE_BQ27000=m
 288 -CONFIG_BATTERY_DS2760=m
 289 -CONFIG_POWER_RESET=y
 290  CONFIG_POWER_RESET_GPIO=y
 291 +CONFIG_BATTERY_DS2760=m
 292  CONFIG_HWMON=m
 293  CONFIG_SENSORS_LM75=m
 294  CONFIG_SENSORS_SHT21=m
 295  CONFIG_SENSORS_SHTC1=m
 296 +CONFIG_SENSORS_INA2XX=m
 297  CONFIG_THERMAL=y
 298  CONFIG_THERMAL_BCM2835=y
 299  CONFIG_WATCHDOG=y
 300 @@ -835,8 +786,6 @@ CONFIG_VIDEO_EM28XX_V4L2=m
 301  CONFIG_VIDEO_EM28XX_ALSA=m
 302  CONFIG_VIDEO_EM28XX_DVB=m
 303  CONFIG_V4L_PLATFORM_DRIVERS=y
 304 -CONFIG_VIDEO_BCM2835=n
 305 -CONFIG_VIDEO_BCM2835_MMAL=n
 306  CONFIG_RADIO_SI470X=y
 307  CONFIG_USB_SI470X=m
 308  CONFIG_I2C_SI470X=m
 309 @@ -892,8 +841,6 @@ CONFIG_SND_VIRMIDI=m
 310  CONFIG_SND_MTPAV=m
 311  CONFIG_SND_SERIAL_U16550=m
 312  CONFIG_SND_MPU401=m
 313 -CONFIG_SND_ARM=n
 314 -CONFIG_SND_BCM2835=n
 315  CONFIG_SND_USB_AUDIO=m
 316  CONFIG_SND_USB_UA101=m
 317  CONFIG_SND_USB_CAIAQ=m
 318 @@ -916,7 +863,10 @@ CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m
 319  CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m
 320  CONFIG_SND_DIGIDAC1_SOUNDCARD=m
 321  CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m
 322 +CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m
 323 +CONFIG_SND_PISOUND=m
 324  CONFIG_SND_SOC_ADAU1701=m
 325 +CONFIG_SND_SOC_AK4554=m
 326  CONFIG_SND_SOC_WM8804_I2C=m
 327  CONFIG_SND_SIMPLE_CARD=m
 328  CONFIG_SOUND_PRIME=m
 329 @@ -979,8 +929,6 @@ CONFIG_USB_HIDDEV=y
 330  CONFIG_USB=y
 331  CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 332  CONFIG_USB_MON=m
 333 -CONFIG_USB_DWCOTG=n
 334 -CONFIG_USB_DWC2=y
 335  CONFIG_USB_PRINTER=m
 336  CONFIG_USB_STORAGE=y
 337  CONFIG_USB_STORAGE_REALTEK=m
 338 @@ -1001,6 +949,7 @@ CONFIG_USB_MICROTEK=m
 339  CONFIG_USBIP_CORE=m
 340  CONFIG_USBIP_VHCI_HCD=m
 341  CONFIG_USBIP_HOST=m
 342 +CONFIG_USB_DWC2=y
 343  CONFIG_USB_SERIAL=m
 344  CONFIG_USB_SERIAL_GENERIC=y
 345  CONFIG_USB_SERIAL_AIRCABLE=m
 346 @@ -1096,6 +1045,7 @@ CONFIG_LEDS_TRIGGER_INPUT=y
 347  CONFIG_LEDS_TRIGGER_PANIC=y
 348  CONFIG_RTC_CLASS=y
 349  # CONFIG_RTC_HCTOSYS is not set
 350 +CONFIG_RTC_DRV_ABX80X=m
 351  CONFIG_RTC_DRV_DS1307=m
 352  CONFIG_RTC_DRV_DS1374=m
 353  CONFIG_RTC_DRV_DS1672=m
 354 @@ -1103,7 +1053,6 @@ CONFIG_RTC_DRV_MAX6900=m
 355  CONFIG_RTC_DRV_RS5C372=m
 356  CONFIG_RTC_DRV_ISL1208=m
 357  CONFIG_RTC_DRV_ISL12022=m
 358 -CONFIG_RTC_DRV_ISL12057=m
 359  CONFIG_RTC_DRV_X1205=m
 360  CONFIG_RTC_DRV_PCF8523=m
 361  CONFIG_RTC_DRV_PCF8563=m
 362 @@ -1137,7 +1086,6 @@ CONFIG_STAGING=y
 363  CONFIG_PRISM2_USB=m
 364  CONFIG_R8712U=m
 365  CONFIG_R8188EU=m
 366 -CONFIG_R8723AU=m
 367  CONFIG_VT6656=m
 368  CONFIG_SPEAKUP=m
 369  CONFIG_SPEAKUP_SYNTH_SOFT=m
 370 @@ -1153,6 +1101,7 @@ CONFIG_FB_TFT_BD663474=m
 371  CONFIG_FB_TFT_HX8340BN=m
 372  CONFIG_FB_TFT_HX8347D=m
 373  CONFIG_FB_TFT_HX8353D=m
 374 +CONFIG_FB_TFT_HX8357D=m
 375  CONFIG_FB_TFT_ILI9163=m
 376  CONFIG_FB_TFT_ILI9320=m
 377  CONFIG_FB_TFT_ILI9325=m
 378 @@ -1176,6 +1125,7 @@ CONFIG_FB_TFT_UPD161704=m
 379  CONFIG_FB_TFT_WATTEROTT=m
 380  CONFIG_FB_FLEX=m
 381  CONFIG_FB_TFT_FBTFT_DEVICE=m
 382 +# CONFIG_BCM2708_VCHIQ is not set
 383  CONFIG_MAILBOX=y
 384  CONFIG_BCM2835_MBOX=y
 385  # CONFIG_IOMMU_SUPPORT is not set
 386 @@ -1189,6 +1139,7 @@ CONFIG_IIO_KFIFO_BUF=m
 387  CONFIG_MCP320X=m
 388  CONFIG_MCP3422=m
 389  CONFIG_DHT11=m
 390 +CONFIG_HTU21=m
 391  CONFIG_PWM_BCM2835=m
 392  CONFIG_PWM_PCA9685=m
 393  CONFIG_RASPBERRYPI_FIRMWARE=y
 394 @@ -1309,6 +1260,7 @@ CONFIG_BOOT_PRINTK_DELAY=y
 395  CONFIG_DEBUG_MEMORY_INIT=y
 396  CONFIG_DETECT_HUNG_TASK=y
 397  CONFIG_TIMER_STATS=y
 398 +CONFIG_LATENCYTOP=y
 399  CONFIG_IRQSOFF_TRACER=y
 400  CONFIG_SCHED_TRACER=y
 401  CONFIG_STACK_TRACER=y
 402 @@ -1331,5 +1283,3 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
 403  CONFIG_ARM64_CRYPTO=y
 404  CONFIG_CRC_ITU_T=y
 405  CONFIG_LIBCRC32C=y
 406 -CONFIG_BCM2708_VCHIQ=n
 407 -CONFIG_ARCH_BCM2835=y
 408 --
 409 2.1.4
 410